[wanda] fix a bug of local image resolving (#88)

otherwise it is breaking backwards compatibility

also added tests for the local resolving paths.

Author: aslonnie

wanda/build_input_test.go

@@ -27,18 +27,18 @@ func TestBuildInputTags(t *testing.T) {
 
 func TestBuildInputCore(t *testing.T) {
 	ts := newTarStream()
-	ts.addFile("Dockerfile", nil, "testdata/Dockerfile")
+	ts.addFile("Dockerfile.hello", nil, "testdata/Dockerfile.hello")
 
 	in := newBuildInput(ts, []string{"MESSAGE=test=msg"})
 	in.addTag("myimage")
 
-	core, err := in.makeCore("Dockerfile")
+	core, err := in.makeCore("Dockerfile.hello")
 	if err != nil {
 		t.Fatalf("make build input core: %v", err)
 	}
 
-	if core.Dockerfile != "Dockerfile" {
-		t.Errorf("got %q, want Dockerfile", core.Dockerfile)
+	if core.Dockerfile != "Dockerfile.hello" {
+		t.Errorf("got %q, want Dockerfile.hello", core.Dockerfile)
 	}
 	if got := core.BuildArgs["MESSAGE"]; got != "test=msg" {
 		t.Errorf("build args MESSAGE got %q, want `test=msg`", got)

wanda/docker_cmd.go

@@ -60,7 +60,7 @@ func (c *dockerCmd) pull(src, asTag string) error {
 	}
 
 	if src != asTag {
-		if err := c.run("tag", src, asTag); err != nil {
+		if err := c.tag(src, asTag); err != nil {
 			return fmt.Errorf("tag %s %s: %w", src, asTag, err)
 		}
 	}
@@ -85,15 +85,11 @@ func (c *dockerCmd) build(in *buildInput, core *buildInputCore) error {
 		if !ok {
 			return fmt.Errorf("missing base image source for %q", from)
 		}
-
-		if src.local != "" {
-			if err := c.tag(src.local, src.name); err != nil {
-				return fmt.Errorf("tag %s %s: %w", src.local, src.name, err)
-			}
-		} else {
-			if err := c.pull(src.src, src.name); err != nil {
-				return fmt.Errorf("pull %s(%s): %w", src.name, src.src, err)
-			}
+		if src.local != "" { // local image, already ready.
+			continue
+		}
+		if err := c.pull(src.src, src.name); err != nil {
+			return fmt.Errorf("pull %s(%s): %w", src.name, src.src, err)
 		}
 	}
 	// TODO(aslonnie): maybe recheck all the IDs of the from images?

wanda/docker_cmd_test.go

@@ -13,15 +13,15 @@ func TestDockerCmdBuild(t *testing.T) {
 	cmd := newDockerCmd("") // uses real docker client
 
 	ts := newTarStream()
-	ts.addFile("Dockerfile", nil, "testdata/Dockerfile")
+	ts.addFile("Dockerfile.hello", nil, "testdata/Dockerfile.hello")
 
 	const tag = "cr.ray.io/rayproject/wanda-test"
 
 	buildArgs := []string{"MESSAGE=test mesasge"}
 	input := newBuildInput(ts, buildArgs)
 	input.addTag(tag)
 
-	core, err := input.makeCore("Dockerfile")
+	core, err := input.makeCore("Dockerfile.hello")
 	if err != nil {
 		t.Fatalf("make build input core: %v", err)
 	}

wanda/forge.go

@@ -93,6 +93,18 @@ func (f *Forge) resolveBases(froms []string) (map[string]*imageSource, error) {
 		}
 
 		if namePrefix != "" && strings.HasPrefix(from, namePrefix) {
+			if f.config.WorkRepo == "" {
+				// Treat it as a local image.
+				src, err := resolveLocalImage(from, from)
+				if err != nil {
+					return nil, fmt.Errorf(
+						"resolve prefixed local image %s: %w", from, err,
+					)
+				}
+				m[from] = src
+				continue
+			}
+
 			// An image in the work namespace. It is generated by a previous
 			// job, and we need to pull it from the work repo.
 			fromName := strings.TrimPrefix(from, f.config.NamePrefix)

wanda/forge_test.go

@@ -11,17 +11,96 @@ import (
 
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/registry"
+	cranev1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/daemon"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
 )
 
+func filesInLayer(layer cranev1.Layer) (map[string]string, error) {
+	rc, err := layer.Uncompressed()
+	if err != nil {
+		return nil, fmt.Errorf("uncompress layer: %w", err)
+	}
+	defer rc.Close()
+
+	tr := tar.NewReader(rc)
+
+	files := make(map[string]string)
+
+	for {
+		hdr, err := tr.Next()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return nil, fmt.Errorf("read tar header: %w", err)
+		}
+
+		if hdr.FileInfo().IsDir() {
+			continue
+		}
+
+		content, err := io.ReadAll(tr)
+		if err != nil {
+			return nil, fmt.Errorf("read tar content: %w", err)
+		}
+
+		files[hdr.Name] = string(content)
+	}
+
+	return files, nil
+}
+
+const worldDotTxt = "This is my world!"
+
+func TestForgeLocal(t *testing.T) {
+	config := &ForgeConfig{WorkDir: "testdata"}
+
+	if err := Build("testdata/localbase.wanda.yaml", config); err != nil {
+		t.Fatalf("build base: %v", err)
+	}
+
+	if err := Build("testdata/local.wanda.yaml", config); err != nil {
+		t.Fatalf("build: %v", err)
+	}
+
+	const resultRef = "cr.ray.io/rayproject/local"
+	ref, err := name.ParseReference(resultRef)
+	if err != nil {
+		t.Fatalf("parse reference: %v", err)
+	}
+
+	img, err := daemon.Image(ref)
+	if err != nil {
+		t.Fatalf("read image: %v", err)
+	}
+
+	layers, err := img.Layers()
+	if err != nil {
+		t.Fatalf("read layers: %v", err)
+	}
+
+	if len(layers) != 1 {
+		t.Fatalf("got %d layers, want 2", len(layers))
+	}
+
+	files, err := filesInLayer(layers[0])
+	if err != nil {
+		t.Fatalf("read layer: %v", err)
+	}
+
+	if _, ok := files["opt/app/Dockerfile"]; !ok {
+		t.Errorf("Dockerfile not in image")
+	}
+}
+
 func TestForge(t *testing.T) {
 	config := &ForgeConfig{
 		WorkDir:    "testdata",
 		NamePrefix: "cr.ray.io/rayproject/",
 	}
 
-	if err := Build("testdata/hello.spec.yaml", config); err != nil {
+	if err := Build("testdata/hello.wanda.yaml", config); err != nil {
 		t.Fatalf("build: %v", err)
 	}
 
@@ -45,6 +124,39 @@ func TestForge(t *testing.T) {
 	if len(layers) != 1 {
 		t.Fatalf("got %d layers, want 1", len(layers))
 	}
+
+	if err := Build("testdata/world.wanda.yaml", config); err != nil {
+		t.Fatalf("build world: %v", err)
+	}
+
+	world := "cr.ray.io/rayproject/world"
+	ref2, err := name.ParseReference(world)
+	if err != nil {
+		t.Fatalf("parse world reference: %v", err)
+	}
+
+	img2, err := daemon.Image(ref2)
+	if err != nil {
+		t.Fatalf("read world image: %v", err)
+	}
+
+	layers2, err := img2.Layers()
+	if err != nil {
+		t.Fatalf("read world layers: %v", err)
+	}
+
+	if len(layers2) != 2 {
+		t.Fatalf("got %d world layers, want 1", len(layers2))
+	}
+
+	files, err := filesInLayer(layers2[1])
+	if err != nil {
+		t.Fatalf("read world layer files: %v", err)
+	}
+
+	if got := files["opt/app/world.txt"]; got != worldDotTxt {
+		t.Errorf("world.txt in image, got %q, want %q", got, worldDotTxt)
+	}
 }
 
 func TestForgeWithWorkRepo(t *testing.T) {
@@ -67,11 +179,11 @@ func TestForgeWithWorkRepo(t *testing.T) {
 		BuildID:    "abc123",
 	}
 
-	if err := Build("testdata/hello.spec.yaml", config); err != nil {
+	if err := Build("testdata/hello.wanda.yaml", config); err != nil {
 		t.Fatalf("build hello: %v", err)
 	}
 
-	if err := Build("testdata/world.spec.yaml", config); err != nil {
+	if err := Build("testdata/world.wanda.yaml", config); err != nil {
 		t.Fatalf("build world: %v", err)
 	}
 
@@ -94,39 +206,11 @@ func TestForgeWithWorkRepo(t *testing.T) {
 	if len(layers) != 2 {
 		t.Fatalf("got %d layers, want 2", len(layers))
 	}
-
-	layer, err := layers[1].Uncompressed()
+	files, err := filesInLayer(layers[1])
 	if err != nil {
-		t.Fatalf("uncompress layer: %v", err)
+		t.Fatalf("read layer: %v", err)
 	}
-
-	tr := tar.NewReader(layer)
-
-	files := make(map[string]string)
-
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			t.Fatalf("read tar header: %v", err)
-		}
-
-		if hdr.FileInfo().IsDir() {
-			continue
-		}
-
-		content, err := io.ReadAll(tr)
-		if err != nil {
-			t.Fatalf("read tar content: %v", err)
-		}
-
-		t.Log(hdr.Name)
-		files[hdr.Name] = string(content)
-	}
-
-	if got, want := files["opt/app/world.txt"], "This is my world!"; got != want {
-		t.Errorf("world.txt in image, got %q, want %q", got, want)
+	if got := files["opt/app/world.txt"]; got != worldDotTxt {
+		t.Errorf("world.txt in image, got %q, want %q", got, worldDotTxt)
 	}
 }

wanda/resolve_image.go

@@ -24,8 +24,9 @@ func resolveLocalImage(name, ref string) (*imageSource, error) {
 	}
 
 	return &imageSource{
-		name: name,
-		id:   id.String(),
+		name:  name,
+		id:    id.String(),
+		local: ref,
 	}, nil
 }
 

wanda/resolve_image_test.go

@@ -48,6 +48,9 @@ func TestResolveLocalImage(t *testing.T) {
 	if want := imageID.String(); want != src.id {
 		t.Errorf("got image id %q, want %q", src.id, want)
 	}
+	if src.local != tagStr {
+		t.Errorf("got image local %q, want %q", src.local, tagStr)
+	}
 
 	dockerCmd := newDockerCmd("")
 	if err := dockerCmd.run("image", "rm", tagStr); err != nil {

wanda/testdata/Dockerfile wanda/testdata/Dockerfile.hello

@@ -2,6 +2,6 @@ FROM scratch
 
 ARG MESSAGE=hello
 ENV MESSAGE=${MESSAGE}
-COPY Dockerfile /opt/Dockerfile
+COPY Dockerfile.hello /opt/Dockerfile
 
 CMD "echo ${MESSAGE}"

wanda/testdata/Dockerfile.local

@@ -0,0 +1,3 @@
+FROM mybase
+
+COPY Dockerfile.local /opt/app/Dockerfile

wanda/testdata/Dockerfile.localbase

@@ -0,0 +1 @@
+FROM scratch

wanda/testdata/hello.spec.yaml

@@ -0,0 +1,2 @@
+name: hello
+dockerfile: Dockerfile.hello

wanda/testdata/hello.wanda.yaml

@@ -0,0 +1,4 @@
+name: local
+dockerfile: Dockerfile.local
+froms: [ "@mybase"]
+tags: [ "cr.ray.io/rayproject/local" ]

wanda/testdata/local.wanda.yaml

@@ -0,0 +1,3 @@
+name: localbase
+dockerfile: Dockerfile.localbase
+tags: [ "mybase" ]

wanda/testdata/localbase.wanda.yaml

@@ -1,4 +1,5 @@
 name: world
 dockerfile: Dockerfile.world
+froms: [ "cr.ray.io/rayproject/hello" ]
 srcs:
   - world.txt