fix(coderd/healthcheck): ignore deleted wsproxies in wsproxy healthcheck (#11515)

johnstcn · web-flow · commit 9f4f9533506f · 2024-01-09T16:36:26.000Z
diff --git a/coderd/healthcheck/workspaceproxy.go b/coderd/healthcheck/workspaceproxy.go
@@ -76,7 +76,11 @@ func (r *WorkspaceProxyReport) Run(ctx context.Context, opts *WorkspaceProxyRepo
 		return
 	}
 
-	r.WorkspaceProxies = proxies
+	for _, proxy := range proxies.Regions {
+		if !proxy.Deleted {
+			r.WorkspaceProxies.Regions = append(r.WorkspaceProxies.Regions, proxy)
+		}
+	}
 	if r.WorkspaceProxies.Regions == nil {
 		r.WorkspaceProxies.Regions = make([]codersdk.WorkspaceProxy, 0)
 	}
diff --git a/coderd/healthcheck/workspaceproxy_test.go b/coderd/healthcheck/workspaceproxy_test.go
@@ -164,6 +164,15 @@ func TestWorkspaceProxies(t *testing.T) {
 			expectedSeverity:      health.SeverityWarning,
 			expectedWarningCode:   health.CodeProxyUpdate,
 		},
+		{
+			name: "Enabled/OneUnhealthyAndDeleted",
+			fetchWorkspaceProxies: fakeFetchWorkspaceProxies(fakeWorkspaceProxy("alpha", false, currentVersion, func(wp *codersdk.WorkspaceProxy) {
+				wp.Deleted = true
+			})),
+			updateProxyHealth: fakeUpdateProxyHealth(nil),
+			expectedHealthy:   true,
+			expectedSeverity:  health.SeverityOK,
+		},
 	} {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
@@ -236,7 +245,7 @@ func (u *fakeWorkspaceProxyFetchUpdater) Update(ctx context.Context) error {
 }
 
 //nolint:revive // yes, this is a control flag, and that is OK in a unit test.
-func fakeWorkspaceProxy(name string, healthy bool, version string) codersdk.WorkspaceProxy {
+func fakeWorkspaceProxy(name string, healthy bool, version string, mutators ...func(*codersdk.WorkspaceProxy)) codersdk.WorkspaceProxy {
 	var status codersdk.WorkspaceProxyStatus
 	if !healthy {
 		status = codersdk.WorkspaceProxyStatus{
@@ -246,14 +255,18 @@ func fakeWorkspaceProxy(name string, healthy bool, version string) codersdk.Work
 			},
 		}
 	}
-	return codersdk.WorkspaceProxy{
+	wsp := codersdk.WorkspaceProxy{
 		Region: codersdk.Region{
 			Name:    name,
 			Healthy: healthy,
 		},
 		Version: version,
 		Status:  status,
 	}
+	for _, f := range mutators {
+		f(&wsp)
+	}
+	return wsp
 }
 
 func fakeFetchWorkspaceProxies(ps ...codersdk.WorkspaceProxy) func(context.Context) (codersdk.RegionsResponse[codersdk.WorkspaceProxy], error) {

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,11 @@ func (r WorkspaceProxyReport) Run(ctx context.Context, opts WorkspaceProxyRepo`
`76`	`76`	`return`
`77`	`77`	`}`
`78`	`78`
`79`		`- r.WorkspaceProxies = proxies`
	`79`	`+ for _, proxy := range proxies.Regions {`
	`80`	`+ if !proxy.Deleted {`
	`81`	`+ r.WorkspaceProxies.Regions = append(r.WorkspaceProxies.Regions, proxy)`
	`82`	`+ }`
	`83`	`+ }`
`80`	`84`	`if r.WorkspaceProxies.Regions == nil {`
`81`	`85`	`r.WorkspaceProxies.Regions = make([]codersdk.WorkspaceProxy, 0)`
`82`	`86`	`}`