Extend the Buildpack environment variables script to other Buildpack …

…files
shipwright-io · Oct 20, 2021 · afb462c · afb462c
1 parent 98406b2
commit afb462c
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 8 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
@@ -46,9 +46,8 @@ spec:
 
           for env in "${envs[@]}"; do
               IFS='=' read -r key value string <<< "$env"
-              if [[ "$key" != "" && "$value" != "" ]]; then
+              if [[ "$key" != "" ]]; then
                   path="${ENV_DIR}/${key}"
-                  echo "--> Writing ${path}..."
                   echo -n "$value" > "$path"
               fi
           done

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/...ta/build_buildpacks-v3_golang_cr+env.yaml → ...ta/build_buildpacks-v3_golang_cr_env.yaml b/...ta/build_buildpacks-v3_golang_cr+env.yaml → ...ta/build_buildpacks-v3_golang_cr_env.yaml
@@ -6,10 +6,10 @@ metadata:
 spec:
   source:
     url: https://github.com/shipwright-io/sample-go
-    contextDir: source-build
+    contextDir: source-build-with-package
   env:
     - name: BP_GO_TARGETS
-      value: "target-build"
+      value: "main-package"
   strategy:
     name: buildpacks-v3
     kind: ClusterBuildStrategy

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -259,15 +259,14 @@ 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",
+				"test/data/build_buildpacks-v3_golang_cr_env.yaml",
 			)
 		})