refactor(docker): split driver into cohesive files; fix label match in FindContainerJSON

pkg/agent/delivery/factory.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"os"
 
+	"github.com/devsy-org/devsy/pkg/driver"
 	"github.com/devsy-org/devsy/pkg/inject"
 	"github.com/devsy-org/devsy/pkg/log"
 	"github.com/devsy-org/devsy/pkg/provider"
@@ -99,19 +100,22 @@ func isLocalDockerHost(host string) bool {
 
 // CommandFunc adapts a driver's command function to inject.ExecFunc.
 func CommandFunc(
-	driverCmd func(
-		ctx context.Context,
-		workspaceID, user, command string,
-		stdin io.Reader, stdout io.Writer, stderr io.Writer,
-	) error,
+	driverCmd func(ctx context.Context, params *driver.CommandParams) error,
 	workspaceID string,
 ) inject.ExecFunc { //nolint:staticcheck // bridges driver command signature to legacy ExecFunc
 	return func(
 		ctx context.Context,
 		command string,
 		stdin io.Reader, stdout io.Writer, stderr io.Writer,
 	) error {
-		return driverCmd(ctx, workspaceID, "root", command, stdin, stdout, stderr)
+		return driverCmd(ctx, &driver.CommandParams{
+			WorkspaceID: workspaceID,
+			User:        "root",
+			Command:     command,
+			Stdin:       stdin,
+			Stdout:      stdout,
+			Stderr:      stderr,
+		})
 	}
 }
 

pkg/devcontainer/delete_test.go

@@ -43,9 +43,7 @@ func (m *mockDriver) DeleteDevContainer(_ context.Context, _ string) error {
 }
 
 //nolint:revive // interface implementation requires 7 args
-func (m *mockDriver) CommandDevContainer(
-	_ context.Context, _, _, _ string, _ io.Reader, _ io.Writer, _ io.Writer,
-) error {
+func (m *mockDriver) CommandDevContainer(_ context.Context, _ *driver.CommandParams) error {
 	return nil
 }
 

pkg/devcontainer/run.go

@@ -189,7 +189,14 @@ func (r *runner) Command(
 	stdout io.Writer,
 	stderr io.Writer,
 ) error {
-	return r.Driver.CommandDevContainer(ctx, r.ID, user, command, stdin, stdout, stderr)
+	return r.Driver.CommandDevContainer(ctx, &driver.CommandParams{
+		WorkspaceID: r.ID,
+		User:        user,
+		Command:     command,
+		Stdin:       stdin,
+		Stdout:      stdout,
+		Stderr:      stderr,
+	})
 }
 
 func (r *runner) Find(ctx context.Context) (*config.ContainerDetails, error) {

pkg/devcontainer/setup.go

@@ -152,15 +152,14 @@ func (r *runner) legacyInject(ctx context.Context, timeout time.Duration) error
 	err := agent.InjectAgent(&agent.InjectOptions{
 		Ctx: ctx,
 		Exec: func(ctx context.Context, command string, stdin io.Reader, stdout io.Writer, stderr io.Writer) error {
-			return r.Driver.CommandDevContainer(
-				ctx,
-				r.ID,
-				containerRootUser,
-				command,
-				stdin,
-				stdout,
-				stderr,
-			)
+			return r.Driver.CommandDevContainer(ctx, &driver.CommandParams{
+				WorkspaceID: r.ID,
+				User:        containerRootUser,
+				Command:     command,
+				Stdin:       stdin,
+				Stdout:      stdout,
+				Stderr:      stderr,
+			})
 		},
 		IsLocal:                     false,
 		RemoteAgentPath:             pkgconfig.ContainerDevsyHelperLocation,
@@ -368,15 +367,14 @@ func (r *runner) executeSetup(
 		sshTunnelStdinReader, sshTunnelStdoutWriter *os.File,
 		writer io.WriteCloser,
 	) error {
-		return r.Driver.CommandDevContainer(
-			cancelCtx,
-			r.ID,
-			containerRootUser,
-			sshCmd,
-			sshTunnelStdinReader,
-			sshTunnelStdoutWriter,
-			writer,
-		)
+		return r.Driver.CommandDevContainer(cancelCtx, &driver.CommandParams{
+			WorkspaceID: r.ID,
+			User:        containerRootUser,
+			Command:     sshCmd,
+			Stdin:       sshTunnelStdinReader,
+			Stdout:      sshTunnelStdoutWriter,
+			Stderr:      writer,
+		})
 	}
 
 	return sshtunnel.ExecuteCommand(ctx, sshtunnel.ExecuteCommandOptions{

pkg/docker/helper.go

@@ -430,14 +430,16 @@ func (r *DockerHelper) FindContainerJSON(ctx context.Context, labels []string) (
 		found := true
 
 		containers, err := r.InspectContainers(ctx, []string{id})
-		if err != nil {
+		if err != nil || len(containers) == 0 {
 			continue
 		}
 
 		for _, label := range labels {
 			key, value, _ := strings.Cut(label, "=")
-
-			found = containers[0].Config.Labels[key] == value
+			if containers[0].Config.Labels[key] != value {
+				found = false
+				break
+			}
 		}
 
 		if found {

pkg/docker/helper_test.go

@@ -119,6 +119,33 @@ echo "$@" > `+argsFile+`
 	})
 }
 
+func TestFindContainerJSON_MatchesAllLabels(t *testing.T) {
+	tmp := t.TempDir()
+	// Fake docker: `ps -q -a` lists three containers; `inspect` returns each
+	// container's labels. c1 matches both query labels; c2 matches only the
+	// last label (an earlier label differs); c3 inspect returns an empty array.
+	bin := writeScript(t, tmp, "docker-fake", `#!/bin/sh
+case "$1" in
+  ps) printf 'c1\nc2\nc3\n' ;;
+  inspect)
+    case "$4" in
+      c1) echo '[{"ID":"c1","Config":{"Labels":{"a":"x","b":"y"}}}]' ;;
+      c2) echo '[{"ID":"c2","Config":{"Labels":{"a":"zzz","b":"y"}}}]' ;;
+      c3) echo '[]' ;;
+    esac ;;
+esac
+`)
+
+	h := &DockerHelper{DockerCommand: bin}
+	got, err := h.FindContainerJSON(context.Background(), []string{"a=x", "b=y"})
+
+	require.NoError(t, err)
+	// Only c1 satisfies every label. c2 must be excluded (the AND-logic bug
+	// previously matched it on the last label alone), and c3's empty inspect
+	// result must not panic.
+	assert.Equal(t, []string{"c1"}, got)
+}
+
 func TestGPUSupportEnabled_CommandFailure(t *testing.T) {
 	tmp := t.TempDir()
 	bin := writeScript(t, tmp, "bad-runtime", `#!/bin/sh

pkg/driver/custom/custom.go

@@ -72,23 +72,20 @@ func (c *customDriver) FindDevContainer(
 // CommandDevContainer runs the given command inside the devcontainer.
 func (c *customDriver) CommandDevContainer(
 	ctx context.Context,
-	workspaceId, user, command string,
-	stdin io.Reader,
-	stdout io.Writer,
-	stderr io.Writer,
+	params *driver.CommandParams,
 ) error {
 	// run command
 	err := c.runCommand(
 		ctx,
-		workspaceId,
+		params.WorkspaceID,
 		"commandDevContainer",
 		c.workspaceInfo.Agent.Custom.CommandDevContainer,
-		stdin,
-		stdout,
-		stderr,
+		params.Stdin,
+		params.Stdout,
+		params.Stderr,
 		[]string{
-			"DEVCONTAINER_USER=" + user,
-			"DEVCONTAINER_COMMAND=" + command,
+			"DEVCONTAINER_USER=" + params.User,
+			"DEVCONTAINER_COMMAND=" + params.Command,
 		},
 	)
 	if err != nil {