Merge branch 'main' into feature/debug-env

.github/dependabot.yml

@@ -6,10 +6,18 @@ updates:
     schedule:
       # Check for updates to GitHub Actions every weekday
       interval: "daily"
+    labels:
+      - "dependencies"
+      - "go"
+      - "type/chore"
 
   # Set update schedule for GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       # Check for updates to GitHub Actions every weekday
       interval: "daily"
+    labels:
+      - "dependencies"
+      - "github_actions"
+      - "type/chore"

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-20201022190551-6525b8cdcdd0
-	github.com/buildpacks/lifecycle v0.9.3
+	github.com/buildpacks/imgutil v0.0.0-20201211223552-8581300fe2b2
+	github.com/buildpacks/lifecycle v0.10.1
 	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
@@ -15,15 +15,14 @@ require (
 	github.com/golang/mock v1.4.4
 	github.com/golang/protobuf v1.4.3 // indirect
 	github.com/google/go-cmp v0.5.4
-	github.com/google/go-containerregistry v0.2.1
+	github.com/google/go-containerregistry v0.3.0
 	github.com/google/go-github/v30 v30.1.0
 	github.com/heroku/color v0.0.6
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/mitchellh/ioprogress v0.0.0-20180201004757-6a23b12fa88e
 	github.com/moby/sys/mount v0.2.0 // indirect
 	github.com/moby/term v0.0.0-20201110203204-bea5bbe245bf // indirect
 	github.com/onsi/gomega v1.10.4
-	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.1
 	github.com/opencontainers/runc v0.1.1 // indirect
 	github.com/opencontainers/selinux v1.6.0 // indirect
@@ -39,7 +38,6 @@ require (
 	golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
 	golang.org/x/mod v0.4.0
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
-	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 // indirect
 	google.golang.org/genproto v0.0.0-20201022181438-0ff5f38871d5 // indirect
 	google.golang.org/grpc v1.33.1 // indirect
 	google.golang.org/protobuf v1.25.0 // indirect

inspect_image.go

@@ -23,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.Buildpack
+	Buildpacks []lifecycle.GroupBuildpack
 
 	// Base includes two references to the run image,
 	// - the Run Image ID,

internal/inspectimage/info_display.go

@@ -126,7 +126,7 @@ func displayMirrors(info *pack.ImageInfo, generalInfo GeneralInfo) []RunImageMir
 	return result
 }
 
-func displayBuildpacks(buildpacks []lifecycle.Buildpack) []dist.BuildpackInfo {
+func displayBuildpacks(buildpacks []lifecycle.GroupBuildpack) []dist.BuildpackInfo {
 	result := []dist.BuildpackInfo{}
 	for _, buildpack := range buildpacks {
 		result = append(result, dist.BuildpackInfo{

internal/inspectimage/writer/bom_json_test.go

@@ -106,7 +106,7 @@ func testJSONBOM(t *testing.T, when spec.G, it spec.S) {
 							},
 						},
 					},
-					Buildpack: lifecycle.Buildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
+					Buildpack: lifecycle.GroupBuildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
 				}}}
 
 			localInfo = &pack.ImageInfo{
@@ -121,7 +121,7 @@ func testJSONBOM(t *testing.T, when spec.G, it spec.S) {
 							},
 						},
 					},
-					Buildpack: lifecycle.Buildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
+					Buildpack: lifecycle.GroupBuildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
 				}},
 			}
 

internal/inspectimage/writer/bom_yaml_test.go

@@ -92,7 +92,7 @@ remote:
 							},
 						},
 					},
-					Buildpack: lifecycle.Buildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
+					Buildpack: lifecycle.GroupBuildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
 				}}}
 
 			localInfo = &pack.ImageInfo{
@@ -107,7 +107,7 @@ remote:
 							},
 						},
 					},
-					Buildpack: lifecycle.Buildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
+					Buildpack: lifecycle.GroupBuildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
 				}},
 			}
 

internal/inspectimage/writer/human_readable_test.go

@@ -98,7 +98,7 @@ Processes:
 
 			remoteInfo = &pack.ImageInfo{
 				StackID: "test.stack.id.remote",
-				Buildpacks: []lifecycle.Buildpack{
+				Buildpacks: []lifecycle.GroupBuildpack{
 					{ID: "test.bp.one.remote", Version: "1.0.0"},
 					{ID: "test.bp.two.remote", Version: "2.0.0"},
 				},
@@ -129,7 +129,7 @@ Processes:
 							},
 						},
 					},
