test(cli): fix race in provisioner list statuses for golden files (#16205)

mafredri · web-flow · commit 56cf0d82c7f0 · 2025-01-21T11:23:21.000Z
diff --git a/cli/provisioners_test.go b/cli/provisioners_test.go
@@ -74,7 +74,7 @@ func TestProvisioners_Golden(t *testing.T) {
 	memberClient, member := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
 
 	// Create initial resources with a running provisioner.
-	firstProvisioner := coderdtest.NewProvisionerDaemon(t, coderdAPI)
+	firstProvisioner := coderdtest.NewTaggedProvisionerDaemon(t, coderdAPI, "default-provisioner", map[string]string{"owner": "", "scope": "organization"})
 	t.Cleanup(func() { _ = firstProvisioner.Close() })
 	version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, completeWithAgent())
 	coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
@@ -92,10 +92,11 @@ func TestProvisioners_Golden(t *testing.T) {
 
 	// Create a provisioner that's working on a job.
 	pd1 := dbgen.ProvisionerDaemon(t, coderdAPI.Database, database.ProvisionerDaemon{
-		Name:      "provisioner-1",
-		CreatedAt: dbtime.Now().Add(1 * time.Second),
-		KeyID:     uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
-		Tags:      database.StringMap{"owner": "", "scope": "organization", "foo": "bar"},
+		Name:       "provisioner-1",
+		CreatedAt:  dbtime.Now().Add(1 * time.Second),
+		LastSeenAt: sql.NullTime{Time: coderdAPI.Clock.Now().Add(time.Hour), Valid: true}, // Stale interval can't be adjusted, keep online.
+		KeyID:      uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
+		Tags:       database.StringMap{"owner": "", "scope": "organization", "foo": "bar"},
 	})
 	w1 := dbgen.Workspace(t, coderdAPI.Database, database.WorkspaceTable{
 		OwnerID:    member.ID,
@@ -164,10 +165,11 @@ func TestProvisioners_Golden(t *testing.T) {
 
 	// Create a provisioner that is idle.
 	_ = dbgen.ProvisionerDaemon(t, coderdAPI.Database, database.ProvisionerDaemon{
-		Name:      "provisioner-3",
-		CreatedAt: dbtime.Now().Add(3 * time.Second),
-		KeyID:     uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
-		Tags:      database.StringMap{"owner": "", "scope": "organization"},
+		Name:       "provisioner-3",
+		CreatedAt:  dbtime.Now().Add(3 * time.Second),
+		LastSeenAt: sql.NullTime{Time: coderdAPI.Clock.Now().Add(time.Hour), Valid: true}, // Stale interval can't be adjusted, keep online.
+		KeyID:      uuid.MustParse(codersdk.ProvisionerKeyIDBuiltIn),
+		Tags:       database.StringMap{"owner": "", "scope": "organization"},
 	})
 
 	updateReplaceUUIDs(coderdAPI)
diff --git a/cli/testdata/TestProvisioners_Golden/list.golden b/cli/testdata/TestProvisioners_Golden/list.golden
@@ -1,5 +1,5 @@
-ID                                    CREATED AT            LAST SEEN AT          NAME           VERSION       TAGS                                    KEY NAME  STATUS   CURRENT JOB ID                        CURRENT JOB STATUS  PREVIOUS JOB ID                       PREVIOUS JOB STATUS  ORGANIZATION  
-00000000-0000-0000-aaaa-000000000001  ====[timestamp]=====  ====[timestamp]=====  provisioner-1  v0.0.0        map[foo:bar owner: scope:organization]  built-in  busy     00000000-0000-0000-bbbb-000000000002  running             <nil>                                 <nil>                Coder         
-00000000-0000-0000-aaaa-000000000002  ====[timestamp]=====  ====[timestamp]=====  provisioner-2  v0.0.0        map[owner: scope:organization]          built-in  offline  <nil>                                 <nil>               00000000-0000-0000-bbbb-000000000003  succeeded            Coder         
-00000000-0000-0000-aaaa-000000000003  ====[timestamp]=====  ====[timestamp]=====  provisioner-3  v0.0.0        map[owner: scope:organization]          built-in  idle     <nil>                                 <nil>               <nil>                                 <nil>                Coder         
-00000000-0000-0000-aaaa-000000000000  ====[timestamp]=====  ====[timestamp]=====  test           v0.0.0-devel  map[owner: scope:organization]          built-in  idle     <nil>                                 <nil>               00000000-0000-0000-bbbb-000000000001  succeeded            Coder         
+ID                                    CREATED AT            LAST SEEN AT          NAME                 VERSION       TAGS                                    KEY NAME  STATUS   CURRENT JOB ID                        CURRENT JOB STATUS  PREVIOUS JOB ID                       PREVIOUS JOB STATUS  ORGANIZATION  
+00000000-0000-0000-aaaa-000000000000  ====[timestamp]=====  ====[timestamp]=====  default-provisioner  v0.0.0-devel  map[owner: scope:organization]          built-in  idle     <nil>                                 <nil>               00000000-0000-0000-bbbb-000000000001  succeeded            Coder         
+00000000-0000-0000-aaaa-000000000001  ====[timestamp]=====  ====[timestamp]=====  provisioner-1        v0.0.0        map[foo:bar owner: scope:organization]  built-in  busy     00000000-0000-0000-bbbb-000000000002  running             <nil>                                 <nil>                Coder         
+00000000-0000-0000-aaaa-000000000002  ====[timestamp]=====  ====[timestamp]=====  provisioner-2        v0.0.0        map[owner: scope:organization]          built-in  offline  <nil>                                 <nil>               00000000-0000-0000-bbbb-000000000003  succeeded            Coder         
+00000000-0000-0000-aaaa-000000000003  ====[timestamp]=====  ====[timestamp]=====  provisioner-3        v0.0.0        map[owner: scope:organization]          built-in  idle     <nil>                                 <nil>               <nil>                                 <nil>                Coder         
