temp disable direct on debug

Author: akosyakov

components/ws-proxy/pkg/proxy/routes.go

@@ -94,9 +94,9 @@ func installWorkspaceRoutes(r *mux.Router, config *RouteHandlerConfig, ip Worksp
 	})
 	routes.HandleSupervisorFrontendRoute(faviconRouter.NewRoute())
 
-	routes.HandleDirectSupervisorRoute(enableCompression(r).PathPrefix("/_supervisor/frontend").MatcherFunc(func(r *http.Request, rm *mux.RouteMatch) bool {
-		return rm.Vars[debugWorkspaceIdentifier] == "true"
-	}), false)
+	// routes.HandleDirectSupervisorRoute(enableCompression(r).PathPrefix("/_supervisor/frontend").MatcherFunc(func(r *http.Request, rm *mux.RouteMatch) bool {
+	// 	return rm.Vars[debugWorkspaceIdentifier] == "true"
+	// }), false)
 	routes.HandleSupervisorFrontendRoute(enableCompression(r).PathPrefix("/_supervisor/frontend"))
 
 	routes.HandleDirectSupervisorRoute(r.PathPrefix("/_supervisor/v1/status/supervisor"), false)
@@ -115,12 +115,12 @@ func installWorkspaceRoutes(r *mux.Router, config *RouteHandlerConfig, ip Worksp
 			h.ServeHTTP(resp, req)
 		})
 	})
-	err := routes.HandleDebugRoot(rootRouter.MatcherFunc(func(r *http.Request, rm *mux.RouteMatch) bool {
-		return rm.Vars[debugWorkspaceIdentifier] == "true"
-	}))
-	if err != nil {
-		return err
-	}
+	// err := routes.HandleDebugRoot(rootRouter.MatcherFunc(func(r *http.Request, rm *mux.RouteMatch) bool {
+	// 	return rm.Vars[debugWorkspaceIdentifier] == "true"
+	// }))
+	// if err != nil {
+	// 	return err
+	// }
 	routes.HandleRoot(rootRouter.NewRoute())
 	return nil
 }
@@ -277,7 +277,7 @@ func (ir *ideRoutes) HandleRoot(route *mux.Route) {
 	r.Use(ir.Config.CorsHandler)
 	r.Use(ir.workspaceMustExistHandler)
 
-	directIDEPass := ir.Config.WorkspaceAuthHandler(
+	workspaceIDEPass := ir.Config.WorkspaceAuthHandler(
 		proxyPass(ir.Config, ir.InfoProvider, workspacePodResolver),
 	)
 	// always hit the blobserver to ensure that blob is downloaded
@@ -342,7 +342,7 @@ func (ir *ideRoutes) HandleRoot(route *mux.Route) {
 				return image
 			},
 		}
-	}, withHTTPErrorHandler(directIDEPass), withUseTargetHost()))
+	}, withHTTPErrorHandler(workspaceIDEPass), withUseTargetHost()))
 }
 
 const imagePathSeparator = "/__files__"

components/ws-proxy/pkg/proxy/routes_test.go

@@ -617,23 +617,23 @@ func TestRoutes(t *testing.T) {
 				Body: "debug workspace hit: /\n",
 			},
 		},
-		{
-			Desc:   "debug supervisor frontend /main.js",
-			Config: &config,
-			Request: modifyRequest(httptest.NewRequest("GET", debugWorkspaceURL+"_supervisor/frontend/main.js", nil),
-				addHostHeader,
-			),
-			Targets: &Targets{DebugSupervisor: &Target{Status: http.StatusOK}},
-			Expectation: Expectation{
-				Status: http.StatusOK,
-				Header: http.Header{
-					"Content-Length": {"52"},
-					"Content-Type":   {"text/plain; charset=utf-8"},
-					"Vary":           {"Accept-Encoding"},
-				},
-				Body: "supervisor debug hit: /_supervisor/frontend/main.js\n",
-			},
-		},
+		// {
+		// 	Desc:   "debug supervisor frontend /main.js",
+		// 	Config: &config,
+		// 	Request: modifyRequest(httptest.NewRequest("GET", debugWorkspaceURL+"_supervisor/frontend/main.js", nil),
+		// 		addHostHeader,
+		// 	),
+		// 	Targets: &Targets{DebugSupervisor: &Target{Status: http.StatusOK}},
+		// 	Expectation: Expectation{
+		// 		Status: http.StatusOK,
+		// 		Header: http.Header{
+		// 			"Content-Length": {"52"},
+		// 			"Content-Type":   {"text/plain; charset=utf-8"},
+		// 			"Vary":           {"Accept-Encoding"},
+		// 		},
+		// 		Body: "supervisor debug hit: /_supervisor/frontend/main.js\n",
+		// 	},
+		// },
 	}
 
 	log.Init("ws-proxy-test", "", false, true)