Skip to content

chore: return template data for provisioner daemons #16514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 11, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions coderd/apidoc/docs.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions coderd/apidoc/swagger.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 21 additions & 8 deletions coderd/database/queries.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion coderd/database/queries/provisionerdaemons.sql
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ SELECT
current_job.id AS current_job_id,
current_job.job_status AS current_job_status,
previous_job.id AS previous_job_id,
previous_job.job_status AS previous_job_status
previous_job.job_status AS previous_job_status,
tmpl.name AS template_name,
tmpl.display_name AS template_display_name,
tmpl.icon AS template_icon
FROM
provisioner_daemons pd
JOIN
Expand All @@ -69,6 +72,10 @@ LEFT JOIN
LIMIT 1
)
)
JOIN
template_versions version ON version.id::text = pd.version
LEFT JOIN
templates tmpl ON tmpl.id = version.template_id
WHERE
pd.organization_id = @organization_id::uuid
AND (COALESCE(array_length(@ids::uuid[], 1), 0) = 0 OR pd.id = ANY(@ids::uuid[]))
Expand Down
3 changes: 3 additions & 0 deletions coderd/provisionerdaemons.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
pd.Status = ptr.Ref(codersdk.ProvisionerDaemonStatus(dbDaemon.Status))
pd.CurrentJob = currentJob
pd.PreviousJob = previousJob
pd.TemplateName = &dbDaemon.TemplateName.String
pd.TemplateDisplayName = &dbDaemon.TemplateDisplayName.String
pd.TemplateIcon = &dbDaemon.TemplateIcon.String

return pd
}))
Expand Down
11 changes: 7 additions & 4 deletions codersdk/provisionerdaemons.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,13 @@ type ProvisionerDaemon struct {
Tags map[string]string `json:"tags" table:"tags"`

// Optional fields.
KeyName *string `json:"key_name" table:"key name"`
Status *ProvisionerDaemonStatus `json:"status" enums:"offline,idle,busy" table:"status"`
CurrentJob *ProvisionerDaemonJob `json:"current_job" table:"current job,recursive"`
PreviousJob *ProvisionerDaemonJob `json:"previous_job" table:"previous job,recursive"`
KeyName *string `json:"key_name" table:"key name"`
Status *ProvisionerDaemonStatus `json:"status" enums:"offline,idle,busy" table:"status"`
CurrentJob *ProvisionerDaemonJob `json:"current_job" table:"current job,recursive"`
PreviousJob *ProvisionerDaemonJob `json:"previous_job" table:"previous job,recursive"`
TemplateName *string `json:"template_name" table:"template name"`
TemplateIcon *string `json:"template_icon" table:"template icon"`
TemplateDisplayName *string `json:"template_display_name" table:"template display name"`
}

type ProvisionerDaemonJob struct {
Expand Down
3 changes: 3 additions & 0 deletions docs/reference/api/debug.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

62 changes: 34 additions & 28 deletions docs/reference/api/enterprise.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading