Merge pull request #1187 from aemengo/fix-lifecycle-0.11.3-package-re…

…names Bump to lifecycle v0.11.3 Signed-off-by: David Freilich <freilich.david@gmail.com>
buildpacks · May 26, 2021 · 360dbae · 360dbae
2 parents eb72b8a + 2fd4158
commit 360dbae
Show file tree

Hide file tree

Showing 33 changed files with 879 additions and 1,028 deletions.
diff --git a/acceptance/testdata/pack_fixtures/report_output.txt b/acceptance/testdata/pack_fixtures/report_output.txt
@@ -2,7 +2,7 @@ Pack:
   Version:  {{ .Version }}
   OS/Arch:  {{ .OS }}/{{ .Arch }}
 
-Default Lifecycle Version:  0.10.2
+Default Lifecycle Version:  0.11.3
 
 Supported Platform APIs:  0.3, 0.4
 

diff --git a/build_test.go b/build_test.go
@@ -1602,7 +1602,7 @@ func testBuild(t *testing.T, when spec.G, it spec.S) {
 					h.AssertEq(t, args.Daemon, true)
 					h.AssertEq(t, args.PullPolicy, config.PullNever)
 
-					args = fakeImageFetcher.FetchCalls["buildpacksio/lifecycle:0.10.2"]
+					args = fakeImageFetcher.FetchCalls["buildpacksio/lifecycle:0.11.3"]
 					h.AssertEq(t, args.Daemon, true)
 					h.AssertEq(t, args.PullPolicy, config.PullNever)
 				})

