Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit855b5c1

Browse files
committed
review
1 parentbfea046 commit855b5c1

File tree

2 files changed

+10
-23
lines changed

2 files changed

+10
-23
lines changed

‎scaletest/createusers/run.go‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,25 @@ import (
1414
"github.com/coder/coder/v2/coderd/tracing"
1515
"github.com/coder/coder/v2/codersdk"
1616
"github.com/coder/coder/v2/cryptorand"
17-
"github.com/coder/coder/v2/scaletest/harness"
1817
"github.com/coder/coder/v2/scaletest/loadtestutil"
1918
)
2019

2120
typeRunnerstruct {
2221
client*codersdk.Client
2322
cfgConfig
2423

25-
userID uuid.UUID
2624
sessionTokenstring
2725
user codersdk.User
2826
}
2927

30-
var (
31-
_ harness.Runnable=&Runner{}
32-
_ harness.Cleanable=&Runner{}
33-
)
34-
3528
funcNewRunner(client*codersdk.Client,cfgConfig)*Runner {
3629
return&Runner{
3730
client:client,
3831
cfg:cfg,
3932
}
4033
}
4134

42-
func (r*Runner)Run(ctx context.Context,idstring,logs io.Writer)error {
35+
func (r*Runner)RunReturningUser(ctx context.Context,idstring,logs io.Writer)(codersdk.User,error) {
4336
ctx,span:=tracing.StartSpan(ctx)
4437
deferspan.End()
4538

@@ -51,7 +44,7 @@ func (r *Runner) Run(ctx context.Context, id string, logs io.Writer) error {
5144
ifr.cfg.Username==""||r.cfg.Email=="" {
5245
genUsername,genEmail,err:=loadtestutil.GenerateUserIdentifier(id)
5346
iferr!=nil {
54-
returnxerrors.Errorf("generate user identifier: %w",err)
47+
returncodersdk.User{},xerrors.Errorf("generate user identifier: %w",err)
5548
}
5649
ifr.cfg.Username=="" {
5750
r.cfg.Username=genUsername
@@ -64,7 +57,7 @@ func (r *Runner) Run(ctx context.Context, id string, logs io.Writer) error {
6457
_,_=fmt.Fprintln(logs,"Generating user password...")
6558
password,err:=cryptorand.String(16)
6659
iferr!=nil {
67-
returnxerrors.Errorf("generate random password for user: %w",err)
60+
returncodersdk.User{},xerrors.Errorf("generate random password for user: %w",err)
6861
}
6962

7063
_,_=fmt.Fprintln(logs,"Creating user:")
@@ -75,9 +68,8 @@ func (r *Runner) Run(ctx context.Context, id string, logs io.Writer) error {
7568
Password:password,
7669
})
7770
iferr!=nil {
78-
returnxerrors.Errorf("create user: %w",err)
71+
returncodersdk.User{},xerrors.Errorf("create user: %w",err)
7972
}
80-
r.userID=user.ID
8173
r.user=user
8274

8375
_,_=fmt.Fprintln(logs,"\nLogging in as new user...")
@@ -87,7 +79,7 @@ func (r *Runner) Run(ctx context.Context, id string, logs io.Writer) error {
8779
Password:password,
8880
})
8981
iferr!=nil {
90-
returnxerrors.Errorf("login as new user: %w",err)
82+
returncodersdk.User{},xerrors.Errorf("login as new user: %w",err)
9183
}
9284
r.sessionToken=loginRes.SessionToken
9385

@@ -96,14 +88,14 @@ func (r *Runner) Run(ctx context.Context, id string, logs io.Writer) error {
9688
_,_=fmt.Fprintf(logs,"\tEmail: %s\n",user.Email)
9789
_,_=fmt.Fprintf(logs,"\tPassword: ****************\n")
9890

99-
returnnil
91+
returnuser,nil
10092
}
10193

10294
func (r*Runner)Cleanup(ctx context.Context,_string,logs io.Writer)error {
103-
ifr.userID!=uuid.Nil {
104-
err:=r.client.DeleteUser(ctx,r.userID)
95+
ifr.user.ID!=uuid.Nil {
96+
err:=r.client.DeleteUser(ctx,r.user.ID)
10597
iferr!=nil {
106-
_,_=fmt.Fprintf(logs,"failed to delete user %q: %v\n",r.userID.String(),err)
98+
_,_=fmt.Fprintf(logs,"failed to delete user %q: %v\n",r.user.ID.String(),err)
10799
returnxerrors.Errorf("delete user: %w",err)
108100
}
109101
}
@@ -113,7 +105,3 @@ func (r *Runner) Cleanup(ctx context.Context, _ string, logs io.Writer) error {
113105
func (r*Runner)SessionToken()string {
114106
returnr.sessionToken
115107
}
116-
117-
func (r*Runner)User() codersdk.User {
118-
returnr.user
119-
}

‎scaletest/createworkspaces/run.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,11 @@ func (r *Runner) Run(ctx context.Context, id string, logs io.Writer) error {
7373
returnxerrors.Errorf("validate create user config: %w",err)
7474
}
7575
r.createUserRunner=createusers.NewRunner(r.client,createUserConfig)
76-
err=r.createUserRunner.Run(ctx,id,logs)
76+
user,err=r.createUserRunner.RunReturningUser(ctx,id,logs)
7777
iferr!=nil {
7878
returnxerrors.Errorf("create user: %w",err)
7979
}
8080

81-
user=r.createUserRunner.User()
8281
client=codersdk.New(r.client.URL)
8382
client.SetSessionToken(r.createUserRunner.SessionToken())
8483
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp