Merge branch 'buildpacks:main' into main

buildpacks · Sep 11, 2023 · 200d0a0 · 200d0a0
2 parents 1c03754 + aeb177c
commit 200d0a0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/cmd/lifecycle/restorer.go b/cmd/lifecycle/restorer.go
@@ -40,6 +40,8 @@ func (r *restoreCmd) DefineFlags() {
 	if r.PlatformAPI.AtLeast("0.12") {
 		cli.FlagUseDaemon(&r.UseDaemon)
 		cli.FlagGeneratedDir(&r.GeneratedDir)
+		cli.FlagUseLayout(&r.UseLayout)
+		cli.FlagLayoutDir(&r.LayoutDir)
 	}
 	if r.PlatformAPI.AtLeast("0.10") {
 		cli.FlagBuildImage(&r.BuildImageRef)

diff --git a/image/layout_handler.go b/image/layout_handler.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/buildpacks/imgutil"
 	"github.com/buildpacks/imgutil/layout"
@@ -33,11 +34,14 @@ func (h *LayoutHandler) Kind() string {
 }
 
 func (h *LayoutHandler) parseRef(imageRef string) (string, error) {
-	path, err := layout.ParseRefToPath(imageRef)
-	if err != nil {
-		return "", err
+	if !strings.HasPrefix(imageRef, h.layoutDir) {
+		path, err := layout.ParseRefToPath(imageRef)
+		if err != nil {
+			return "", err
+		}
+		return filepath.Join(h.layoutDir, path), nil
 	}
-	return filepath.Join(h.layoutDir, path), nil
+	return imageRef, nil
 }
 
 // helpers

diff --git a/image/layout_handler_test.go b/image/layout_handler_test.go
@@ -102,6 +102,18 @@ func testLayoutImageHandler(t *testing.T, when spec.G, it spec.S) {
 					h.AssertNotNil(t, err)
 				})
 			})
+
+			when("image reference is a layout path", func() {
+				it.Before(func() {
+					imageRef = filepath.Join(layoutDir, "index.docker.io", "cnbs", "sample-stack-run", "jammy")
+				})
+
+				it("it returns the same path value", func() {
+					image, err := imageHandler.InitImage(imageRef)
+					h.AssertNil(t, err)
+					h.AssertEq(t, image.Name(), imageRef)
+				})
+			})
 		})
 	})
 }