diff --git a/cli/ssh.go b/cli/ssh.go
index 70f00afa5614a..f16cbba9316b7 100644
--- a/cli/ssh.go
+++ b/cli/ssh.go
@@ -1594,12 +1594,14 @@ func writeCoderConnectNetInfo(ctx context.Context, networkInfoDir string) error
// Converts workspace name input to owner/workspace.agent format
// Possible valid input formats:
// workspace
+// workspace.agent
// owner/workspace
// owner--workspace
// owner/workspace--agent
// owner/workspace.agent
// owner--workspace--agent
// owner--workspace.agent
+// agent.workspace.owner - for parity with Coder Connect
func normalizeWorkspaceInput(input string) string {
// Split on "/", "--", and "."
parts := workspaceNameRe.Split(input, -1)
@@ -1608,8 +1610,15 @@ func normalizeWorkspaceInput(input string) string {
case 1:
return input // "workspace"
case 2:
+ if strings.Contains(input, ".") {
+ return fmt.Sprintf("%s.%s", parts[0], parts[1]) // "workspace.agent"
+ }
return fmt.Sprintf("%s/%s", parts[0], parts[1]) // "owner/workspace"
case 3:
+ // If the only separator is a dot, it's the Coder Connect format
+ if !strings.Contains(input, "/") && !strings.Contains(input, "--") {
+ return fmt.Sprintf("%s/%s.%s", parts[2], parts[1], parts[0]) // "owner/workspace.agent"
+ }
return fmt.Sprintf("%s/%s.%s", parts[0], parts[1], parts[2]) // "owner/workspace.agent"
default:
return input // Fallback
diff --git a/cli/ssh_test.go b/cli/ssh_test.go
index 147fc07372032..8845200273697 100644
--- a/cli/ssh_test.go
+++ b/cli/ssh_test.go
@@ -107,12 +107,14 @@ func TestSSH(t *testing.T) {
cases := []string{
"myworkspace",
+ "myworkspace.dev",
"myuser/myworkspace",
"myuser--myworkspace",
"myuser/myworkspace--dev",
"myuser/myworkspace.dev",
"myuser--myworkspace--dev",
"myuser--myworkspace.dev",
+ "dev.myworkspace.myuser",
}
for _, tc := range cases {
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy