Skip to content

Commit 633df53

Browse files
SasSwartSasSwart
committed
make the linter happy
1 parent 8dd3f4a commit 633df53

File tree

8 files changed

+58
-40
lines changed

8 files changed

+58
-40
lines changed

‎coderd/database/dbgen/dbgen.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,6 +1179,16 @@ func PresetParameter(t testing.TB, db database.Store, seed database.InsertPreset
11791179
return parameters
11801180
}
11811181

1182+
func PresetPrebuild(t testing.TB, db database.Store, seed database.InsertPresetPrebuildParams) database.TemplateVersionPresetPrebuild {
1183+
prebuild, err := db.InsertPresetPrebuild(genCtx, database.InsertPresetPrebuildParams{
1184+
ID: takeFirst(seed.ID, uuid.New()),
1185+
PresetID: takeFirst(seed.PresetID, uuid.New()),
1186+
DesiredInstances: takeFirst(seed.DesiredInstances, 1),
1187+
})
1188+
require.NoError(t, err, "insert preset prebuild")
1189+
return prebuild
1190+
}
1191+
11821192
func provisionerJobTiming(t testing.TB, db database.Store, seed database.ProvisionerJobTiming) database.ProvisionerJobTiming {
11831193
timing, err := db.InsertProvisionerJobTimings(genCtx, database.InsertProvisionerJobTimingsParams{
11841194
JobID: takeFirst(seed.JobID, uuid.New()),

‎coderd/database/dbmem/dbmem.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,8 +1709,8 @@ func (*FakeQuerier) BulkMarkNotificationMessagesSent(_ context.Context, arg data
17091709
return int64(len(arg.IDs)), nil
17101710
}
17111711

1712-
func (q *FakeQuerier) ClaimPrebuild(ctx context.Context, newOwnerID database.ClaimPrebuildParams) (database.ClaimPrebuildRow, error) {
1713-
panic("not implemented")
1712+
func (*FakeQuerier) ClaimPrebuild(_ context.Context, _ database.ClaimPrebuildParams) (database.ClaimPrebuildRow, error) {
1713+
return database.ClaimPrebuildRow{}, ErrUnimplemented
17141714
}
17151715

17161716
func (*FakeQuerier) CleanTailnetCoordinators(_ context.Context) error {
@@ -4017,12 +4017,12 @@ func (q *FakeQuerier) GetParameterSchemasByJobID(_ context.Context, jobID uuid.U
40174017
return parameters, nil
40184018
}
40194019

4020-
func (q *FakeQuerier) GetPrebuildMetrics(ctx context.Context) ([]database.GetPrebuildMetricsRow, error) {
4021-
panic("not implemented")
4020+
func (*FakeQuerier) GetPrebuildMetrics(_ context.Context) ([]database.GetPrebuildMetricsRow, error) {
4021+
return nil, ErrUnimplemented
40224022
}
40234023

4024-
func (q *FakeQuerier) GetPrebuildsInProgress(ctx context.Context) ([]database.GetPrebuildsInProgressRow, error) {
4025-
panic("not implemented")
4024+
func (*FakeQuerier) GetPrebuildsInProgress(_ context.Context) ([]database.GetPrebuildsInProgressRow, error) {
4025+
return nil, ErrUnimplemented
40264026
}
40274027

40284028
func (q *FakeQuerier) GetPresetByWorkspaceBuildID(_ context.Context, workspaceBuildID uuid.UUID) (database.TemplateVersionPreset, error) {
@@ -4067,8 +4067,8 @@ func (q *FakeQuerier) GetPresetParametersByTemplateVersionID(_ context.Context,
40674067
return parameters, nil
40684068
}
40694069

4070-
func (q *FakeQuerier) GetPresetsBackoff(ctx context.Context, period time.Time) ([]database.GetPresetsBackoffRow, error) {
4071-
panic("not implemented")
4070+
func (*FakeQuerier) GetPresetsBackoff(_ context.Context, _ time.Time) ([]database.GetPresetsBackoffRow, error) {
4071+
return nil, ErrUnimplemented
40724072
}
40734073

40744074
func (q *FakeQuerier) GetPresetsByTemplateVersionID(_ context.Context, templateVersionID uuid.UUID) ([]database.TemplateVersionPreset, error) {
@@ -4734,8 +4734,8 @@ func (q *FakeQuerier) GetReplicasUpdatedAfter(_ context.Context, updatedAt time.
47344734
return replicas, nil
47354735
}
47364736

4737-
func (q *FakeQuerier) GetRunningPrebuilds(ctx context.Context) ([]database.GetRunningPrebuildsRow, error) {
4738-
panic("not implemented")
4737+
func (*FakeQuerier) GetRunningPrebuilds(_ context.Context) ([]database.GetRunningPrebuildsRow, error) {
4738+
return nil, ErrUnimplemented
47394739
}
47404740

47414741
func (q *FakeQuerier) GetRuntimeConfig(_ context.Context, key string) (string, error) {
@@ -5777,8 +5777,8 @@ func (q *FakeQuerier) GetTemplateParameterInsights(ctx context.Context, arg data
57775777
return rows, nil
57785778
}
57795779

5780-
func (q *FakeQuerier) GetTemplatePresetsWithPrebuilds(ctx context.Context, templateID uuid.NullUUID) ([]database.GetTemplatePresetsWithPrebuildsRow, error) {
5781-
panic("not implemented")
5780+
func (*FakeQuerier) GetTemplatePresetsWithPrebuilds(_ context.Context, _ uuid.NullUUID) ([]database.GetTemplatePresetsWithPrebuildsRow, error) {
5781+
return nil, ErrUnimplemented
57825782
}
57835783

57845784
func (q *FakeQuerier) GetTemplateUsageStats(_ context.Context, arg database.GetTemplateUsageStatsParams) ([]database.TemplateUsageStat, error) {
@@ -8551,13 +8551,13 @@ func (q *FakeQuerier) InsertPresetParameters(_ context.Context, arg database.Ins
85518551
return presetParameters, nil
85528552
}
85538553

8554-
func (q *FakeQuerier) InsertPresetPrebuild(ctx context.Context, arg database.InsertPresetPrebuildParams) (database.TemplateVersionPresetPrebuild, error) {
8554+
func (*FakeQuerier) InsertPresetPrebuild(_ context.Context, arg database.InsertPresetPrebuildParams) (database.TemplateVersionPresetPrebuild, error) {
85558555
err := validateDatabaseType(arg)
85568556
if err != nil {
85578557
return database.TemplateVersionPresetPrebuild{}, err
85588558
}
85598559

8560-
panic("not implemented")
8560+
return database.TemplateVersionPresetPrebuild{}, ErrUnimplemented
85618561
}
85628562

85638563
func (q *FakeQuerier) InsertProvisionerJob(_ context.Context, arg database.InsertProvisionerJobParams) (database.ProvisionerJob, error) {

‎coderd/prebuilds/state.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ func (p PresetState) CalculateActions(clock quartz.Clock, backoffInterval time.D
146146

147147
actions.Create = int32(toCreate)
148148

149-
if toDelete > 0 && len(p.Running) != toDelete {
150-
// TODO: move up
151-
// c.logger.Warn(ctx, "mismatch between running prebuilds and expected deletion count!",
152-
// slog.F("template_id", s.preset.TemplateID.String()), slog.F("running", len(p.Running)), slog.F("to_delete", toDelete))
153-
}
149+
// if toDelete > 0 && len(p.Running) != toDelete {
150+
// TODO: move up
151+
// c.logger.Warn(ctx, "mismatch between running prebuilds and expected deletion count!",
152+
// slog.F("template_id", s.preset.TemplateID.String()), slog.F("running", len(p.Running)), slog.F("to_delete", toDelete))
153+
// }
154154

155155
// TODO: implement lookup to not perform same action on workspace multiple times in $period
156156
// i.e. a workspace cannot be deleted for some reason, which continually makes it eligible for deletion

‎coderd/prebuilds/state_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ var opts = map[uint]options{
6464

6565
// A new template version with a preset without prebuilds configured should result in no prebuilds being created.
6666
func TestNoPrebuilds(t *testing.T) {
67+
t.Parallel()
6768
current := opts[optionSet0]
6869
clock := quartz.NewMock(t)
6970

@@ -83,6 +84,7 @@ func TestNoPrebuilds(t *testing.T) {
8384

8485
// A new template version with a preset with prebuilds configured should result in a new prebuild being created.
8586
func TestNetNew(t *testing.T) {
87+
t.Parallel()
8688
current := opts[optionSet0]
8789
clock := quartz.NewMock(t)
8890

@@ -106,6 +108,7 @@ func TestNetNew(t *testing.T) {
106108
// A new template version is created with a preset with prebuilds configured; this outdates the older version and
107109
// requires the old prebuilds to be destroyed and new prebuilds to be created.
108110
func TestOutdatedPrebuilds(t *testing.T) {
111+
t.Parallel()
109112
outdated := opts[optionSet0]
110113
current := opts[optionSet1]
111114
clock := quartz.NewMock(t)
@@ -147,6 +150,7 @@ func TestOutdatedPrebuilds(t *testing.T) {
147150
// A new template version is created with a preset with prebuilds configured; while a prebuild is provisioning up or down,
148151
// the calculated actions should indicate the state correctly.
149152
func TestInProgressActions(t *testing.T) {
153+
t.Parallel()
150154
current := opts[optionSet0]
151155
clock := quartz.NewMock(t)
152156

@@ -294,6 +298,7 @@ func TestInProgressActions(t *testing.T) {
294298
}
295299

296300
for _, tc := range cases {
301+
tc := tc
297302
t.Run(tc.name, func(t *testing.T) {
298303
t.Parallel()
299304

@@ -343,6 +348,7 @@ func TestInProgressActions(t *testing.T) {
343348

344349
// Additional prebuilds exist for a given preset configuration; these must be deleted.
345350
func TestExtraneous(t *testing.T) {
351+
t.Parallel()
346352
current := opts[optionSet0]
347353
clock := quartz.NewMock(t)
348354

@@ -384,6 +390,7 @@ func TestExtraneous(t *testing.T) {
384390

385391
// As above, but no actions will be performed because
386392
func TestExtraneousInProgress(t *testing.T) {
393+
t.Parallel()
387394
current := opts[optionSet0]
388395
clock := quartz.NewMock(t)
389396

@@ -426,6 +433,7 @@ func TestExtraneousInProgress(t *testing.T) {
426433

427434
// A template marked as deprecated will not have prebuilds running.
428435
func TestDeprecated(t *testing.T) {
436+
t.Parallel()
429437
current := opts[optionSet0]
430438
clock := quartz.NewMock(t)
431439

@@ -460,6 +468,7 @@ func TestDeprecated(t *testing.T) {
460468

461469
// If the latest build failed, backoff exponentially with the given interval.
462470
func TestLatestBuildFailed(t *testing.T) {
471+
t.Parallel()
463472
current := opts[optionSet0]
464473
other := opts[optionSet1]
465474
clock := quartz.NewMock(t)

‎enterprise/coderd/prebuilds/claim.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515

1616
type EnterpriseClaimer struct{}
1717

18-
func (e EnterpriseClaimer) Claim(ctx context.Context, store database.Store, userID uuid.UUID, name string, presetID uuid.UUID) (*uuid.UUID, error) {
18+
func (_ EnterpriseClaimer) Claim(ctx context.Context, store database.Store, userID uuid.UUID, name string, presetID uuid.UUID) (*uuid.UUID, error) {
1919
var prebuildID *uuid.UUID
2020
err := store.InTx(func(db database.Store) error {
2121
// TODO: do we need this?
@@ -51,7 +51,7 @@ func (e EnterpriseClaimer) Claim(ctx context.Context, store database.Store, user
5151
return prebuildID, err
5252
}
5353

54-
func (e EnterpriseClaimer) Initiator() uuid.UUID {
54+
func (_ EnterpriseClaimer) Initiator() uuid.UUID {
5555
return OwnerID
5656
}
5757

‎enterprise/coderd/prebuilds/metricscollector_test.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,15 @@ func TestMetricsCollector(t *testing.T) {
116116
},
117117
}
118118
for _, test := range tests {
119+
test := test // capture for parallel
119120
for _, transition := range test.transitions {
121+
transition := transition // capture for parallel
120122
for _, jobStatus := range test.jobStatuses {
123+
jobStatus := jobStatus // capture for parallel
121124
for _, initiatorID := range test.initiatorIDs {
125+
initiatorID := initiatorID // capture for parallel
122126
for _, ownerID := range test.ownerIDs {
127+
ownerID := ownerID // capture for parallel
123128
t.Run(fmt.Sprintf("transition:%s/jobStatus:%s", transition, jobStatus), func(t *testing.T) {
124129
t.Parallel()
125130

@@ -156,9 +161,9 @@ func TestMetricsCollector(t *testing.T) {
156161
for i := 0; i < numTemplates; i++ {
157162
orgID, templateID := setupTestDBTemplate(t, db, ownerID)
158163
templateVersionID := setupTestDBTemplateVersion(ctx, t, clock, db, pubsub, orgID, ownerID, templateID)
159-
preset := setupTestDBPreset(ctx, t, db, pubsub, templateVersionID, 1, uuid.New().String())
164+
preset := setupTestDBPreset(t, db, templateVersionID, 1, uuid.New().String())
160165
setupTestDBWorkspace(
161-
ctx, t, clock, db, pubsub,
166+
t, clock, db, pubsub,
162167
transition, jobStatus, orgID, preset, templateID, templateVersionID, initiatorID, ownerID,
163168
)
164169
}
@@ -171,6 +176,7 @@ func TestMetricsCollector(t *testing.T) {
171176
require.Equal(t, numTemplates, len(templates))
172177

173178
for _, template := range templates {
179+
template := template // capture for parallel
174180
templateVersions, err := db.GetTemplateVersionsByTemplateID(ctx, database.GetTemplateVersionsByTemplateIDParams{
175181
TemplateID: template.ID,
176182
})
@@ -182,6 +188,7 @@ func TestMetricsCollector(t *testing.T) {
182188
require.Equal(t, 1, len(presets))
183189

184190
for _, preset := range presets {
191+
preset := preset // capture for parallel
185192
labels := map[string]string{
186193
"template_name": template.Name,
187194
"preset_name": preset.Name,

‎enterprise/coderd/prebuilds/reconcile.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ type StoreReconciler struct {
4444

4545
var _ prebuilds.ReconciliationOrchestrator = &StoreReconciler{}
4646

47-
func NewStoreReconciler(store database.Store, pubsub pubsub.Pubsub, cfg codersdk.PrebuildsConfig, logger slog.Logger, clock quartz.Clock) *StoreReconciler {
47+
func NewStoreReconciler(store database.Store, ps pubsub.Pubsub, cfg codersdk.PrebuildsConfig, logger slog.Logger, clock quartz.Clock) *StoreReconciler {
4848
return &StoreReconciler{
4949
store: store,
50-
pubsub: pubsub,
50+
pubsub: ps,
5151
logger: logger,
5252
cfg: cfg,
5353
clock: clock,
@@ -70,7 +70,7 @@ func (c *StoreReconciler) RunLoop(ctx context.Context) {
7070
c.done <- struct{}{}
7171
}()
7272

73-
// TODO: create new authz role
73+
// nolint:gocritic // TODO: create a new authz role
7474
ctx, cancel := context.WithCancelCause(dbauthz.AsSystemRestricted(ctx))
7575
c.cancelFn = cancel
7676

‎enterprise/coderd/prebuilds/reconcile_test.go

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ func TestPrebuildReconciliation(t *testing.T) {
272272
},
273273
}
274274
for _, tc := range testCases {
275+
tc := tc // capture for parallel
275276
for _, templateVersionActive := range tc.templateVersionActive {
276277
for _, prebuildLatestTransition := range tc.prebuildLatestTransitions {
277278
for _, prebuildJobStatus := range tc.prebuildJobStatuses {
@@ -310,17 +311,14 @@ func TestPrebuildReconciliation(t *testing.T) {
310311
templateID,
311312
)
312313
preset := setupTestDBPreset(
313-
ctx,
314314
t,
315315
db,
316-
pubsub,
317316
templateVersionID,
318317
1,
319318
uuid.New().String(),
320319
)
321320
prebuild := setupTestDBPrebuild(
322321
t,
323-
ctx,
324322
clock,
325323
db,
326324
pubsub,
@@ -410,9 +408,9 @@ func TestFailedBuildBackoff(t *testing.T) {
410408
orgID, templateID := setupTestDBTemplate(t, db, userID)
411409
templateVersionID := setupTestDBTemplateVersion(ctx, t, clock, db, ps, orgID, userID, templateID)
412410

413-
preset := setupTestDBPreset(ctx, t, db, ps, templateVersionID, desiredInstances, "test")
411+
preset := setupTestDBPreset(t, db, templateVersionID, desiredInstances, "test")
414412
for range desiredInstances {
415-
_ = setupTestDBPrebuild(t, ctx, clock, db, ps, database.WorkspaceTransitionStart, database.ProvisionerJobStatusFailed, orgID, preset, templateID, templateVersionID)
413+
_ = setupTestDBPrebuild(t, clock, db, ps, database.WorkspaceTransitionStart, database.ProvisionerJobStatusFailed, orgID, preset, templateID, templateVersionID)
416414
}
417415

418416
// When: determining what actions to take next, backoff is calculated because the prebuild is in a failed state.
@@ -470,7 +468,7 @@ func TestFailedBuildBackoff(t *testing.T) {
470468
if i == 1 {
471469
status = database.ProvisionerJobStatusSucceeded
472470
}
473-
_ = setupTestDBPrebuild(t, ctx, clock, db, ps, database.WorkspaceTransitionStart, status, orgID, preset, templateID, templateVersionID)
471+
_ = setupTestDBPrebuild(t, clock, db, ps, database.WorkspaceTransitionStart, status, orgID, preset, templateID, templateVersionID)
474472
}
475473

476474
// Then: the backoff time is roughly equal to two backoff intervals, since another build has failed.
@@ -544,10 +542,8 @@ func setupTestDBTemplateVersion(
544542
}
545543

546544
func setupTestDBPreset(
547-
ctx context.Context,
548545
t *testing.T,
549546
db database.Store,
550-
ps pubsub.Pubsub,
551547
templateVersionID uuid.UUID,
552548
desiredInstances int32,
553549
presetName string,
@@ -562,18 +558,15 @@ func setupTestDBPreset(
562558
Names: []string{"test"},
563559
Values: []string{"test"},
564560
})
565-
_, err := db.InsertPresetPrebuild(ctx, database.InsertPresetPrebuildParams{
566-
ID: uuid.New(),
561+
dbgen.PresetPrebuild(t, db, database.InsertPresetPrebuildParams{
567562
PresetID: preset.ID,
568563
DesiredInstances: desiredInstances,
569564
})
570-
require.NoError(t, err)
571565
return preset
572566
}
573567

574568
func setupTestDBPrebuild(
575569
t *testing.T,
576-
ctx context.Context,
577570
clock quartz.Clock,
578571
db database.Store,
579572
ps pubsub.Pubsub,
@@ -585,11 +578,10 @@ func setupTestDBPrebuild(
585578
templateVersionID uuid.UUID,
586579
) database.WorkspaceTable {
587580
t.Helper()
588-
return setupTestDBWorkspace(ctx, t, clock, db, ps, transition, prebuildStatus, orgID, preset, templateID, templateVersionID, prebuilds.OwnerID, prebuilds.OwnerID)
581+
return setupTestDBWorkspace(t, clock, db, ps, transition, prebuildStatus, orgID, preset, templateID, templateVersionID, prebuilds.OwnerID, prebuilds.OwnerID)
589582
}
590583

591584
func setupTestDBWorkspace(
592-
ctx context.Context,
593585
t *testing.T,
594586
clock quartz.Clock,
595587
db database.Store,

0 commit comments

Comments
 (0)