Fix proxy error status code

kylecarbs · kylecarbs · commit ca2d449a382d · 2022-06-04T17:05:17.000Z
diff --git a/coderd/parameters_test.go b/coderd/parameters_test.go
@@ -2,11 +2,12 @@ package coderd_test
 
 import (
 	"context"
-	"github.com/coder/coder/provisioner/echo"
-	"github.com/coder/coder/provisionersdk/proto"
 	"net/http"
 	"testing"
 
+	"github.com/coder/coder/provisioner/echo"
+	"github.com/coder/coder/provisionersdk/proto"
+
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/coderd/coderdtest"
diff --git a/coderd/workspaceapps.go b/coderd/workspaceapps.go
@@ -129,7 +129,6 @@ func (api *API) workspaceAppsProxyPath(rw http.ResponseWriter, r *http.Request)
 			StatusCode: http.StatusBadGateway,
 			Message:    err.Error(),
 		}))
-		w.WriteHeader(http.StatusBadGateway)
 		api.siteHandler.ServeHTTP(w, r)
 	}
 	path := chi.URLParam(r, "*")
diff --git a/coderd/workspaceapps_test.go b/coderd/workspaceapps_test.go
@@ -120,6 +120,6 @@ func TestWorkspaceAppsProxyPath(t *testing.T) {
 		resp, err := client.Request(context.Background(), http.MethodGet, "/@me/"+workspace.Name+"/apps/fake/", nil)
 		require.NoError(t, err)
 		defer resp.Body.Close()
-		require.Equal(t, http.StatusBadGateway, resp.StatusCode)
+		require.Equal(t, http.StatusOK, resp.StatusCode)
 	})
 }

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ func (api API) workspaceAppsProxyPath(rw http.ResponseWriter, r http.Request)`
`129`	`129`	`StatusCode: http.StatusBadGateway,`
`130`	`130`	`Message: err.Error(),`
`131`	`131`	`}))`
`132`		`- w.WriteHeader(http.StatusBadGateway)`
`133`	`132`	`api.siteHandler.ServeHTTP(w, r)`
`134`	`133`	`}`
`135`	`134`	`path := chi.URLParam(r, "*")`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,6 @@ func TestWorkspaceAppsProxyPath(t *testing.T) {`
`120`	`120`	`resp, err := client.Request(context.Background(), http.MethodGet, "/@me/"+workspace.Name+"/apps/fake/", nil)`
`121`	`121`	`require.NoError(t, err)`
`122`	`122`	`defer resp.Body.Close()`
`123`		`- require.Equal(t, http.StatusBadGateway, resp.StatusCode)`
	`123`	`+ require.Equal(t, http.StatusOK, resp.StatusCode)`
`124`	`124`	`})`
`125`	`125`	`}`