Catch broader set of conditions in the if statement

Emyrk · Emyrk · commit aec49c5957e9 · 2022-06-28T09:32:25.000-05:00
diff --git a/coderd/workspaceapps.go b/coderd/workspaceapps.go
@@ -80,6 +80,7 @@ func (api *API) workspaceAppsProxyPath(rw http.ResponseWriter, r *http.Request)
 		httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{
 			Message: "No agents exist.",
 		})
+		return
 	}
 
 	agent := agents[0]
diff --git a/scripts/rules.go b/scripts/rules.go
@@ -159,18 +159,19 @@ func HttpAPIReturn(m dsl.Matcher) {
 	// Manually enumerate the httpapi function rather then a 'Where' condition
 	// as this is a bit more efficient.
 	m.Match(`
-	if err != nil {
-		httpapi.Write($*_)
+	if $*_ {
+		httpapi.Write($*a)
 	}
 	`, `
-	if err != nil {
-		httpapi.Forbidden($*_)
+	if $*_ {
+		httpapi.Forbidden($*a)
 	}
 	`, `
-	if err != nil {
-		httpapi.ResourceNotFound($*_)
+	if $*_ {
+		httpapi.ResourceNotFound($*a)
 	}
-	`).Report("Forgot to return early after the httpapi.Write call")
+	`).At(m["a"]).
+		Report("Forgot to return early after the httpapi.Write call")
 }
 
 // ProperRBACReturn ensures we always write to the response writer after a

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ func (api API) workspaceAppsProxyPath(rw http.ResponseWriter, r http.Request)`
`80`	`80`	`httpapi.Write(rw, http.StatusBadRequest, httpapi.Response{`
`81`	`81`	`Message: "No agents exist.",`
`82`	`82`	`})`
	`83`	`+ return`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`agent := agents[0]`