Finish dist spec and build plan changes

Signed-off-by: Stephen Levine <stephen.levine@gmail.com>
buildpacks · Jul 9, 2019 · decb68d · decb68d
1 parent 3eab338
commit decb68d
Show file tree

Hide file tree

Showing 22 changed files with 368 additions and 348 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,7 @@
+export GO111MODULE = on
+
 GOCMD=go
-GOENV=GO111MODULE=on GOOS=linux GOARCH=amd64 CGO_ENABLED=0
+GOENV=GOOS=linux GOARCH=amd64 CGO_ENABLED=0
 GOBUILD=$(GOCMD) build -mod=vendor
 GOTEST=$(GOCMD) test -mod=vendor
 LIFECYCLE_VERSION?=dev

diff --git a/analyzer.go b/analyzer.go
@@ -11,7 +11,7 @@ import (
 )
 
 type Analyzer struct {
-	Buildpacks []*Buildpack
+	Buildpacks []Buildpack
 	AppDir     string
 	LayersDir  string
 	In         []byte
@@ -26,7 +26,7 @@ func (a *Analyzer) Analyze(image imgutil.Image) error {
 		return err
 	}
 	for _, buildpack := range a.Buildpacks {
-		cache, err := readBuildpackLayersDir(a.LayersDir, *buildpack)
+		cache, err := readBuildpackLayersDir(a.LayersDir, buildpack)
 		if err != nil {
 			return err
 		}

diff --git a/analyzer_test.go b/analyzer_test.go
@@ -45,7 +45,7 @@ func testAnalyzer(t *testing.T, when spec.G, it spec.S) {
 
 		stdout, stderr = &bytes.Buffer{}, &bytes.Buffer{}
 		analyzer = &lifecycle.Analyzer{
-			Buildpacks: []*lifecycle.Buildpack{{ID: "metdata.buildpack"}, {ID: "no.cache.buildpack"}, {ID: "no.metadata.buildpack"}},
+			Buildpacks: []lifecycle.Buildpack{{ID: "metdata.buildpack"}, {ID: "no.cache.buildpack"}, {ID: "no.metadata.buildpack"}},
 			AppDir:     appDir,
 			LayersDir:  layerDir,
 			Out:        log.New(stdout, "", 0),
@@ -165,7 +165,7 @@ func testAnalyzer(t *testing.T, when spec.G, it spec.S) {
 				})
 
 				it("should only write layer TOML files that correspond to detected buildpacks", func() {
-					analyzer.Buildpacks = []*lifecycle.Buildpack{{ID: "no.cache.buildpack"}}
+					analyzer.Buildpacks = []lifecycle.Buildpack{{ID: "no.cache.buildpack"}}
 
 					if err := analyzer.Analyze(image); err != nil {
 						t.Fatalf("Error: %s\n", err)

diff --git a/bin/format b/bin/format
diff --git a/builder.go b/builder.go
@@ -94,8 +94,7 @@ func (b *Builder) Build() (*BuildMetadata, error) {
 			return nil, err
 		}
 		cmd := exec.Command(filepath.Join(bpInfo.Path, "bin", "build"), bpLayersDir, platformDir, bpPlanPath)
-		cmd.Env = append(b.Env.List(), "BP_ID="+bpInfo.ID)
-		cmd.Env = append(os.Environ(),
+		cmd.Env = append(b.Env.List(),
 			"BP_ID="+bpInfo.ID,
 			"BP_VERSION="+bpInfo.Version,
 			"BP_PATH="+bpInfo.Path,
@@ -148,6 +147,7 @@ func (p DetectPlan) toBuild(bp Buildpack) buildPlan {
 	return buildPlan{Entries: out}
 }
 
+// TODO: ensure at least one claimed entry of each name is provided by the BP
 func (p DetectPlan) filter(bp Buildpack, plan buildPlan) (DetectPlan, []BOMEntry) {
 	var out []DetectPlanEntry
 	for _, entry := range p.Entries {