fix(coderd): correctly show warning when no provisioner daemons are registered (#11591)

johnstcn · web-flow · commit 0e96115d5d03 · 2024-01-12T11:22:59.000Z
diff --git a/coderd/healthcheck/provisioner.go b/coderd/healthcheck/provisioner.go
@@ -152,7 +152,7 @@ func (r *ProvisionerDaemonsReport) Run(ctx context.Context, opts *ProvisionerDae
 
 	if len(r.Items) == 0 {
 		r.Severity = health.SeverityError
-		r.Error = ptr.Ref("No active provisioner daemons found!")
+		r.Warnings = append(r.Warnings, health.Messagef(health.CodeProvisionerDaemonsNoProvisionerDaemons, "No active provisioner daemons found!"))
 		return
 	}
 }
diff --git a/coderd/healthcheck/provisioner_test.go b/coderd/healthcheck/provisioner_test.go
@@ -48,8 +48,8 @@ func TestProvisionerDaemonReport(t *testing.T) {
 			currentVersion:         "v1.2.3",
 			currentAPIMajorVersion: provisionersdk.CurrentMajor,
 			expectedSeverity:       health.SeverityError,
-			expectedError:          "No active provisioner daemons found!",
 			expectedItems:          []healthcheck.ProvisionerDaemonsReportItem{},
+			expectedWarningCode:    health.CodeProvisionerDaemonsNoProvisionerDaemons,
 		},
 		{
 			name:                   "error fetching daemons",
@@ -303,7 +303,7 @@ func TestProvisionerDaemonReport(t *testing.T) {
 			currentVersion:         "v2.3.4",
 			currentAPIMajorVersion: provisionersdk.CurrentMajor,
 			expectedSeverity:       health.SeverityError,
-			expectedError:          "No active provisioner daemons found!",
+			expectedWarningCode:    health.CodeProvisionerDaemonsNoProvisionerDaemons,
 			provisionerDaemons:     []database.ProvisionerDaemon{fakeProvisionerDaemonStale(t, "pd-ok", "v1.2.3", "0.9", now.Add(-5*time.Minute), now)},
 			expectedItems:          []healthcheck.ProvisionerDaemonsReportItem{},
 		},
diff --git a/site/src/pages/HealthPage/ProvisionerDaemonsPage.tsx b/site/src/pages/HealthPage/ProvisionerDaemonsPage.tsx
@@ -41,6 +41,7 @@ export const ProvisionerDaemonsPage = () => {
       </Header>
 
       <Main>
+        {daemons.error && <Alert severity="error">{daemons.error}</Alert>}
         {daemons.warnings.map((warning) => {
           return (
             <Alert

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ func (r ProvisionerDaemonsReport) Run(ctx context.Context, opts ProvisionerDae`
`152`	`152`
`153`	`153`	`if len(r.Items) == 0 {`
`154`	`154`	`r.Severity = health.SeverityError`
`155`		`- r.Error = ptr.Ref("No active provisioner daemons found!")`
	`155`	`+ r.Warnings = append(r.Warnings, health.Messagef(health.CodeProvisionerDaemonsNoProvisionerDaemons, "No active provisioner daemons found!"))`
`156`	`156`	`return`
`157`	`157`	`}`
`158`	`158`	`}`