fix(cdr): fix ssh and sync cmds

Author: sreya

coder-sdk/client.go

@@ -123,6 +123,6 @@ func (c *DefaultClient) Token() string {
 }
 
 // BaseURL returns the BaseURL configured for this Client.
-func (c *DefaultClient) BaseURL() url.URL {
-	return *c.baseURL
+func (c *DefaultClient) BaseURL() *url.URL {
+	return c.baseURL
 }

coder-sdk/interface.go

@@ -227,7 +227,7 @@ type Client interface {
 	Token() string
 
 	// BaseURL returns the BaseURL configured for this Client.
-	BaseURL() url.URL
+	BaseURL() *url.URL
 
 	// CordonWorkspaceProvider prevents the provider from having any more workspaces placed on it.
 	CordonWorkspaceProvider(ctx context.Context, id, reason string) error

coder-sdk/workspace.go

@@ -229,7 +229,7 @@ func (c *DefaultClient) EditWorkspace(ctx context.Context, workspaceID string, r
 // DialWsep dials a workspace's command execution interface
 // See https://github.com/cdr/wsep for details.
 func (c *DefaultClient) DialWsep(ctx context.Context, baseURL *url.URL, workspaceID string) (*websocket.Conn, error) {
-	return c.dialWebsocket(ctx, "/proxy/workspaces/"+workspaceID+"/wsep", withBaseURL(baseURL))
+	return c.dialWebsocket(ctx, "/api/v0/workspaces/"+workspaceID+"/proxy/wsep", withBaseURL(baseURL))
 }
 
 // DialExecutor gives a remote execution interface for performing commands
@@ -244,7 +244,7 @@ func (c *DefaultClient) DialExecutor(ctx context.Context, baseURL *url.URL, work
 
 // DialIDEStatus opens a websocket connection for cpu load metrics on the workspace.
 func (c *DefaultClient) DialIDEStatus(ctx context.Context, baseURL *url.URL, workspaceID string) (*websocket.Conn, error) {
-	return c.dialWebsocket(ctx, "/proxy/workspaces/"+workspaceID+"/ide/api/status", withBaseURL(baseURL))
+	return c.dialWebsocket(ctx, "/api/v0/workspaces/"+workspaceID+"/proxy/ide/api/status", withBaseURL(baseURL))
 }
 
 // DialWorkspaceBuildLog opens a websocket connection for the workspace build log messages.

internal/cmd/configssh.go

@@ -287,6 +287,13 @@ func makeSSHConfig(binPath, host, userName, workspaceName, privateKeyFilepath st
 `, workspaceName, host, userName, workspaceName, privateKeyFilepath)
 }
 
+func proxyCommand(binPath, workspaceName string, quoted bool) string {
+	if quoted {
+		binPath = fmt.Sprintf("%q", binPath)
+	}
+	return fmt.Sprintf(`%s tunnel %s 12213 stdio`, binPath, workspaceName)
+}
+
 func writeStr(filename, data string) error {
 	return ioutil.WriteFile(filename, []byte(data), 0777)
 }

internal/cmd/ssh.go

@@ -60,6 +60,11 @@ func shell(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+
+	if !wp.SSHEnabled {
+		return clog.Error("SSH is disabled on this Workspace")
+	}
+
 	u, err := url.Parse(wp.EnvproxyAccessURL)
 	if err != nil {
 		return err
@@ -75,10 +80,24 @@ func shell(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+
+	binPath, err := binPath()
+	if err != nil {
+		return xerrors.Errorf("Failed to get executable path: %w", err)
+	}
+
 	ssh := exec.CommandContext(ctx,
 		"ssh", "-i"+privateKeyFilepath,
 		fmt.Sprintf("%s-%s@%s", me.Username, workspace.Name, u.Hostname()),
 	)
+
+	if wp.EnableNetV2 {
+		ssh = exec.CommandContext(ctx,
+			"ssh", "-i"+privateKeyFilepath,
+			"-o"+fmt.Sprintf("ProxyCommand=%s", proxyCommand(binPath, workspace.Name, false)),
+			workspace.Name,
+		)
+	}
 	if len(args) > 1 {
 		ssh.Args = append(ssh.Args, args[1:]...)
 	}

internal/cmd/tunnel.go

@@ -77,7 +77,7 @@ coder tunnel my-dev 3000 3000
 
 			c := &tunnneler{
 				log:         log,
-				brokerAddr:  &baseURL,
+				brokerAddr:  baseURL,
 				token:       sdk.Token(),
 				workspaceID: workspaceID,
 				stdio:       args[2] == "stdio",

internal/coderutil/workspace.go

@@ -20,7 +20,12 @@ func DialWorkspaceWsep(ctx context.Context, client coder.Client, workspace *code
 	if err != nil {
 		return nil, xerrors.Errorf("get workspace workspace provider: %w", err)
 	}
-	accessURL, err := url.Parse(workspaceProvider.EnvproxyAccessURL)
+	uri := workspaceProvider.EnvproxyAccessURL
+	if workspaceProvider.EnableNetV2 {
+		uri = client.BaseURL().String()
+	}
+
+	accessURL, err := url.Parse(uri)
 	if err != nil {
 		return nil, xerrors.Errorf("invalid workspace provider envproxy access url: %w", err)
 	}