fix(runtime-manifest.go): fix resolution for step- and bundle-level o…

…utputs (#1205) * fix(runtime-manifest.go): fix resolution for step- and bundle-level outputs Signed-off-by: Vaughn Dice <[email protected]> * update runtime-manifest fix * mod testdata bundle for outputs int test Signed-off-by: Vaughn Dice <[email protected]>
getporter · Aug 25, 2020 · 8aa3ddc · 8aa3ddc
1 parent 1cff9e4
commit 8aa3ddc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/pkg/runtime/runtime-manifest.go b/pkg/runtime/runtime-manifest.go
@@ -329,6 +329,12 @@ func (m *RuntimeManifest) buildSourceData() (map[string]interface{}, error) {
 					continue
 				}
 
+				// A bundle-level output may also be a step-level output
+				// If already set, do not override
+				if val, exists := m.outputs[ps.OutputName]; exists && val != "" {
+					continue
+				}
+
 				val, err := m.resolveBundleOutput(ps.OutputName)
 				if err != nil {
 					return nil, err

diff --git a/tests/testdata/bundles/outputs-example/helpers.sh b/tests/testdata/bundles/outputs-example/helpers.sh
@@ -9,5 +9,12 @@ dump() {
   echo $1
 }
 
+assert-output-value() {
+  if [ "$1" != "$2" ]; then
+    echo "'$1' does not match the expected output value of '$2'."
+    exit 1
+  fi
+}
+
 # Call the requested function and pass the arguments as-is
 "$@"
diff --git a/tests/testdata/bundles/outputs-example/porter.yaml b/tests/testdata/bundles/outputs-example/porter.yaml
@@ -9,7 +9,7 @@ mixins:
 outputs:
   - name: user-output
     type: string
-    sensitive: true
+    sensitive: false
     applyTo:
       - upgrade
 
@@ -40,11 +40,14 @@ upgrade:
         - name: user-output
           jsonPath: '$.user'
   # This step tests successful interpolation of a bundle-level output in the same action
+  # Note: this assertion is placed in the bundle itself as docker driver output still goes directly
+  # to stdout, hence we can't yet capture it in the integration test output
+  # https://github.com/cnabio/cnab-go/issues/78
   - exec:
-      description: "Echo bundle-level output in same action as it was produced"
+      description: "Validate bundle-level output value in the same action as it was produced"
       command: ./helpers.sh
       arguments:
-        - "dump {{ bundle.outputs.user-output }}"
+        - "assert-output-value {{ bundle.outputs.user-output }} 'sally'"
 
 uninstall:
   # This step tests successful interpolation of a bundle-level output across actions