Merge pull request #906 from shahulsonhal/prepare-platform-env

Extend the Buildpack strategy to work with the environment variables
shipwright-io · Oct 20, 2021 · 3d6ec4c · 3d6ec4c
2 parents c86cbcd + afb462c
commit 3d6ec4c
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 3 deletions.
diff --git a/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml b/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_cr.yaml
@@ -10,7 +10,7 @@ spec:
       securityContext:
         runAsUser: 0
         capabilities:
-          add: 
+          add:
             - CHOWN
       command:
         - chown
@@ -39,6 +39,19 @@ spec:
 
           mkdir /tmp/cache /tmp/layers
 
+          echo "> Processing environment variables..."
+          ENV_DIR="/platform/env"
+
+          envs=($(env))
+
+          for env in "${envs[@]}"; do
+              IFS='=' read -r key value string <<< "$env"
+              if [[ "$key" != "" ]]; then
+                  path="${ENV_DIR}/${key}"
+                  echo -n "$value" > "$path"
+              fi
+          done
+
           /cnb/lifecycle/creator \
             '-app=$(params.shp-source-context)' \
             -cache-dir=/tmp/cache \
@@ -48,6 +61,9 @@ spec:
 
           # Store the image digest
           grep digest /tmp/report.toml | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)"
+      volumeMounts:
+        - mountPath: /platform/env
+          name: platform-env
       resources:
         limits:
           cpu: 500m

diff --git a/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml b/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3-heroku_namespaced_cr.yaml
@@ -10,7 +10,7 @@ spec:
       securityContext:
         runAsUser: 0
         capabilities:
-          add: 
+          add:
             - CHOWN
       command:
         - chown
@@ -39,6 +39,19 @@ spec:
 
           mkdir /tmp/cache /tmp/layers
 
+          echo "> Processing environment variables..."
+          ENV_DIR="/platform/env"
+
+          envs=($(env))
+
+          for env in "${envs[@]}"; do
+              IFS='=' read -r key value string <<< "$env"
+              if [[ "$key" != "" ]]; then
+                  path="${ENV_DIR}/${key}"
+                  echo -n "$value" > "$path"
+              fi
+          done
+
           /cnb/lifecycle/creator \
             '-app=$(params.shp-source-context)' \
             -cache-dir=/tmp/cache \
@@ -48,6 +61,9 @@ spec:
 
           # Store the image digest
           grep digest /tmp/report.toml | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)"
+      volumeMounts:
+        - mountPath: /platform/env
+          name: platform-env
       resources:
         limits:
           cpu: 500m

diff --git a/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml b/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_cr.yaml
@@ -11,7 +11,7 @@ spec:
       securityContext:
         runAsUser: 0
         capabilities:
-          add: 
+          add:
             - CHOWN
       command:
         - chown
@@ -39,6 +39,19 @@ spec:
         - |
           set -euo pipefail
 
+          echo "> Processing environment variables..."
+          ENV_DIR="/platform/env"
+
+          envs=($(env))
+
+          for env in "${envs[@]}"; do
+              IFS='=' read -r key value string <<< "$env"
+              if [[ "$key" != "" ]]; then
+                  path="${ENV_DIR}/${key}"
+                  echo -n "$value" > "$path"
+              fi
+          done
+
           mkdir /tmp/cache /tmp/layers
 
           /cnb/lifecycle/creator \
@@ -50,6 +63,9 @@ spec:
 
           # Store the image digest
           grep digest /tmp/report.toml | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)"
+      volumeMounts:
+        - mountPath: /platform/env
+          name: platform-env
       resources:
         limits:
           cpu: 500m

diff --git a/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml b/samples/buildstrategy/buildpacks-v3/buildstrategy_buildpacks-v3_namespaced_cr.yaml
@@ -41,6 +41,19 @@ spec:
 
           mkdir /tmp/cache /tmp/layers
 
+          echo "> Processing environment variables..."
+          ENV_DIR="/platform/env"
+
+          envs=($(env))
+
+          for env in "${envs[@]}"; do
+              IFS='=' read -r key value string <<< "$env"
+              if [[ "$key" != "" ]]; then
+                  path="${ENV_DIR}/${key}"
+                  echo -n "$value" > "$path"
+              fi
+          done
+
           /cnb/lifecycle/creator \
             '-app=$(params.shp-source-context)' \
             -cache-dir=/tmp/cache \
@@ -50,6 +63,9 @@ spec:
 
           # Store the image digest
           grep digest /tmp/report.toml | tr -d ' \"\n' | sed s/digest=// > "$(results.shp-image-digest.path)"
+      volumeMounts:
+        - mountPath: /platform/env
+          name: platform-env
       resources:
         limits:
           cpu: 500m

diff --git a/test/data/build_buildpacks-v3_golang_cr_env.yaml b/test/data/build_buildpacks-v3_golang_cr_env.yaml
@@ -0,0 +1,17 @@
+---
+apiVersion: shipwright.io/v1alpha1
+kind: Build
+metadata:
+  name: buildpack-golang-build
+spec:
+  source:
+    url: https://github.com/shipwright-io/sample-go
+    contextDir: source-build-with-package
+  env:
+    - name: BP_GO_TARGETS
+      value: "main-package"
+  strategy:
+    name: buildpacks-v3
+    kind: ClusterBuildStrategy
+  output:
+    image: image-registry.openshift-image-registry.svc:5000/build-examples/taxi-app
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -258,6 +258,26 @@ var _ = Describe("For a Kubernetes cluster with Tekton and build installed", fun
 		})
 	})
 
+	Context("when a Buildpacks v3 build is defined for a golang runtime with `BP_GO_TARGETS` env", func() {
+		BeforeEach(func() {
+			testID = generateTestID("buildpacks-v3-golang")
+
+			// create the build definition
+			build = createBuild(
+				testBuild,
+				testID,
+				"test/data/build_buildpacks-v3_golang_cr_env.yaml",
+			)
+		})
+
+		It("successfully runs a build", func() {
+			buildRun, err = buildRunTestData(testBuild.Namespace, testID, "test/data/buildrun_buildpacks-v3_golang_cr.yaml")
+			Expect(err).ToNot(HaveOccurred(), "Error retrieving buildrun test data")
+
+			validateBuildRunToSucceed(testBuild, buildRun)
+		})
+	})
+
 	Context("when a build uses the build-run-deletion annotation", func() {
 
 		BeforeEach(func() {