Merge issues

Emyrk · Emyrk · commit 2608bbcbb754 · 2023-05-10T15:29:25.000-05:00
diff --git a/codersdk/workspaceproxy.go b/codersdk/workspaceproxy.go
@@ -89,7 +89,7 @@ func (c *Client) CreateWorkspaceProxy(ctx context.Context, req CreateWorkspacePr
 	if res.StatusCode != http.StatusCreated {
 		return UpdateWorkspaceProxyResponse{}, ReadBodyAsError(res)
 	}
-	var resp CreateWorkspaceProxyResponse
+	var resp UpdateWorkspaceProxyResponse
 	return resp, json.NewDecoder(res.Body).Decode(&resp)
 }
 
diff --git a/enterprise/coderd/workspaceproxy.go b/enterprise/coderd/workspaceproxy.go
@@ -338,24 +338,6 @@ func (api *API) workspaceProxies(rw http.ResponseWriter, r *http.Request) {
 	httpapi.Write(ctx, rw, http.StatusOK, convertProxies(proxies, statues))
 }
 
-// @Summary Get workspace proxy
-// @ID get-workspace-proxy
-// @Security CoderSessionToken
-// @Produce json
-// @Tags Enterprise
-// @Param workspaceproxy path string true "Proxy ID or name" format(uuid)
-// @Success 200 {object} codersdk.WorkspaceProxy
-// @Router /workspaceproxies/{workspaceproxy} [get]
-func (api *API) fetchWorkspaceProxy(rw http.ResponseWriter, r *http.Request) {
-	var (
-		ctx   = r.Context()
-		proxy = httpmw.WorkspaceProxyParam(r)
-	)
-
-	status := api.ProxyHealth.HealthStatus()[proxy.ID]
-	httpapi.Write(ctx, rw, http.StatusOK, convertProxy(proxy, status))
-}
-
 // @Summary Issue signed workspace app token
 // @ID issue-signed-workspace-app-token
 // @Security CoderSessionToken

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func (c *Client) CreateWorkspaceProxy(ctx context.Context, req CreateWorkspacePr`
`89`	`89`	`if res.StatusCode != http.StatusCreated {`
`90`	`90`	`return UpdateWorkspaceProxyResponse{}, ReadBodyAsError(res)`
`91`	`91`	`}`
`92`		`- var resp CreateWorkspaceProxyResponse`
	`92`	`+ var resp UpdateWorkspaceProxyResponse`
`93`	`93`	`return resp, json.NewDecoder(res.Body).Decode(&resp)`
`94`	`94`	`}`
`95`	`95`