Skip to content

Commit 2cc3a0d

Browse files
johnstcnjohnstcn
committed
chore: coderdtest: change argument types to remove unnecessary conversion
1 parent 7e49c3e commit 2cc3a0d

File tree

8 files changed

+36
-38
lines changed

8 files changed

+36
-38
lines changed

‎cli/start_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ func TestStartAutoUpdate(t *testing.T) {
359359
coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID)
360360

361361
if c.Cmd == "start" {
362-
coderdtest.MustTransitionWorkspace(t, member, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
362+
coderdtest.MustTransitionWorkspace(t, member, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
363363
}
364364
version2 := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, prepareEchoResponses(stringRichParameters), func(ctvr *codersdk.CreateTemplateVersionRequest) {
365365
ctvr.TemplateID = template.ID

‎coderd/autobuild/lifecycle_executor_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func TestExecutorAutostartOK(t *testing.T) {
4747
})
4848
)
4949
// Given: workspace is stopped
50-
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
50+
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
5151

5252
// When: the autobuild executor ticks after the scheduled time
5353
go func() {
@@ -105,7 +105,7 @@ func TestMultipleLifecycleExecutors(t *testing.T) {
105105
)
106106

107107
// Have the workspace stopped so we can perform an autostart
108-
workspace = coderdtest.MustTransitionWorkspace(t, clientA, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
108+
workspace = coderdtest.MustTransitionWorkspace(t, clientA, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
109109

110110
// Get both clients to perform a lifecycle execution tick
111111
next := sched.Next(workspace.LatestBuild.CreatedAt)
@@ -204,7 +204,7 @@ func TestExecutorAutostartTemplateUpdated(t *testing.T) {
204204
)
205205
// Given: workspace is stopped
206206
workspace = coderdtest.MustTransitionWorkspace(
207-
t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
207+
t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
208208

209209
orgs, err := client.OrganizationsByUser(ctx, workspace.OwnerID.String())
210210
require.NoError(t, err)
@@ -345,7 +345,7 @@ func TestExecutorAutostartNotEnabled(t *testing.T) {
345345
require.Empty(t, workspace.AutostartSchedule)
346346

347347
// Given: workspace is stopped
348-
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
348+
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
349349

350350
// When: the autobuild executor ticks way into the future
351351
go func() {
@@ -385,7 +385,7 @@ func TestExecutorAutostartUserSuspended(t *testing.T) {
385385
workspace = coderdtest.MustWorkspace(t, userClient, workspace.ID)
386386

387387
// Given: workspace is stopped, and the user is suspended.
388-
workspace = coderdtest.MustTransitionWorkspace(t, userClient, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
388+
workspace = coderdtest.MustTransitionWorkspace(t, userClient, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
389389

390390
ctx := testutil.Context(t, testutil.WaitShort)
391391

@@ -508,7 +508,7 @@ func TestExecutorAutostopAlreadyStopped(t *testing.T) {
508508
)
509509

510510
// Given: workspace is stopped
511-
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
511+
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
512512

513513
// When: the autobuild executor ticks past the TTL
514514
go func() {
@@ -579,7 +579,7 @@ func TestExecutorWorkspaceDeleted(t *testing.T) {
579579
)
580580

581581
// Given: workspace is deleted
582-
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionDelete)
582+
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionDelete)
583583

584584
// When: the autobuild executor ticks
585585
go func() {
@@ -768,7 +768,7 @@ func TestExecutorAutostartMultipleOK(t *testing.T) {
768768
})
769769
)
770770
// Given: workspace is stopped
771-
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
771+
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
772772

773773
// When: the autobuild executor ticks past the scheduled time
774774
go func() {
@@ -833,7 +833,7 @@ func TestExecutorAutostartWithParameters(t *testing.T) {
833833
})
834834
)
835835
// Given: workspace is stopped
836-
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
836+
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
837837

838838
// When: the autobuild executor ticks after the scheduled time
839839
go func() {
@@ -883,7 +883,7 @@ func TestExecutorAutostartTemplateDisabled(t *testing.T) {
883883
})
884884
)
885885
// Given: workspace is stopped
886-
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
886+
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
887887

888888
// When: the autobuild executor ticks before the next scheduled time
889889
go func() {
@@ -1002,7 +1002,7 @@ func TestExecutorRequireActiveVersion(t *testing.T) {
10021002
cwr.AutostartSchedule = ptr.Ref(sched.String())
10031003
})
10041004
_ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, ownerClient, ws.LatestBuild.ID)
1005-
ws = coderdtest.MustTransitionWorkspace(t, memberClient, ws.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop, func(req *codersdk.CreateWorkspaceBuildRequest) {
1005+
ws = coderdtest.MustTransitionWorkspace(t, memberClient, ws.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop, func(req *codersdk.CreateWorkspaceBuildRequest) {
10061006
req.TemplateVersionID = inactiveVersion.ID
10071007
})
10081008
require.Equal(t, inactiveVersion.ID, ws.LatestBuild.TemplateVersionID)
@@ -1160,7 +1160,7 @@ func TestNotifications(t *testing.T) {
11601160
coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, workspace.LatestBuild.ID)
11611161

11621162
// Stop workspace
1163-
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
1163+
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
11641164
_ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, workspace.LatestBuild.ID)
11651165

11661166
// Wait for workspace to become dormant

‎coderd/coderdtest/coderdtest.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,16 +1245,16 @@ func CreateWorkspace(t testing.TB, client *codersdk.Client, templateID uuid.UUID
12451245
}
12461246

12471247
// TransitionWorkspace is a convenience method for transitioning a workspace from one state to another.
1248-
func MustTransitionWorkspace(t testing.TB, client *codersdk.Client, workspaceID uuid.UUID, from, to database.WorkspaceTransition, muts ...func(req *codersdk.CreateWorkspaceBuildRequest)) codersdk.Workspace {
1248+
func MustTransitionWorkspace(t testing.TB, client *codersdk.Client, workspaceID uuid.UUID, from, to codersdk.WorkspaceTransition, muts ...func(req *codersdk.CreateWorkspaceBuildRequest)) codersdk.Workspace {
12491249
t.Helper()
12501250
ctx := context.Background()
12511251
workspace, err := client.Workspace(ctx, workspaceID)
12521252
require.NoError(t, err, "unexpected error fetching workspace")
1253-
require.Equal(t, workspace.LatestBuild.Transition, codersdk.WorkspaceTransition(from), "expected workspace state: %s got: %s", from, workspace.LatestBuild.Transition)
1253+
require.Equal(t, workspace.LatestBuild.Transition, from, "expected workspace state: %s got: %s", from, workspace.LatestBuild.Transition)
12541254

12551255
req := codersdk.CreateWorkspaceBuildRequest{
12561256
TemplateVersionID: workspace.LatestBuild.TemplateVersionID,
1257-
Transition: codersdk.WorkspaceTransition(to),
1257+
Transition: to,
12581258
}
12591259

12601260
for _, mut := range muts {
@@ -1267,7 +1267,7 @@ func MustTransitionWorkspace(t testing.TB, client *codersdk.Client, workspaceID
12671267
_ = AwaitWorkspaceBuildJobCompleted(t, client, build.ID)
12681268

12691269
updated := MustWorkspace(t, client, workspace.ID)
1270-
require.Equal(t, codersdk.WorkspaceTransition(to), updated.LatestBuild.Transition, "expected workspace to be in state %s but got %s", to, updated.LatestBuild.Transition)
1270+
require.Equal(t, to, updated.LatestBuild.Transition, "expected workspace to be in state %s but got %s", to, updated.LatestBuild.Transition)
12711271
return updated
12721272
}
12731273

‎coderd/workspaceapps/apptest/apptest.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"golang.org/x/xerrors"
2828

2929
"github.com/coder/coder/v2/coderd/coderdtest"
30-
"github.com/coder/coder/v2/coderd/database"
3130
"github.com/coder/coder/v2/coderd/jwtutils"
3231
"github.com/coder/coder/v2/coderd/rbac"
3332
"github.com/coder/coder/v2/coderd/workspaceapps"
@@ -1824,7 +1823,7 @@ func Run(t *testing.T, appHostIsPrimary bool, factory DeploymentFactory) {
18241823
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
18251824
defer cancel()
18261825

1827-
_ = coderdtest.MustTransitionWorkspace(t, appDetails.SDKClient, appDetails.Workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
1826+
_ = coderdtest.MustTransitionWorkspace(t, appDetails.SDKClient, appDetails.Workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
18281827

18291828
u := appDetails.PathAppURL(appDetails.Apps.Owner)
18301829
resp, err := appDetails.AppClient(t).Request(ctx, http.MethodGet, u.String(), nil)

‎coderd/workspacebuilds_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ func TestWorkspaceBuildWithUpdatedTemplateVersionSendsNotification(t *testing.T)
585585
// Create a workspace using this template
586586
workspace := coderdtest.CreateWorkspace(t, userClient, template.ID)
587587
coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, workspace.LatestBuild.ID)
588-
coderdtest.MustTransitionWorkspace(t, userClient, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
588+
coderdtest.MustTransitionWorkspace(t, userClient, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
589589

590590
// Create a new version of the template
591591
newVersion := coderdtest.CreateTemplateVersion(t, templateAdminClient, first.OrganizationID, nil, func(ctvr *codersdk.CreateTemplateVersionRequest) {
@@ -598,7 +598,7 @@ func TestWorkspaceBuildWithUpdatedTemplateVersionSendsNotification(t *testing.T)
598598
cwbr.TemplateVersionID = newVersion.ID
599599
})
600600
coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, build.ID)
601-
coderdtest.MustTransitionWorkspace(t, userClient, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
601+
coderdtest.MustTransitionWorkspace(t, userClient, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
602602

603603
// Create the workspace build _again_. We are doing this to
604604
// ensure we do not create _another_ notification. This is
@@ -610,7 +610,7 @@ func TestWorkspaceBuildWithUpdatedTemplateVersionSendsNotification(t *testing.T)
610610
cwbr.TemplateVersionID = newVersion.ID
611611
})
612612
coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, build.ID)
613-
coderdtest.MustTransitionWorkspace(t, userClient, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
613+
coderdtest.MustTransitionWorkspace(t, userClient, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
614614

615615
// We're going to have two notifications (one for the first user and one for the template admin)
616616
// By ensuring we only have these two, we are sure the second build didn't trigger more
@@ -659,7 +659,7 @@ func TestWorkspaceBuildWithUpdatedTemplateVersionSendsNotification(t *testing.T)
659659
// Create a workspace using this template
660660
workspace := coderdtest.CreateWorkspace(t, userClient, template.ID)
661661
coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, workspace.LatestBuild.ID)
662-
coderdtest.MustTransitionWorkspace(t, userClient, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
662+
coderdtest.MustTransitionWorkspace(t, userClient, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
663663

664664
// Create a new version of the template
665665
newVersion := coderdtest.CreateTemplateVersion(t, templateAdminClient, first.OrganizationID, nil, func(ctvr *codersdk.CreateTemplateVersionRequest) {
@@ -675,7 +675,7 @@ func TestWorkspaceBuildWithUpdatedTemplateVersionSendsNotification(t *testing.T)
675675
})
676676
require.NoError(t, err)
677677
coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, build.ID)
678-
coderdtest.MustTransitionWorkspace(t, userClient, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
678+
coderdtest.MustTransitionWorkspace(t, userClient, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
679679

680680
// Ensure we receive only 1 workspace manually updated notification and to the right user
681681
sent := notify.Sent(notificationstest.WithTemplateID(notifications.TemplateWorkspaceManuallyUpdated))

‎coderd/workspaces_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3998,7 +3998,7 @@ func TestWorkspaceDormant(t *testing.T) {
39983998
require.NoError(t, err)
39993999

40004000
// Should be able to stop a workspace while it is dormant.
4001-
coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
4001+
coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
40024002

40034003
// Should not be able to start a workspace while it is dormant.
40044004
_, err = client.CreateWorkspaceBuild(ctx, workspace.ID, codersdk.CreateWorkspaceBuildRequest{
@@ -4011,7 +4011,7 @@ func TestWorkspaceDormant(t *testing.T) {
40114011
Dormant: false,
40124012
})
40134013
require.NoError(t, err)
4014-
coderdtest.MustTransitionWorkspace(t, client, workspace.ID, database.WorkspaceTransitionStop, database.WorkspaceTransitionStart)
4014+
coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStop, codersdk.WorkspaceTransitionStart)
40154015
})
40164016
}
40174017

‎enterprise/cli/start_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99

1010
"github.com/coder/coder/v2/cli/clitest"
1111
"github.com/coder/coder/v2/coderd/coderdtest"
12-
"github.com/coder/coder/v2/coderd/database"
1312
"github.com/coder/coder/v2/coderd/rbac"
1413
"github.com/coder/coder/v2/codersdk"
1514
"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
@@ -146,7 +145,7 @@ func TestStart(t *testing.T) {
146145

147146
if cmd == "start" {
148147
// Stop the workspace so that we can start it.
149-
coderdtest.MustTransitionWorkspace(t, c.Client, ws.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
148+
coderdtest.MustTransitionWorkspace(t, c.Client, ws.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
150149
}
151150
// Start the workspace. Every test permutation should
152151
// pass.
@@ -198,7 +197,7 @@ func TestStart(t *testing.T) {
198197
memberClient, _ := coderdtest.CreateAnotherUser(t, ownerClient, owner.OrganizationID)
199198
workspace := coderdtest.CreateWorkspace(t, memberClient, template.ID)
200199
_ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, memberClient, workspace.LatestBuild.ID)
201-
_ = coderdtest.MustTransitionWorkspace(t, memberClient, workspace.ID, database.WorkspaceTransitionStart, database.WorkspaceTransitionStop)
200+
_ = coderdtest.MustTransitionWorkspace(t, memberClient, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
202201
err := memberClient.UpdateWorkspaceDormancy(ctx, workspace.ID, codersdk.UpdateWorkspaceDormancy{
203202
Dormant: true,
204203
})

0 commit comments

Comments
 (0)