Dockerfiles phase 1 (detect changes)

acceptance/detector_test.go

@@ -96,7 +96,7 @@ func testDetector(t *testing.T, when spec.G, it spec.S) {
 			)
 			output, err := command.CombinedOutput()
 			h.AssertNotNil(t, err)
-			expected := "failed to read buildpack order file"
+			expected := "failed to initialize detector: reading buildpack order file"
 			h.AssertStringContains(t, string(output), expected)
 		})
 	})
@@ -290,7 +290,7 @@ func testDetector(t *testing.T, when spec.G, it spec.S) {
 					"-order=/custom/order.toml")
 				output, err := command.CombinedOutput()
 				h.AssertNotNil(t, err)
-				expected := "failed to read buildpack order file: open /custom/order.toml: no such file or directory"
+				expected := "failed to initialize detector: reading buildpack order file: open /custom/order.toml: no such file or directory"
 				h.AssertStringContains(t, string(output), expected)
 			})
 		})
@@ -435,13 +435,63 @@ func testDetector(t *testing.T, when spec.G, it spec.S) {
 						"--rm", detectImage)
 					output, err := command.CombinedOutput()
 					h.AssertNotNil(t, err)
-					expected := "failed to read buildpack order file: open /cnb/order.toml: no such file or directory"
+					expected := "failed to initialize detector: reading buildpack order file: open /cnb/order.toml: no such file or directory"
 					h.AssertStringContains(t, string(output), expected)
 				})
 			})
 		})
 	})
 