diff --git a/client.go b/client.go
@@ -51,7 +51,7 @@ type Downloader interface {
 type ImageFactory interface {
 	// NewImage initializes an image object with required settings so that it
 	// can be written either locally or to a registry.
-	NewImage(repoName string, local bool) (imgutil.Image, error)
+	NewImage(repoName string, local bool, imageOS string) (imgutil.Image, error)
 }
 
 // Client is an orchestration object, it contains all parameters needed to

diff --git a/create_builder_test.go b/create_builder_test.go
@@ -170,7 +170,7 @@ func testCreateBuilder(t *testing.T, when spec.G, it spec.S) {
 
 		var createPackage = func(imageName string) *fakes.Image {
 			packageImage := fakes.NewImage(imageName, "", nil)
-			mockImageFactory.EXPECT().NewImage(packageImage.Name(), false).Return(packageImage, nil)
+			mockImageFactory.EXPECT().NewImage(packageImage.Name(), false, "linux").Return(packageImage, nil)
 
 			h.AssertNil(t, subject.PackageBuildpack(context.TODO(), pack.PackageBuildpackOptions{
 				Name: packageImage.Name(),
@@ -901,7 +901,7 @@ func testCreateBuilder(t *testing.T, when spec.G, it spec.S) {
 			when("package image lives in docker registry", func() {
 				it.Before(func() {
 					packageImage = fakes.NewImage("docker.io/some/package-"+h.RandString(12), "", nil)
-					mockImageFactory.EXPECT().NewImage(packageImage.Name(), false).Return(packageImage, nil)
+					mockImageFactory.EXPECT().NewImage(packageImage.Name(), false, "linux").Return(packageImage, nil)
 
 					bpd := dist.BuildpackDescriptor{
 						API:    api.MustParse("0.3"),

diff --git a/go.mod b/go.mod
@@ -5,8 +5,8 @@ require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/Microsoft/hcsshim v0.8.10 // indirect
 	github.com/apex/log v1.9.0
-	github.com/buildpacks/imgutil v0.0.0-20210209163614-30601e371ce3
-	github.com/buildpacks/lifecycle v0.10.2
+	github.com/buildpacks/imgutil v0.0.0-20210510154637-009f91f52918
+	github.com/buildpacks/lifecycle v0.11.3
 	github.com/containerd/containerd v1.4.1 // indirect
 	github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41 // indirect
 	github.com/docker/docker v20.10.0-beta1.0.20201110211921-af34b94a78a1+incompatible

diff --git a/go.sum b/go.sum
diff --git a/inspect_image.go b/inspect_image.go
@@ -5,8 +5,9 @@ import (
 	"strings"
 
 	"github.com/Masterminds/semver"
-	"github.com/buildpacks/lifecycle"
+	"github.com/buildpacks/lifecycle/buildpack"
 	"github.com/buildpacks/lifecycle/launch"
+	"github.com/buildpacks/lifecycle/platform"
 	"github.com/pkg/errors"
 
 	"github.com/buildpacks/pack/config"
@@ -22,7 +23,7 @@ type ImageInfo struct {
 
 	// List of buildpacks that passed detection, ran their build
 	// phases and made a contribution to this image.
-	Buildpacks []lifecycle.GroupBuildpack
+	Buildpacks []buildpack.GroupBuildpack
 
 	// Base includes two references to the run image,
 	// - the Run Image ID,
@@ -38,15 +39,15 @@ type ImageInfo struct {
 	// the first 1 to k layers all belong to the run image,
 	// the last k+1 to n layers are added by buildpacks.
 	// the sum of all of these is our app image.
-	Base lifecycle.RunImageMetadata
+	Base platform.RunImageMetadata
 
 	// BOM or Bill of materials, contains dependency and
 	// version information provided by each buildpack.
-	BOM []lifecycle.BOMEntry
+	BOM []buildpack.BOMEntry
 
 	// Stack includes the run image name, and a list of image mirrors,
 	// where the run image is hosted.
-	Stack lifecycle.StackMetadata
+	Stack platform.StackMetadata
 
 	// Processes lists all processes contributed by buildpacks.
 	Processes ProcessDetails
@@ -64,8 +65,8 @@ type ProcessDetails struct {
 
 // Deserialize just the subset of fields we need to avoid breaking changes
 type layersMetadata struct {
-	RunImage lifecycle.RunImageMetadata `json:"runImage" toml:"run-image"`
-	Stack    lifecycle.StackMetadata    `json:"stack" toml:"stack"`
+	RunImage platform.RunImageMetadata `json:"runImage" toml:"run-image"`
+	Stack    platform.StackMetadata    `json:"stack" toml:"stack"`
 }
 
 const (
@@ -94,12 +95,12 @@ func (c *Client) InspectImage(name string, daemon bool) (*ImageInfo, error) {
 	}
 
 	var layersMd layersMetadata
-	if _, err := dist.GetLabel(img, lifecycle.LayerMetadataLabel, &layersMd); err != nil {
+	if _, err := dist.GetLabel(img, platform.LayerMetadataLabel, &layersMd); err != nil {
 		return nil, err
 	}
 
-	var buildMD lifecycle.BuildMetadata
-	if _, err := dist.GetLabel(img, lifecycle.BuildMetadataLabel, &buildMD); err != nil {
+	var buildMD platform.BuildMetadata
+	if _, err := dist.GetLabel(img, platform.BuildMetadataLabel, &buildMD); err != nil {
 		return nil, err
 	}
 
@@ -110,7 +111,7 @@ func (c *Client) InspectImage(name string, daemon bool) (*ImageInfo, error) {
 		layersMd.RunImage.Reference = ""
 	}
 
-	stackID, err := img.Label(lifecycle.StackIDLabel)
+	stackID, err := img.Label(platform.StackIDLabel)
 	if err != nil {
 		return nil, err
 	}

diff --git a/inspect_image_test.go b/inspect_image_test.go
@@ -7,19 +7,17 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/buildpacks/pack/internal/logging"
-
-	"github.com/buildpacks/pack/config"
-
 	"github.com/buildpacks/imgutil/fakes"
-	"github.com/buildpacks/lifecycle"
 	"github.com/buildpacks/lifecycle/launch"
+	"github.com/buildpacks/lifecycle/platform"
 	"github.com/golang/mock/gomock"
 	"github.com/heroku/color"
 	"github.com/sclevine/spec"
 	"github.com/sclevine/spec/report"
 
+	"github.com/buildpacks/pack/config"
 	"github.com/buildpacks/pack/internal/image"
+	"github.com/buildpacks/pack/internal/logging"
 	h "github.com/buildpacks/pack/testhelpers"
 	"github.com/buildpacks/pack/testmocks"
 )
@@ -134,8 +132,8 @@ func testInspectImage(t *testing.T, when spec.G, it spec.S) {
 					info, err := subject.InspectImage("some/image", useDaemon)
 					h.AssertNil(t, err)
 					h.AssertEq(t, info.Stack,
-						lifecycle.StackMetadata{
-							RunImage: lifecycle.StackRunImageMetadata{
+						platform.StackMetadata{
+							RunImage: platform.StackRunImageMetadata{
 								Image: "some-run-image",
 								Mirrors: []string{
 									"some-mirror",
@@ -150,7 +148,7 @@ func testInspectImage(t *testing.T, when spec.G, it spec.S) {
 					info, err := subject.InspectImage("some/image", useDaemon)
 					h.AssertNil(t, err)
 					h.AssertEq(t, info.Base,
-						lifecycle.RunImageMetadata{
+						platform.RunImageMetadata{
 							TopLayer:  "some-top-layer",
 							Reference: "some-run-image-reference",
 						},
@@ -617,7 +615,7 @@ func testInspectImage(t *testing.T, when spec.G, it spec.S) {
 			info, err := subject.InspectImage("old/image", true)
 			h.AssertNil(t, err)
 			h.AssertEq(t, info.Base,
-				lifecycle.RunImageMetadata{
+				platform.RunImageMetadata{
 					TopLayer:  "some-top-layer",
 					Reference: "",
 				},

diff --git a/internal/builder/lifecycle.go b/internal/builder/lifecycle.go
@@ -14,7 +14,7 @@ import (
 
 // A snapshot of the latest tested lifecycle version values
 const (
-	DefaultLifecycleVersion    = "0.10.2"
+	DefaultLifecycleVersion    = "0.11.3"
 	DefaultBuildpackAPIVersion = "0.2"
 )
 

diff --git a/internal/builder/testmocks/mock_lifecycle.go b/internal/builder/testmocks/mock_lifecycle.go