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

ninehills · ninehills · commit 4f8a9b98cd41 · 2022-11-18T09:18:05.000+08:00
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -123,6 +123,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,
 	})
 }
 

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`