Skip to content

Commit fec0066

Browse files
committed
move convertProvisionerDaemon to db2sdk
1 parent ba174ad commit fec0066

File tree

3 files changed

+20
-35
lines changed

3 files changed

+20
-35
lines changed

coderd/database/db2sdk/db2sdk.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,3 +416,19 @@ func Apps(dbApps []database.WorkspaceApp, agent database.WorkspaceAgent, ownerNa
416416
}
417417
return apps
418418
}
419+
420+
func ProvisionerDaemon(dbDaemon database.ProvisionerDaemon) codersdk.ProvisionerDaemon {
421+
result := codersdk.ProvisionerDaemon{
422+
ID: dbDaemon.ID,
423+
CreatedAt: dbDaemon.CreatedAt,
424+
LastSeenAt: codersdk.NullTime{NullTime: dbDaemon.LastSeenAt},
425+
Name: dbDaemon.Name,
426+
Tags: dbDaemon.Tags,
427+
Version: dbDaemon.Version,
428+
APIVersion: dbDaemon.APIVersion,
429+
}
430+
for _, provisionerType := range dbDaemon.Provisioners {
431+
result.Provisioners = append(result.Provisioners, codersdk.ProvisionerType(provisionerType))
432+
}
433+
return result
434+
}

coderd/healthcheck/provisioner.go

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/coder/coder/v2/buildinfo"
1010
"github.com/coder/coder/v2/coderd/database"
11+
"github.com/coder/coder/v2/coderd/database/db2sdk"
1112
"github.com/coder/coder/v2/coderd/database/dbauthz"
1213
"github.com/coder/coder/v2/coderd/healthcheck/health"
1314
"github.com/coder/coder/v2/coderd/provisionerdserver"
@@ -78,7 +79,7 @@ func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDae
7879
}
7980

8081
for _, daemon := range daemons {
81-
r.ProvisionerDaemons = append(r.ProvisionerDaemons, convertProvisionerDaemon(daemon))
82+
r.ProvisionerDaemons = append(r.ProvisionerDaemons, db2sdk.ProvisionerDaemon(daemon))
8283
}
8384

8485
if len(r.ProvisionerDaemons) == 0 {
@@ -126,20 +127,3 @@ func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDae
126127
}
127128
}
128129
}
129-
130-
// XXX: duplicated from enterprise/coderd
131-
func convertProvisionerDaemon(daemon database.ProvisionerDaemon) codersdk.ProvisionerDaemon {
132-
result := codersdk.ProvisionerDaemon{
133-
ID: daemon.ID,
134-
CreatedAt: daemon.CreatedAt,
135-
LastSeenAt: codersdk.NullTime{NullTime: daemon.LastSeenAt},
136-
Name: daemon.Name,
137-
Tags: daemon.Tags,
138-
Version: daemon.Version,
139-
APIVersion: daemon.APIVersion,
140-
}
141-
for _, provisionerType := range daemon.Provisioners {
142-
result.Provisioners = append(result.Provisioners, codersdk.ProvisionerType(provisionerType))
143-
}
144-
return result
145-
}

enterprise/coderd/provisionerdaemons.go

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"cdr.dev/slog"
2727
"github.com/coder/coder/v2/coderd"
2828
"github.com/coder/coder/v2/coderd/database"
29+
"github.com/coder/coder/v2/coderd/database/db2sdk"
2930
"github.com/coder/coder/v2/coderd/database/dbauthz"
3031
"github.com/coder/coder/v2/coderd/database/dbtime"
3132
"github.com/coder/coder/v2/coderd/httpapi"
@@ -89,7 +90,7 @@ func (api *API) provisionerDaemons(rw http.ResponseWriter, r *http.Request) {
8990
}
9091
apiDaemons := make([]codersdk.ProvisionerDaemon, 0)
9192
for _, daemon := range daemons {
92-
apiDaemons = append(apiDaemons, convertProvisionerDaemon(daemon))
93+
apiDaemons = append(apiDaemons, db2sdk.ProvisionerDaemon(daemon))
9394
}
9495
httpapi.Write(ctx, rw, http.StatusOK, apiDaemons)
9596
}
@@ -360,22 +361,6 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)
360361
_ = conn.Close(websocket.StatusGoingAway, "")
361362
}
362363

363-
func convertProvisionerDaemon(daemon database.ProvisionerDaemon) codersdk.ProvisionerDaemon {
364-
result := codersdk.ProvisionerDaemon{
365-
ID: daemon.ID,
366-
CreatedAt: daemon.CreatedAt,
367-
LastSeenAt: codersdk.NullTime{NullTime: daemon.LastSeenAt},
368-
Name: daemon.Name,
369-
Tags: daemon.Tags,
370-
Version: daemon.Version,
371-
APIVersion: daemon.APIVersion,
372-
}
373-
for _, provisionerType := range daemon.Provisioners {
374-
result.Provisioners = append(result.Provisioners, codersdk.ProvisionerType(provisionerType))
375-
}
376-
return result
377-
}
378-
379364
// wsNetConn wraps net.Conn created by websocket.NetConn(). Cancel func
380365
// is called if a read or write error is encountered.
381366
type wsNetConn struct {

0 commit comments

Comments
 (0)