fix: ssh access with remote profiles (#1092)

Signed-off-by: Toma Puljak <[email protected]>
daytonaio · Sep 12, 2024 · a540533 · a540533
1 parent 52cc61e
commit a540533
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/cmd/workspace/create.go b/pkg/cmd/workspace/create.go
@@ -146,7 +146,7 @@ var CreateCmd = &cobra.Command{
 		}
 
 		var tsConn *tsnet.Server
-		if target.Name != "local" {
+		if target.Name != "local" || activeProfile.Id != "default" {
 			tsConn, err = tailscale.GetConnection(&activeProfile)
 			if err != nil {
 				log.Fatal(err)
@@ -406,7 +406,7 @@ func processGitURL(repoUrl string, apiClient *apiclient.APIClient, projects *[]a
 }
 
 func waitForDial(workspace *apiclient.Workspace, activeProfile *config.Profile, tsConn *tsnet.Server) error {
-	if workspace.Target == "local" {
+	if workspace.Target == "local" && (activeProfile != nil && activeProfile.Id == "default") {
 		err := config.EnsureSshConfigEntryAdded(activeProfile.Id, workspace.Id, workspace.Projects[0].Name)
 		if err != nil {
 			return err

diff --git a/pkg/cmd/workspace/ssh-proxy.go b/pkg/cmd/workspace/ssh-proxy.go
@@ -58,7 +58,7 @@ var SshProxyCmd = &cobra.Command{
 			log.Fatal(err)
 		}
 
-		if workspace.Target == "local" {
+		if workspace.Target == "local" && profile.Id == "default" {
 			// If the workspace is local, we directly access the ssh port through the container
 			project := workspace.Projects[0]