fix: limit worker_name addition to GetProvisionerJobsByOrganizationAndStatusWithQueuePositionAndProvisioner query

ssncferreira · ssncferreira · commit 58d023409251 · 2025-05-16T18:17:41.000Z
diff --git a/cli/testdata/coder_list_--output_json.golden b/cli/testdata/coder_list_--output_json.golden
@@ -37,7 +37,6 @@
         "completed_at": "====[timestamp]=====",
         "status": "succeeded",
         "worker_id": "====[workspace build worker ID]=====",
-        "worker_name": "test-daemon",
         "file_id": "=====[workspace build file ID]======",
         "tags": {
           "owner": "",
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -1267,14 +1267,6 @@ func (q *FakeQuerier) getProvisionerJobsByIDsWithQueuePositionLockedTagBasedQueu
 	// Step 6: Compute the final results with minimal checks
 	var results []database.GetProvisionerJobsByIDsWithQueuePositionRow
 	for _, job := range filteredJobs {
-		workerName := ""
-		// Add daemon name to provisioner job
-		for _, daemon := range q.provisionerDaemons {
-			if job.WorkerID.Valid && job.WorkerID.UUID == daemon.ID {
-				workerName = daemon.Name
-			}
-		}
-
 		// If the job has a computed rank, use it
 		if rank, found := jobQueueStats[job.ID]; found {
 			results = append(results, rank)
@@ -1286,7 +1278,6 @@ func (q *FakeQuerier) getProvisionerJobsByIDsWithQueuePositionLockedTagBasedQueu
 				ProvisionerJob: job,
 				QueuePosition:  0,
 				QueueSize:      0,
-				WorkerName:     workerName,
 			})
 		}
 	}
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/provisionerjobs.sql b/coderd/database/queries/provisionerjobs.sql
@@ -100,15 +100,12 @@ SELECT
 	fj.created_at,
 	sqlc.embed(pj),
 	fj.queue_position,
-	fj.queue_size,
-	COALESCE(pd.name, '') AS worker_name
+	fj.queue_size
 FROM
 	final_jobs fj
 		INNER JOIN provisioner_jobs pj
 				ON fj.id = pj.id -- Ensure we retrieve full details from `provisioner_jobs`.
                                  -- JOIN with pj is required for sqlc.embed(pj) to compile successfully.
-		LEFT JOIN provisioner_daemons pd -- Join to get the daemon name corresponding to the job's worker_id
-		  ON pj.worker_id = pd.id
 ORDER BY
 	fj.created_at;
 
diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go
@@ -354,7 +354,6 @@ func convertProvisionerJob(pj database.GetProvisionerJobsByIDsWithQueuePositionR
 	provisionerJob := pj.ProvisionerJob
 	job := codersdk.ProvisionerJob{
 		ID:             provisionerJob.ID,
-		WorkerName:     pj.WorkerName,
 		OrganizationID: provisionerJob.OrganizationID,
 		CreatedAt:      provisionerJob.CreatedAt,
 		Type:           codersdk.ProvisionerJobType(provisionerJob.Type),
@@ -393,10 +392,10 @@ func convertProvisionerJob(pj database.GetProvisionerJobsByIDsWithQueuePositionR
 func convertProvisionerJobWithQueuePosition(pj database.GetProvisionerJobsByOrganizationAndStatusWithQueuePositionAndProvisionerRow) codersdk.ProvisionerJob {
 	job := convertProvisionerJob(database.GetProvisionerJobsByIDsWithQueuePositionRow{
 		ProvisionerJob: pj.ProvisionerJob,
-		WorkerName:     pj.WorkerName,
 		QueuePosition:  pj.QueuePosition,
 		QueueSize:      pj.QueueSize,
 	})
+	job.WorkerName = pj.WorkerName
 	job.AvailableWorkers = pj.AvailableWorkers
 	job.Metadata = codersdk.ProvisionerJobMetadata{
 		TemplateVersionName: pj.TemplateVersionName,
diff --git a/coderd/templateversions_test.go b/coderd/templateversions_test.go
