From 17f692a89a83142e6939e1b5e839f2348c921167 Mon Sep 17 00:00:00 2001
From: Colin Adler <colin1adler@gmail.com>
Date: Wed, 12 Apr 2023 17:36:05 -0500
Subject: [PATCH] fix(scaletest): correctly validate configs using
 `SessionToken` (#7111)

---
 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 e8607dff86..e1e92fb6e8 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 df8805b735..c3cca1d275 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,