Skip to content

Commit 5fc39a0

Browse files
ssncferreirassncferreira
committed
feat(coderd): add provisioner daemon name to provisioner jobs responses
1 parent cf98268 commit 5fc39a0

24 files changed

+628
-172
lines changed

‎cli/testdata/coder_list_--output_json.golden

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"completed_at": "====[timestamp]=====",
3838
"status": "succeeded",
3939
"worker_id": "====[workspace build worker ID]=====",
40+
"worker_name": "test-daemon",
4041
"file_id": "=====[workspace build file ID]======",
4142
"tags": {
4243
"owner": "",

‎cli/testdata/coder_provisioner_jobs_list_--help.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ OPTIONS:
1111
-O, --org string, $CODER_ORGANIZATION
1212
Select which organization (uuid or name) to use.
1313

14-
-c, --column [id|created at|started at|completed at|canceled at|error|error code|status|worker id|file id|tags|queue position|queue size|organization id|template version id|workspace build id|type|available workers|template version name|template id|template name|template display name|template icon|workspace id|workspace name|organization|queue] (default: created at,id,type,template display name,status,queue,tags)
14+
-c, --column [id|created at|started at|completed at|canceled at|error|error code|status|worker id|worker name|file id|tags|queue position|queue size|organization id|template version id|workspace build id|type|available workers|template version name|template id|template name|template display name|template icon|workspace id|workspace name|organization|queue] (default: created at,id,type,template display name,status,queue,tags)
1515
Columns to display in table output.
1616

1717
-l, --limit int, $CODER_PROVISIONER_JOB_LIST_LIMIT (default: 50)

‎cli/testdata/coder_provisioner_jobs_list_--output_json.golden

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"completed_at": "====[timestamp]=====",
77
"status": "succeeded",
88
"worker_id": "====[workspace build worker ID]=====",
9+
"worker_name": "test-daemon",
910
"file_id": "=====[workspace build file ID]======",
1011
"tags": {
1112
"owner": "",
@@ -34,6 +35,7 @@
3435
"completed_at": "====[timestamp]=====",
3536
"status": "succeeded",
3637
"worker_id": "====[workspace build worker ID]=====",
38+
"worker_name": "test-daemon",
3739
"file_id": "=====[workspace build file ID]======",
3840
"tags": {
3941
"owner": "",

‎cli/testdata/coder_provisioner_list.golden

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
CREATED AT LAST SEEN AT KEY NAME NAME VERSION STATUS TAGS
2-
====[timestamp]===== ====[timestamp]===== built-in test v0.0.0-devel idle map[owner: scope:organization]
1+
CREATED AT LAST SEEN AT KEY NAME NAME VERSION STATUS TAGS
2+
====[timestamp]===== ====[timestamp]===== built-in test-daemon v0.0.0-devel idle map[owner: scope:organization]

‎cli/testdata/coder_provisioner_list_--output_json.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"key_id": "00000000-0000-0000-0000-000000000001",
66
"created_at": "====[timestamp]=====",
77
"last_seen_at": "====[timestamp]=====",
8-
"name": "test",
8+
"name": "test-daemon",
99
"version": "v0.0.0-devel",
1010
"api_version": "1.6",
1111
"provisioners": [

‎coderd/apidoc/docs.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/coderdtest/coderdtest.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ import (
9696
"github.com/coder/coder/v2/testutil"
9797
)
9898

99+
const defaultTestDaemonName = "test-daemon"
100+
99101
type Options struct {
100102
// AccessURL denotes a custom access URL. By default we use the httptest
101103
// server's URL. Setting this may result in unexpected behavior (especially
@@ -601,7 +603,7 @@ func NewWithAPI(t testing.TB, options *Options) (*codersdk.Client, io.Closer, *c
601603
setHandler(rootHandler)
602604
var provisionerCloser io.Closer = nopcloser{}
603605
if options.IncludeProvisionerDaemon {
604-
provisionerCloser = NewTaggedProvisionerDaemon(t, coderAPI, "test", options.ProvisionerDaemonTags)
606+
provisionerCloser = NewTaggedProvisionerDaemon(t, coderAPI, defaultTestDaemonName, options.ProvisionerDaemonTags)
605607
}
606608
client := codersdk.New(serverURL)
607609
t.Cleanup(func() {
@@ -645,7 +647,7 @@ func (c *ProvisionerdCloser) Close() error {
645647
// well with coderd testing. It registers the "echo" provisioner for
646648
// quick testing.
647649
func NewProvisionerDaemon(t testing.TB, coderAPI *coderd.API) io.Closer {
648-
return NewTaggedProvisionerDaemon(t, coderAPI, "test", nil)
650+
return NewTaggedProvisionerDaemon(t, coderAPI, defaultTestDaemonName, nil)
649651
}
650652

651653
func NewTaggedProvisionerDaemon(t testing.TB, coderAPI *coderd.API, name string, provisionerTags map[string]string) io.Closer {

‎coderd/database/dbmem/dbmem.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,6 +1267,14 @@ func (q *FakeQuerier) getProvisionerJobsByIDsWithQueuePositionLockedTagBasedQueu
12671267
// Step 6: Compute the final results with minimal checks
12681268
var results []database.GetProvisionerJobsByIDsWithQueuePositionRow
12691269
for _, job := range filteredJobs {
1270+
workerName := ""
1271+
// Add daemon name to provisioner job
1272+
for _, daemon := range q.provisionerDaemons {
1273+
if job.WorkerID.Valid && job.WorkerID.UUID == daemon.ID {
1274+
workerName = daemon.Name
1275+
}
1276+
}
1277+
12701278
// If the job has a computed rank, use it
12711279
if rank, found := jobQueueStats[job.ID]; found {
12721280
results = append(results, rank)
@@ -1278,6 +1286,7 @@ func (q *FakeQuerier) getProvisionerJobsByIDsWithQueuePositionLockedTagBasedQueu
12781286
ProvisionerJob: job,
12791287
QueuePosition: 0,
12801288
QueueSize: 0,
1289+
WorkerName: workerName,
12811290
})
12821291
}
12831292
}
@@ -4848,6 +4857,13 @@ func (q *FakeQuerier) GetProvisionerJobsByOrganizationAndStatusWithQueuePosition
48484857
row.AvailableWorkers = append(row.AvailableWorkers, worker.ID)
48494858
}
48504859
}
4860+
4861+
// Add daemon name to provisioner job
4862+
for _, daemon := range q.provisionerDaemons {
4863+
if job.WorkerID.Valid && job.WorkerID.UUID == daemon.ID {
4864+
row.WorkerName = daemon.Name
4865+
}
4866+
}
48514867
rows = append(rows, row)
48524868
}
48534869

‎coderd/database/queries.sql.go

Lines changed: 16 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)