From d3790bb5bef034b05e2f3d8979878bea4bcf0959 Mon Sep 17 00:00:00 2001
From: Kyle Carberry <kyle@coder.com>
Date: Sat, 13 Apr 2024 14:39:57 -0400
Subject: [PATCH] fix: use provided username when fetching workspaces (#12955)

---
 cli/open.go        |  2 +-
 cli/ping.go        |  2 +-
 cli/portforward.go |  2 +-
 cli/speedtest.go   |  2 +-
 cli/ssh.go         | 10 ++++++----
 cli/vscodessh.go   |  2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cli/open.go b/cli/open.go
index 80f4fdf4c6..9b51469ec7 100644
--- 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
index 17920c013e..d20cab81f7 100644
--- 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
index 95ca8731f9..8de89bd390 100644
--- 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
index dff9dabdf1..f4053d72c6 100644
--- 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
index 31b0209175..7f40959a59 100644
--- 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
index 65f2bc7bd1..147436374b 100644
--- 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)
 			}