fixup! feat(cli): add capability for SSH command to connect to a running container

johnstcn · johnstcn · commit 9780c67a78ca · 2025-02-27T10:50:06.000Z
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -469,27 +469,19 @@ func (s *Server) sessionStart(logger slog.Logger, session ssh.Session, env []str
 	}
 
 	// plumb in envinfoer here to modify command for container exec?
-	cmd, err := s.CreateCommand(ctx, session.RawCommand(), env, nil)
-	if err != nil {
-		s.metrics.sessionErrors.WithLabelValues(magicTypeLabel, ptyLabel, "create_command").Add(1)
-		return err
-	}
-
+	var ei usershell.EnvInfoer
+	var err error
 	if s.config.ExperimentalContainersEnabled && container != "" {
-		ei, err := agentcontainers.EnvInfo(ctx, s.Execer, container, containerUser)
+		ei, err = agentcontainers.EnvInfo(ctx, s.Execer, container, containerUser)
 		if err != nil {
 			s.metrics.sessionErrors.WithLabelValues(magicTypeLabel, ptyLabel, "container_env_info").Add(1)
 			return err
 		}
-		modifiedCmd, modifiedArgs := ei.ModifyCommand(cmd.Path, cmd.Args...)
-		if modifiedCmd != cmd.Path || slices.Compare(modifiedArgs, cmd.Args) != 0 {
-			logger.Debug(ctx, "modified command for container",
-				slog.F("before", append([]string{cmd.Path}, cmd.Args...)),
-				slog.F("after", append([]string{modifiedCmd}, modifiedArgs...)),
-			)
-			cmd.Path = modifiedCmd
-			cmd.Args = modifiedArgs
-		}
+	}
+	cmd, err := s.CreateCommand(ctx, session.RawCommand(), env, ei)
+	if err != nil {
+		s.metrics.sessionErrors.WithLabelValues(magicTypeLabel, ptyLabel, "create_command").Add(1)
+		return err
 	}
 
 	if ssh.AgentRequested(session) {
diff --git a/cli/ssh_test.go b/cli/ssh_test.go
@@ -1928,9 +1928,9 @@ Expire-Date: 0
 
 func TestSSH_Container(t *testing.T) {
 	t.Parallel()
-	// if runtime.GOOS != "linux" {
-	// t.Skip("Skipping test on non-Linux platform")
-	// }
+	if runtime.GOOS != "linux" {
+		t.Skip("Skipping test on non-Linux platform")
+	}
 
 	client, workspace, agentToken := setupWorkspaceForAgent(t)
 	ctx := testutil.Context(t, testutil.WaitLong)
