Skip to content

Commit 967db28

Browse files
sreyasreya
authored
chore: refactor ResolveAutostart tests to use dbfake (#10603)
1 parent 12a4b11 commit 967db28

15 files changed

+479
-299
lines changed

‎cli/agent_test.go

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@ func TestWorkspaceAgent(t *testing.T) {
3131

3232
client, db := coderdtest.NewWithDatabase(t, nil)
3333
user := coderdtest.CreateFirstUser(t, client)
34-
r := dbfake.Workspace(t, db).
35-
Seed(database.Workspace{
36-
OrganizationID: user.OrganizationID,
37-
OwnerID: user.UserID,
38-
}).
34+
r := dbfake.WorkspaceBuild(t, db, database.Workspace{
35+
OrganizationID: user.OrganizationID,
36+
OwnerID: user.UserID,
37+
}).
3938
WithAgent().
4039
Do()
4140
logDir := t.TempDir()
@@ -68,7 +67,7 @@ func TestWorkspaceAgent(t *testing.T) {
6867
AzureCertificates: certificates,
6968
})
7069
user := coderdtest.CreateFirstUser(t, client)
71-
r := dbfake.Workspace(t, db).Seed(database.Workspace{
70+
r := dbfake.WorkspaceBuild(t, db, database.Workspace{
7271
OrganizationID: user.OrganizationID,
7372
OwnerID: user.UserID,
7473
}).WithAgent(func(agents []*proto.Agent) []*proto.Agent {
@@ -105,7 +104,7 @@ func TestWorkspaceAgent(t *testing.T) {
105104
AWSCertificates: certificates,
106105
})
107106
user := coderdtest.CreateFirstUser(t, client)
108-
r := dbfake.Workspace(t, db).Seed(database.Workspace{
107+
r := dbfake.WorkspaceBuild(t, db, database.Workspace{
109108
OrganizationID: user.OrganizationID,
110109
OwnerID: user.UserID,
111110
}).WithAgent(func(agents []*proto.Agent) []*proto.Agent {
@@ -143,7 +142,7 @@ func TestWorkspaceAgent(t *testing.T) {
143142
})
144143
owner := coderdtest.CreateFirstUser(t, client)
145144
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
146-
r := dbfake.Workspace(t, db).Seed(database.Workspace{
145+
r := dbfake.WorkspaceBuild(t, db, database.Workspace{
147146
OrganizationID: owner.OrganizationID,
148147
OwnerID: memberUser.ID,
149148
}).WithAgent(func(agents []*proto.Agent) []*proto.Agent {
@@ -195,13 +194,10 @@ func TestWorkspaceAgent(t *testing.T) {
195194

196195
client, db := coderdtest.NewWithDatabase(t, nil)
197196
user := coderdtest.CreateFirstUser(t, client)
198-
r := dbfake.Workspace(t, db).
199-
Seed(database.Workspace{
200-
OrganizationID: user.OrganizationID,
201-
OwnerID: user.UserID,
202-
}).
203-
WithAgent().
204-
Do()
197+
r := dbfake.WorkspaceBuild(t, db, database.Workspace{
198+
OrganizationID: user.OrganizationID,
199+
OwnerID: user.UserID,
200+
}).WithAgent().Do()
205201

206202
logDir := t.TempDir()
207203
inv, _ := clitest.New(t,

‎cli/configssh_test.go

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,10 @@ func TestConfigSSH(t *testing.T) {
7777
})
7878
owner := coderdtest.CreateFirstUser(t, client)
7979
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
80-
r := dbfake.Workspace(t, db).
81-
Seed(database.Workspace{
82-
OrganizationID: owner.OrganizationID,
83-
OwnerID: memberUser.ID,
84-
}).
85-
WithAgent().
86-
Do()
80+
r := dbfake.WorkspaceBuild(t, db, database.Workspace{
81+
OrganizationID: owner.OrganizationID,
82+
OwnerID: memberUser.ID,
83+
}).WithAgent().Do()
8784
_ = agenttest.New(t, client.URL, r.AgentToken)
8885
resources := coderdtest.AwaitWorkspaceAgents(t, client, r.Workspace.ID)
8986
agentConn, err := client.DialWorkspaceAgent(context.Background(), resources[0].Agents[0].ID, nil)
@@ -575,7 +572,7 @@ func TestConfigSSH_FileWriteAndOptionsFlow(t *testing.T) {
575572
client, db := coderdtest.NewWithDatabase(t, nil)
576573
user := coderdtest.CreateFirstUser(t, client)
577574
if tt.hasAgent {
578-
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
575+
_ = dbfake.WorkspaceBuild(t, db, database.Workspace{
579576
OrganizationID: user.OrganizationID,
580577
OwnerID: user.UserID,
581578
}).WithAgent().Do()
@@ -695,11 +692,10 @@ func TestConfigSSH_Hostnames(t *testing.T) {
695692
owner := coderdtest.CreateFirstUser(t, client)
696693
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
697694

698-
r := dbfake.Workspace(t, db).Seed(database.Workspace{
695+
r := dbfake.WorkspaceBuild(t, db, database.Workspace{
699696
OrganizationID: owner.OrganizationID,
700697
OwnerID: memberUser.ID,
701-
}).Do()
702-
dbfake.WorkspaceBuild(t, db, r.Workspace).Resource(resources...).Do()
698+
}).Resource(resources...).Do()
703699
sshConfigFile := sshConfigFileName(t)
704700

705701
inv, root := clitest.New(t, "config-ssh", "--ssh-config-file", sshConfigFile)

‎cli/gitssh_test.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,11 @@ func prepareTestGitSSH(ctx context.Context, t *testing.T) (*agentsdk.Client, str
4848
require.NoError(t, err)
4949

5050
// setup template
51-
r := dbfake.Workspace(t, db).
52-
Seed(database.Workspace{
53-
OrganizationID: user.OrganizationID,
54-
OwnerID: user.UserID,
55-
}).
56-
WithAgent().
57-
Do()
51+
r := dbfake.WorkspaceBuild(t, db, database.Workspace{
52+
OrganizationID: user.OrganizationID,
53+
OwnerID: user.UserID,
54+
}).WithAgent().Do()
55+
5856
// start workspace agent
5957
agentClient := agentsdk.New(client.URL)
6058
agentClient.SetSessionToken(r.AgentToken)

‎cli/list_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ func TestList(t *testing.T) {
2525
client, db := coderdtest.NewWithDatabase(t, nil)
2626
owner := coderdtest.CreateFirstUser(t, client)
2727
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
28-
r := dbfake.Workspace(t, db).Seed(database.Workspace{
28+
// setup template
29+
r := dbfake.WorkspaceBuild(t, db, database.Workspace{
2930
OrganizationID: owner.OrganizationID,
3031
OwnerID: memberUser.ID,
3132
}).WithAgent().Do()
33+
3234
inv, root := clitest.New(t, "ls")
3335
clitest.SetupConfig(t, member, root)
3436
pty := ptytest.New(t).Attach(inv)
@@ -52,7 +54,7 @@ func TestList(t *testing.T) {
5254
client, db := coderdtest.NewWithDatabase(t, nil)
5355
owner := coderdtest.CreateFirstUser(t, client)
5456
member, memberUser := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
55-
dbfake.Workspace(t, db).Seed(database.Workspace{
57+
_ = dbfake.WorkspaceBuild(t, db, database.Workspace{
5658
OrganizationID: owner.OrganizationID,
5759
OwnerID: memberUser.ID,
5860
}).WithAgent().Do()

‎cli/portforward_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,10 +305,11 @@ func runAgent(t *testing.T, client *codersdk.Client, owner uuid.UUID, db databas
305305
require.NoError(t, err, "specified user does not exist")
306306
require.Greater(t, len(user.OrganizationIDs), 0, "user has no organizations")
307307
orgID := user.OrganizationIDs[0]
308-
r := dbfake.Workspace(t, db).Seed(database.Workspace{
308+
r := dbfake.WorkspaceBuild(t, db, database.Workspace{
309309
OrganizationID: orgID,
310310
OwnerID: owner,
311311
}).WithAgent().Do()
312+
312313
_ = agenttest.New(t, client.URL, r.AgentToken,
313314
func(o *agent.Options) {
314315
o.SSHMaxTimeout = 60 * time.Second

‎cli/schedule_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,27 @@ func setupTestSchedule(t *testing.T, sched *cron.Schedule) (ownerClient, memberC
3838
memberClient, memberUser := coderdtest.CreateAnotherUserMutators(t, ownerClient, owner.OrganizationID, nil, func(r *codersdk.CreateUserRequest) {
3939
r.Username = "testuser2" // ensure deterministic ordering
4040
})
41-
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
41+
_ = dbfake.WorkspaceBuild(t, db, database.Workspace{
4242
Name: "a-owner",
4343
OwnerID: owner.UserID,
4444
OrganizationID: owner.OrganizationID,
4545
AutostartSchedule: sql.NullString{String: sched.String(), Valid: true},
4646
Ttl: sql.NullInt64{Int64: 8 * time.Hour.Nanoseconds(), Valid: true},
4747
}).WithAgent().Do()
48-
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
48+
49+
_ = dbfake.WorkspaceBuild(t, db, database.Workspace{
4950
Name: "b-owner",
5051
OwnerID: owner.UserID,
5152
OrganizationID: owner.OrganizationID,
5253
AutostartSchedule: sql.NullString{String: sched.String(), Valid: true},
5354
}).WithAgent().Do()
54-
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
55+
_ = dbfake.WorkspaceBuild(t, db, database.Workspace{
5556
Name: "c-member",
5657
OwnerID: memberUser.ID,
5758
OrganizationID: owner.OrganizationID,
5859
Ttl: sql.NullInt64{Int64: 8 * time.Hour.Nanoseconds(), Valid: true},
5960
}).WithAgent().Do()
60-
_ = dbfake.Workspace(t, db).Seed(database.Workspace{
61+
_ = dbfake.WorkspaceBuild(t, db, database.Workspace{
6162
Name: "d-member",
6263
OwnerID: memberUser.ID,
6364
OrganizationID: owner.OrganizationID,

‎cli/ssh_test.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,10 @@ func setupWorkspaceForAgent(t *testing.T, mutations ...func([]*proto.Agent) []*p
5252
client.SetLogger(slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug))
5353
first := coderdtest.CreateFirstUser(t, client)
5454
userClient, user := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
55-
r := dbfake.Workspace(t, store).
56-
Seed(database.Workspace{
57-
OrganizationID: first.OrganizationID,
58-
OwnerID: user.ID,
59-
}).
60-
WithAgent(mutations...).
61-
Do()
55+
r := dbfake.WorkspaceBuild(t, store, database.Workspace{
56+
OrganizationID: first.OrganizationID,
57+
OwnerID: user.ID,
58+
}).WithAgent(mutations...).Do()
6259

6360
return userClient, r.Workspace, r.AgentToken
6461
}
@@ -130,7 +127,7 @@ func TestSSH(t *testing.T) {
130127
client.SetLogger(slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug))
131128
first := coderdtest.CreateFirstUser(t, client)
132129
userClient, user := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
133-
r := dbfake.Workspace(t, store).Seed(database.Workspace{
130+
r := dbfake.WorkspaceBuild(t, store, database.Workspace{
134131
OrganizationID: first.OrganizationID,
135132
OwnerID: user.ID,
136133
}).WithAgent().Do()
@@ -469,7 +466,7 @@ func TestSSH(t *testing.T) {
469466
client.SetLogger(slogtest.Make(t, nil).Named("client").Leveled(slog.LevelDebug))
470467
first := coderdtest.CreateFirstUser(t, client)
471468
userClient, user := coderdtest.CreateAnotherUser(t, client, first.OrganizationID)
472-
r := dbfake.Workspace(t, store).Seed(database.Workspace{
469+
r := dbfake.WorkspaceBuild(t, store, database.Workspace{
473470
OrganizationID: first.OrganizationID,
474471
OwnerID: user.ID,
475472
}).WithAgent().Do()

‎coderd/coderdtest/coderdtest.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,8 @@ func CreateWorkspaceBuild(
753753
transition database.WorkspaceTransition,
754754
mutators ...func(*codersdk.CreateWorkspaceBuildRequest),
755755
) codersdk.WorkspaceBuild {
756+
t.Helper()
757+
756758
req := codersdk.CreateWorkspaceBuildRequest{
757759
Transition: codersdk.WorkspaceTransition(transition),
758760
}

0 commit comments

Comments
 (0)