From 8fd2335c31bfdad7a5d8a3db26edc9fdc918ee36 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Wed, 12 Apr 2023 17:15:18 -0500 Subject: [PATCH] fix(scaletest): correctly validate configs using `SessionToken` --- scaletest/createworkspaces/config.go | 12 +++++++----- scaletest/createworkspaces/run.go | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scaletest/createworkspaces/config.go b/scaletest/createworkspaces/config.go index e8607dff86000..e1e92fb6e86c0 100644 --- a/scaletest/createworkspaces/config.go +++ b/scaletest/createworkspaces/config.go @@ -26,11 +26,13 @@ func (c UserConfig) Validate() error { if c.OrganizationID == uuid.Nil { return xerrors.New("organization_id must not be a nil UUID") } - if c.Username == "" { - return xerrors.New("username must be set") - } - if c.Email == "" { - return xerrors.New("email must be set") + if c.SessionToken == "" { + if c.Username == "" { + return xerrors.New("username must be set") + } + if c.Email == "" { + return xerrors.New("email must be set") + } } return nil diff --git a/scaletest/createworkspaces/run.go b/scaletest/createworkspaces/run.go index df8805b7356ba..c3cca1d275287 100644 --- a/scaletest/createworkspaces/run.go +++ b/scaletest/createworkspaces/run.go @@ -72,7 +72,7 @@ func (r *Runner) Run(ctx context.Context, id string, logs io.Writer) error { _, _ = fmt.Fprintln(logs, "Creating user:") - user, err := r.client.CreateUser(ctx, codersdk.CreateUserRequest{ + user, err = r.client.CreateUser(ctx, codersdk.CreateUserRequest{ OrganizationID: r.cfg.User.OrganizationID, Username: r.cfg.User.Username, Email: r.cfg.User.Email,