10000 typescript fixings · coder/coder@6fae074 · GitHub
[go: up one dir, main page]

Skip to content

Commit 6fae074

Browse files
committed
typescript fixings
1 parent e7a5e43 commit 6fae074

File tree

2 files changed

+26
-4
lines changed

2 files changed

+26
-4
lines changed

coderd/healthcheck/healthcheck.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ type Report struct {
3838
Websocket WebsocketReport `json:"websocket"`
3939
Database DatabaseReport `json:"database"`
4040
WorkspaceProxy WorkspaceProxyReport `json:"workspace_proxy"`
41-
ProvisionerDaemons ProvisionerDaemonsReport `json:"provisioner_daemon"`
41+
ProvisionerDaemons ProvisionerDaemonsReport `json:"provisioner_daemons"`
4242

4343
// The Coder version of the server that the report was generated on.
4444
CoderVersion string `json:"coder_version"`

coderd/healthcheck/provisioner.go

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ type ProvisionerDaemonsReport struct {
2121
Severity health.Severity `json:"severity"`
2222
Warnings []health.Message `json:"warnings"`
2323
Dismissed bool `json:"dismissed"`
24-
Error *string
24+
Error *string `json:"error"`
2525

26-
Provisioners []codersdk.ProvisionerDaemon
26+
ProvisionerDaemons []codersdk.ProvisionerDaemon `json:"provisioner_daemons"`
2727
}
2828

2929
type ProvisionerDaemonsReportOptions struct {
@@ -41,6 +41,7 @@ type ProvisionerDaemonsReportOptions struct {
4141
}
4242

4343
func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDaemonsReportOptions) {
44+
r.ProvisionerDaemons = make([]codersdk.ProvisionerDaemon, 0)
4445
r.Severity = health.SeverityOK
4546
r.Warnings = make([]health.Message, 0)
4647
r.Dismissed = opts.Dismissed
@@ -75,7 +76,11 @@ func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDae
7576
return
7677
}
7778

78-
if len(daemons) == 0 {
79+
for _, daemon := range daemons {
80+
r.ProvisionerDaemons = append(r.ProvisionerDaemons, convertProvisionerDaemon(daemon))
81+
}
82+
83+
if len(r.ProvisionerDaemons) == 0 {
7984
r.Severity = health.SeverityError
8085
r.Error = ptr.Ref("No provisioner daemons found!")
8186
return
@@ -117,3 +122,20 @@ func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDae
117122
}
118123
}
119124
}
125+
126+
// XXX: duplicated from enterprise/coderd
127+
func convertProvisionerDaemon(daemon database.ProvisionerDaemon) codersdk.ProvisionerDaemon {
128+
result := codersdk.ProvisionerDaemon{
129+
ID: daemon.ID,
130+
CreatedAt: daemon.CreatedAt,
131+
LastSeenAt: codersdk.NullTime{NullTime: daemon.LastSeenAt},
132+
Name: daemon.Name,
133+
Tags: daemon.Tags,
134+
Version: daemon.Version,
135+
APIVersion: daemon.APIVersion,
136+
}
137+
for _, provisionerType := range daemon.Provisioners {
138+
result.Provisioners = append(result.Provisioners, codersdk.ProvisionerType(provisionerType))
139+
}
140+
return result
141+
}

0 commit comments

Comments
 (0)
0