Adds basic compatibility with buildpacks/lifecycle#149

Resolves #243

Signed-off-by: Andrew Meyer <ameyer@pivotal.io>
Signed-off-by: Javier Romero <jromero@pivotal.io>

Makefile

@@ -6,6 +6,7 @@ PACK_BIN?=pack
 PACKAGE_BASE=github.com/buildpack/pack
 PACKAGES:=$(shell $(GOCMD) list -mod=vendor ./... | grep -v /testdata/)
 SRC:=$(shell find . -type f -name '*.go' -not -path "./vendor/*")
+ARCHIVE_NAME=pack-$(PACK_VERSION)
 
 all: clean verify test build
 
@@ -14,6 +15,9 @@ build:
 	mkdir -p ./out
 	$(GOENV) $(GOCMD) build -mod=vendor -ldflags "-X 'main.Version=${PACK_VERSION}'" -o ./out/$(PACK_BIN) -a ./cmd/pack
 
+package:
+	tar czf ./out/$(ARCHIVE_NAME).tgz -C out/ pack
+
 install-goimports:
 	@echo "> Installing goimports..."
 	$(GOCMD) install -mod=vendor golang.org/x/tools/cmd/goimports
@@ -31,7 +35,7 @@ test: unit acceptance
 unit: format vet
 	@echo "> Running unit/integration tests..."
 	$(GOCMD) test -mod=vendor -v -count=1 -parallel=1 -timeout=0 ./...
-	
+
 acceptance: format vet
 	@echo "> Running acceptance tests..."
 	$(GOCMD) test -mod=vendor -v -count=1 -parallel=1 -timeout=0 -tags=acceptance ./acceptance

acceptance/acceptance_test.go

@@ -265,7 +265,7 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 					var notBuilderTgz string
 
 					it.Before(func() {
-						notBuilderTgz = h.CreateTgz(t, filepath.Join("testdata", "mock_buildpacks", "not-in-builder-buildpack"), "./", 0766)
+						notBuilderTgz = h.CreateTgz(t, filepath.Join(testBuildpacksDir(), "not-in-builder-buildpack"), "./", 0766)
 					})
 
 					it.After(func() {
@@ -276,21 +276,32 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 						cmd := packCmd(
 							"build", repoName,
 							"-p", filepath.Join("testdata", "mock_app"),
+
+							// tgz not in builder
 							"--buildpack", notBuilderTgz,
+
+							// with version
 							"--buildpack", "simple/layers@simple-layers-version",
+
+							// without version
 							"--buildpack", "noop.buildpack",
+
+							// latest (for backwards compatibility)
+							"--buildpack", "read/env@latest",
+							"--env", "DETECT_ENV_BUILDPACK=true",
 						)
 						output := h.Run(t, cmd)
 						h.AssertContains(t, output, "NOOP Buildpack")
+						h.AssertContains(t, output, "Read Env Buildpack")
 						h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))
+
 						t.Log("app is runnable")
 						assertMockAppRunsWithOutput(t, repoName,
 							"Local Buildpack Dep Contents",
 							"Launch Dep Contents",
 							"Cached Dep Contents",
 						)
 					})
-
 				})
 
 				when("the argument is directory", func() {
@@ -300,7 +311,7 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 						cmd := packCmd(
 							"build", repoName,
 							"-p", filepath.Join("testdata", "mock_app"),
-							"--buildpack", filepath.Join("testdata", "mock_buildpacks", "not-in-builder-buildpack"),
+							"--buildpack", filepath.Join(testBuildpacksDir(), "not-in-builder-buildpack"),
 						)
 						output := h.Run(t, cmd)
 						h.AssertContains(t, output, fmt.Sprintf("Successfully built image '%s'", repoName))
@@ -313,7 +324,7 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 					var otherStackBuilderTgz string
 
 					it.Before(func() {
-						otherStackBuilderTgz = h.CreateTgz(t, filepath.Join("testdata", "mock_buildpacks", "other-stack-buildpack"), "./", 0766)
+						otherStackBuilderTgz = h.CreateTgz(t, filepath.Join(testBuildpacksDir(), "other-stack-buildpack"), "./", 0766)
 					})
 
 					it.After(func() {
@@ -328,7 +339,7 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 						)
 						txt, err := h.RunE(cmd)
 						h.AssertNotNil(t, err)
-						h.AssertContains(t, txt, "buildpack 'other/stack/bp' version 'other-stack-version' does not support stack 'pack.test.stack'")
+						h.AssertContains(t, txt, "buildpack 'other/stack/bp@other-stack-version' does not support stack 'pack.test.stack'")
 					})
 				})
 			})
