Do not assume php layer to launch=true

Instead, read the buildplan and mark the layer
accordingly

Signed-off-by: Arjun Sreedharan <arjun024@gmail.com>

Author: arjun024

.gitignore

@@ -2,5 +2,6 @@
 .idea
 .bin
 /bin
+/build
 *.tgz
 php-dist_*

build.go

@@ -56,11 +56,12 @@ func Build(entries EntryResolver,
 
 		logger.SelectedDependency(entry, dependency.Version)
 
-		phpLayer, err := context.Layers.Get("php", packit.LaunchLayer)
+		phpLayer, err := context.Layers.Get("php")
 		if err != nil {
 			return packit.BuildResult{}, err
 		}
 
+		phpLayer.Launch = entry.Metadata["launch"] == true
 		phpLayer.Build = entry.Metadata["build"] == true
 		phpLayer.Cache = entry.Metadata["build"] == true
 

build_test.go

@@ -161,7 +161,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 					BuildEnv:  packit.Environment{},
 					LaunchEnv: packit.Environment{},
 					Build:     false,
-					Launch:    true,
+					Launch:    false,
 					Cache:     false,
 					Metadata: map[string]interface{}{
 						phpdist.DepKey: "",
@@ -201,7 +201,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 		Expect(buffer.String()).To(ContainSubstring("Executing build process"))
 	})
 
