Skip to content

Commit be53b25

Browse files
mafredrimafredri
committed
remove provisioner daemon with status type
1 parent ca9c72b commit be53b25

File tree

10 files changed

+235
-287
lines changed

10 files changed

+235
-287
lines changed

‎coderd/apidoc/docs.go

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

‎coderd/provisionerdaemons.go

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
// @Tags Enterprise
1919
// @Param organization path string true "Organization ID" format(uuid)
2020
// @Param tags query object false "Provisioner tags to filter by (JSON of the form {'tag1':'value1','tag2':'value2'})"
21-
// @Success 200 {array} codersdk.ProvisionerDaemonWithStatus
21+
// @Success 200 {array} codersdk.ProvisionerDaemon
2222
// @Router /organizations/{organization}/provisionerdaemons [get]
2323
func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
2424
var (
@@ -53,7 +53,7 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
5353
return
5454
}
5555

56-
httpapi.Write(ctx, rw, http.StatusOK, db2sdk.List(daemons, func(dbDaemon database.GetProvisionerDaemonsWithStatusByOrganizationRow) codersdk.ProvisionerDaemonWithStatus {
56+
httpapi.Write(ctx, rw, http.StatusOK, db2sdk.List(daemons, func(dbDaemon database.GetProvisionerDaemonsWithStatusByOrganizationRow) codersdk.ProvisionerDaemon {
5757
pd := db2sdk.ProvisionerDaemon(dbDaemon.ProvisionerDaemon)
5858
var currentJob, previousJob *codersdk.ProvisionerDaemonJob
5959
if dbDaemon.CurrentJobID.Valid {
@@ -68,12 +68,14 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
6868
Status: codersdk.ProvisionerJobStatus(dbDaemon.PreviousJobStatus.ProvisionerJobStatus),
6969
}
7070
}
71-
return codersdk.ProvisionerDaemonWithStatus{
72-
ProvisionerDaemon: pd,
73-
KeyName: dbDaemon.KeyName,
74-
Status: codersdk.ProvisionerDaemonStatus(dbDaemon.Status),
75-
CurrentJob: currentJob,
76-
PreviousJob: previousJob,
77-
}
71+
72+
// Add optional fields.
73+
status := codersdk.ProvisionerDaemonStatus(dbDaemon.Status)
74+
pd.KeyName = &dbDaemon.KeyName
75+
pd.Status = &status
76+
pd.CurrentJob = currentJob
77+
pd.PreviousJob = previousJob
78+
79+
return pd
7880
}))
7981
}

‎codersdk/organizations.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ func (c *Client) DeleteOrganization(ctx context.Context, orgID string) error {
296296
}
297297

298298
// ProvisionerDaemons returns provisioner daemons available.
299-
func (c *Client) ProvisionerDaemons(ctx context.Context) ([]ProvisionerDaemonWithStatus, error) {
299+
func (c *Client) ProvisionerDaemons(ctx context.Context) ([]ProvisionerDaemon, error) {
300300
res, err := c.Request(ctx, http.MethodGet,
301301
// TODO: the organization path parameter is currently ignored.
302302
"/api/v2/organizations/default/provisionerdaemons",
@@ -311,11 +311,11 @@ func (c *Client) ProvisionerDaemons(ctx context.Context) ([]ProvisionerDaemonWit
311311
return nil, ReadBodyAsError(res)
312312
}
313313

314-
var daemons []ProvisionerDaemonWithStatus
314+
var daemons []ProvisionerDaemon
315315
return daemons, json.NewDecoder(res.Body).Decode(&daemons)
316316
}
317317

318-
func (c *Client) OrganizationProvisionerDaemons(ctx context.Context, organizationID uuid.UUID, tags map[string]string) ([]ProvisionerDaemonWithStatus, error) {
318+
func (c *Client) OrganizationProvisionerDaemons(ctx context.Context, organizationID uuid.UUID, tags map[string]string) ([]ProvisionerDaemon, error) {
319319
baseURL := fmt.Sprintf("/api/v2/organizations/%s/provisionerdaemons", organizationID.String())
320320

321321
queryParams := url.Values{}
@@ -339,7 +339,7 @@ func (c *Client) OrganizationProvisionerDaemons(ctx context.Context, organizatio
339339
return nil, ReadBodyAsError(res)
340340
}
341341

342-
var daemons []ProvisionerDaemonWithStatus
342+
var daemons []ProvisionerDaemon
343343
return daemons, json.NewDecoder(res.Body).Decode(&daemons)
344344
}
345345

‎codersdk/provisionerdaemons.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,12 @@ type ProvisionerDaemon struct {
6060
APIVersion string `json:"api_version" table:"api version"`
6161
Provisioners []ProvisionerType `json:"provisioners" table:"-"`
6262
Tags map[string]string `json:"tags" table:"tags"`
63-
}
6463

65-
type ProvisionerDaemonWithStatus struct {
66-
ProvisionerDaemon `table:"provisioner daemon,recursive_inline"`
67-
KeyName string `json:"key_name" table:"key name"`
68-
Status ProvisionerDaemonStatus `json:"status" enums:"offline,idle,busy" table:"status"`
69-
CurrentJob *ProvisionerDaemonJob `json:"current_job" table:"current job,recursive"`
70-
PreviousJob *ProvisionerDaemonJob `json:"previous_job" table:"previous job,recursive"`
64+
// 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"`
7169
}
7270

7371
type ProvisionerDaemonJob struct {

‎docs/reference/api/debug.md

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

0 commit comments

Comments
 (0)