Merge branch 'main' into main

Arjun Sreedharan · web-flow · commit cfe0dae31de9 · 2021-07-27T10:32:14.000-04:00
diff --git a/buildpack.toml b/buildpack.toml
@@ -34,6 +34,11 @@ api = "0.5"
     optional = true
     version = "4.2.2"
 
+    [[order.group]]
+    id = "paketo-buildpacks/environment-variables"
+    optional = true
+    version = "3.1.1"
+
 [[order]]
 
   [[order.group]]
@@ -57,6 +62,11 @@ api = "0.5"
     optional = true
     version = "4.2.2"
 
+  [[order.group]]
+    id = "paketo-buildpacks/environment-variables"
+    optional = true
+    version = "3.1.1"
+
 [[order]]
 
   [[order.group]]
@@ -76,6 +86,11 @@ api = "0.5"
     optional = true
     version = "4.2.2"
 
+  [[order.group]]
+    id = "paketo-buildpacks/environment-variables"
+    optional = true
+    version = "3.1.1"
+
 [[order]]
 
   [[order.group]]
@@ -90,3 +105,8 @@ api = "0.5"
     id = "paketo-buildpacks/procfile"
     optional = true
     version = "4.2.2"
+
+  [[order.group]]
+    id = "paketo-buildpacks/environment-variables"
+    optional = true
+    version = "3.1.1"
diff --git a/go.mod b/go.mod
@@ -5,6 +5,6 @@ go 1.14
 require (
 	github.com/onsi/gomega v1.14.0
 	github.com/paketo-buildpacks/occam v0.1.4
-	github.com/paketo-buildpacks/packit v0.14.1
+	github.com/paketo-buildpacks/packit v0.14.2
 	github.com/sclevine/spec v1.4.0
 )
diff --git a/go.sum b/go.sum
@@ -422,8 +422,8 @@ github.com/paketo-buildpacks/occam v0.1.4 h1:KFYEXc0S1rEus/by2s4PEbFYfSNX5TEcjNN
 github.com/paketo-buildpacks/occam v0.1.4/go.mod h1:Rn7l2Ndm1ff0RGj0hWJwH8+iGhkEGY5nt/qpWKWB9lE=
 github.com/paketo-buildpacks/packit v0.5.0/go.mod h1:ATLZccUzqEAyPlirdka8hs+XNqS4pyJ/tjyU1NXJKm8=
 github.com/paketo-buildpacks/packit v0.13.0/go.mod h1:o3ajTEGOKZpEVRDpBH6qaIRVK92CO7WWinm87MTBlV8=
-github.com/paketo-buildpacks/packit v0.14.1 h1:divpTQ8LE8Hue+lv0r4XQqR3a1jARosplCpr8Mcu7A4=
-github.com/paketo-buildpacks/packit v0.14.1/go.mod h1:D1a4w1fN+iLjQj9iGEmwp3e+MN8ohHSdKTiwS7cK3xg=
+github.com/paketo-buildpacks/packit v0.14.2 h1:J0SmjiTya4B6CYXJMFRfMu+Lqhhb+w5XTpNg+53rRHw=
+github.com/paketo-buildpacks/packit v0.14.2/go.mod h1:D1a4w1fN+iLjQj9iGEmwp3e+MN8ohHSdKTiwS7cK3xg=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
diff --git a/integration/conda_test.go b/integration/conda_test.go
@@ -60,6 +60,9 @@ func testConda(t *testing.T, context spec.G, it spec.S) {
 			image, logs, err = pack.WithNoColor().Build.
 				WithBuildpacks(pythonBuildpack).
 				WithPullPolicy("never").
+				WithEnv(map[string]string{
+					"BPE_SOME_VARIABLE": "some-value",
+				}).
 				Execute(name, source)
 			Expect(err).NotTo(HaveOccurred(), logs.String())
 
@@ -86,6 +89,10 @@ func testConda(t *testing.T, context spec.G, it spec.S) {
 			Expect(logs).To(ContainLines(ContainSubstring("Conda Env Update Buildpack")))
 			Expect(logs).To(ContainLines(ContainSubstring("Python Start Buildpack")))
 			Expect(logs).To(ContainLines(ContainSubstring("Procfile Buildpack")))
+			Expect(logs).To(ContainLines(ContainSubstring("Environment Variables Buildpack")))
+
+			Expect(image.Buildpacks[4].Key).To(Equal("paketo-buildpacks/environment-variables"))
+			Expect(image.Buildpacks[4].Layers["environment-variables"].Metadata["variables"]).To(Equal(map[string]interface{}{"SOME_VARIABLE": "some-value"}))
 		})
 	})
 }
