@@ -21,9 +21,9 @@ type ProvisionerDaemonsReport struct {
21
21
Severity health.Severity `json:"severity"`
22
22
Warnings []health.Message `json:"warnings"`
23
23
Dismissed bool `json:"dismissed"`
24
- Error * string
24
+ Error * string `json:"error"`
25
25
26
- Provisioners []codersdk.ProvisionerDaemon
26
+ ProvisionerDaemons []codersdk.ProvisionerDaemon `json:"provisioner_daemons"`
27
27
}
28
28
29
29
type ProvisionerDaemonsReportOptions struct {
@@ -41,6 +41,7 @@ type ProvisionerDaemonsReportOptions struct {
41
41
}
42
42
43
43
func (r * ProvisionerDaemonsReport ) Run (ctx context.Context , opts * ProvisionerDaemonsReportOptions ) {
44
+ r .ProvisionerDaemons = make ([]codersdk.ProvisionerDaemon , 0 )
44
45
r .Severity = health .SeverityOK
45
46
r .Warnings = make ([]health.Message , 0 )
46
47
r .Dismissed = opts .Dismissed
@@ -75,7 +76,11 @@ func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDae
75
76
return
76
77
}
77
78
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 {
79
84
r .Severity = health .SeverityError
80
85
r .Error = ptr .Ref ("No provisioner daemons found!" )
81
86
return
@@ -117,3 +122,20 @@ func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDae
117
122
}
118
123
}
119
124
}
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