+	when("-order contains extensions", func() {
+		var containerName, copyDir, orderPath string
+
+		it.Before(func() {
+			containerName = "test-container-" + h.RandString(10)
+			var err error
+			copyDir, err = ioutil.TempDir("", "test-docker-copy-")
+			h.AssertNil(t, err)
+			orderPath, err = filepath.Abs(filepath.Join("testdata", "detector", "container", "cnb", "orders", "order_with_ext.toml"))
+			h.AssertNil(t, err)
+		})
+
+		it.After(func() {
+			if h.DockerContainerExists(t, containerName) {
+				h.Run(t, exec.Command("docker", "rm", containerName))
+			}
+			os.RemoveAll(copyDir)
+		})
+
+		it("processes the provided order.toml", func() {
+			h.DockerRunAndCopy(t,
+				containerName,
+				copyDir,
+				"/layers",
+				detectImage,
+				h.WithFlags(
+					"--user", userID,
+					"--volume", orderPath+":/layers/order.toml",
+					"--env", "CNB_PLATFORM_API="+latestPlatformAPI,
+				),
+				h.WithArgs(
+					"-extensions=/cnb/extensions",
+					"-log-level=debug",
+				),
+			)
+
+			// check group.toml
+			tempGroupToml := filepath.Join(copyDir, "layers", "group.toml")
+			var buildpackGroup buildpack.Group
+			_, err := toml.DecodeFile(tempGroupToml, &buildpackGroup)
+			h.AssertNil(t, err)
+			h.AssertEq(t, buildpackGroup.Group[0].ID, "simple_extension")
+			h.AssertEq(t, buildpackGroup.Group[0].Version, "simple_extension_version")
+			h.AssertEq(t, buildpackGroup.Group[0].Extension, true)
+			h.AssertEq(t, buildpackGroup.Group[1].ID, "buildpack_for_ext")
+			h.AssertEq(t, buildpackGroup.Group[1].Version, "buildpack_for_ext_version")
+			h.AssertEq(t, buildpackGroup.Group[1].Extension, false)
+		})
+	})
+
 	when("platform api < 0.6", func() {
 		when("no buildpack group passed detection", func() {
 			it("errors", func() {

acceptance/testdata/detector/container/cnb/buildpacks/buildpack_for_ext/buildpack_for_ext_version/bin/detect

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+plan_path=$2
+
+cat >> "${plan_path}" <<EOL
+[[requires]]
+name = "some_requirement"
+[requires.metadata]
+version = "some_version"     # Optional
+some_metadata_key = "some_metadata_val" # Optional
+EOL

acceptance/testdata/detector/container/cnb/buildpacks/buildpack_for_ext/buildpack_for_ext_version/buildpack.toml

@@ -0,0 +1,5 @@
+api = "0.3"
+[buildpack]
+    id = "buildpack_for_ext"
+    version = "buildpack_for_ext_version"
+    name = "Buildpack for Extensions"

acceptance/testdata/detector/container/cnb/extensions/simple_extension/simple_extension_version/bin/detect

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+plan_path=$2
+
+cat >> "${plan_path}" <<EOL
+[[provides]]
+name = "some_requirement"
+EOL

acceptance/testdata/detector/container/cnb/extensions/simple_extension/simple_extension_version/extension.toml

@@ -0,0 +1,5 @@
+api = "0.9"
+[extension]
+    id = "simple_extension"
+    version = "simple_extension_version"
+    name = "Simple Extension"

acceptance/testdata/detector/container/cnb/orders/order_with_ext.toml

@@ -0,0 +1,9 @@
+[[order]]
+  [[order.group]]
+    id = "buildpack_for_ext"
+    version = "buildpack_for_ext_version"
+
+[[order-ext]]
+  [[order-ext.group]]
+    id = "simple_extension"
+    version = "simple_extension_version"

analyzer.go

@@ -12,21 +12,26 @@ import (
 	"github.com/buildpacks/lifecycle/platform"
 )
 
-type Platform interface {
-	API() *api.Version
-}
-
 type AnalyzerFactory struct {
 	platformAPI     *api.Version
+	apiVerifier     APIVerifier
 	cacheHandler    CacheHandler
 	configHandler   ConfigHandler
 	imageHandler    ImageHandler
 	registryHandler RegistryHandler
 }
 
-func NewAnalyzerFactory(platformAPI *api.Version, cacheHandler CacheHandler, configHandler ConfigHandler, imageHandler ImageHandler, registryHandler RegistryHandler) *AnalyzerFactory {
+func NewAnalyzerFactory(
+	platformAPI *api.Version,
+	apiVerifier APIVerifier,
+	cacheHandler CacheHandler,
+	configHandler ConfigHandler,
+	imageHandler ImageHandler,
+	registryHandler RegistryHandler,
+) *AnalyzerFactory {
 	return &AnalyzerFactory{
 		platformAPI:     platformAPI,
+		apiVerifier:     apiVerifier,
 		cacheHandler:    cacheHandler,
 		configHandler:   configHandler,
 		imageHandler:    imageHandler,
@@ -41,7 +46,7 @@ type Analyzer struct {
 	SBOMRestorer  layer.SBOMRestorer
 
 	// Platform API < 0.7
-	Buildpacks            []buildpack.GroupBuildpack
+	Buildpacks            []buildpack.GroupElement
 	Cache                 Cache
 	LayerMetadataRestorer layer.MetadataRestorer
 	RestoresLayerMetadata bool
@@ -128,8 +133,10 @@ func (f *AnalyzerFactory) setBuildpacks(analyzer *Analyzer, group buildpack.Grou
 		return nil
 	}
 	var err error
-	analyzer.Buildpacks, err = f.configHandler.ReadGroup(path)
-	return err
+	if analyzer.Buildpacks, err = f.configHandler.ReadGroup(path); err != nil {
+		return err
+	}
+	return f.apiVerifier.VerifyBuildpackAPIsForGroup(analyzer.Buildpacks)
 }
 
 func (f *AnalyzerFactory) setCache(analyzer *Analyzer, imageRef string, dir string) error {

analyzer_test.go

@@ -38,6 +38,7 @@ func testAnalyzerFactory(t *testing.T, when spec.G, it spec.S) {
 	when("#NewAnalyzer", func() {
 		var (
 			analyzerFactory     *lifecycle.AnalyzerFactory
+			fakeAPIVerifier     *testmock.MockAPIVerifier
 			fakeCacheHandler    *testmock.MockCacheHandler
 			fakeConfigHandler   *testmock.MockConfigHandler
 			fakeImageHandler    *testmock.MockImageHandler
@@ -49,6 +50,7 @@ func testAnalyzerFactory(t *testing.T, when spec.G, it spec.S) {
 
 		it.Before(func() {
 			mockController = gomock.NewController(t)
+			fakeAPIVerifier = testmock.NewMockAPIVerifier(mockController)
 			fakeCacheHandler = testmock.NewMockCacheHandler(mockController)
 			fakeConfigHandler = testmock.NewMockConfigHandler(mockController)
 			fakeImageHandler = testmock.NewMockImageHandler(mockController)
@@ -66,13 +68,7 @@ func testAnalyzerFactory(t *testing.T, when spec.G, it spec.S) {
 
 		when("platform api >= 0.8", func() {
 			it.Before(func() {
-				analyzerFactory = lifecycle.NewAnalyzerFactory(
-					api.Platform.Latest(),
-					fakeCacheHandler,
-					fakeConfigHandler,
-					fakeImageHandler,
-					fakeRegistryHandler,
-				)
+				analyzerFactory = lifecycle.NewAnalyzerFactory(api.Platform.Latest(), fakeAPIVerifier, fakeCacheHandler, fakeConfigHandler, fakeImageHandler, fakeRegistryHandler)
 			})
 
 			it("configures the analyzer", func() {
@@ -164,13 +160,7 @@ func testAnalyzerFactory(t *testing.T, when spec.G, it spec.S) {
 
 		when("platform api = 0.7", func() {
 			it.Before(func() {
-				analyzerFactory = lifecycle.NewAnalyzerFactory(
-					api.MustParse("0.7"),
-					fakeCacheHandler,
-					fakeConfigHandler,
-					fakeImageHandler,
-					fakeRegistryHandler,
-				)
+				analyzerFactory = lifecycle.NewAnalyzerFactory(api.MustParse("0.7"), fakeAPIVerifier, fakeCacheHandler, fakeConfigHandler, fakeImageHandler, fakeRegistryHandler)
 			})
 
 			it("configures the analyzer", func() {
@@ -235,13 +225,7 @@ func testAnalyzerFactory(t *testing.T, when spec.G, it spec.S) {
 
 		when("platform api < 0.7", func() {
 			it.Before(func() {
-				analyzerFactory = lifecycle.NewAnalyzerFactory(
-					api.MustParse("0.6"),
-					fakeCacheHandler,
-					fakeConfigHandler,
-					fakeImageHandler,
-					fakeRegistryHandler,
-				)
+				analyzerFactory = lifecycle.NewAnalyzerFactory(api.MustParse("0.6"), fakeAPIVerifier, fakeCacheHandler, fakeConfigHandler, fakeImageHandler, fakeRegistryHandler)
 			})
 
 			it("configures the analyzer", func() {
@@ -251,7 +235,9 @@ func testAnalyzerFactory(t *testing.T, when spec.G, it spec.S) {
 				t.Log("does not ensure registry access")
 
 				t.Log("processes group")
-				fakeConfigHandler.EXPECT().ReadGroup("some-legacy-group-path")
+				group := []buildpack.GroupElement{{ID: "some-buildpack-id", Version: "some-buildpack-version", API: "0.2"}}
+				fakeConfigHandler.EXPECT().ReadGroup("some-legacy-group-path").Return(group, nil)
+				fakeAPIVerifier.EXPECT().VerifyBuildpackAPIsForGroup(group)
 
 				t.Log("processes cache")
 				fakeCacheHandler.EXPECT().InitCache("some-cache-image-ref", "some-legacy-cache-dir")
@@ -291,7 +277,9 @@ func testAnalyzerFactory(t *testing.T, when spec.G, it spec.S) {
 					t.Log("does not ensure registry access")
 
 					t.Log("processes group")
-					fakeConfigHandler.EXPECT().ReadGroup("some-legacy-group-path")
+					group := []buildpack.GroupElement{{ID: "some-buildpack-id", Version: "some-buildpack-version", API: "0.2"}}
+					fakeConfigHandler.EXPECT().ReadGroup("some-legacy-group-path").Return(group, nil)
+					fakeAPIVerifier.EXPECT().VerifyBuildpackAPIsForGroup(group)
 
 					t.Log("processes cache")
 					fakeCacheHandler.EXPECT().InitCache("some-cache-image-ref", "some-legacy-cache-dir")
@@ -319,7 +307,8 @@ func testAnalyzerFactory(t *testing.T, when spec.G, it spec.S) {
 					fakeImageHandler.EXPECT().Docker()
 					fakeImageHandler.EXPECT().InitImage(gomock.Any())
 
-					providedGroup := buildpack.Group{Group: []buildpack.GroupBuildpack{{ID: "some-buildpack-id"}}}
+					providedGroup := buildpack.Group{Group: []buildpack.GroupElement{{ID: "some-buildpack-id"}}}
+
 					analyzer, err := analyzerFactory.NewAnalyzer([]string{"some-additional-tag"}, "some-cache-image-ref", "some-launch-cache-dir", "some-layers-dir", "some-legacy-cache-dir", providedGroup, "some-legacy-group-path", "some-output-image-ref", "some-previous-image-ref", "some-run-image-ref", false, nil)
 					h.AssertNil(t, err)
 
@@ -375,7 +364,7 @@ func testAnalyzer(platformAPI string) func(t *testing.T, when spec.G, it spec.S)
 				PreviousImage: image,
 				Logger:        &discardLogger,
 				SBOMRestorer:  sbomRestorer,
-				Buildpacks: []buildpack.GroupBuildpack{
+				Buildpacks: []buildpack.GroupElement{
 					{ID: "metadata.buildpack", API: api.Buildpack.Latest().String()},
 					{ID: "no.cache.buildpack", API: api.Buildpack.Latest().String()},
 					{ID: "no.metadata.buildpack", API: api.Buildpack.Latest().String()},
@@ -444,7 +433,7 @@ func testAnalyzer(platformAPI string) func(t *testing.T, when spec.G, it spec.S)
 						h.AssertNil(t, testCache.SetMetadata(expectedCacheMetadata))
 						h.AssertNil(t, testCache.Commit())
 
-						analyzer.Buildpacks = append(analyzer.Buildpacks, buildpack.GroupBuildpack{ID: "escaped/buildpack/id", API: api.Buildpack.Latest().String()})
+						analyzer.Buildpacks = append(analyzer.Buildpacks, buildpack.GroupElement{ID: "escaped/buildpack/id", API: api.Buildpack.Latest().String()})
 						expectRestoresLayerMetadataIfSupported()
 					})
 

api/apis.go

@@ -8,8 +8,8 @@ import (
 )
 
 var (
-	Platform  = newApisMustParse([]string{"0.3", "0.4", "0.5", "0.6", "0.7", "0.8", "0.9"}, nil)
-	Buildpack = newApisMustParse([]string{"0.2", "0.3", "0.4", "0.5", "0.6", "0.7", "0.8"}, nil)
+	Platform  = newApisMustParse([]string{"0.3", "0.4", "0.5", "0.6", "0.7", "0.8", "0.9", "0.10"}, nil)
+	Buildpack = newApisMustParse([]string{"0.2", "0.3", "0.4", "0.5", "0.6", "0.7", "0.8", "0.9"}, nil)
 )
 
 type APIs struct {

auth/keychain.go

@@ -106,7 +106,7 @@ func (p *providedAuth) Authorization() (*authn.AuthConfig, error) {
 
 // NewResolvedKeychain resolves credentials for the given images from the given keychain and returns a new keychain
 // that stores the pre-resolved credentials in memory and returns them on demand. This is useful in cases where the
-// backing credential store may become inaccessible in the the future.
+// backing credential store may become inaccessible in the future.
 func NewResolvedKeychain(keychain authn.Keychain, images ...string) authn.Keychain {
 	return &ResolvedKeychain{
 		AuthConfigs: buildAuthConfigs(keychain, images...),

builder.go

@@ -19,33 +19,32 @@ import (
 	"github.com/buildpacks/lifecycle/platform"
 )
 
+type Platform interface {
+	API() *api.Version
+}
+
 type BuildEnv interface {
 	AddRootDir(baseDir string) error
 	AddEnvDir(envDir string, defaultAction env.ActionType) error
 	WithPlatform(platformDir string) ([]string, error)
 	List() []string
 }
 
-type BuildpackStore interface {
-	Lookup(bpID, bpVersion string) (buildpack.Buildpack, error)
-}
-
-type Buildpack interface {
-	Build(bpPlan buildpack.Plan, config buildpack.BuildConfig, bpEnv buildpack.BuildEnv) (buildpack.BuildResult, error)
-	ConfigFile() *buildpack.Descriptor
-	Detect(config *buildpack.DetectConfig, bpEnv buildpack.BuildEnv) buildpack.DetectRun
+type DirStore interface {
+	LookupBp(bpID, bpVersion string) (buildpack.BuildModule, error)
+	LookupExt(bpID, bpVersion string) (buildpack.BuildModule, error)
 }
 
 type Builder struct {
-	AppDir         string
-	LayersDir      string
-	PlatformDir    string
-	Platform       Platform
-	Group          buildpack.Group
-	Plan           platform.BuildPlan
-	Out, Err       io.Writer
-	Logger         Logger
-	BuildpackStore BuildpackStore
+	AppDir      string
+	LayersDir   string
+	PlatformDir string
+	Platform    Platform
+	Group       buildpack.Group
+	Plan        platform.BuildPlan
+	Out, Err    io.Writer
+	Logger      Logger
+	DirStore    DirStore
 }
 
 func (b *Builder) Build() (*platform.BuildMetadata, error) {
@@ -75,7 +74,7 @@ func (b *Builder) Build() (*platform.BuildMetadata, error) {
 		b.Logger.Debugf("Running build for buildpack %s", bp)
 
 		b.Logger.Debug("Looking up buildpack")
-		bpTOML, err := b.BuildpackStore.Lookup(bp.ID, bp.Version)
+		bpTOML, err := b.DirStore.LookupBp(bp.ID, bp.Version)
 		if err != nil {
 			return nil, err
 		}