Fix formats

Emyrk · Emyrk · commit 62f676b0416d · 2023-04-17T14:51:47.000-05:00
diff --git a/cli/cliui/output.go b/cli/cliui/output.go
@@ -192,3 +192,30 @@ func (textFormat) AttachOptions(_ *clibase.OptionSet) {}
 func (textFormat) Format(_ context.Context, data any) (string, error) {
 	return fmt.Sprintf("%s", data), nil
 }
+
+type DataChangeFormat struct {
+	format OutputFormat
+	change func(data any) (any, error)
+}
+
+// ChangeFormatterData allows manipulating the data passed to an output
+// format.
+func ChangeFormatterData(format OutputFormat, change func(data any) (any, error)) *DataChangeFormat {
+	return &DataChangeFormat{format: format, change: change}
+}
+
+func (d *DataChangeFormat) ID() string {
+	return d.format.ID()
+}
+
+func (d *DataChangeFormat) AttachOptions(opts *clibase.OptionSet) {
+	d.format.AttachOptions(opts)
+}
+
+func (d *DataChangeFormat) Format(ctx context.Context, data any) (string, error) {
+	newData, err := d.change(data)
+	if err != nil {
+		return "", err
+	}
+	return d.format.Format(ctx, newData)
+}
diff --git a/codersdk/workspaceproxy.go b/codersdk/workspaceproxy.go
@@ -33,8 +33,9 @@ type CreateWorkspaceProxyRequest struct {
 }
 
 type CreateWorkspaceProxyResponse struct {
-	Proxy      WorkspaceProxy `json:"proxy" table:"proxy,recursive,default_sort"`
-	ProxyToken string         `json:"proxy_token"`
+	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) {

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,9 @@ type CreateWorkspaceProxyRequest struct {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`type CreateWorkspaceProxyResponse struct {`
`36`		- Proxy WorkspaceProxy `json:"proxy" table:"proxy,recursive,default_sort"`
`37`		- ProxyToken string `json:"proxy_token"`
	`36`	+ Proxy WorkspaceProxy `json:"proxy" table:"proxy,recursive"`
	`37`	`+ // The recursive table sort is not working very well.`
	`38`	+ ProxyToken string `json:"proxy_token" table:"proxy token,default_sort"`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`func (c *Client) CreateWorkspaceProxy(ctx context.Context, req CreateWorkspaceProxyRequest) (CreateWorkspaceProxyResponse, error) {`