improved s2i extended test

Author: adambkaplan

test/extended/testdata/bindata.go

@@ -22,7 +22,7 @@ fi
 
 mkdir -p "${HOME}/testconfig"
 if [[ -f /tmp/configmap/foo ]]; then
-    # Copy three secrets defined in configmap1 fixture to directory
+    # Copy three configMap entries defined in configmap1 fixture to directory
     cp /tmp/configmap/* "${HOME}/testconfig"
 else
     echo "Unable to locate test-configmap fixture files"
@@ -31,7 +31,7 @@ fi
 
 mkdir -p "${HOME}/testconfig2"
 if [[ -f configmap2/foo  ]]; then
-    # Copy three secrets defined in configmap2 fixture to directory
+    # Copy three configMap entries defined in configmap2 fixture to directory
     cp configmap2/* "${HOME}/testconfig2"
 else
     echo "Unable to locate test-configmap-2 fixture files"

test/extended/testdata/builds/build-secrets/s2i-binary-dir/.s2i/bin/assemble

@@ -1,18 +1,46 @@
 #!/bin/bash
 
 # Ensure none of the build config inject secrets still exist in the file system
-for s in /tmp/secret? secret?; do
-    if [[ -s "${s}" ]]; then
-        echo "Found secret file which should have been removed: ${s}"
+
+secrets=(secret1 secret2 secret3)
+configMaps=(foo this red)
+
+function checkSecret() {
+    dir=$1
+    file=$2
+    if [[ -a "${dir}/${file}" ]]; then
+        if [[ -s "${dir}/${file}" ]]; then
+            echo "Found secret file which should have been truncated: ${dir}/${file}"
+            exit 1
+        fi
+    else
+        echo "Secret file ${file} is missing from ${dir}."
         exit 1
     fi
-done
+}
 
-for c in /tmp/configmap/* configmap2/*; do
-    if [[ ! -s "${c}" ]]; then
-        echo "Found configmap file which should not have been truncated: ${s}"
-        exit 2
+function checkConfigMap() {
+    dir=$1
+    file=$2
+    if [[ -a "${dir}/${file}" ]]; then
+        if [[ ! -s "${dir}/${file}" ]]; then
+            echo "Found empty configMap file which should not have been truncated: ${dir}/${file}"
+            exit 1
+        fi
+    else
+        echo "ConfigMap file ${file} is missing from ${dir}."
+        exit 1
     fi
+}
+
+for s in ${secrets[@]}; do
+    checkSecret "/tmp" $s
+    checkSecret "." $s
+done
+
+for c in ${configMaps[@]}; do
+    checkConfigMap "/tmp/configmap" $c
+    checkConfigMap "configmap2" $c
 done
 
 # Print out the secrets copied into the image during assemble