diff --git a/integration/no_package_manager_test.go b/integration/no_package_manager_test.go
@@ -91,12 +91,19 @@ func testNoPackageManager(t *testing.T, context spec.G, it spec.S) {
 				image, logs, err = pack.WithNoColor().Build.
 					WithBuildpacks(pythonBuildpack).
 					WithPullPolicy("never").
+					WithEnv(map[string]string{
+						"BPE_SOME_VARIABLE": "some-value",
+					}).
 					Execute(name, source)
 				Expect(err).NotTo(HaveOccurred(), logs.String())
 
 				Expect(logs).To(ContainLines(ContainSubstring("CPython Buildpack")))
 				Expect(logs).To(ContainLines(ContainSubstring("Python Start Buildpack")))
 				Expect(logs).To(ContainLines(ContainSubstring("Procfile Buildpack")))
+				Expect(logs).To(ContainLines(ContainSubstring("Environment Variables Buildpack")))
+
+				Expect(image.Buildpacks[3].Key).To(Equal("paketo-buildpacks/environment-variables"))
+				Expect(image.Buildpacks[3].Layers["environment-variables"].Metadata["variables"]).To(Equal(map[string]interface{}{"SOME_VARIABLE": "some-value"}))
 
 				container, err = docker.Container.Run.Execute(image.ID)
 				Expect(err).NotTo(HaveOccurred())
diff --git a/integration/pip_test.go b/integration/pip_test.go
@@ -60,6 +60,9 @@ func testPip(t *testing.T, context spec.G, it spec.S) {
 			image, logs, err = pack.WithNoColor().Build.
 				WithBuildpacks(pythonBuildpack).
 				WithPullPolicy("never").
+				WithEnv(map[string]string{
+					"BPE_SOME_VARIABLE": "some-value",
+				}).
 				Execute(name, source)
 			Expect(err).NotTo(HaveOccurred(), logs.String())
 
@@ -87,6 +90,10 @@ func testPip(t *testing.T, context spec.G, it spec.S) {
 			Expect(logs).To(ContainLines(ContainSubstring("Pip Install Buildpack")))
 			Expect(logs).To(ContainLines(ContainSubstring("Python Start Buildpack")))
 			Expect(logs).To(ContainLines(ContainSubstring("Procfile Buildpack")))
+			Expect(logs).To(ContainLines(ContainSubstring("Environment Variables Buildpack")))
+
+			Expect(image.Buildpacks[5].Key).To(Equal("paketo-buildpacks/environment-variables"))
+			Expect(image.Buildpacks[5].Layers["environment-variables"].Metadata["variables"]).To(Equal(map[string]interface{}{"SOME_VARIABLE": "some-value"}))
 		})
 	})
 }
diff --git a/integration/pipenv_test.go b/integration/pipenv_test.go
@@ -60,6 +60,9 @@ func testPipenv(t *testing.T, context spec.G, it spec.S) {
 			image, logs, err = pack.WithNoColor().Build.
 				WithBuildpacks(pythonBuildpack).
 				WithPullPolicy("never").
+				WithEnv(map[string]string{
+					"BPE_SOME_VARIABLE": "some-value",
+				}).
 				Execute(name, source)
 			Expect(err).NotTo(HaveOccurred(), logs.String())
 
@@ -88,6 +91,10 @@ func testPipenv(t *testing.T, context spec.G, it spec.S) {
 			Expect(logs).To(ContainLines(ContainSubstring("Pipenv Install Buildpack")))
 			Expect(logs).To(ContainLines(ContainSubstring("Python Start Buildpack")))
 			Expect(logs).To(ContainLines(ContainSubstring("Procfile Buildpack")))
+			Expect(logs).To(ContainLines(ContainSubstring("Environment Variables Buildpack")))
+
+			Expect(image.Buildpacks[6].Key).To(Equal("paketo-buildpacks/environment-variables"))
+			Expect(image.Buildpacks[6].Layers["environment-variables"].Metadata["variables"]).To(Equal(map[string]interface{}{"SOME_VARIABLE": "some-value"}))
 		})
 	})
 }
diff --git a/package.toml b/package.toml
@@ -28,3 +28,6 @@
 
 [[dependencies]]
   uri = "docker://gcr.io/paketo-buildpacks/procfile:4.2.2"
+
+[[dependencies]]
+  uri = "docker://gcr.io/paketo-buildpacks/environment-variables:3.1.1"
diff --git a/scripts/.util/tools.json b/scripts/.util/tools.json
@@ -1,5 +1,5 @@
 {
   "hugo": "v0.86.0",
-  "jam": "v0.14.1",
+  "jam": "v0.14.2",
   "pack": "v0.20.0"
 }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ go 1.14`
`5`	`5`	`require (`
`6`	`6`	`github.com/onsi/gomega v1.14.0`
`7`	`7`	`github.com/paketo-buildpacks/occam v0.1.4`
`8`		`- github.com/paketo-buildpacks/packit v0.14.1`
	`8`	`+ github.com/paketo-buildpacks/packit v0.14.2`
`9`	`9`	`github.com/sclevine/spec v1.4.0`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"hugo": "v0.86.0",`
`3`		`- "jam": "v0.14.1",`
	`3`	`+ "jam": "v0.14.2",`
`4`	`4`	`"pack": "v0.20.0"`
`5`	`5`	`}`