typescript fixings

johnstcn · johnstcn · commit 6fae074c312a · 2024-01-05T11:20:21.000Z
diff --git a/coderd/healthcheck/healthcheck.go b/coderd/healthcheck/healthcheck.go
@@ -38,7 +38,7 @@ type Report struct {
 	Websocket          WebsocketReport          `json:"websocket"`
 	Database           DatabaseReport           `json:"database"`
 	WorkspaceProxy     WorkspaceProxyReport     `json:"workspace_proxy"`
-	ProvisionerDaemons ProvisionerDaemonsReport `json:"provisioner_daemon"`
+	ProvisionerDaemons ProvisionerDaemonsReport `json:"provisioner_daemons"`
 
 	// The Coder version of the server that the report was generated on.
 	CoderVersion string `json:"coder_version"`
diff --git a/coderd/healthcheck/provisioner.go b/coderd/healthcheck/provisioner.go
@@ -21,9 +21,9 @@ type ProvisionerDaemonsReport struct {
 	Severity  health.Severity  `json:"severity"`
 	Warnings  []health.Message `json:"warnings"`
 	Dismissed bool             `json:"dismissed"`
-	Error     *string
+	Error     *string          `json:"error"`
 
-	Provisioners []codersdk.ProvisionerDaemon
+	ProvisionerDaemons []codersdk.ProvisionerDaemon `json:"provisioner_daemons"`
 }
 
 type ProvisionerDaemonsReportOptions struct {
@@ -41,6 +41,7 @@ type ProvisionerDaemonsReportOptions struct {
 }
 
 func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDaemonsReportOptions) {
+	r.ProvisionerDaemons = make([]codersdk.ProvisionerDaemon, 0)
 	r.Severity = health.SeverityOK
 	r.Warnings = make([]health.Message, 0)
 	r.Dismissed = opts.Dismissed
@@ -75,7 +76,11 @@ func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDae
 		return
 	}
 
-	if len(daemons) == 0 {
+	for _, daemon := range daemons {
+		r.ProvisionerDaemons = append(r.ProvisionerDaemons, convertProvisionerDaemon(daemon))
+	}
+
+	if len(r.ProvisionerDaemons) == 0 {
 		r.Severity = health.SeverityError
 		r.Error = ptr.Ref("No provisioner daemons found!")
 		return
@@ -117,3 +122,20 @@ func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDae
 		}
 	}
 }
+
+// XXX: duplicated from enterprise/coderd
+func convertProvisionerDaemon(daemon database.ProvisionerDaemon) codersdk.ProvisionerDaemon {
+	result := codersdk.ProvisionerDaemon{
+		ID:         daemon.ID,
+		CreatedAt:  daemon.CreatedAt,
+		LastSeenAt: codersdk.NullTime{NullTime: daemon.LastSeenAt},
+		Name:       daemon.Name,
+		Tags:       daemon.Tags,
+		Version:    daemon.Version,
+		APIVersion: daemon.APIVersion,
+	}
+	for _, provisionerType := range daemon.Provisioners {
+		result.Provisioners = append(result.Provisioners, codersdk.ProvisionerType(provisionerType))
+	}
+	return result
+}
