feat: Let port-forwarding support custom http(s) port (#5084)

ninehills · web-flow · commit 5457dd0c6526 · 2022-12-02T06:39:19.000+10:00
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -124,6 +124,9 @@ func (api *API) workspaceAgentMetadata(rw http.ResponseWriter, r *http.Request)
 			workspace.Name,
 			owner.Username,
 		))
+	if api.AccessURL.Port() != "" {
+		vscodeProxyURI += fmt.Sprintf(":%s", api.AccessURL.Port())
+	}
 
 	httpapi.Write(ctx, rw, http.StatusOK, codersdk.WorkspaceAgentMetadata{
 		Apps:                 convertApps(dbApps),
diff --git a/coderd/workspaceapps.go b/coderd/workspaceapps.go
@@ -40,8 +40,13 @@ const (
 )
 
 func (api *API) appHost(rw http.ResponseWriter, r *http.Request) {
+	host := api.AppHostname
+	if api.AccessURL.Port() != "" {
+		host += fmt.Sprintf(":%s", api.AccessURL.Port())
+	}
+
 	httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.GetAppHostResponse{
-		Host: api.AppHostname,
+		Host: host,
 	})
 }
 
diff --git a/coderd/workspaceapps_test.go b/coderd/workspaceapps_test.go
@@ -69,7 +69,8 @@ func TestGetAppHost(t *testing.T) {
 			_ = coderdtest.CreateFirstUser(t, client)
 			host, err = client.GetAppHost(ctx)
 			require.NoError(t, err)
-			require.Equal(t, c, host.Host)
+			domain := strings.Split(host.Host, ":")[0]
+			require.Equal(t, c, domain)
 		})
 	}
 }
@@ -204,13 +205,17 @@ func createWorkspaceWithApps(t *testing.T, client *codersdk.Client, orgID uuid.U
 	if appHost != "" {
 		metadata, err := agentClient.WorkspaceAgentMetadata(context.Background())
 		require.NoError(t, err)
-		require.Equal(t, fmt.Sprintf(
+		proxyURL := fmt.Sprintf(
 			"http://{{port}}--%s--%s--%s%s",
 			proxyTestAgentName,
 			workspace.Name,
 			"testuser",
 			strings.ReplaceAll(appHost, "*", ""),
-		), metadata.VSCodePortProxyURI)
+		)
+		if client.URL.Port() != "" {
+			proxyURL += fmt.Sprintf(":%s", client.URL.Port())
+		}
+		require.Equal(t, proxyURL, metadata.VSCodePortProxyURI)
 	}
 	agentCloser := agent.New(agent.Options{
 		Client: agentClient,

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,13 @@ const (`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`func (api API) appHost(rw http.ResponseWriter, r http.Request) {`
	`43`	`+ host := api.AppHostname`
	`44`	`+ if api.AccessURL.Port() != "" {`
	`45`	`+ host += fmt.Sprintf(":%s", api.AccessURL.Port())`
	`46`	`+ }`
	`47`	`+`
`43`	`48`	`httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.GetAppHostResponse{`
`44`		`- Host: api.AppHostname,`
	`49`	`+ Host: host,`
`45`	`50`	`})`
`46`	`51`	`}`
`47`	`52`