Skip to content

Commit cffe140

Browse files
BrunoQuaresmaBrunoQuaresma
committed
chore: return template data for provisioner daemons
1 parent 700a453 commit cffe140

File tree

12 files changed

+162
-82
lines changed

12 files changed

+162
-82
lines changed

‎coderd/apidoc/docs.go

Lines changed: 9 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: 9 additions & 0 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: 21 additions & 8 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: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ SELECT
4444
current_job.id AS current_job_id,
4545
current_job.job_status AS current_job_status,
4646
previous_job.id AS previous_job_id,
47-
previous_job.job_status AS previous_job_status
47+
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
4851
FROM
4952
provisioner_daemons pd
5053
JOIN
@@ -69,6 +72,10 @@ LEFT JOIN
6972
LIMIT 1
7073
)
7174
)
75+
JOIN
76+
template_versions version ON version.id = pd.version
77+
LEFT JOIN
78+
templates tmpl ON tmpl.id = version.template_id
7279
WHERE
7380
pd.organization_id = @organization_id::uuid
7481
AND (COALESCE(array_length(@ids::uuid[], 1), 0) = 0 OR pd.id = ANY(@ids::uuid[]))

‎coderd/provisionerdaemons.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
7575
pd.Status = ptr.Ref(codersdk.ProvisionerDaemonStatus(dbDaemon.Status))
7676
pd.CurrentJob = currentJob
7777
pd.PreviousJob = previousJob
78+
pd.TemplateName = &dbDaemon.TemplateName.String
79+
pd.TemplateDisplayName = &dbDaemon.TemplateDisplayName.String
80+
pd.TemplateIcon = &dbDaemon.TemplateIcon.String
7881

7982
return pd
8083
}))

‎codersdk/provisionerdaemons.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,13 @@ 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"`
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"`
6972
}
7073

7174
type ProvisionerDaemonJob struct {

‎docs/reference/api/debug.md

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

‎docs/reference/api/enterprise.md

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

0 commit comments

Comments
 (0)