Fix IPC tests

kylecarbs · kylecarbs · commit 6bad9aeb1e2d · 2022-12-18T19:25:30.000Z
diff --git a/cli/vscodeipc/vscodeipc.go b/cli/vscodeipc/vscodeipc.go
@@ -23,6 +23,8 @@ import (
 	"github.com/coder/coder/codersdk"
 )
 
+const AuthHeader = "Coder-IPC-Token"
+
 // New creates a VS Code IPC client that can be used to communicate with workspaces.
 //
 // Creating this IPC was required instead of using SSH, because we're unable to get
@@ -290,10 +292,10 @@ func (e *execWriter) Write(data []byte) (int, error) {
 func sessionTokenMiddleware(sessionToken string) func(h http.Handler) http.Handler {
 	return func(h http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			token := r.Header.Get("Coder-IPC-Token")
+			token := r.Header.Get(AuthHeader)
 			if token == "" {
 				httpapi.Write(r.Context(), w, http.StatusUnauthorized, codersdk.Response{
-					Message: "A session token must be provided in the `Coder-IPC-Token` header.",
+					Message: fmt.Sprintf("A session token must be provided in the `%s` header.", AuthHeader),
 				})
 				return
 			}
diff --git a/cli/vscodeipc/vscodeipc_test.go b/cli/vscodeipc/vscodeipc_test.go
@@ -110,8 +110,8 @@ func TestVSCodeIPC(t *testing.T) {
 	// Ensure that we're actually connected!
 	require.Eventually(t, func() bool {
 		res := httptest.NewRecorder()
-		req := httptest.NewRequest(http.MethodGet, "/network", nil)
-		req.Header.Set("Coder-Session-Token", token)
+		req := httptest.NewRequest(http.MethodGet, "/v1/network", nil)
+		req.Header.Set(vscodeipc.AuthHeader, token)
 		handler.ServeHTTP(res, req)
 		network := &vscodeipc.NetworkResponse{}
 		err = json.NewDecoder(res.Body).Decode(&network)
@@ -125,16 +125,16 @@ func TestVSCodeIPC(t *testing.T) {
 	t.Run("NoSessionToken", func(t *testing.T) {
 		t.Parallel()
 		res := httptest.NewRecorder()
-		req := httptest.NewRequest(http.MethodGet, fmt.Sprintf("/port/%s", port), nil)
+		req := httptest.NewRequest(http.MethodGet, fmt.Sprintf("/v1/port/%s", port), nil)
 		handler.ServeHTTP(res, req)
 		require.Equal(t, http.StatusUnauthorized, res.Code)
 	})
 
 	t.Run("MismatchedSessionToken", func(t *testing.T) {
 		t.Parallel()
 		res := httptest.NewRecorder()
-		req := httptest.NewRequest(http.MethodGet, fmt.Sprintf("/port/%s", port), nil)
-		req.Header.Set("Coder-Session-Token", uuid.NewString())
+		req := httptest.NewRequest(http.MethodGet, fmt.Sprintf("/v1/port/%s", port), nil)
+		req.Header.Set(vscodeipc.AuthHeader, uuid.NewString())
 		handler.ServeHTTP(res, req)
 		require.Equal(t, http.StatusUnauthorized, res.Code)
 	})
@@ -147,8 +147,8 @@ func TestVSCodeIPC(t *testing.T) {
 		defer input.Close()
 		defer output.Close()
 		res := &hijackable{httptest.NewRecorder(), output}
-		req := httptest.NewRequest(http.MethodGet, fmt.Sprintf("/port/%s", port), nil)
-		req.Header.Set("Coder-Session-Token", token)
+		req := httptest.NewRequest(http.MethodGet, fmt.Sprintf("/v1/port/%s", port), nil)
+		req.Header.Set(vscodeipc.AuthHeader, token)
 		go handler.ServeHTTP(res, req)
 
 		req, err := http.NewRequestWithContext(ctx, http.MethodGet, "http://127.0.0.1/", nil)
@@ -177,8 +177,8 @@ func TestVSCodeIPC(t *testing.T) {
 		data, _ := json.Marshal(vscodeipc.ExecuteRequest{
 			Command: "echo test",
 		})
-		req := httptest.NewRequest(http.MethodPost, "/execute", bytes.NewReader(data))
-		req.Header.Set("Coder-Session-Token", token)
+		req := httptest.NewRequest(http.MethodPost, "/v1/execute", bytes.NewReader(data))
+		req.Header.Set(vscodeipc.AuthHeader, token)
 		handler.ServeHTTP(res, req)
 
 		decoder := json.NewDecoder(res.Body)
