fix: use provided username when fetching workspaces (#12955)

kylecarbs · web-flow · commit d3790bb5bef0 · 2024-04-13T14:39:57.000-04:00
diff --git a/cli/open.go b/cli/open.go
@@ -64,7 +64,7 @@ func (r *RootCmd) openVSCode() *serpent.Command {
 			// need to wait for the agent to start.
 			workspaceQuery := inv.Args[0]
 			autostart := true
-			workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, autostart, codersdk.Me, workspaceQuery)
+			workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, autostart, workspaceQuery)
 			if err != nil {
 				return xerrors.Errorf("get workspace and agent: %w", err)
 			}
diff --git a/cli/ping.go b/cli/ping.go
@@ -42,7 +42,7 @@ func (r *RootCmd) ping() *serpent.Command {
 			_, workspaceAgent, err := getWorkspaceAndAgent(
 				ctx, inv, client,
 				false, // Do not autostart for a ping.
-				codersdk.Me, workspaceName,
+				workspaceName,
 			)
 			if err != nil {
 				return err
diff --git a/cli/portforward.go b/cli/portforward.go
@@ -73,7 +73,7 @@ func (r *RootCmd) portForward() *serpent.Command {
 				return xerrors.New("no port-forwards requested")
 			}
 
-			workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, !disableAutostart, codersdk.Me, inv.Args[0])
+			workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, !disableAutostart, inv.Args[0])
 			if err != nil {
 				return err
 			}
diff --git a/cli/speedtest.go b/cli/speedtest.go
@@ -39,7 +39,7 @@ func (r *RootCmd) speedtest() *serpent.Command {
 			ctx, cancel := context.WithCancel(inv.Context())
 			defer cancel()
 
-			_, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, false, codersdk.Me, inv.Args[0])
+			_, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, false, inv.Args[0])
 			if err != nil {
 				return err
 			}
diff --git a/cli/ssh.go b/cli/ssh.go
@@ -157,7 +157,7 @@ func (r *RootCmd) ssh() *serpent.Command {
 				}
 			}
 
-			workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, !disableAutostart, codersdk.Me, inv.Args[0])
+			workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, !disableAutostart, inv.Args[0])
 			if err != nil {
 				return err
 			}
@@ -551,10 +551,12 @@ startWatchLoop:
 // getWorkspaceAgent returns the workspace and agent selected using either the
 // `<workspace>[.<agent>]` syntax via `in`.
 // If autoStart is true, the workspace will be started if it is not already running.
-func getWorkspaceAndAgent(ctx context.Context, inv *serpent.Invocation, client *codersdk.Client, autostart bool, userID string, in string) (codersdk.Workspace, codersdk.WorkspaceAgent, error) { //nolint:revive
+func getWorkspaceAndAgent(ctx context.Context, inv *serpent.Invocation, client *codersdk.Client, autostart bool, input string) (codersdk.Workspace, codersdk.WorkspaceAgent, error) { //nolint:revive
 	var (
-		workspace      codersdk.Workspace
-		workspaceParts = strings.Split(in, ".")
+		workspace codersdk.Workspace
+		// The input will be `owner/name.agent`
+		// The agent is optional.
+		workspaceParts = strings.Split(input, ".")
 		err            error
 	)
 
diff --git a/cli/vscodessh.go b/cli/vscodessh.go
@@ -110,7 +110,7 @@ func (r *RootCmd) vscodeSSH() *serpent.Command {
 			// will call this command after the workspace is started.
 			autostart := false
 
-			_, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, autostart, owner, name)
+			_, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, autostart, fmt.Sprintf("%s/%s", owner, name))
 			if err != nil {
 				return xerrors.Errorf("find workspace and agent: %w", err)
 			}

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func (r RootCmd) openVSCode() serpent.Command {`
`64`	`64`	`// need to wait for the agent to start.`
`65`	`65`	`workspaceQuery := inv.Args[0]`
`66`	`66`	`autostart := true`
`67`		`- workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, autostart, codersdk.Me, workspaceQuery)`
	`67`	`+ workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, autostart, workspaceQuery)`
`68`	`68`	`if err != nil {`
`69`	`69`	`return xerrors.Errorf("get workspace and agent: %w", err)`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func (r RootCmd) ping() serpent.Command {`
`42`	`42`	`_, workspaceAgent, err := getWorkspaceAndAgent(`
`43`	`43`	`ctx, inv, client,`
`44`	`44`	`false, // Do not autostart for a ping.`
`45`		`- codersdk.Me, workspaceName,`
	`45`	`+ workspaceName,`
`46`	`46`	`)`
`47`	`47`	`if err != nil {`
`48`	`48`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func (r RootCmd) portForward() serpent.Command {`
`73`	`73`	`return xerrors.New("no port-forwards requested")`
`74`	`74`	`}`
`75`	`75`
`76`		`- workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, !disableAutostart, codersdk.Me, inv.Args[0])`
	`76`	`+ workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, !disableAutostart, inv.Args[0])`
`77`	`77`	`if err != nil {`
`78`	`78`	`return err`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func (r RootCmd) speedtest() serpent.Command {`
`39`	`39`	`ctx, cancel := context.WithCancel(inv.Context())`
`40`	`40`	`defer cancel()`
`41`	`41`
`42`		`- _, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, false, codersdk.Me, inv.Args[0])`
	`42`	`+ _, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, false, inv.Args[0])`
`43`	`43`	`if err != nil {`
`44`	`44`	`return err`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ func (r RootCmd) ssh() serpent.Command {`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`
`160`		`- workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, !disableAutostart, codersdk.Me, inv.Args[0])`
	`160`	`+ workspace, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, !disableAutostart, inv.Args[0])`
`161`	`161`	`if err != nil {`
`162`	`162`	`return err`
`163`	`163`	`}`
`@@ -551,10 +551,12 @@ startWatchLoop:`
`551`	`551`	`// getWorkspaceAgent returns the workspace and agent selected using either the`
`552`	`552`	// `<workspace>[.<agent>]` syntax via `in`.
`553`	`553`	`// If autoStart is true, the workspace will be started if it is not already running.`
`554`		`-func getWorkspaceAndAgent(ctx context.Context, inv serpent.Invocation, client codersdk.Client, autostart bool, userID string, in string) (codersdk.Workspace, codersdk.WorkspaceAgent, error) { //nolint:revive`
	`554`	`+func getWorkspaceAndAgent(ctx context.Context, inv serpent.Invocation, client codersdk.Client, autostart bool, input string) (codersdk.Workspace, codersdk.WorkspaceAgent, error) { //nolint:revive`
`555`	`555`	`var (`
`556`		`- workspace codersdk.Workspace`
`557`		`- workspaceParts = strings.Split(in, ".")`
	`556`	`+ workspace codersdk.Workspace`
	`557`	+ // The input will be `owner/name.agent`
	`558`	`+ // The agent is optional.`
	`559`	`+ workspaceParts = strings.Split(input, ".")`
`558`	`560`	`err error`
`559`	`561`	`)`
`560`	`562`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ func (r RootCmd) vscodeSSH() serpent.Command {`
`110`	`110`	`// will call this command after the workspace is started.`
`111`	`111`	`autostart := false`
`112`	`112`
`113`		`- _, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, autostart, owner, name)`
	`113`	`+ _, workspaceAgent, err := getWorkspaceAndAgent(ctx, inv, client, autostart, fmt.Sprintf("%s/%s", owner, name))`
`114`	`114`	`if err != nil {`
`115`	`115`	`return xerrors.Errorf("find workspace and agent: %w", err)`
`116`	`116`	`}`