mirror of
https://github.com/coder/coder.git
synced 2026-10-16 14:48:56 +08:00
## Summary
The `tags` query parameter on the "Get provisioner daemons" and "Get
provisioner jobs" endpoints was annotated as `@Param tags query object`,
which caused Swagger to emit `"type": "object"` for a query parameter.
Query parameters cannot be of type `object` in the OpenAPI 2.0 spec, so
this produced an invalid schema that breaks spec validators and client
generators.
As noted in the doc, the value is actually a single JSON-encoded string
(parsed via `QueryParamParser.JSONStringMap`), so the correct type is
`string`. This is a doc only concern as generators do not use this file.
## Changes
- Change the `tags` query param annotation from `object` to `string` in:
- `coderd/provisionerdaemons.go` (`GET
/api/v2/organizations/{organization}/provisionerdaemons`)
- `coderd/provisionerjobs.go` (`GET
/api/v2/organizations/{organization}/provisionerjobs`)
- Regenerate API docs (`make coderd/apidoc/.gen`):
`coderd/apidoc/swagger.json`, `coderd/apidoc/docs.go`, and the reference
markdown.
The description still documents the expected JSON form
(`{'tag1':'value1','tag2':'value2'}`), so no behavior changes for
callers.
> [!NOTE]
> This PR was generated by Coder Agents on behalf of @snagles.
115 lines
4.3 KiB
Go
115 lines
4.3 KiB
Go
package coderd
|
|
|
|
import (
|
|
"database/sql"
|
|
"net/http"
|
|
|
|
"github.com/coder/coder/v2/coderd/database"
|
|
"github.com/coder/coder/v2/coderd/database/db2sdk"
|
|
"github.com/coder/coder/v2/coderd/database/sdk2db"
|
|
"github.com/coder/coder/v2/coderd/httpapi"
|
|
"github.com/coder/coder/v2/coderd/httpmw"
|
|
"github.com/coder/coder/v2/coderd/provisionerdserver"
|
|
"github.com/coder/coder/v2/coderd/rbac"
|
|
"github.com/coder/coder/v2/coderd/rbac/policy"
|
|
"github.com/coder/coder/v2/coderd/util/slice"
|
|
"github.com/coder/coder/v2/codersdk"
|
|
)
|
|
|
|
// @Summary Get provisioner daemons
|
|
// @ID get-provisioner-daemons
|
|
// @Security CoderSessionToken
|
|
// @Produce json
|
|
// @Tags Provisioning
|
|
// @Param organization path string true "Organization ID" format(uuid)
|
|
// @Param limit query int false "Page limit"
|
|
// @Param ids query []string false "Filter results by job IDs" format(uuid)
|
|
// @Param status query codersdk.ProvisionerJobStatus false "Filter results by status" enums(pending,running,succeeded,canceling,canceled,failed)
|
|
// @Param tags query string false "Provisioner tags to filter by (JSON of the form `{'tag1':'value1','tag2':'value2'}`)"
|
|
// @Success 200 {array} codersdk.ProvisionerDaemon
|
|
// @Router /api/v2/organizations/{organization}/provisionerdaemons [get]
|
|
func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
|
|
var (
|
|
ctx = r.Context()
|
|
org = httpmw.OrganizationParam(r)
|
|
)
|
|
|
|
// This endpoint returns information about provisioner jobs.
|
|
// For now, only owners and template admins can access provisioner jobs.
|
|
if !api.Authorize(r, policy.ActionRead, rbac.ResourceProvisionerJobs.InOrg(org.ID)) {
|
|
httpapi.ResourceNotFound(rw)
|
|
return
|
|
}
|
|
|
|
qp := r.URL.Query()
|
|
p := httpapi.NewQueryParamParser()
|
|
limit := p.PositiveInt32(qp, 50, "limit")
|
|
ids := p.UUIDs(qp, nil, "ids")
|
|
tags := p.JSONStringMap(qp, database.StringMap{}, "tags")
|
|
includeOffline := p.NullableBoolean(qp, sql.NullBool{}, "offline")
|
|
statuses := p.ProvisionerDaemonStatuses(qp, []codersdk.ProvisionerDaemonStatus{}, "status")
|
|
maxAge := p.Duration(qp, 0, "max_age")
|
|
p.ErrorExcessParams(qp)
|
|
if len(p.Errors) > 0 {
|
|
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
|
|
Message: "Invalid query parameters.",
|
|
Validations: p.Errors,
|
|
})
|
|
return
|
|
}
|
|
|
|
dbStatuses := sdk2db.ProvisionerDaemonStatuses(statuses)
|
|
|
|
daemons, err := api.Database.GetProvisionerDaemonsWithStatusByOrganization(
|
|
ctx,
|
|
database.GetProvisionerDaemonsWithStatusByOrganizationParams{
|
|
OrganizationID: org.ID,
|
|
StaleIntervalMS: provisionerdserver.StaleInterval.Milliseconds(),
|
|
Limit: sql.NullInt32{Int32: limit, Valid: limit > 0},
|
|
Offline: includeOffline,
|
|
Statuses: dbStatuses,
|
|
MaxAgeMs: sql.NullInt64{Int64: maxAge.Milliseconds(), Valid: maxAge > 0},
|
|
IDs: ids,
|
|
Tags: tags,
|
|
},
|
|
)
|
|
if err != nil {
|
|
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
|
|
Message: "Internal error fetching provisioner daemons.",
|
|
Detail: err.Error(),
|
|
})
|
|
return
|
|
}
|
|
|
|
httpapi.Write(ctx, rw, http.StatusOK, slice.List(daemons, func(dbDaemon database.GetProvisionerDaemonsWithStatusByOrganizationRow) codersdk.ProvisionerDaemon {
|
|
pd := db2sdk.ProvisionerDaemon(dbDaemon.ProvisionerDaemon)
|
|
var currentJob, previousJob *codersdk.ProvisionerDaemonJob
|
|
if dbDaemon.CurrentJobID.Valid {
|
|
currentJob = &codersdk.ProvisionerDaemonJob{
|
|
ID: dbDaemon.CurrentJobID.UUID,
|
|
Status: codersdk.ProvisionerJobStatus(dbDaemon.CurrentJobStatus.ProvisionerJobStatus),
|
|
TemplateName: dbDaemon.CurrentJobTemplateName,
|
|
TemplateIcon: dbDaemon.CurrentJobTemplateIcon,
|
|
TemplateDisplayName: dbDaemon.CurrentJobTemplateDisplayName,
|
|
}
|
|
}
|
|
if dbDaemon.PreviousJobID.Valid {
|
|
previousJob = &codersdk.ProvisionerDaemonJob{
|
|
ID: dbDaemon.PreviousJobID.UUID,
|
|
Status: codersdk.ProvisionerJobStatus(dbDaemon.PreviousJobStatus.ProvisionerJobStatus),
|
|
TemplateName: dbDaemon.PreviousJobTemplateName,
|
|
TemplateIcon: dbDaemon.PreviousJobTemplateIcon,
|
|
TemplateDisplayName: dbDaemon.PreviousJobTemplateDisplayName,
|
|
}
|
|
}
|
|
|
|
// Add optional fields.
|
|
pd.KeyName = &dbDaemon.KeyName
|
|
pd.Status = new(codersdk.ProvisionerDaemonStatus(dbDaemon.Status))
|
|
pd.CurrentJob = currentJob
|
|
pd.PreviousJob = previousJob
|
|
|
|
return pd
|
|
}))
|
|
}
|