@@ -780,57 +791,84 @@ func testAcceptance(t *testing.T, when spec.G, it spec.S) {
 	})
 }
 
+func testBuildpacksDir() string {
+	d := "v1"
+	if lifecycleVersion.GreaterThan(lifecycleV030) {
+		d = "v2"
+	}
+	return filepath.Join("testdata", "mock_buildpacks", d)
+}
+
 func createBuilder(t *testing.T, runImageMirror string) string {
-	t.Log("create builder image")
+	t.Log("Creating builder image...")
 
+	// CREATE TEMP WORKING DIR
 	tmpDir, err := ioutil.TempDir("", "create-test-builder")
 	h.AssertNil(t, err)
 	defer os.RemoveAll(tmpDir)
 
-	h.RecursiveCopy(t, filepath.Join("testdata", "mock_buildpacks"), tmpDir)
+	// DETERMINE LIFECYCLE
+	lifecyclePath, hasLifecyclePath := os.LookupEnv("LIFECYCLE_PATH")
+	if hasLifecyclePath {
+		lifecycleVersion = semver.MustParse("0.0.0")
 
-	buildpacks := []string{
-		"noop-buildpack",
-		"not-in-builder-buildpack",
-		"other-stack-buildpack",
-		"read-env-buildpack",
-		"simple-layers-buildpack",
+		if !filepath.IsAbs(lifecyclePath) {
+			lifecyclePath, err = filepath.Abs(lifecyclePath)
+			h.AssertNil(t, err)
+		}
 	}
 
-	for _, v := range buildpacks {
-		tgz := h.CreateTgz(t, filepath.Join("testdata", "mock_buildpacks", v), "./", 0766)
-		err := os.Rename(tgz, filepath.Join(tmpDir, v+".tgz"))
-		h.AssertNil(t, err)
+	if v, ok := os.LookupEnv("LIFECYCLE_VERSION"); ok {
+		lifecycleVersion = semver.MustParse(v)
 	}
 
+	// DETERMINE TEST DATA
+	t.Log("Using buildpacks from: ", testBuildpacksDir())
+	h.RecursiveCopy(t, testBuildpacksDir(), tmpDir)
+
+	// COPY builder.toml
 	builderConfigFile, err := os.OpenFile(filepath.Join(tmpDir, "builder.toml"), os.O_RDWR|os.O_APPEND, 0666)
 	h.AssertNil(t, err)
 
+	// ADD run-image-mirrors
 	_, err = builderConfigFile.Write([]byte(fmt.Sprintf("run-image-mirrors = [\"%s\"]\n", runImageMirror)))
 	h.AssertNil(t, err)
 
+	// ADD lifecycle
 	_, err = builderConfigFile.Write([]byte("[lifecycle]\n"))
 	h.AssertNil(t, err)
-	if lifecyclePath, ok := os.LookupEnv("LIFECYCLE_PATH"); ok {
-		lifecycleVersion = semver.MustParse("0.0.0")
-		if !filepath.IsAbs(lifecyclePath) {
-			t.Fatal("LIFECYCLE_PATH must be an absolute path")
-		}
+
+	if hasLifecyclePath {
 		t.Logf("Adding lifecycle path '%s' to builder config", lifecyclePath)
 		_, err = builderConfigFile.Write([]byte(fmt.Sprintf("uri = \"%s\"\n", strings.ReplaceAll(lifecyclePath, `\`, `\\`))))
 		h.AssertNil(t, err)
 	}
-	if lcver, ok := os.LookupEnv("LIFECYCLE_VERSION"); ok {
-		lifecycleVersion = semver.MustParse(lcver)
-		t.Logf("Adding lifecycle version '%s' to builder config", lifecycleVersion)
-		_, err = builderConfigFile.Write([]byte(fmt.Sprintf("version = \"%s\"\n", lifecycleVersion.String())))
-		h.AssertNil(t, err)
-	}
+
+	t.Logf("Adding lifecycle version '%s' to builder config", lifecycleVersion)
+	_, err = builderConfigFile.Write([]byte(fmt.Sprintf("version = \"%s\"\n", lifecycleVersion.String())))
+	h.AssertNil(t, err)
 
 	builderConfigFile.Close()
 
+	// PACKAGE BUILDPACKS
+	buildpacks := []string{
+		"noop-buildpack",
+		"not-in-builder-buildpack",
+		"other-stack-buildpack",
+		"read-env-buildpack",
+		"simple-layers-buildpack",
+	}
+
+	for _, v := range buildpacks {
+		tgz := h.CreateTgz(t, filepath.Join(testBuildpacksDir(), v), "./", 0766)
+		err := os.Rename(tgz, filepath.Join(tmpDir, v+".tgz"))
+		h.AssertNil(t, err)
+	}
+
+	// NAME BUILDER
 	builder := registryConfig.RepoName("some-org/" + h.RandString(10))
 
+	// CREATE BUILDER
 	t.Logf("Creating builder. Lifecycle version '%s' will be used.", lifecycleVersion)
 	cmd := exec.Command(packPath, "create-builder", "--no-color", builder, "-b", filepath.Join(tmpDir, "builder.toml"))
 	output := h.Run(t, cmd)
@@ -841,7 +879,7 @@ func createBuilder(t *testing.T, runImageMirror string) string {
 }
 
 func createStack(t *testing.T, dockerCli *client.Client) {
-	t.Log("create stack images")
+	t.Log("Creating stack images...")
 	createStackImage(t, dockerCli, runImage, filepath.Join("testdata", "mock_stack"))
 	h.AssertNil(t, dockerCli.ImageTag(context.Background(), runImage, buildImage))
 	h.AssertNil(t, dockerCli.ImageTag(context.Background(), runImage, runImageMirror))

acceptance/testdata/inspect_builder_output.txt

@@ -13,10 +13,10 @@ Run Images:
   %s
 
 Buildpacks:
-  ID                    VERSION                       LATEST
-  simple/layers         simple-layers-version         false
-  read/env              read-env-version              false
-  noop.buildpack        noop.buildpack.version        true
+  ID                    VERSION
+  simple/layers         simple-layers-version
+  read/env              read-env-version
+  noop.buildpack        noop.buildpack.version
 
 Detection Order:        
   Group #1:              
@@ -36,10 +36,10 @@ Run Images:
   %s
 
 Buildpacks:
-  ID                    VERSION                       LATEST
-  simple/layers         simple-layers-version         false
-  read/env              read-env-version              false
-  noop.buildpack        noop.buildpack.version        true
+  ID                    VERSION
+  simple/layers         simple-layers-version
+  read/env              read-env-version
+  noop.buildpack        noop.buildpack.version
 
 Detection Order:        
   Group #1:              

acceptance/testdata/mock_buildpacks/builder.toml → acceptance/testdata/mock_buildpacks/v1/builder.toml

@@ -12,16 +12,16 @@
   id = "noop.buildpack"
   version = "noop.buildpack.version"
   uri = "noop-buildpack.tgz"
-  latest = true
 
-[[groups]]
-  [[groups.buildpacks]]
-    id = "simple/layers"
-    version = "simple-layers-version"
-  [[groups.buildpacks]]
-    id = "read/env"
-    version = "read-env-version"
-    optional = true
+[[order]]
+[[order.group]]
+  id = "simple/layers"
+  # intentionlly missing version to test support
+
+[[order.group]]
+  id = "read/env"
+  version = "read-env-version"
+  optional = true
 
 [stack]
   id = "pack.test.stack"

acceptance/testdata/mock_buildpacks/v1/noop-buildpack/bin/build

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+echo "---> NOOP Buildpack"

acceptance/testdata/mock_buildpacks/read-env-buildpack/bin/build → acceptance/testdata/mock_buildpacks/v1/read-env-buildpack/bin/build

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-#!/usr/bin/env bash
-
 echo "---> Read Env Buildpack"
 
 set -o errexit

acceptance/testdata/mock_buildpacks/v2/builder.toml

@@ -0,0 +1,30 @@
+[[buildpacks]]
+  id = "simple/layers"
+  version = "simple-layers-version"
+  uri = "simple-layers-buildpack.tgz"
+
+[[buildpacks]]
+  id = "read/env"
+  version = "read-env-version"
+  uri = "read-env-buildpack.tgz"
+
+[[buildpacks]]
+  # intentionally missing id/version as they are optional
+  uri = "noop-buildpack.tgz"
+
+[[order]]
+[[order.group]]
+  id = "simple/layers"
+  # intentionlly missing version to test support
+
+[[order.group]]
+  id = "read/env"
+  version = "read-env-version"
+  optional = true
+
+[stack]
+  id = "pack.test.stack"
+  build-image = "pack-test/build"
+  run-image = "pack-test/run"
+
+# run-image-mirror and lifecycle are appended by acceptance tests

acceptance/testdata/mock_buildpacks/v2/noop-buildpack/bin/build

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+echo "---> NOOP Buildpack"

acceptance/testdata/mock_buildpacks/v2/noop-buildpack/bin/detect

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+## always detect

acceptance/testdata/mock_buildpacks/v2/noop-buildpack/buildpack.toml

@@ -0,0 +1,7 @@
+[buildpack]
+  id = "noop.buildpack"
+  version = "noop.buildpack.version"
+  name = "NOOP Buildpack"
+
+[[stacks]]
+  id = "pack.test.stack"

acceptance/testdata/mock_buildpacks/v2/not-in-builder-buildpack/bin/build

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+echo "---> Simple mock buildpack"
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+launch_dir=$1
+
+## makes a launch layer
+echo "making launch layer"
+mkdir "$launch_dir/launch-layer"
+echo "Local Buildpack Dep Contents" > "$launch_dir/launch-layer/local-dep"
+ln -snf "$launch_dir/launch-layer/local-dep" local-dep
+echo "launch = true" > "$launch_dir/launch-layer.toml"
+
+## adds a process
+echo 'processes = [{ type = "web", command = "./run"}]' > "$launch_dir/launch.toml"
+
+echo "---> Done"

acceptance/testdata/mock_buildpacks/v2/not-in-builder-buildpack/bin/detect

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+## always detect

acceptance/testdata/mock_buildpacks/v2/not-in-builder-buildpack/buildpack.toml

@@ -0,0 +1,7 @@
+[buildpack]
+  id = "local/bp"
+  version = "local-bp-version"
+  name = "Not in Builder Buildpack"
+
+[[stacks]]
+  id = "pack.test.stack"

acceptance/testdata/mock_buildpacks/v2/other-stack-buildpack/buildpack.toml

@@ -0,0 +1,7 @@
+[buildpack]
+  id = "other/stack/bp"
+  version = "other-stack-version"
+  name = "Other Stack Buildpack"
+
+[[stacks]]
+  id = "other.stack"