Skip to content

Commit 8dd3f4a

Browse files
SasSwartSasSwart
committed
make the linter happy
1 parent 376f3ef commit 8dd3f4a

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

‎enterprise/coderd/prebuilds/metricscollector_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,10 @@ func TestMetricsCollector(t *testing.T) {
155155
numTemplates := 2
156156
for i := 0; i < numTemplates; i++ {
157157
orgID, templateID := setupTestDBTemplate(t, db, ownerID)
158-
templateVersionID := setupTestDBTemplateVersion(t, ctx, clock, db, pubsub, orgID, ownerID, templateID)
159-
preset := setupTestDBPreset(t, ctx, db, pubsub, templateVersionID, 1, uuid.New().String())
158+
templateVersionID := setupTestDBTemplateVersion(ctx, t, clock, db, pubsub, orgID, ownerID, templateID)
159+
preset := setupTestDBPreset(ctx, t, db, pubsub, templateVersionID, 1, uuid.New().String())
160160
setupTestDBWorkspace(
161-
t, ctx, clock, db, pubsub,
161+
ctx, t, clock, db, pubsub,
162162
transition, jobStatus, orgID, preset, templateID, templateVersionID, initiatorID, ownerID,
163163
)
164164
}

‎enterprise/coderd/prebuilds/reconcile_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ func TestNoReconciliationActionsIfNoPresets(t *testing.T) {
3636

3737
clock := quartz.NewMock(t)
3838
ctx := testutil.Context(t, testutil.WaitLong)
39-
db, pubsub := dbtestutil.NewDB(t)
39+
db, ps := dbtestutil.NewDB(t)
4040
cfg := codersdk.PrebuildsConfig{
4141
ReconciliationInterval: serpent.Duration(testutil.WaitLong),
4242
}
4343
logger := testutil.Logger(t)
44-
controller := prebuilds.NewStoreReconciler(db, pubsub, cfg, logger, quartz.NewMock(t))
44+
controller := prebuilds.NewStoreReconciler(db, ps, cfg, logger, quartz.NewMock(t))
4545

4646
// given a template version with no presets
4747
org := dbgen.Organization(t, db, database.Organization{})
@@ -81,12 +81,12 @@ func TestNoReconciliationActionsIfNoPrebuilds(t *testing.T) {
8181

8282
clock := quartz.NewMock(t)
8383
ctx := testutil.Context(t, testutil.WaitLong)
84-
db, pubsub := dbtestutil.NewDB(t)
84+
db, ps := dbtestutil.NewDB(t)
8585
cfg := codersdk.PrebuildsConfig{
8686
ReconciliationInterval: serpent.Duration(testutil.WaitLong),
8787
}
8888
logger := testutil.Logger(t)
89-
controller := prebuilds.NewStoreReconciler(db, pubsub, cfg, logger, quartz.NewMock(t))
89+
controller := prebuilds.NewStoreReconciler(db, ps, cfg, logger, quartz.NewMock(t))
9090

9191
// given there are presets, but no prebuilds
9292
org := dbgen.Organization(t, db, database.Organization{})
@@ -300,8 +300,8 @@ func TestPrebuildReconciliation(t *testing.T) {
300300
})
301301
orgID, templateID := setupTestDBTemplate(t, db, ownerID)
302302
templateVersionID := setupTestDBTemplateVersion(
303-
t,
304303
ctx,
304+
t,
305305
clock,
306306
db,
307307
pubsub,
@@ -310,8 +310,8 @@ func TestPrebuildReconciliation(t *testing.T) {
310310
templateID,
311311
)
312312
preset := setupTestDBPreset(
313-
t,
314313
ctx,
314+
t,
315315
db,
316316
pubsub,
317317
templateVersionID,
@@ -335,7 +335,7 @@ func TestPrebuildReconciliation(t *testing.T) {
335335
if !templateVersionActive {
336336
// Create a new template version and mark it as active
337337
// This marks the template version that we care about as inactive
338-
setupTestDBTemplateVersion(t, ctx, clock, db, pubsub, orgID, ownerID, templateID)
338+
setupTestDBTemplateVersion(ctx, t, clock, db, pubsub, orgID, ownerID, templateID)
339339
}
340340

341341
// Run the reconciliation multiple times to ensure idempotency
@@ -408,9 +408,9 @@ func TestFailedBuildBackoff(t *testing.T) {
408408
ID: userID,
409409
})
410410
orgID, templateID := setupTestDBTemplate(t, db, userID)
411-
templateVersionID := setupTestDBTemplateVersion(t, ctx, clock, db, ps, orgID, userID, templateID)
411+
templateVersionID := setupTestDBTemplateVersion(ctx, t, clock, db, ps, orgID, userID, templateID)
412412

413-
preset := setupTestDBPreset(t, ctx, db, ps, templateVersionID, desiredInstances, "test")
413+
preset := setupTestDBPreset(ctx, t, db, ps, templateVersionID, desiredInstances, "test")
414414
for range desiredInstances {
415415
_ = setupTestDBPrebuild(t, ctx, clock, db, ps, database.WorkspaceTransitionStart, database.ProvisionerJobStatusFailed, orgID, preset, templateID, templateVersionID)
416416
}
@@ -513,8 +513,8 @@ const (
513513
)
514514

515515
func setupTestDBTemplateVersion(
516-
t *testing.T,
517516
ctx context.Context,
517+
t *testing.T,
518518
clock quartz.Clock,
519519
db database.Store,
520520
ps pubsub.Pubsub,
@@ -544,8 +544,8 @@ func setupTestDBTemplateVersion(
544544
}
545545

546546
func setupTestDBPreset(
547-
t *testing.T,
548547
ctx context.Context,
548+
t *testing.T,
549549
db database.Store,
550550
ps pubsub.Pubsub,
551551
templateVersionID uuid.UUID,
@@ -585,12 +585,12 @@ func setupTestDBPrebuild(
585585
templateVersionID uuid.UUID,
586586
) database.WorkspaceTable {
587587
t.Helper()
588-
return setupTestDBWorkspace(t, ctx, clock, db, ps, transition, prebuildStatus, orgID, preset, templateID, templateVersionID, prebuilds.OwnerID, prebuilds.OwnerID)
588+
return setupTestDBWorkspace(ctx, t, clock, db, ps, transition, prebuildStatus, orgID, preset, templateID, templateVersionID, prebuilds.OwnerID, prebuilds.OwnerID)
589589
}
590590

591591
func setupTestDBWorkspace(
592-
t *testing.T,
593592
ctx context.Context,
593+
t *testing.T,
594594
clock quartz.Clock,
595595
db database.Store,
596596
ps pubsub.Pubsub,

0 commit comments

Comments
 (0)