feat: add provisioner daemon name to provisioner jobs responses (#17877)

# Description

This PR adds the `worker_name` field to the provisioner jobs endpoint.

To achieve this, the following SQL query was updated:
-
`GetProvisionerJobsByOrganizationAndStatusWithQueuePositionAndProvisioner`

As a result, the `codersdk.ProvisionerJob` type, which represents the
provisioner job API response, was modified to include the new field.

**Notes:** 
* As mentioned in
[comment](https://github.com/coder/coder/pull/17877#discussion_r2093218206),
the `GetProvisionerJobsByIDsWithQueuePosition` query was not changed due
to load concerns. This means that for template and template version
endpoints, `worker_id` will still be returned, but `worker_name` will
not.
* Similar to `worker_id`, the `worker_name` is only present once a job
is assigned to a provisioner daemon. For jobs in a pending state (not
yet assigned), neither `worker_id` nor `worker_name` will be returned.

---

# Affected Endpoints

- `/organizations/{organization}/provisionerjobs`
- `/organizations/{organization}/provisionerjobs/{job}`

---

# Testing

- Added new tests verifying that both `worker_id` and `worker_name` are
returned once a provisioner job reaches the **succeeded** state.
- Existing tests covering state transitions and other logic remain
unchanged, as they test different scenarios.

---

# Front-end Changes

Admin provisioner jobs dashboard:
<img width="1088" alt="Screenshot 2025-05-16 at 11 51 33"
src="https://github.com/user-attachments/assets/0e20e360-c615-4497-84b7-693777c5443e"
/>

Fixes: https://github.com/coder/coder/issues/16982

coderd/apidoc/docs.go

@@ -14618,6 +14618,9 @@ const docTemplate = `{
                 "worker_id": {
                     "type": "string",
                     "format": "uuid"
+                },
+                "worker_name": {
+                    "type": "string"
                 }
             }
         },

coderd/apidoc/swagger.json

@@ -13250,6 +13250,9 @@
 				"worker_id": {
 					"type": "string",
 					"format": "uuid"
+				},
+				"worker_name": {
+					"type": "string"
 				}
 			}
 		},

coderd/coderdtest/coderdtest.go

@@ -96,6 +96,8 @@ import (
 	"github.com/coder/coder/v2/testutil"
 )
 
+const defaultTestDaemonName = "test-daemon"
+
 type Options struct {
 	// AccessURL denotes a custom access URL. By default we use the httptest
 	// server's URL. Setting this may result in unexpected behavior (especially
@@ -602,7 +604,7 @@ func NewWithAPI(t testing.TB, options *Options) (*codersdk.Client, io.Closer, *c
 	setHandler(rootHandler)
 	var provisionerCloser io.Closer = nopcloser{}
 	if options.IncludeProvisionerDaemon {
-		provisionerCloser = NewTaggedProvisionerDaemon(t, coderAPI, "test", options.ProvisionerDaemonTags, coderd.MemoryProvisionerWithVersionOverride(options.ProvisionerDaemonVersion))
+		provisionerCloser = NewTaggedProvisionerDaemon(t, coderAPI, defaultTestDaemonName, options.ProvisionerDaemonTags, coderd.MemoryProvisionerWithVersionOverride(options.ProvisionerDaemonVersion))
 	}
 	client := codersdk.New(serverURL)
 	t.Cleanup(func() {
@@ -646,7 +648,7 @@ func (c *ProvisionerdCloser) Close() error {
 // well with coderd testing. It registers the "echo" provisioner for
 // quick testing.
 func NewProvisionerDaemon(t testing.TB, coderAPI *coderd.API) io.Closer {
-	return NewTaggedProvisionerDaemon(t, coderAPI, "test", nil)
+	return NewTaggedProvisionerDaemon(t, coderAPI, defaultTestDaemonName, nil)
 }
 
 func NewTaggedProvisionerDaemon(t testing.TB, coderAPI *coderd.API, name string, provisionerTags map[string]string, opts ...coderd.MemoryProvisionerDaemonOption) io.Closer {

coderd/database/dbmem/dbmem.go

@@ -4848,6 +4848,13 @@ func (q *FakeQuerier) GetProvisionerJobsByOrganizationAndStatusWithQueuePosition
 				row.AvailableWorkers = append(row.AvailableWorkers, worker.ID)
 			}
 		}
+
+		// Add daemon name to provisioner job
+		for _, daemon := range q.provisionerDaemons {
+			if job.WorkerID.Valid && job.WorkerID.UUID == daemon.ID {
+				row.WorkerName = daemon.Name
+			}
+		}
 		rows = append(rows, row)
 	}
 

coderd/database/queries.sql.go

@@ -7730,7 +7730,9 @@ SELECT
 	COALESCE(t.display_name, '') AS template_display_name,
 	COALESCE(t.icon, '') AS template_icon,
 	w.id AS workspace_id,
-	COALESCE(w.name, '') AS workspace_name
+	COALESCE(w.name, '') AS workspace_name,
+	-- Include the name of the provisioner_daemon associated to the job
+	COALESCE(pd.name, '') AS worker_name
 FROM
 	provisioner_jobs pj
 LEFT JOIN
@@ -7755,6 +7757,9 @@ LEFT JOIN
 		t.id = tv.template_id
 		AND t.organization_id = pj.organization_id
 	)
+LEFT JOIN
+	-- Join to get the daemon name corresponding to the job's worker_id
+	provisioner_daemons pd ON pd.id = pj.worker_id
 WHERE
 	pj.organization_id = $1::uuid
 	AND (COALESCE(array_length($2::uuid[], 1), 0) = 0 OR pj.id = ANY($2::uuid[]))
@@ -7770,7 +7775,8 @@ GROUP BY
 	t.display_name,
 	t.icon,
 	w.id,
-	w.name
+	w.name,
+	pd.name
 ORDER BY
 	pj.created_at DESC
 LIMIT
@@ -7797,6 +7803,7 @@ type GetProvisionerJobsByOrganizationAndStatusWithQueuePositionAndProvisionerRow
 	TemplateIcon        string         `db:"template_icon" json:"template_icon"`
 	WorkspaceID         uuid.NullUUID  `db:"workspace_id" json:"workspace_id"`
 	WorkspaceName       string         `db:"workspace_name" json:"workspace_name"`
+	WorkerName          string         `db:"worker_name" json:"worker_name"`
 }
 
 func (q *sqlQuerier) GetProvisionerJobsByOrganizationAndStatusWithQueuePositionAndProvisioner(ctx context.Context, arg GetProvisionerJobsByOrganizationAndStatusWithQueuePositionAndProvisionerParams) ([]GetProvisionerJobsByOrganizationAndStatusWithQueuePositionAndProvisionerRow, error) {
@@ -7844,6 +7851,7 @@ func (q *sqlQuerier) GetProvisionerJobsByOrganizationAndStatusWithQueuePositionA
 			&i.TemplateIcon,
 			&i.WorkspaceID,
 			&i.WorkspaceName,
+			&i.WorkerName,
 		); err != nil {
 			return nil, err
 		}

coderd/database/queries/provisionerjobs.sql

@@ -160,7 +160,9 @@ SELECT
 	COALESCE(t.display_name, '') AS template_display_name,
 	COALESCE(t.icon, '') AS template_icon,
 	w.id AS workspace_id,
-	COALESCE(w.name, '') AS workspace_name
+	COALESCE(w.name, '') AS workspace_name,
+	-- Include the name of the provisioner_daemon associated to the job
+	COALESCE(pd.name, '') AS worker_name
 FROM
 	provisioner_jobs pj
 LEFT JOIN
@@ -185,6 +187,9 @@ LEFT JOIN
 		t.id = tv.template_id
 		AND t.organization_id = pj.organization_id
 	)
+LEFT JOIN
+	-- Join to get the daemon name corresponding to the job's worker_id
+	provisioner_daemons pd ON pd.id = pj.worker_id
 WHERE
 	pj.organization_id = @organization_id::uuid
 	AND (COALESCE(array_length(@ids::uuid[], 1), 0) = 0 OR pj.id = ANY(@ids::uuid[]))
@@ -200,7 +205,8 @@ GROUP BY
 	t.display_name,
 	t.icon,
 	w.id,
-	w.name
+	w.name,
+	pd.name
 ORDER BY
 	pj.created_at DESC
 LIMIT

coderd/provisionerjobs.go

@@ -395,6 +395,7 @@ func convertProvisionerJobWithQueuePosition(pj database.GetProvisionerJobsByOrga
 		QueuePosition:  pj.QueuePosition,
 		QueueSize:      pj.QueueSize,
 	})
+	job.WorkerName = pj.WorkerName
 	job.AvailableWorkers = pj.AvailableWorkers
 	job.Metadata = codersdk.ProvisionerJobMetadata{
 		TemplateVersionName: pj.TemplateVersionName,

coderd/provisionerjobs_test.go

@@ -27,162 +27,263 @@ import (
 func TestProvisionerJobs(t *testing.T) {
 	t.Parallel()
 
-	db, ps := dbtestutil.NewDB(t, dbtestutil.WithDumpOnFailure())
-	client := coderdtest.New(t, &coderdtest.Options{
-		IncludeProvisionerDaemon: true,
-		Database:                 db,
-		Pubsub:                   ps,
-	})
-	owner := coderdtest.CreateFirstUser(t, client)
-	templateAdminClient, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.ScopedRoleOrgTemplateAdmin(owner.OrganizationID))
-	memberClient, member := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
+	t.Run("ProvisionerJobs", func(t *testing.T) {
+		db, ps := dbtestutil.NewDB(t, dbtestutil.WithDumpOnFailure())
+		client := coderdtest.New(t, &coderdtest.Options{
+			IncludeProvisionerDaemon: true,
+			Database:                 db,
+			Pubsub:                   ps,
+		})
+		owner := coderdtest.CreateFirstUser(t, client)
+		templateAdminClient, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.ScopedRoleOrgTemplateAdmin(owner.OrganizationID))
+		memberClient, member := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
 
-	version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, nil)
-	coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
-	template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID)
+		version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, nil)
+		coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
+		template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID)
 
-	time.Sleep(1500 * time.Millisecond) // Ensure the workspace build job has a different timestamp for sorting.
-	workspace := coderdtest.CreateWorkspace(t, client, template.ID)
-	coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID)
+		time.Sleep(1500 * time.Millisecond) // Ensure the workspace build job has a different timestamp for sorting.
+		workspace := coderdtest.CreateWorkspace(t, client, template.ID)
+		coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID)
 
-	// Create a pending job.
-	w := dbgen.Workspace(t, db, database.WorkspaceTable{
-		OrganizationID: owner.OrganizationID,
-		OwnerID:        member.ID,
-		TemplateID:     template.ID,
-	})
-	wbID := uuid.New()
-	job := dbgen.ProvisionerJob(t, db, nil, database.ProvisionerJob{
-		OrganizationID: w.OrganizationID,
-		StartedAt:      sql.NullTime{Time: dbtime.Now(), Valid: true},
-		Type:           database.ProvisionerJobTypeWorkspaceBuild,
-		Input:          json.RawMessage(`{"workspace_build_id":"` + wbID.String() + `"}`),
-	})
-	dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{
-		ID:                wbID,
-		JobID:             job.ID,
-		WorkspaceID:       w.ID,
-		TemplateVersionID: version.ID,
-	})
-
-	// Add more jobs than the default limit.
-	for i := range 60 {
-		dbgen.ProvisionerJob(t, db, nil, database.ProvisionerJob{
+		// Create a pending job.
+		w := dbgen.Workspace(t, db, database.WorkspaceTable{
 			OrganizationID: owner.OrganizationID,
-			Tags:           database.StringMap{"count": strconv.Itoa(i)},
+			OwnerID:        member.ID,
+			TemplateID:     template.ID,
+		})
+		wbID := uuid.New()
+		job := dbgen.ProvisionerJob(t, db, nil, database.ProvisionerJob{
+			OrganizationID: w.OrganizationID,
+			StartedAt:      sql.NullTime{Time: dbtime.Now(), Valid: true},
+			Type:           database.ProvisionerJobTypeWorkspaceBuild,
+			Input:          json.RawMessage(`{"workspace_build_id":"` + wbID.String() + `"}`),
+		})
+		dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{
+			ID:                wbID,
+			JobID:             job.ID,
+			WorkspaceID:       w.ID,
+			TemplateVersionID: version.ID,
 		})
-	}
 
-	t.Run("Single", func(t *testing.T) {
-		t.Parallel()
-		t.Run("Workspace", func(t *testing.T) {
+		// Add more jobs than the default limit.
+		for i := range 60 {
+			dbgen.ProvisionerJob(t, db, nil, database.ProvisionerJob{
+				OrganizationID: owner.OrganizationID,
+				Tags:           database.StringMap{"count": strconv.Itoa(i)},
+			})
+		}
+
+		t.Run("Single", func(t *testing.T) {
 			t.Parallel()
-			t.Run("OK", func(t *testing.T) {
+			t.Run("Workspace", func(t *testing.T) {
+				t.Parallel()
+				t.Run("OK", func(t *testing.T) {
+					t.Parallel()
+					ctx := testutil.Context(t, testutil.WaitMedium)
+					// Note this calls the single job endpoint.
+					job2, err := templateAdminClient.OrganizationProvisionerJob(ctx, owner.OrganizationID, job.ID)
+					require.NoError(t, err)
+					require.Equal(t, job.ID, job2.ID)
+
+					// Verify that job metadata is correct.
+					assert.Equal(t, job2.Metadata, codersdk.ProvisionerJobMetadata{
+						TemplateVersionName: version.Name,
+						TemplateID:          template.ID,
+						TemplateName:        template.Name,
+						TemplateDisplayName: template.DisplayName,
+						TemplateIcon:        template.Icon,
+						WorkspaceID:         &w.ID,
+						WorkspaceName:       w.Name,
+					})
+				})
+			})
+			t.Run("Template Import", func(t *testing.T) {
+				t.Parallel()
+				t.Run("OK", func(t *testing.T) {
+					t.Parallel()
+					ctx := testutil.Context(t, testutil.WaitMedium)
+					// Note this calls the single job endpoint.
+					job2, err := templateAdminClient.OrganizationProvisionerJob(ctx, owner.OrganizationID, version.Job.ID)
+					require.NoError(t, err)
+					require.Equal(t, version.Job.ID, job2.ID)
+
+					// Verify that job metadata is correct.
+					assert.Equal(t, job2.Metadata, codersdk.ProvisionerJobMetadata{
+						TemplateVersionName: version.Name,
+						TemplateID:          template.ID,
+						TemplateName:        template.Name,
+						TemplateDisplayName: template.DisplayName,
+						TemplateIcon:        template.Icon,
+					})
+				})
+			})
+			t.Run("Missing", func(t *testing.T) {
 				t.Parallel()
 				ctx := testutil.Context(t, testutil.WaitMedium)
 				// Note this calls the single job endpoint.
-				job2, err := templateAdminClient.OrganizationProvisionerJob(ctx, owner.OrganizationID, job.ID)
-				require.NoError(t, err)
-				require.Equal(t, job.ID, job2.ID)
-
-				// Verify that job metadata is correct.
-				assert.Equal(t, job2.Metadata, codersdk.ProvisionerJobMetadata{
-					TemplateVersionName: version.Name,
-					TemplateID:          template.ID,
-					TemplateName:        template.Name,
-					TemplateDisplayName: template.DisplayName,
-					TemplateIcon:        template.Icon,
-					WorkspaceID:         &w.ID,
-					WorkspaceName:       w.Name,
-				})
+				_, err := templateAdminClient.OrganizationProvisionerJob(ctx, owner.OrganizationID, uuid.New())
+				require.Error(t, err)
 			})
 		})
-		t.Run("Template Import", func(t *testing.T) {
-			t.Parallel()
-			t.Run("OK", func(t *testing.T) {
-				t.Parallel()
-				ctx := testutil.Context(t, testutil.WaitMedium)
-				// Note this calls the single job endpoint.
-				job2, err := templateAdminClient.OrganizationProvisionerJob(ctx, owner.OrganizationID, version.Job.ID)
-				require.NoError(t, err)
-				require.Equal(t, version.Job.ID, job2.ID)
 
-				// Verify that job metadata is correct.
-				assert.Equal(t, job2.Metadata, codersdk.ProvisionerJobMetadata{
-					TemplateVersionName: version.Name,
-					TemplateID:          template.ID,
-					TemplateName:        template.Name,
-					TemplateDisplayName: template.DisplayName,
-					TemplateIcon:        template.Icon,
-				})
-			})
-		})
-		t.Run("Missing", func(t *testing.T) {
+		t.Run("Default limit", func(t *testing.T) {
 			t.Parallel()
 			ctx := testutil.Context(t, testutil.WaitMedium)
-			// Note this calls the single job endpoint.
-			_, err := templateAdminClient.OrganizationProvisionerJob(ctx, owner.OrganizationID, uuid.New())
+			jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, nil)
+			require.NoError(t, err)
+			require.Len(t, jobs, 50)
+		})
+
+		t.Run("IDs", func(t *testing.T) {
+			t.Parallel()
+			ctx := testutil.Context(t, testutil.WaitMedium)
+			jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, &codersdk.OrganizationProvisionerJobsOptions{
+				IDs: []uuid.UUID{workspace.LatestBuild.Job.ID, version.Job.ID},
+			})
+			require.NoError(t, err)
+			require.Len(t, jobs, 2)
+		})
+
+		t.Run("Status", func(t *testing.T) {
+			t.Parallel()
+			ctx := testutil.Context(t, testutil.WaitMedium)
+			jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, &codersdk.OrganizationProvisionerJobsOptions{
+				Status: []codersdk.ProvisionerJobStatus{codersdk.ProvisionerJobRunning},
+			})
+			require.NoError(t, err)
+			require.Len(t, jobs, 1)
+		})
+
+		t.Run("Tags", func(t *testing.T) {
+			t.Parallel()
+			ctx := testutil.Context(t, testutil.WaitMedium)
+			jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, &codersdk.OrganizationProvisionerJobsOptions{
+				Tags: map[string]string{"count": "1"},
+			})
+			require.NoError(t, err)
+			require.Len(t, jobs, 1)
+		})
+
+		t.Run("Limit", func(t *testing.T) {
+			t.Parallel()
+			ctx := testutil.Context(t, testutil.WaitMedium)
+			jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, &codersdk.OrganizationProvisionerJobsOptions{
+				Limit: 1,
+			})
+			require.NoError(t, err)
+			require.Len(t, jobs, 1)
+		})
+
+		// For now, this is not allowed even though the member has created a
+		// workspace. Once member-level permissions for jobs are supported
+		// by RBAC, this test should be updated.
+		t.Run("MemberDenied", func(t *testing.T) {
+			t.Parallel()
+			ctx := testutil.Context(t, testutil.WaitMedium)
+			jobs, err := memberClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, nil)
 			require.Error(t, err)
+			require.Len(t, jobs, 0)
 		})
 	})
 
-	t.Run("Default limit", func(t *testing.T) {
+	// Ensures that when a provisioner job is in the succeeded state,
+	// the API response includes both worker_id and worker_name fields
+	t.Run("AssignedProvisionerJob", func(t *testing.T) {
 		t.Parallel()
-		ctx := testutil.Context(t, testutil.WaitMedium)
-		jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, nil)
-		require.NoError(t, err)
-		require.Len(t, jobs, 50)
-	})
 
-	t.Run("IDs", func(t *testing.T) {
-		t.Parallel()
-		ctx := testutil.Context(t, testutil.WaitMedium)
-		jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, &codersdk.OrganizationProvisionerJobsOptions{
-			IDs: []uuid.UUID{workspace.LatestBuild.Job.ID, version.Job.ID},
+		db, ps := dbtestutil.NewDB(t, dbtestutil.WithDumpOnFailure())
+		client, _, coderdAPI := coderdtest.NewWithAPI(t, &coderdtest.Options{
+			IncludeProvisionerDaemon: false,
+			Database:                 db,
+			Pubsub:                   ps,
 		})
-		require.NoError(t, err)
-		require.Len(t, jobs, 2)
-	})
+		provisionerDaemonName := "provisioner_daemon_test"
+		provisionerDaemon := coderdtest.NewTaggedProvisionerDaemon(t, coderdAPI, provisionerDaemonName, map[string]string{"owner": "", "scope": "organization"})
+		owner := coderdtest.CreateFirstUser(t, client)
+		templateAdminClient, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.ScopedRoleOrgTemplateAdmin(owner.OrganizationID))
 
-	t.Run("Status", func(t *testing.T) {
-		t.Parallel()
-		ctx := testutil.Context(t, testutil.WaitMedium)
-		jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, &codersdk.OrganizationProvisionerJobsOptions{
-			Status: []codersdk.ProvisionerJobStatus{codersdk.ProvisionerJobRunning},
+		version := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, nil)
+		coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
+		template := coderdtest.CreateTemplate(t, client, owner.OrganizationID, version.ID)
+
+		workspace := coderdtest.CreateWorkspace(t, client, template.ID)
+		coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID)
+
+		// Stop the provisioner so it doesn't grab any more jobs
+		err := provisionerDaemon.Close()
+		require.NoError(t, err)
+
+		t.Run("List_IncludesWorkerIDAndName", func(t *testing.T) {
+			t.Parallel()
+
+			ctx := testutil.Context(t, testutil.WaitMedium)
+
+			// Get provisioner daemon responsible for executing the provisioner jobs
+			provisionerDaemons, err := db.GetProvisionerDaemons(ctx)
+			require.NoError(t, err)
+			require.Equal(t, 1, len(provisionerDaemons))
+			if assert.NotEmpty(t, provisionerDaemons) {
+				require.Equal(t, provisionerDaemonName, provisionerDaemons[0].Name)
+			}
+
+			// Get provisioner jobs
+			jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, nil)
+			require.NoError(t, err)
+			require.Equal(t, 2, len(jobs))
+
+			for _, job := range jobs {
+				require.Equal(t, owner.OrganizationID, job.OrganizationID)
+				require.Equal(t, database.ProvisionerJobStatusSucceeded, database.ProvisionerJobStatus(job.Status))
+
+				// Guarantee that provisioner jobs contain the provisioner daemon ID and name
+				if assert.NotEmpty(t, provisionerDaemons) {
+					require.Equal(t, &provisionerDaemons[0].ID, job.WorkerID)
+					require.Equal(t, provisionerDaemonName, job.WorkerName)
+				}
+			}
 		})
-		require.NoError(t, err)
-		require.Len(t, jobs, 1)
-	})
 
-	t.Run("Tags", func(t *testing.T) {
-		t.Parallel()
-		ctx := testutil.Context(t, testutil.WaitMedium)
-		jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, &codersdk.OrganizationProvisionerJobsOptions{
-			Tags: map[string]string{"count": "1"},
+		t.Run("Get_IncludesWorkerIDAndName", func(t *testing.T) {
+			t.Parallel()
+
+			ctx := testutil.Context(t, testutil.WaitMedium)
+
+			// Get provisioner daemon responsible for executing the provisioner job
+			provisionerDaemons, err := db.GetProvisionerDaemons(ctx)
+			require.NoError(t, err)
+			require.Equal(t, 1, len(provisionerDaemons))
+			if assert.NotEmpty(t, provisionerDaemons) {
+				require.Equal(t, provisionerDaemonName, provisionerDaemons[0].Name)
+			}
+
+			// Get all provisioner jobs
+			jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, nil)
+			require.NoError(t, err)
+			require.Equal(t, 2, len(jobs))
+
+			// Find workspace_build provisioner job ID
+			var workspaceProvisionerJobID uuid.UUID
+			for _, job := range jobs {
+				if job.Type == codersdk.ProvisionerJobTypeWorkspaceBuild {
+					workspaceProvisionerJobID = job.ID
+				}
+			}
+			require.NotNil(t, workspaceProvisionerJobID)
+
+			// Get workspace_build provisioner job by ID
+			workspaceProvisionerJob, err := templateAdminClient.OrganizationProvisionerJob(ctx, owner.OrganizationID, workspaceProvisionerJobID)
+			require.NoError(t, err)
+
+			require.Equal(t, owner.OrganizationID, workspaceProvisionerJob.OrganizationID)
+			require.Equal(t, database.ProvisionerJobStatusSucceeded, database.ProvisionerJobStatus(workspaceProvisionerJob.Status))
+
+			// Guarantee that provisioner job contains the provisioner daemon ID and name
+			if assert.NotEmpty(t, provisionerDaemons) {
+				require.Equal(t, &provisionerDaemons[0].ID, workspaceProvisionerJob.WorkerID)
+				require.Equal(t, provisionerDaemonName, workspaceProvisionerJob.WorkerName)
+			}
 		})
-		require.NoError(t, err)
-		require.Len(t, jobs, 1)
-	})
-
-	t.Run("Limit", func(t *testing.T) {
-		t.Parallel()
-		ctx := testutil.Context(t, testutil.WaitMedium)
-		jobs, err := templateAdminClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, &codersdk.OrganizationProvisionerJobsOptions{
-			Limit: 1,
-		})
-		require.NoError(t, err)
-		require.Len(t, jobs, 1)
-	})
-
-	// For now, this is not allowed even though the member has created a
-	// workspace. Once member-level permissions for jobs are supported
-	// by RBAC, this test should be updated.
-	t.Run("MemberDenied", func(t *testing.T) {
-		t.Parallel()
-		ctx := testutil.Context(t, testutil.WaitMedium)
-		jobs, err := memberClient.OrganizationProvisionerJobs(ctx, owner.OrganizationID, nil)
-		require.Error(t, err)
-		require.Len(t, jobs, 0)
 	})
 }