mirror of
https://github.com/coder/coder.git
synced 2026-06-02 20:48:20 +00:00
refactor(scaletest): add runner for creating users (#19811)
Closes https://github.com/coder/internal/issues/985 Simple refactor of the user creation logic into it's own test runner. This lets us create users independently of workspaces, for use in a bunch of load generators, including the Coder Connect load generator. This PR creates the new runner, and has the existing `createworkspaces` runner use it.
This commit is contained in:
@@ -14,8 +14,8 @@ import (
|
||||
|
||||
"github.com/coder/coder/v2/coderd/tracing"
|
||||
"github.com/coder/coder/v2/codersdk"
|
||||
"github.com/coder/coder/v2/cryptorand"
|
||||
"github.com/coder/coder/v2/scaletest/agentconn"
|
||||
"github.com/coder/coder/v2/scaletest/createusers"
|
||||
"github.com/coder/coder/v2/scaletest/harness"
|
||||
"github.com/coder/coder/v2/scaletest/loadtestutil"
|
||||
"github.com/coder/coder/v2/scaletest/reconnectingpty"
|
||||
@@ -26,7 +26,7 @@ type Runner struct {
|
||||
client *codersdk.Client
|
||||
cfg Config
|
||||
|
||||
userID uuid.UUID
|
||||
createUserRunner *createusers.Runner
|
||||
workspacebuildRunner *workspacebuild.Runner
|
||||
}
|
||||
|
||||
@@ -64,42 +64,24 @@ func (r *Runner) Run(ctx context.Context, id string, logs io.Writer) error {
|
||||
return xerrors.Errorf("generate random password for user: %w", err)
|
||||
}
|
||||
} else {
|
||||
_, _ = fmt.Fprintln(logs, "Generating user password...")
|
||||
password, err := cryptorand.String(16)
|
||||
if err != nil {
|
||||
return xerrors.Errorf("generate random password for user: %w", err)
|
||||
createUserConfig := createusers.Config{
|
||||
OrganizationID: r.cfg.User.OrganizationID,
|
||||
Username: r.cfg.User.Username,
|
||||
Email: r.cfg.User.Email,
|
||||
}
|
||||
|
||||
_, _ = fmt.Fprintln(logs, "Creating user:")
|
||||
|
||||
user, err = r.client.CreateUserWithOrgs(ctx, codersdk.CreateUserRequestWithOrgs{
|
||||
OrganizationIDs: []uuid.UUID{r.cfg.User.OrganizationID},
|
||||
Username: r.cfg.User.Username,
|
||||
Email: r.cfg.User.Email,
|
||||
Password: password,
|
||||
})
|
||||
if err := createUserConfig.Validate(); err != nil {
|
||||
return xerrors.Errorf("validate create user config: %w", err)
|
||||
}
|
||||
r.createUserRunner = createusers.NewRunner(r.client, createUserConfig)
|
||||
newUser, err := r.createUserRunner.RunReturningUser(ctx, id, logs)
|
||||
if err != nil {
|
||||
return xerrors.Errorf("create user: %w", err)
|
||||
}
|
||||
r.userID = user.ID
|
||||
|
||||
_, _ = fmt.Fprintln(logs, "\nLogging in as new user...")
|
||||
user = newUser.User
|
||||
client = codersdk.New(r.client.URL)
|
||||
loginRes, err := client.LoginWithPassword(ctx, codersdk.LoginWithPasswordRequest{
|
||||
Email: r.cfg.User.Email,
|
||||
Password: password,
|
||||
})
|
||||
if err != nil {
|
||||
return xerrors.Errorf("login as new user: %w", err)
|
||||
}
|
||||
client.SetSessionToken(loginRes.SessionToken)
|
||||
client.SetSessionToken(newUser.SessionToken)
|
||||
}
|
||||
|
||||
_, _ = fmt.Fprintf(logs, "\tOrg ID: %s\n", r.cfg.User.OrganizationID.String())
|
||||
_, _ = fmt.Fprintf(logs, "\tUsername: %s\n", user.Username)
|
||||
_, _ = fmt.Fprintf(logs, "\tEmail: %s\n", user.Email)
|
||||
_, _ = fmt.Fprintf(logs, "\tPassword: ****************\n")
|
||||
|
||||
_, _ = fmt.Fprintln(logs, "\nCreating workspace...")
|
||||
workspaceBuildConfig := r.cfg.Workspace
|
||||
workspaceBuildConfig.OrganizationID = r.cfg.User.OrganizationID
|
||||
@@ -189,11 +171,10 @@ func (r *Runner) Cleanup(ctx context.Context, id string, logs io.Writer) error {
|
||||
}
|
||||
}
|
||||
|
||||
if r.userID != uuid.Nil {
|
||||
err := r.client.DeleteUser(ctx, r.userID)
|
||||
if r.createUserRunner != nil {
|
||||
err := r.createUserRunner.Cleanup(ctx, id, logs)
|
||||
if err != nil {
|
||||
_, _ = fmt.Fprintf(logs, "failed to delete user %q: %v\n", r.userID.String(), err)
|
||||
return xerrors.Errorf("delete user: %w", err)
|
||||
return xerrors.Errorf("cleanup user: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user