Fix inspect-buildpack command when docker: URLs are passed to it

Signed-off-by: Joe Kutner <[email protected]>
buildpacks · Jan 13, 2021 · e0f6c50 · e0f6c50
1 parent c4f5f3e
commit e0f6c50
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/inspect_buildpack.go b/inspect_buildpack.go
@@ -108,7 +108,8 @@ func metadataFromArchive(downloader Downloader, path string) (buildpackMd buildp
 }
 
 func metadataFromImage(client *Client, name string, daemon bool) (buildpackMd buildpackage.Metadata, layersMd dist.BuildpackLayers, err error) {
-	img, err := client.imageFetcher.Fetch(context.Background(), name, daemon, config.PullNever)
+	imageName := buildpack.ParsePackageLocator(name)
+	img, err := client.imageFetcher.Fetch(context.Background(), imageName, daemon, config.PullNever)
 	if err != nil {
 		return buildpackage.Metadata{}, dist.BuildpackLayers{}, err
 	}

diff --git a/inspect_buildpack_test.go b/inspect_buildpack_test.go
@@ -424,9 +424,9 @@ func testInspectBuildpack(t *testing.T, when spec.G, it spec.S) {
 					it.Before(func() {
 						expectedInfo.Location = buildpack.PackageLocator
 						if useDaemon {
-							mockImageFetcher.EXPECT().Fetch(gomock.Any(), "docker://some/buildpack", true, config.PullNever).Return(buildpackImage, nil)
+							mockImageFetcher.EXPECT().Fetch(gomock.Any(), "some/buildpack", true, config.PullNever).Return(buildpackImage, nil)
 						} else {
-							mockImageFetcher.EXPECT().Fetch(gomock.Any(), "docker://some/buildpack", false, config.PullNever).Return(buildpackImage, nil)
+							mockImageFetcher.EXPECT().Fetch(gomock.Any(), "some/buildpack", false, config.PullNever).Return(buildpackImage, nil)
 						}
 					})
 
@@ -460,7 +460,7 @@ func testInspectBuildpack(t *testing.T, when spec.G, it spec.S) {
 		when("buildpack image", func() {
 			when("unable to fetch buildpack image", func() {
 				it.Before(func() {
-					mockImageFetcher.EXPECT().Fetch(gomock.Any(), "docker://missing/buildpack", true, config.PullNever).Return(nil, errors.Wrapf(image.ErrNotFound, "big bad error"))
+					mockImageFetcher.EXPECT().Fetch(gomock.Any(), "missing/buildpack", true, config.PullNever).Return(nil, errors.Wrapf(image.ErrNotFound, "big bad error"))
 				})
 				it("returns an ErrNotFound error", func() {
 					inspectOptions := pack.InspectBuildpackOptions{
@@ -476,7 +476,7 @@ func testInspectBuildpack(t *testing.T, when spec.G, it spec.S) {
 				it.Before(func() {
 					fakeImage := fakes.NewImage("empty", "", nil)
 					h.AssertNil(t, fakeImage.SetLabel(dist.BuildpackLayersLabel, ":::"))
-					mockImageFetcher.EXPECT().Fetch(gomock.Any(), "docker://missing-metadata/buildpack", true, config.PullNever).Return(fakeImage, nil)
+					mockImageFetcher.EXPECT().Fetch(gomock.Any(), "missing-metadata/buildpack", true, config.PullNever).Return(fakeImage, nil)
 				})
 				it("returns an error", func() {
 					inspectOptions := pack.InspectBuildpackOptions{