feedbacks

Topic: add-podman-backend
Relative: refactor-for-podman

Signed-off-by: andrew <andrew@anyscale.com>

Author: andrew-anyscale

wanda/podman_cmd.go

@@ -6,15 +6,16 @@ import (
 )
 
 func podmanCmdEnvs() []string {
-	var envs []string
-	for _, k := range []string{
+	keys := []string{
 		"HOME",
 		"USER",
 		"PATH",
 		"XDG_RUNTIME_DIR",
 		"CONTAINERS_CONF",
 		"REGISTRY_AUTH_FILE",
-	} {
+	}
+	var envs []string
+	for _, k := range keys {
 		if v, ok := os.LookupEnv(k); ok {
 			envs = append(envs, fmt.Sprintf("%s=%s", k, v))
 		}

wanda/podman_cmd_test.go

@@ -1,23 +1,48 @@
 package wanda
 
 import (
+	"strings"
 	"testing"
 )
 
 func TestNewPodmanCmd(t *testing.T) {
-	c := NewPodmanCmd(&PodmanCmdConfig{})
-	cmd := c.(*podmanCmd)
-
-	if cmd.bin != "podman" {
-		t.Errorf("bin: got %q, want %q", cmd.bin, "podman")
+	testCases := []struct {
+		name    string
+		config  *PodmanCmdConfig
+		wantBin string
+	}{
+		{
+			name:    "default",
+			config:  &PodmanCmdConfig{},
+			wantBin: "podman",
+		},
+		{
+			name:    "custom bin",
+			config:  &PodmanCmdConfig{Bin: "/usr/local/bin/podman"},
+			wantBin: "/usr/local/bin/podman",
+		},
 	}
-}
 
-func TestNewPodmanCmd_customBin(t *testing.T) {
-	c := NewPodmanCmd(&PodmanCmdConfig{Bin: "/usr/local/bin/podman"})
-	cmd := c.(*podmanCmd)
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			c := NewPodmanCmd(tc.config)
+			cmd := c.(*podmanCmd)
+
+			if cmd.bin != tc.wantBin {
+				t.Errorf("bin: got %q, want %q", cmd.bin, tc.wantBin)
+			}
 
-	if cmd.bin != "/usr/local/bin/podman" {
-		t.Errorf("bin: got %q, want %q", cmd.bin, "/usr/local/bin/podman")
+			// Check that at least one env var is propagated, e.g. PATH.
+			foundEnv := false
+			for _, env := range cmd.envs {
+				if strings.HasPrefix(env, "PATH=") {
+					foundEnv = true
+					break
+				}
+			}
+			if !foundEnv {
+				t.Errorf("expected env vars to be propagated, but PATH was not found")
+			}
+		})
 	}
 }

wanda/wanda/main.go

@@ -26,7 +26,8 @@ Flags:
 
 func main() {
 	workDir := flag.String("work_dir", ".", "root directory for the build")
-	dockerBin := flag.String("docker", "", "path to the docker/podman binary")
+	// Flag kept as docker for backward compatibility.
+	containerBin := flag.String("docker", "", "path to the docker/podman binary")
 	podman := flag.Bool("podman", false, "use podman instead of docker")
 	rayCI := flag.Bool(
 		"rayci", false,
@@ -91,7 +92,7 @@ func main() {
 		ReadOnlyCache: *readOnly,
 
 		ContainerRuntime: runtime,
-		ContainerBin:     *dockerBin,
+		ContainerBin:     *containerBin,
 	}
 
 	if err := wanda.Build(input, config); err != nil {