Pass auth sock id to other IDEs

loft-sh · Dec 17, 2024 · 631f742 · 631f742
1 parent c9fb98a
commit 631f742
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/cmd/up.go b/cmd/up.go
@@ -333,6 +333,7 @@ func (cmd *UpCmd) Run(
 				ideConfig.Options,
 				cmd.GitUsername,
 				cmd.GitToken,
+				cmd.AuthSockID,
 				log,
 			)
 		case string(config.IDEJupyterDesktop):
@@ -345,6 +346,7 @@ func (cmd *UpCmd) Run(
 				ideConfig.Options,
 				cmd.GitUsername,
 				cmd.GitToken,
+				cmd.AuthSockID,
 				log)
 		case string(config.IDEMarimo):
 			return startMarimoInBrowser(
@@ -356,6 +358,7 @@ func (cmd *UpCmd) Run(
 				ideConfig.Options,
 				cmd.GitUsername,
 				cmd.GitToken,
+				cmd.AuthSockID,
 				log)
 		}
 	}
@@ -582,7 +585,7 @@ func startMarimoInBrowser(
 	client client2.BaseWorkspaceClient,
 	user string,
 	ideOptions map[string]config.OptionValue,
-	gitUsername, gitToken string,
+	gitUsername, gitToken, authSockID string,
 	logger log.Logger,
 ) error {
 	if forwardGpg {
@@ -629,7 +632,7 @@ func startMarimoInBrowser(
 		extraPorts,
 		gitUsername,
 		gitToken,
-		"",
+		authSockID,
 		logger,
 	)
 }
@@ -641,7 +644,7 @@ func startJupyterNotebookInBrowser(
 	client client2.BaseWorkspaceClient,
 	user string,
 	ideOptions map[string]config.OptionValue,
-	gitUsername, gitToken string,
+	gitUsername, gitToken, authSockID string,
 	logger log.Logger,
 ) error {
 	if forwardGpg {
@@ -688,7 +691,7 @@ func startJupyterNotebookInBrowser(
 		extraPorts,
 		gitUsername,
 		gitToken,
-		"",
+		authSockID,
 		logger,
 	)
 }
@@ -700,7 +703,7 @@ func startJupyterDesktop(
 	client client2.BaseWorkspaceClient,
 	user string,
 	ideOptions map[string]config.OptionValue,
-	gitUsername, gitToken string,
+	gitUsername, gitToken, authSockID string,
 	logger log.Logger,
 ) error {
 	if forwardGpg {
@@ -744,7 +747,7 @@ func startJupyterDesktop(
 		extraPorts,
 		gitUsername,
 		gitToken,
-		"",
+		authSockID,
 		logger,
 	)
 }

diff --git a/pkg/tunnel/container.go b/pkg/tunnel/container.go
@@ -34,7 +34,7 @@ func NewContainerTunnel(client client.WorkspaceClient, proxy bool, log log.Logge
 	}
 }
 
-// ContainerTunnel is a struct that contains the workspace client to use, if proxy is
+// ContainerTunnel manages the state of the tunnel to the container
 type ContainerTunnel struct {
 	client               client.WorkspaceClient
 	updateConfigInterval time.Duration
@@ -184,7 +184,7 @@ func (c *ContainerTunnel) updateConfig(ctx context.Context, sshClient *ssh.Clien
 }
 
 // runInContainer uses the connected SSH client to execute runInContainer on the remote
-func (c *ContainerTunnel) runInContainer(ctx context.Context, sshClient *ssh.Client, runInContainer Handler, envVars map[string]string) error {
+func (c *ContainerTunnel) runInContainer(ctx context.Context, sshClient *ssh.Client, handler Handler, envVars map[string]string) error {
 	// compress info
 	workspaceInfo, _, err := c.client.AgentInfo(provider.CLIOptions{Proxy: c.proxy})
 	if err != nil {
@@ -237,5 +237,5 @@ func (c *ContainerTunnel) runInContainer(ctx context.Context, sshClient *ssh.Cli
 	c.log.Debugf("Successfully connected to container")
 
 	// start handler
-	return runInContainer(cancelCtx, containerClient)
+	return handler(cancelCtx, containerClient)
 }