-	context("when the build plan entry includes the build flag", func() {
+	context("when the build plan entry includes the build, launch flags", func() {
 		var workingDir string
 
 		it.Before(func() {
@@ -214,6 +214,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 				Version: "7.2.*",
 				Metadata: map[string]interface{}{
 					"version-source": "buildpack.yml",
+					"launch":         true,
 					"build":          true,
 				},
 			}
@@ -225,6 +226,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 						Version: "7.2.*",
 						Metadata: map[string]interface{}{
 							"version-source": "buildpack.yml",
+							"launch":         true,
 							"build":          true,
 						},
 					},
@@ -236,7 +238,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 			Expect(os.RemoveAll(workingDir)).To(Succeed())
 		})
 
-		it("marks the php layer as cached", func() {
+		it("marks the php layer as build, cache and launch", func() {
 			result, err := build(packit.BuildContext{
 				CNBPath:    cnbDir,
 				Stack:      "some-stack",
@@ -248,6 +250,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 							Version: "7.2.*",
 							Metadata: map[string]interface{}{
 								"version-source": "buildpack.yml",
+								"launch":         true,
 								"build":          true,
 							},
 						},
@@ -264,6 +267,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 							Version: "7.2.*",
 							Metadata: map[string]interface{}{
 								"version-source": "buildpack.yml",
+								"launch":         true,
 								"build":          true,
 							},
 						},
@@ -342,7 +346,7 @@ func testBuild(t *testing.T, context spec.G, it spec.S) {
 						BuildEnv:  packit.Environment{},
 						LaunchEnv: packit.Environment{},
 						Build:     false,
-						Launch:    true,
+						Launch:    false,
 						Cache:     false,
 						Metadata: map[string]interface{}{
 							phpdist.DepKey: "",

go.sum

@@ -3,6 +3,7 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/ForestEckhardt/freezer v0.0.0-20200630185456-a126adb8de1b h1:5ah4g+sbKU2LvMIOeR0+a4PIzrXRxJTqjZwXOdOdQsA=
 github.com/ForestEckhardt/freezer v0.0.0-20200630185456-a126adb8de1b/go.mod h1:Tp5MaiHIfM9TOqTFYlqHsittmOnFGsUcUVDX+AtbNrI=
+github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM=
 github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=
@@ -97,9 +98,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

integration.json

@@ -0,0 +1,3 @@
+{
+  "build-plan": "github.com/ForestEckhardt/build-plan"
+}

integration/init_test.go

@@ -2,6 +2,7 @@ package integration_test
 
 import (
 	"bytes"
+	"encoding/json"
 	"os"
 	"path/filepath"
 	"strings"
@@ -18,16 +19,22 @@ import (
 )
 
 var (
-	phpDistBuildpack        string
-	offlinePhpDistBuildpack string
-	version                 string
+	phpDistBuildpack          string
+	offlinePhpDistBuildpack   string
+	buildPlanBuildpack        string
+	offlineBuildPlanBuildpack string
+	version                   string
 
 	buildpackInfo struct {
 		Buildpack struct {
 			ID   string
 			Name string
 		}
 	}
+
+	config struct {
+		BuildPlan string `json:"build-plan"`
+	}
 )
 
 func TestIntegration(t *testing.T) {
@@ -38,10 +45,16 @@ func TestIntegration(t *testing.T) {
 
 	file, err := os.Open("../buildpack.toml")
 	Expect(err).NotTo(HaveOccurred())
-	defer file.Close()
 
 	_, err = toml.DecodeReader(file, &buildpackInfo)
 	Expect(err).NotTo(HaveOccurred())
+	Expect(file.Close()).To(Succeed())
+
+	file, err = os.Open("../integration.json")
+	Expect(err).NotTo(HaveOccurred())
+
+	Expect(json.NewDecoder(file).Decode(&config)).To(Succeed())
+	Expect(file.Close()).To(Succeed())
 
 	buildpackStore := occam.NewBuildpackStore()
 
@@ -59,6 +72,15 @@ func TestIntegration(t *testing.T) {
 		Execute(root)
 	Expect(err).NotTo(HaveOccurred())
 
+	buildPlanBuildpack, err = buildpackStore.Get.
+		Execute(config.BuildPlan)
+	Expect(err).ToNot(HaveOccurred())
+
+	offlineBuildPlanBuildpack, err = buildpackStore.Get.
+		WithOfflineDependencies().
+		Execute(config.BuildPlan)
+	Expect(err).ToNot(HaveOccurred())
+
 	SetDefaultEventuallyTimeout(5 * time.Second)
 
 	suite := spec.New("Integration", spec.Report(report.Terminal{}), spec.Parallel())

integration/offline_test.go

@@ -55,7 +55,10 @@ func testOffline(t *testing.T, context spec.G, it spec.S) {
 			var logs fmt.Stringer
 			image, logs, err = pack.WithNoColor().Build.
 				WithNoPull().
-				WithBuildpacks(offlinePhpDistBuildpack).
+				WithBuildpacks(
+					offlinePhpDistBuildpack,
+					offlineBuildPlanBuildpack,
+				).
 				WithNetwork("none").
 				Execute(name, source)
 			Expect(err).NotTo(HaveOccurred(), logs.String())

integration/simple_app_test.go

@@ -56,7 +56,10 @@ func testSimpleApp(t *testing.T, context spec.G, it spec.S) {
 			var logs fmt.Stringer
 			image, logs, err = pack.WithNoColor().Build.
 				WithNoPull().
-				WithBuildpacks(phpDistBuildpack).
+				WithBuildpacks(
+					phpDistBuildpack,
+					buildPlanBuildpack,
+				).
 				Execute(name, source)
 			Expect(err).NotTo(HaveOccurred(), logs.String())
 
@@ -65,6 +68,7 @@ func testSimpleApp(t *testing.T, context spec.G, it spec.S) {
 				"  Resolving PHP version",
 				"    Candidate version sources (in priority order):",
 				"      buildpack.yml -> \"7.2.*\"",
+				"      <unknown>     -> \"\"",
 				"",
 				MatchRegexp(`    Selected PHP version \(using buildpack\.yml\): 7\.2\.\d+`),
 				"",

integration/testdata/simple_app/plan.toml

@@ -0,0 +1,5 @@
+[[requires]]
+  name = "php"
+
+  [requires.metadata]
+    launch = true

plan_entry_resolver.go

@@ -19,11 +19,11 @@ func NewPlanEntryResolver(logger LogEmitter) PlanEntryResolver {
 func (r PlanEntryResolver) Resolve(entries []packit.BuildpackPlanEntry) packit.BuildpackPlanEntry {
 	var (
 		priorities = map[string]int{
-			"buildpack.yml":		3,
-			"composer.lock":		2,
-			"composer.json":		2,
+			"buildpack.yml":    3,
+			"composer.lock":    2,
+			"composer.json":    2,
 			"default-versions": 1,
-			"":									-1,
+			"":                 -1,
 		}
 	)
 
@@ -47,6 +47,10 @@ func (r PlanEntryResolver) Resolve(entries []packit.BuildpackPlanEntry) packit.B
 		if entry.Metadata["build"] == true {
 			chosenEntry.Metadata["build"] = true
 		}
+
+		if entry.Metadata["launch"] == true {
+			chosenEntry.Metadata["launch"] = true
+		}
 	}
 
 	r.logger.Candidates(entries)