Fix linting

Emyrk · Emyrk · commit 42f81542add9 · 2023-05-08T17:18:52.000-05:00
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -121,7 +121,7 @@ func New(ctx context.Context, options *Options) (*API, error) {
 					httpmw.ExtractWorkspaceProxyParam(api.Database),
 				)
 
-				r.Get("/", api.getWorkspaceProxy)
+				r.Get("/", api.fetchWorkspaceProxy)
 				r.Delete("/", api.deleteWorkspaceProxy)
 			})
 		})
diff --git a/enterprise/coderd/workspaceproxy.go b/enterprise/coderd/workspaceproxy.go
@@ -258,7 +258,7 @@ func (api *API) workspaceProxies(rw http.ResponseWriter, r *http.Request) {
 // @Param workspaceproxy path string true "Proxy ID or name" format(uuid)
 // @Success 200 {object} codersdk.WorkspaceProxy
 // @Router /workspaceproxies/{workspaceproxy} [get]
-func (api *API) getWorkspaceProxy(rw http.ResponseWriter, r *http.Request) {
+func (api *API) fetchWorkspaceProxy(rw http.ResponseWriter, r *http.Request) {
 	var (
 		ctx   = r.Context()
 		proxy = httpmw.WorkspaceProxyParam(r)
diff --git a/enterprise/coderd/workspaceproxy_test.go b/enterprise/coderd/workspaceproxy_test.go
@@ -221,7 +221,7 @@ func TestRegions(t *testing.T) {
 				return false
 			}
 			return proxy.Status.Status == codersdk.ProxyHealthy
-		}, time.Second*10, time.Millisecond*100, "proxy never became healthy")
+		}, testutil.WaitShort, testutil.IntervalFast, "proxy never became healthy")
 
 		_ = proxy.Close()
 		// The proxy should tell the primary on close that is is no longer healthy.
@@ -231,7 +231,7 @@ func TestRegions(t *testing.T) {
 				return false
 			}
 			return proxy.Status.Status == codersdk.ProxyUnhealthy
-		}, time.Second*10, time.Millisecond*100, "proxy never became unhealthy after close")
+		}, testutil.WaitShort, testutil.IntervalFast, "proxy never became unhealthy after close")
 	})
 }
 
diff --git a/enterprise/wsproxy/wsproxy.go b/enterprise/wsproxy/wsproxy.go
@@ -292,6 +292,7 @@ func (s *Server) healthReport(rw http.ResponseWriter, r *http.Request) {
 	// app, so the webserver AND the proxy will be shut down at the same time.
 	if s.ctx.Err() != nil {
 		httpapi.Write(r.Context(), rw, http.StatusInternalServerError, "workspace proxy in middle of shutting down")
+		return
 	}
 
 	// Hit the build info to do basic version checking.

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ func New(ctx context.Context, options Options) (API, error) {`
`121`	`121`	`httpmw.ExtractWorkspaceProxyParam(api.Database),`
`122`	`122`	`)`
`123`	`123`
`124`		`- r.Get("/", api.getWorkspaceProxy)`
	`124`	`+ r.Get("/", api.fetchWorkspaceProxy)`
`125`	`125`	`r.Delete("/", api.deleteWorkspaceProxy)`
`126`	`126`	`})`
`127`	`127`	`})`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ func TestRegions(t *testing.T) {`
`221`	`221`	`return false`
`222`	`222`	`}`
`223`	`223`	`return proxy.Status.Status == codersdk.ProxyHealthy`
`224`		`- }, time.Second10, time.Millisecond100, "proxy never became healthy")`
	`224`	`+ }, testutil.WaitShort, testutil.IntervalFast, "proxy never became healthy")`
`225`	`225`
`226`	`226`	`_ = proxy.Close()`
`227`	`227`	`// The proxy should tell the primary on close that is is no longer healthy.`
`@@ -231,7 +231,7 @@ func TestRegions(t *testing.T) {`
`231`	`231`	`return false`
`232`	`232`	`}`
`233`	`233`	`return proxy.Status.Status == codersdk.ProxyUnhealthy`
`234`		`- }, time.Second10, time.Millisecond100, "proxy never became unhealthy after close")`
	`234`	`+ }, testutil.WaitShort, testutil.IntervalFast, "proxy never became unhealthy after close")`
`235`	`235`	`})`
`236`	`236`	`}`
`237`	`237`
Original file line number	Diff line number	Diff line change
`@@ -292,6 +292,7 @@ func (s Server) healthReport(rw http.ResponseWriter, r http.Request) {`
`292`	`292`	`// app, so the webserver AND the proxy will be shut down at the same time.`
`293`	`293`	`if s.ctx.Err() != nil {`
`294`	`294`	`httpapi.Write(r.Context(), rw, http.StatusInternalServerError, "workspace proxy in middle of shutting down")`
	`295`	`+ return`
`295`	`296`	`}`
`296`	`297`
`297`	`298`	`// Hit the build info to do basic version checking.`