Skip to content

Commit a98ef1d

Browse files
cstyancstyan
committed
fix lint
Signed-off-by: Callum Styan <callumstyan@gmail.com>
1 parent 9a3f534 commit a98ef1d

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

‎coderd/autobuild/lifecycle_executor.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func (e *Executor) Run() {
132132
}()
133133
}
134134

135-
// hasNonStaleProvisioner checks whether there is at least one valid (non-stale, correct tags) provisioner
135+
// hasValidProvisioner checks whether there is at least one valid (non-stale, correct tags) provisioner
136136
// based on t and the tags on templateVersionJob.
137137
func (e *Executor) hasValidProvisioner(ctx context.Context, tx database.Store, t time.Time, ws database.Workspace, templateVersionJob database.ProvisionerJob) (bool, error) {
138138
queryParams := database.GetProvisionerDaemonsByOrganizationParams{
@@ -321,7 +321,7 @@ func (e *Executor) runOnce(t time.Time) Stats {
321321
}
322322

323323
// Before creating the workspace build, check for available provisioners
324-
hasProvisioners, err := e.hasNonStaleProvisioner(e.ctx, tx, t, ws, templateVersionJob)
324+
hasProvisioners, err := e.hasValidProvisioner(e.ctx, tx, t, ws, templateVersionJob)
325325
if err != nil {
326326
return xerrors.Errorf("check provisioner availability: %w", err)
327327
}

‎coderd/autobuild/lifecycle_executor_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func TestExecutorAutostartOK(t *testing.T) {
5656
)
5757
// Given: workspace is stopped
5858
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
59-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), workspace.OrganizationID, map[string]string{})
59+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, map[string]string{})
6060
require.NoError(t, err)
6161
// When: the autobuild executor ticks after the scheduled time
6262
go func() {
@@ -118,7 +118,7 @@ func TestMultipleLifecycleExecutors(t *testing.T) {
118118
// Have the workspace stopped so we can perform an autostart
119119
workspace = coderdtest.MustTransitionWorkspace(t, clientA, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
120120

121-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), workspace.OrganizationID, nil)
121+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, nil)
122122
require.NoError(t, err)
123123
// Get both clients to perform a lifecycle execution tick
124124
next := sched.Next(workspace.LatestBuild.CreatedAt)
@@ -254,7 +254,7 @@ func TestExecutorAutostartTemplateUpdated(t *testing.T) {
254254
},
255255
))
256256

257-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), workspace.OrganizationID, nil)
257+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, nil)
258258
require.NoError(t, err)
259259

260260
t.Log("sending autobuild tick")
@@ -440,7 +440,7 @@ func TestExecutorAutostopOK(t *testing.T) {
440440
require.Equal(t, codersdk.WorkspaceTransitionStart, workspace.LatestBuild.Transition)
441441
require.NotZero(t, workspace.LatestBuild.Deadline)
442442

443-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), workspace.OrganizationID, nil)
443+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, nil)
444444
require.NoError(t, err)
445445

446446
// When: the autobuild executor ticks *after* the deadline:
@@ -489,7 +489,7 @@ func TestExecutorAutostopExtend(t *testing.T) {
489489
})
490490
require.NoError(t, err, "extend workspace deadline")
491491

492-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), workspace.OrganizationID, nil)
492+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, nil)
493493
require.NoError(t, err)
494494

495495
// When: the autobuild executor ticks *after* the original deadline:
@@ -802,7 +802,7 @@ func TestExecutorAutostartMultipleOK(t *testing.T) {
802802
// Given: workspace is stopped
803803
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
804804

805-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), workspace.OrganizationID, nil)
805+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, nil)
806806
require.NoError(t, err)
807807

808808
// When: the autobuild executor ticks past the scheduled time
@@ -872,7 +872,7 @@ func TestExecutorAutostartWithParameters(t *testing.T) {
872872
// Given: workspace is stopped
873873
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
874874

875-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), workspace.OrganizationID, nil)
875+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, nil)
876876
require.NoError(t, err)
877877

