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

Commit2e7fb5e

Browse files
committed
fixup
1 parent855b5c1 commit2e7fb5e

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

‎scaletest/createusers/run.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,19 @@ type Runner struct {
2525
user codersdk.User
2626
}
2727

28+
typeUserstruct {
29+
codersdk.User
30+
SessionTokenstring
31+
}
32+
2833
funcNewRunner(client*codersdk.Client,cfgConfig)*Runner {
2934
return&Runner{
3035
client:client,
3136
cfg:cfg,
3237
}
3338
}
3439

35-
func (r*Runner)RunReturningUser(ctx context.Context,idstring,logs io.Writer) (codersdk.User,error) {
40+
func (r*Runner)RunReturningUser(ctx context.Context,idstring,logs io.Writer) (User,error) {
3641
ctx,span:=tracing.StartSpan(ctx)
3742
deferspan.End()
3843

@@ -44,7 +49,7 @@ func (r *Runner) RunReturningUser(ctx context.Context, id string, logs io.Writer
4449
ifr.cfg.Username==""||r.cfg.Email=="" {
4550
genUsername,genEmail,err:=loadtestutil.GenerateUserIdentifier(id)
4651
iferr!=nil {
47-
returncodersdk.User{},xerrors.Errorf("generate user identifier: %w",err)
52+
returnUser{},xerrors.Errorf("generate user identifier: %w",err)
4853
}
4954
ifr.cfg.Username=="" {
5055
r.cfg.Username=genUsername
@@ -57,7 +62,7 @@ func (r *Runner) RunReturningUser(ctx context.Context, id string, logs io.Writer
5762
_,_=fmt.Fprintln(logs,"Generating user password...")
5863
password,err:=cryptorand.String(16)
5964
iferr!=nil {
60-
returncodersdk.User{},xerrors.Errorf("generate random password for user: %w",err)
65+
returnUser{},xerrors.Errorf("generate random password for user: %w",err)
6166
}
6267

6368
_,_=fmt.Fprintln(logs,"Creating user:")
@@ -68,7 +73,7 @@ func (r *Runner) RunReturningUser(ctx context.Context, id string, logs io.Writer
6873
Password:password,
6974
})
7075
iferr!=nil {
71-
returncodersdk.User{},xerrors.Errorf("create user: %w",err)
76+
returnUser{},xerrors.Errorf("create user: %w",err)
7277
}
7378
r.user=user
7479

@@ -79,7 +84,7 @@ func (r *Runner) RunReturningUser(ctx context.Context, id string, logs io.Writer
7984
Password:password,
8085
})
8186
iferr!=nil {
82-
returncodersdk.User{},xerrors.Errorf("login as new user: %w",err)
87+
returnUser{},xerrors.Errorf("login as new user: %w",err)
8388
}
8489
r.sessionToken=loginRes.SessionToken
8590

@@ -88,7 +93,7 @@ func (r *Runner) RunReturningUser(ctx context.Context, id string, logs io.Writer
8893
_,_=fmt.Fprintf(logs,"\tEmail: %s\n",user.Email)
8994
_,_=fmt.Fprintf(logs,"\tPassword: ****************\n")
9095

91-
returnuser,nil
96+
returnUser{User:user,SessionToken:r.sessionToken},nil
9297
}
9398

9499
func (r*Runner)Cleanup(ctx context.Context,_string,logs io.Writer)error {
@@ -101,7 +106,3 @@ func (r *Runner) Cleanup(ctx context.Context, _ string, logs io.Writer) error {
101106
}
102107
returnnil
103108
}
104-
105-
func (r*Runner)SessionToken()string {
106-
returnr.sessionToken
107-
}

‎scaletest/createworkspaces/run.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ 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-
user,err=r.createUserRunner.RunReturningUser(ctx,id,logs)
76+
newUser,err:=r.createUserRunner.RunReturningUser(ctx,id,logs)
7777
iferr!=nil {
7878
returnxerrors.Errorf("create user: %w",err)
7979
}
80-
80+
user=newUser.User
8181
client=codersdk.New(r.client.URL)
82-
client.SetSessionToken(r.createUserRunner.SessionToken())
82+
client.SetSessionToken(newUser.SessionToken)
8383
}
8484

8585
_,_=fmt.Fprintln(logs,"\nCreating workspace...")

0 commit comments

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