Skip to content

Commit 415bd20

Browse files
BrunoQuaresmaBrunoQuaresma
committed
Apply PR review suggestions
1 parent 25f13a1 commit 415bd20

File tree

12 files changed

+206
-179
lines changed

12 files changed

+206
-179
lines changed

‎coderd/apidoc/docs.go

Lines changed: 9 additions & 9 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: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

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

‎coderd/database/queries/provisionerdaemons.sql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ SELECT
4545
current_job.job_status AS current_job_status,
4646
previous_job.id AS previous_job_id,
4747
previous_job.job_status AS previous_job_status,
48-
tmpl.name AS template_name,
49-
tmpl.display_name AS template_display_name,
50-
tmpl.icon AS template_icon
48+
tmpl.name AS current_job_template_name,
49+
tmpl.display_name AS current_job_template_display_name,
50+
tmpl.icon AS current_job_template_icon
5151
FROM
5252
provisioner_daemons pd
5353
JOIN
@@ -73,7 +73,7 @@ LEFT JOIN
7373
)
7474
)
7575
JOIN
76-
template_versions version ON version.id::text = pd.version
76+
template_versions version ON version.id = (current_job.input->>'template_version_id')::uuid
7777
LEFT JOIN
7878
templates tmpl ON tmpl.id = version.template_id
7979
WHERE

‎coderd/provisionerdaemons.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,11 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
5959
var currentJob, previousJob *codersdk.ProvisionerDaemonJob
6060
if dbDaemon.CurrentJobID.Valid {
6161
currentJob = &codersdk.ProvisionerDaemonJob{
62-
ID: dbDaemon.CurrentJobID.UUID,
63-
Status: codersdk.ProvisionerJobStatus(dbDaemon.CurrentJobStatus.ProvisionerJobStatus),
62+
ID: dbDaemon.CurrentJobID.UUID,
63+
Status: codersdk.ProvisionerJobStatus(dbDaemon.CurrentJobStatus.ProvisionerJobStatus),
64+
TemplateName: dbDaemon.CurrentJobTemplateName.String,
65+
TemplateIcon: dbDaemon.CurrentJobTemplateIcon.String,
66+
TemplateDisplayName: dbDaemon.CurrentJobTemplateDisplayName.String,
6467
}
6568
}
6669
if dbDaemon.PreviousJobID.Valid {
@@ -75,9 +78,6 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
7578
pd.Status = ptr.Ref(codersdk.ProvisionerDaemonStatus(dbDaemon.Status))
7679
pd.CurrentJob = currentJob
7780
pd.PreviousJob = previousJob
78-
pd.TemplateName = &dbDaemon.TemplateName.String
79-
pd.TemplateDisplayName = &dbDaemon.TemplateDisplayName.String
80-
pd.TemplateIcon = &dbDaemon.TemplateIcon.String
8181

8282
return pd
8383
}))

‎codersdk/provisionerdaemons.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,18 @@ type ProvisionerDaemon struct {
6262
Tags map[string]string `json:"tags" table:"tags"`
6363

6464
// Optional fields.
65-
KeyName *string `json:"key_name" table:"key name"`
66-
Status *ProvisionerDaemonStatus `json:"status" enums:"offline,idle,busy" table:"status"`
67-
CurrentJob *ProvisionerDaemonJob `json:"current_job" table:"current job,recursive"`
68-
PreviousJob *ProvisionerDaemonJob `json:"previous_job" table:"previous job,recursive"`
69-
TemplateName *string `json:"template_name" table:"template name"`
70-
TemplateIcon *string `json:"template_icon" table:"template icon"`
71-
TemplateDisplayName *string `json:"template_display_name" table:"template display name"`
65+
KeyName *string `json:"key_name" table:"key name"`
66+
Status *ProvisionerDaemonStatus `json:"status" enums:"offline,idle,busy" table:"status"`
67+
CurrentJob *ProvisionerDaemonJob `json:"current_job" table:"current job,recursive"`
68+
PreviousJob *ProvisionerDaemonJob `json:"previous_job" table:"previous job,recursive"`
7269
}
7370

7471
type ProvisionerDaemonJob struct {
75-
ID uuid.UUID `json:"id" format:"uuid" table:"id"`
76-
Status ProvisionerJobStatus `json:"status" enums:"pending,running,succeeded,canceling,canceled,failed" table:"status"`
72+
ID uuid.UUID `json:"id" format:"uuid" table:"id"`
73+
Status ProvisionerJobStatus `json:"status" enums:"pending,running,succeeded,canceling,canceled,failed" table:"status"`
74+
TemplateName string `json:"template_name" table:"template name"`
75+
TemplateIcon string `json:"template_icon" table:"template icon"`
76+
TemplateDisplayName string `json:"template_display_name" table:"template display name"`
7777
}
7878

7979
// MatchedProvisioners represents the number of provisioner daemons

‎docs/reference/api/debug.md

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

0 commit comments

Comments
 (0)