878878
// When: the autobuild executor ticks after the scheduled time
@@ -971,7 +971,7 @@ func TestExecutorAutostopTemplateDisabled(t *testing.T) {
971971
// Then: the deadline should be set to the template default TTL
972972
assert.WithinDuration(t, workspace.LatestBuild.CreatedAt.Add(time.Hour), workspace.LatestBuild.Deadline.Time, time.Minute)
973973

974-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), workspace.OrganizationID, nil)
974+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, nil)
975975
require.NoError(t, err)
976976

977977
// When: the autobuild executor ticks after the workspace setting, but before the template setting:
@@ -1059,7 +1059,7 @@ func TestExecutorRequireActiveVersion(t *testing.T) {
10591059
})
10601060
require.Equal(t, inactiveVersion.ID, ws.LatestBuild.TemplateVersionID)
10611061

1062-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), ws.OrganizationID, nil)
1062+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
10631063
require.NoError(t, err)
10641064

10651065
tickTime := sched.Next(ws.LatestBuild.CreatedAt)
@@ -1221,7 +1221,7 @@ func TestNotifications(t *testing.T) {
12211221
workspace = coderdtest.MustTransitionWorkspace(t, client, workspace.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)
12221222
_ = coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, workspace.LatestBuild.ID)
12231223

1224-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), workspace.OrganizationID, nil)
1224+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, nil)
12251225
require.NoError(t, err)
12261226

12271227
// Wait for workspace to become dormant
@@ -1302,7 +1302,7 @@ func TestExecutorPrebuilds(t *testing.T) {
13021302
require.Equal(t, codersdk.WorkspaceTransitionStart, prebuild.LatestBuild.Transition)
13031303
require.NotZero(t, prebuild.LatestBuild.Deadline)
13041304

1305-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), prebuild.OrganizationID, nil)
1305+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), prebuild.OrganizationID, nil)
13061306
require.NoError(t, err)
13071307

13081308
// When: the autobuild executor ticks *after* the deadline:
@@ -1697,7 +1697,7 @@ func TestExecutorAutostartSkipsWhenNoProvisionersAvailable(t *testing.T) {
16971697

16981698
// Wait for provisioner to be available for this specific workspace
16991699
coderdtest.MustWaitForProvisionersAvailable(t, db, workspace, provisionerdserver.StaleInterval)
1700-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), workspace.OrganizationID, provisionerDaemonTags)
1700+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, provisionerDaemonTags)
17011701
require.NoError(t, err, "Error getting provisioner for workspace")
17021702

17031703
// Ensure the provisioner is stale

‎coderd/coderdtest/coderdtest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1594,7 +1594,7 @@ func DeploymentValues(t testing.TB, mut ...func(*codersdk.DeploymentValues)) *co
15941594
}
15951595

15961596
// GetProvisionerForTags returns the first valid provisioner for a workspace + template tags.
1597-
func GetProvisionerForTags(t *testing.T, tx database.Store, curTime time.Time, orgID uuid.UUID, tags map[string]string) (database.ProvisionerDaemon, error) {
1597+
func GetProvisionerForTags(tx database.Store, curTime time.Time, orgID uuid.UUID, tags map[string]string) (database.ProvisionerDaemon, error) {
15981598
if tags == nil {
15991599
tags = map[string]string{}
16001600
}

‎enterprise/coderd/workspaces_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
646646
require.Equal(t, codersdk.WorkspaceStatusFailed, build.Status)
647647
tickTime := build.Job.CompletedAt.Add(failureTTL * 2)
648648

649-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), ws.OrganizationID, nil)
649+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
650650
require.NoError(t, err)
651651
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
652652
ticker <- tickTime
@@ -698,7 +698,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
698698
// Make it impossible to trigger the failure TTL.
699699
tickTime := build.Job.CompletedAt.Add(-failureTTL * 2)
700700

