remove username/password from json output

Emyrk · Emyrk · commit 5fec06303a93 · 2024-03-28T12:47:45.000-05:00
diff --git a/cli/externalauth.go b/cli/externalauth.go
@@ -67,7 +67,17 @@ func (r *RootCmd) externalAuthLink() *serpent.Command {
 				}
 				return []agentsdk.ExternalAuthResponse{auth}, nil
 			}),
-			cliui.JSONFormat(),
+			cliui.ChangeFormatterData(cliui.JSONFormat(), func(data any) (any, error) {
+				auth, ok := data.(agentsdk.ExternalAuthResponse)
+				if !ok {
+					return nil, xerrors.Errorf("expected data to be of type codersdk.ExternalAuth, got %T", data)
+				}
+
+				// Deprecated fields, omit them from any output.
+				auth.Username = ""
+				auth.Password = ""
+				return auth, nil
+			}),
 		)
 	)
 
diff --git a/codersdk/agentsdk/agentsdk.go b/codersdk/agentsdk/agentsdk.go
@@ -569,8 +569,8 @@ type ExternalAuthResponse struct {
 
 	// Deprecated: Only supported on `/workspaceagents/me/gitauth`
 	// for backwards compatibility.
-	Username string `json:"username" table:"-"`
-	Password string `json:"password" table:"-"`
+	Username string `json:"username,omitempty" table:"-"`
+	Password string `json:"password,omitempty" table:"-"`
 }
 
 // ExternalAuthRequest is used to request an access token for a provider.

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,17 @@ func (r RootCmd) externalAuthLink() serpent.Command {`
`67`	`67`	`}`
`68`	`68`	`return []agentsdk.ExternalAuthResponse{auth}, nil`
`69`	`69`	`}),`
`70`		`- cliui.JSONFormat(),`
	`70`	`+ cliui.ChangeFormatterData(cliui.JSONFormat(), func(data any) (any, error) {`
	`71`	`+ auth, ok := data.(agentsdk.ExternalAuthResponse)`
	`72`	`+ if !ok {`
	`73`	`+ return nil, xerrors.Errorf("expected data to be of type codersdk.ExternalAuth, got %T", data)`
	`74`	`+ }`
	`75`	`+`
	`76`	`+ // Deprecated fields, omit them from any output.`
	`77`	`+ auth.Username = ""`
	`78`	`+ auth.Password = ""`
	`79`	`+ return auth, nil`
	`80`	`+ }),`
`71`	`81`	`)`
`72`	`82`	`)`
`73`	`83`
Original file line number	Diff line number	Diff line change
`@@ -569,8 +569,8 @@ type ExternalAuthResponse struct {`
`569`	`569`
`570`	`570`	// Deprecated: Only supported on `/workspaceagents/me/gitauth`
`571`	`571`	`// for backwards compatibility.`
`572`		- Username string `json:"username" table:"-"`
`573`		- Password string `json:"password" table:"-"`
	`572`	+ Username string `json:"username,omitempty" table:"-"`
	`573`	+ Password string `json:"password,omitempty" table:"-"`
`574`	`574`	`}`
`575`	`575`
`576`	`576`	`// ExternalAuthRequest is used to request an access token for a provider.`