-					Buildpack: lifecycle.Buildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
+					Buildpack: lifecycle.GroupBuildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
 				}},
 				Processes: pack.ProcessDetails{
 					DefaultProcess: &launch.Process{
@@ -151,7 +151,7 @@ Processes:
 
 			localInfo = &pack.ImageInfo{
 				StackID: "test.stack.id.local",
-				Buildpacks: []lifecycle.Buildpack{
+				Buildpacks: []lifecycle.GroupBuildpack{
 					{ID: "test.bp.one.local", Version: "1.0.0"},
 					{ID: "test.bp.two.local", Version: "2.0.0"},
 				},
@@ -176,7 +176,7 @@ Processes:
 							},
 						},
 					},
-					Buildpack: lifecycle.Buildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
+					Buildpack: lifecycle.GroupBuildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
 				}},
 				Processes: pack.ProcessDetails{
 					DefaultProcess: &launch.Process{
@@ -293,7 +293,7 @@ Processes:
 
 			when("buildpack metadata is missing", func() {
 				it.Before(func() {
-					remoteInfo.Buildpacks = []lifecycle.Buildpack{}
+					remoteInfo.Buildpacks = []lifecycle.GroupBuildpack{}
 				})
 				it("displays a message indicating missing metadata", func() {
 					sharedImageInfo := inspectimage.GeneralInfo{

internal/inspectimage/writer/json_test.go

@@ -164,7 +164,7 @@ func testJSON(t *testing.T, when spec.G, it spec.S) {
 
 			remoteInfo = &pack.ImageInfo{
 				StackID: "test.stack.id.remote",
-				Buildpacks: []lifecycle.Buildpack{
+				Buildpacks: []lifecycle.GroupBuildpack{
 					{ID: "test.bp.one.remote", Version: "1.0.0"},
 					{ID: "test.bp.two.remote", Version: "2.0.0"},
 				},
@@ -195,7 +195,7 @@ func testJSON(t *testing.T, when spec.G, it spec.S) {
 							},
 						},
 					},
-					Buildpack: lifecycle.Buildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
+					Buildpack: lifecycle.GroupBuildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
 				}},
 				Processes: pack.ProcessDetails{
 					DefaultProcess: &launch.Process{
@@ -217,7 +217,7 @@ func testJSON(t *testing.T, when spec.G, it spec.S) {
 
 			localInfo = &pack.ImageInfo{
 				StackID: "test.stack.id.local",
-				Buildpacks: []lifecycle.Buildpack{
+				Buildpacks: []lifecycle.GroupBuildpack{
 					{ID: "test.bp.one.local", Version: "1.0.0"},
 					{ID: "test.bp.two.local", Version: "2.0.0"},
 				},
@@ -242,7 +242,7 @@ func testJSON(t *testing.T, when spec.G, it spec.S) {
 							},
 						},
 					},
-					Buildpack: lifecycle.Buildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
+					Buildpack: lifecycle.GroupBuildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
 				}},
 				Processes: pack.ProcessDetails{
 					DefaultProcess: &launch.Process{

internal/inspectimage/writer/toml_test.go

@@ -150,7 +150,7 @@ args = [
 
 			remoteInfo = &pack.ImageInfo{
 				StackID: "test.stack.id.remote",
-				Buildpacks: []lifecycle.Buildpack{
+				Buildpacks: []lifecycle.GroupBuildpack{
 					{ID: "test.bp.one.remote", Version: "1.0.0"},
 					{ID: "test.bp.two.remote", Version: "2.0.0"},
 				},
@@ -181,7 +181,7 @@ args = [
 							},
 						},
 					},
-					Buildpack: lifecycle.Buildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
+					Buildpack: lifecycle.GroupBuildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
 				}},
 				Processes: pack.ProcessDetails{
 					DefaultProcess: &launch.Process{
@@ -203,7 +203,7 @@ args = [
 
 			localInfo = &pack.ImageInfo{
 				StackID: "test.stack.id.local",
-				Buildpacks: []lifecycle.Buildpack{
+				Buildpacks: []lifecycle.GroupBuildpack{
 					{ID: "test.bp.one.local", Version: "1.0.0"},
 					{ID: "test.bp.two.local", Version: "2.0.0"},
 				},
@@ -228,7 +228,7 @@ args = [
 							},
 						},
 					},
-					Buildpack: lifecycle.Buildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
+					Buildpack: lifecycle.GroupBuildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
 				}},
 				Processes: pack.ProcessDetails{
 					DefaultProcess: &launch.Process{

internal/inspectimage/writer/yaml_test.go

@@ -118,7 +118,7 @@ remote_info:
 
 			remoteInfo = &pack.ImageInfo{
 				StackID: "test.stack.id.remote",
-				Buildpacks: []lifecycle.Buildpack{
+				Buildpacks: []lifecycle.GroupBuildpack{
 					{ID: "test.bp.one.remote", Version: "1.0.0"},
 					{ID: "test.bp.two.remote", Version: "2.0.0"},
 				},
@@ -149,7 +149,7 @@ remote_info:
 							},
 						},
 					},
-					Buildpack: lifecycle.Buildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
+					Buildpack: lifecycle.GroupBuildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
 				}},
 				Processes: pack.ProcessDetails{
 					DefaultProcess: &launch.Process{
@@ -171,7 +171,7 @@ remote_info:
 
 			localInfo = &pack.ImageInfo{
 				StackID: "test.stack.id.local",
-				Buildpacks: []lifecycle.Buildpack{
+				Buildpacks: []lifecycle.GroupBuildpack{
 					{ID: "test.bp.one.local", Version: "1.0.0"},
 					{ID: "test.bp.two.local", Version: "2.0.0"},
 				},
@@ -196,7 +196,7 @@ remote_info:
 							},
 						},
 					},
-					Buildpack: lifecycle.Buildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
+					Buildpack: lifecycle.GroupBuildpack{ID: "test.bp.one.remote", Version: "1.0.0"},
 				}},
 				Processes: pack.ProcessDetails{
 					DefaultProcess: &launch.Process{