Merge pull request #1743 from joe-kimmel-vmw/jkutner/dep-updates

add one Rebase unit test and fix nil handling
buildpacks · Apr 28, 2023 · 8e03c74 · 8e03c74
2 parents 85da68a + 6b17d90
commit 8e03c74
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/pkg/client/rebase.go b/pkg/client/rebase.go
@@ -66,15 +66,17 @@ func (c *Client) Rebase(ctx context.Context, opts RebaseOptions) error {
 		return errors.Errorf("could not find label %s on image", style.Symbol(platform.LayerMetadataLabel))
 	}
 	var runImageMD builder.RunImageMetadata
-	if md.RunImage.Image != "" { // TODO: add unit
+	if md.RunImage.Image != "" {
 		runImageMD = builder.RunImageMetadata{
 			Image:   md.RunImage.Image,
 			Mirrors: md.RunImage.Mirrors,
 		}
 	} else {
-		runImageMD = builder.RunImageMetadata{
-			Image:   md.Stack.RunImage.Image,
-			Mirrors: md.Stack.RunImage.Mirrors,
+		if md.Stack != nil {
+			runImageMD = builder.RunImageMetadata{
+				Image:   md.Stack.RunImage.Image,
+				Mirrors: md.Stack.RunImage.Mirrors,
+			}
 		}
 	}
 	runImageName := c.resolveRunImage(

diff --git a/pkg/client/rebase_test.go b/pkg/client/rebase_test.go
@@ -148,6 +148,23 @@ func testRebase(t *testing.T, when spec.G, it spec.S) {
 							h.AssertContains(t, lbl, `"runImage":{"topLayer":"local-mirror-top-layer-sha","reference":"local-mirror-digest"`)
 						})
 					})
+					when("there is a label and it has a run image and no stack", func() {
+						it("reads the run image from the label", func() {
+							h.AssertNil(t, fakeAppImage.SetLabel("io.buildpacks.lifecycle.metadata",
+								`{"runImage":{"image":"some/run", "mirrors":["example.com/some/run"]}}`))
+							h.AssertNil(t, subject.Rebase(context.TODO(), RebaseOptions{
+								RepoName: "some/app",
+							}))
+							h.AssertEq(t, fakeAppImage.Base(), "some/run")
+						})
+					})
+					when("there is neither runImage nor stack", func() {
+						it("fails gracefully", func() {
+							h.AssertNil(t, fakeAppImage.SetLabel("io.buildpacks.lifecycle.metadata", `{}`))
+							h.AssertError(t, subject.Rebase(context.TODO(), RebaseOptions{RepoName: "some/app"}),
+								"run image must be specified")
+						})
+					})
 				})
 
 				when("the image does not have a label with a run image specified", func() {