701-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), ws.OrganizationID, nil)
701+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
702702
require.NoError(t, err)
703703
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
704704
ticker <- tickTime
@@ -803,7 +803,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
803803
// Simulate being inactive.
804804
tickTime := workspace.LastUsedAt.Add(inactiveTTL * 2)
805805

806-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), workspace.OrganizationID, nil)
806+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, nil)
807807
require.NoError(t, err)
808808
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
809809
ticker <- tickTime
@@ -906,7 +906,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
906906
// Simulate being inactive.
907907
// Fix provisioner stale issue by updating LastSeenAt to the tick time
908908
tickTime := time.Now().Add(time.Hour)
909-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), workspaces[0].OrganizationID, nil)
909+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspaces[0].OrganizationID, nil)
910910
require.NoError(t, err)
911911
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
912912
ticker <- tickTime
@@ -1051,7 +1051,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
10511051

10521052
// Simulate not having accessed the workspace in a while.
10531053
tickTime := ws.LastUsedAt.Add(2 * inactiveTTL)
1054-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), ws.OrganizationID, nil)
1054+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
10551055
require.NoError(t, err)
10561056
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
10571057
ticker <- tickTime
@@ -1105,7 +1105,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
11051105

11061106
// Simulate not having accessed the workspace in a while.
11071107
tickTime := ws.LastUsedAt.Add(2 * transitionTTL)
1108-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), ws.OrganizationID, nil)
1108+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
11091109
require.NoError(t, err)
11101110
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
11111111
ticker <- tickTime
@@ -1190,7 +1190,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
11901190

11911191
// Ensure we haven't breached our threshold.
11921192
tickTime := ws.DormantAt.Add(-dormantTTL * 2)
1193-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), ws.OrganizationID, nil)
1193+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
11941194
require.NoError(t, err)
11951195
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
11961196
ticker <- tickTime
@@ -1255,7 +1255,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
12551255

12561256
// Assert that autostart works when the workspace isn't dormant..
12571257
tickTime := sched.Next(ws.LatestBuild.CreatedAt)
1258-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), ws.OrganizationID, nil)
1258+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
12591259
require.NoError(t, err)
12601260
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
12611261
tickCh <- tickTime
@@ -1379,7 +1379,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
13791379
// Under normal circumstances this should result in a transition but
13801380
// since our last build resulted in failure it should be skipped.
13811381
tickTime := build.Job.CompletedAt.Add(time.Hour)
1382-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), ws.OrganizationID, nil)
1382+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
13831383
require.NoError(t, err)
13841384
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
13851385
ticker <- tickTime
@@ -1451,7 +1451,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
14511451

14521452
// Kick of an autostart build.
14531453
tickTime := sched.Next(ws.LatestBuild.CreatedAt)
1454-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), ws.OrganizationID, nil)
1454+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
14551455
require.NoError(t, err)
14561456
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
14571457
tickCh <- tickTime
@@ -1549,7 +1549,7 @@ func TestWorkspaceAutobuild(t *testing.T) {
15491549
next = sched.Next(next)
15501550

15511551
clock.Set(next)
1552-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), ws.OrganizationID, nil)
1552+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), ws.OrganizationID, nil)
15531553
require.NoError(t, err)
15541554
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), next)
15551555
tickCh <- next
@@ -2272,7 +2272,7 @@ func TestExecutorPrebuilds(t *testing.T) {
22722272
coderdtest.MustWaitForProvisionersAvailable(t, db, prebuild, provisionerdserver.StaleInterval)
22732273

22742274
tickTime := sched.Next(prebuild.LatestBuild.CreatedAt).Add(time.Minute)
2275-
p, err := coderdtest.GetProvisionerForTags(t, db, time.Now(), workspace.OrganizationID, nil)
2275+
p, err := coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, nil)
22762276
require.NoError(t, err)
22772277
coderdtest.UpdateProvisionerLastSeenAt(t, db, p.ID, time.Now(), tickTime)
22782278

0 commit comments

Comments
 (0)