fixup! Share formatter for similar commands

Emyrk · Emyrk · commit eaeaae5cb084 · 2023-05-05T13:18:24.000-05:00
diff --git a/codersdk/workspaceproxy.go b/codersdk/workspaceproxy.go
@@ -70,26 +70,26 @@ type CreateWorkspaceProxyRequest struct {
 	Icon        string `json:"icon"`
 }
 
-type CreateWorkspaceProxyResponse struct {
+type UpdateWorkspaceProxyResponse struct {
 	Proxy WorkspaceProxy `json:"proxy" table:"proxy,recursive"`
 	// The recursive table sort is not working very well.
 	ProxyToken string `json:"proxy_token" table:"proxy token,default_sort"`
 }
 
-func (c *Client) CreateWorkspaceProxy(ctx context.Context, req CreateWorkspaceProxyRequest) (CreateWorkspaceProxyResponse, error) {
+func (c *Client) CreateWorkspaceProxy(ctx context.Context, req CreateWorkspaceProxyRequest) (UpdateWorkspaceProxyResponse, error) {
 	res, err := c.Request(ctx, http.MethodPost,
 		"/api/v2/workspaceproxies",
 		req,
 	)
 	if err != nil {
-		return CreateWorkspaceProxyResponse{}, xerrors.Errorf("make request: %w", err)
+		return UpdateWorkspaceProxyResponse{}, xerrors.Errorf("make request: %w", err)
 	}
 	defer res.Body.Close()
 
 	if res.StatusCode != http.StatusCreated {
-		return CreateWorkspaceProxyResponse{}, ReadBodyAsError(res)
+		return UpdateWorkspaceProxyResponse{}, ReadBodyAsError(res)
 	}
-	var resp CreateWorkspaceProxyResponse
+	var resp UpdateWorkspaceProxyResponse
 	return resp, json.NewDecoder(res.Body).Decode(&resp)
 }
 
@@ -119,26 +119,20 @@ type PatchWorkspaceProxy struct {
 	RegenerateToken bool      `json:"regenerate_token"`
 }
 
-type PatchWorkspaceProxyResponse struct {
-	Proxy WorkspaceProxy `json:"proxy" table:"proxy,recursive"`
-	// ProxyToken is only returned if 'RegenerateToken' is set.
-	ProxyToken string `json:"proxy_token" table:"proxy token,default_sort"`
-}
-
-func (c *Client) PatchWorkspaceProxy(ctx context.Context, req PatchWorkspaceProxy) (WorkspaceProxy, error) {
+func (c *Client) PatchWorkspaceProxy(ctx context.Context, req PatchWorkspaceProxy) (UpdateWorkspaceProxyResponse, error) {
 	res, err := c.Request(ctx, http.MethodPatch,
 		fmt.Sprintf("/api/v2/workspaceproxies/%s", req.ID.String()),
 		req,
 	)
 	if err != nil {
-		return WorkspaceProxy{}, xerrors.Errorf("make request: %w", err)
+		return UpdateWorkspaceProxyResponse{}, xerrors.Errorf("make request: %w", err)
 	}
 	defer res.Body.Close()
 
 	if res.StatusCode != http.StatusOK {
-		return WorkspaceProxy{}, ReadBodyAsError(res)
+		return UpdateWorkspaceProxyResponse{}, ReadBodyAsError(res)
 	}
-	var resp WorkspaceProxy
+	var resp UpdateWorkspaceProxyResponse
 	return resp, json.NewDecoder(res.Body).Decode(&resp)
 }
 
diff --git a/enterprise/cli/workspaceproxy.go b/enterprise/cli/workspaceproxy.go
@@ -28,13 +28,14 @@ func (r *RootCmd) workspaceProxy() *clibase.Cmd {
 			r.deleteProxy(),
 			r.listProxies(),
 			r.patchProxy(),
+			r.regenerateProxyToken(),
 		},
 	}
 
 	return cmd
 }
 
-func (r *RootCmd) regenerateProxy() *clibase.Cmd {
+func (r *RootCmd) regenerateProxyToken() *clibase.Cmd {
 	var (
 		formatter = newUpdateProxyResponseFormatter()
 	)
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -262,12 +262,6 @@ export interface CreateWorkspaceProxyRequest {
   readonly icon: string
 }
 
-// From codersdk/workspaceproxy.go
-export interface CreateWorkspaceProxyResponse {
-  readonly proxy: WorkspaceProxy
-  readonly proxy_token: string
-}
-
 // From codersdk/organizations.go
 export interface CreateWorkspaceRequest {
   readonly template_id: string
@@ -639,12 +633,6 @@ export interface PatchWorkspaceProxy {
   readonly regenerate_token: boolean
 }
 
-// From codersdk/workspaceproxy.go
-export interface PatchWorkspaceProxyResponse {
-  readonly proxy: WorkspaceProxy
-  readonly proxy_token: string
-}
-
 // From codersdk/deployment.go
 export interface PprofConfig {
   readonly enable: boolean
@@ -1043,6 +1031,12 @@ export interface UpdateWorkspaceAutostartRequest {
   readonly schedule?: string
 }
 
+// From codersdk/workspaceproxy.go
+export interface UpdateWorkspaceProxyResponse {
+  readonly proxy: WorkspaceProxy
+  readonly proxy_token: string
+}
+
 // From codersdk/workspaces.go
 export interface UpdateWorkspaceRequest {
   readonly name?: string

Original file line number	Diff line number	Diff line change
`@@ -70,26 +70,26 @@ type CreateWorkspaceProxyRequest struct {`
`70`	`70`	Icon string `json:"icon"`
`71`	`71`	`}`
`72`	`72`
`73`		`-type CreateWorkspaceProxyResponse struct {`
	`73`	`+type UpdateWorkspaceProxyResponse struct {`
`74`	`74`	Proxy WorkspaceProxy `json:"proxy" table:"proxy,recursive"`
`75`	`75`	`// The recursive table sort is not working very well.`
`76`	`76`	ProxyToken string `json:"proxy_token" table:"proxy token,default_sort"`
`77`	`77`	`}`
`78`	`78`
`79`		`-func (c *Client) CreateWorkspaceProxy(ctx context.Context, req CreateWorkspaceProxyRequest) (CreateWorkspaceProxyResponse, error) {`
	`79`	`+func (c *Client) CreateWorkspaceProxy(ctx context.Context, req CreateWorkspaceProxyRequest) (UpdateWorkspaceProxyResponse, error) {`
`80`	`80`	`res, err := c.Request(ctx, http.MethodPost,`
`81`	`81`	`"/api/v2/workspaceproxies",`
`82`	`82`	`req,`
`83`	`83`	`)`
`84`	`84`	`if err != nil {`
`85`		`- return CreateWorkspaceProxyResponse{}, xerrors.Errorf("make request: %w", err)`
	`85`	`+ return UpdateWorkspaceProxyResponse{}, xerrors.Errorf("make request: %w", err)`
`86`	`86`	`}`
`87`	`87`	`defer res.Body.Close()`
`88`	`88`
`89`	`89`	`if res.StatusCode != http.StatusCreated {`
`90`		`- return CreateWorkspaceProxyResponse{}, ReadBodyAsError(res)`
	`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`
`@@ -119,26 +119,20 @@ type PatchWorkspaceProxy struct {`
`119`	`119`	RegenerateToken bool `json:"regenerate_token"`
`120`	`120`	`}`
`121`	`121`
`122`		`-type PatchWorkspaceProxyResponse struct {`
`123`		- Proxy WorkspaceProxy `json:"proxy" table:"proxy,recursive"`
`124`		`- // ProxyToken is only returned if 'RegenerateToken' is set.`
`125`		- ProxyToken string `json:"proxy_token" table:"proxy token,default_sort"`
`126`		`-}`
`127`		`-`
`128`		`-func (c *Client) PatchWorkspaceProxy(ctx context.Context, req PatchWorkspaceProxy) (WorkspaceProxy, error) {`
	`122`	`+func (c *Client) PatchWorkspaceProxy(ctx context.Context, req PatchWorkspaceProxy) (UpdateWorkspaceProxyResponse, error) {`
`129`	`123`	`res, err := c.Request(ctx, http.MethodPatch,`
`130`	`124`	`fmt.Sprintf("/api/v2/workspaceproxies/%s", req.ID.String()),`
`131`	`125`	`req,`
`132`	`126`	`)`
`133`	`127`	`if err != nil {`
`134`		`- return WorkspaceProxy{}, xerrors.Errorf("make request: %w", err)`
	`128`	`+ return UpdateWorkspaceProxyResponse{}, xerrors.Errorf("make request: %w", err)`
`135`	`129`	`}`
`136`	`130`	`defer res.Body.Close()`
`137`	`131`
`138`	`132`	`if res.StatusCode != http.StatusOK {`
`139`		`- return WorkspaceProxy{}, ReadBodyAsError(res)`
	`133`	`+ return UpdateWorkspaceProxyResponse{}, ReadBodyAsError(res)`
`140`	`134`	`}`
`141`		`- var resp WorkspaceProxy`
	`135`	`+ var resp UpdateWorkspaceProxyResponse`
`142`	`136`	`return resp, json.NewDecoder(res.Body).Decode(&resp)`
`143`	`137`	`}`
`144`	`138`
Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,14 @@ func (r RootCmd) workspaceProxy() clibase.Cmd {`
`28`	`28`	`r.deleteProxy(),`
`29`	`29`	`r.listProxies(),`
`30`	`30`	`r.patchProxy(),`
	`31`	`+ r.regenerateProxyToken(),`
`31`	`32`	`},`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`return cmd`
`35`	`36`	`}`
`36`	`37`
`37`		`-func (r RootCmd) regenerateProxy() clibase.Cmd {`
	`38`	`+func (r RootCmd) regenerateProxyToken() clibase.Cmd {`
`38`	`39`	`var (`
`39`	`40`	`formatter = newUpdateProxyResponseFormatter()`
`40`	`41`	`)`