chore(scripts): add quoting for safer bash

Author: Jeff Peeler

scripts/run_e2e_docker.sh

@@ -7,17 +7,17 @@ set -e
 timestamp=$(date +%s)
 namespace="e2e-tests-${timestamp}-$RANDOM"
 
-tmpdir=`mktemp -d 2>/dev/null || mktemp -d -t 'valuetmpdir'`
-cp test/e2e/e2e-values.yaml ${tmpdir}/e2e-values.yaml
+tmpdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'valuetmpdir')
+cp test/e2e/e2e-values.yaml "${tmpdir}/e2e-values.yaml"
 
 echo "namespace: ${namespace}" >> ${tmpdir}/e2e-values.yaml
 echo "watchedNamespaces: ${namespace}" >> ${tmpdir}/e2e-values.yaml
 echo "catalog_namespace: ${namespace}" >> ${tmpdir}/e2e-values.yaml
 
-./scripts/package-release.sh 1.0.0-e2e test/e2e/resources ${tmpdir}/e2e-values.yaml
+./scripts/package-release.sh 1.0.0-e2e test/e2e/resources "${tmpdir}/e2e-values.yaml"
 
 function cleanup {
-	kubectl delete namespace ${namespace}
+	kubectl delete namespace "${namespace}"
 	rm -rf test/e2e/resources
 	rm -rf test/e2e/test-resources
 }
@@ -26,24 +26,24 @@ function cleanupAndExit {
 	exitCode=$?
 	if [ "$exitCode" -ne "0" ]; then
 		echo "error running tests. logs written to olm.log and catalog.log";
-		kubectl -n ${namespace} logs -l app=alm-operator > olm.log;
-		kubectl -n ${namespace} logs -l app=catalog-operator > catalog.log;
-		kubectl -n ${namespace} logs -l app=package-server > package.log
+		kubectl -n "${namespace}" logs -l app=alm-operator > olm.log;
+		kubectl -n "${namespace}" logs -l app=catalog-operator > catalog.log;
+		kubectl -n "${namespace}" logs -l app=package-server > package.log
 	fi
 	cleanup
     exit $exitCode
 }
 
 trap cleanupAndExit SIGINT SIGTERM EXIT
 
-./scripts/install_local.sh ${namespace} test/e2e/resources
+./scripts/install_local.sh "${namespace}" test/e2e/resources
 
 mkdir -p test/e2e/test-resources
-helm template --set namespace=${namespace}  -f test/e2e/e2e-values.yaml test/e2e/chart  --output-dir test/e2e/test-resources
+helm template --set namespace="${namespace}"  -f test/e2e/e2e-values.yaml test/e2e/chart  --output-dir test/e2e/test-resources
 
-eval $(minikube docker-env) || { echo 'Cannot switch to minikube docker'; exit 1; }
+eval "$(minikube docker-env)" || { echo 'Cannot switch to minikube docker'; exit 1; }
 kubectl apply -f test/e2e/test-resources/alm-e2e/templates
-until kubectl -n ${namespace} logs job/e2e | grep -v "ContainerCreating"; do echo "waiting for job to run" && sleep 1; done
-kubectl -n ${namespace} logs job/e2e -f
+until kubectl -n "${namespace}" logs job/e2e | grep -v "ContainerCreating"; do echo "waiting for job to run" && sleep 1; done
+kubectl -n "${namespace}" logs job/e2e -f
 
 

scripts/run_e2e_local.sh

@@ -8,8 +8,7 @@ set -e
 timestamp=$(date +%s)
 namespace="e2e-tests-${timestamp}-$RANDOM"
 
-tmpdir=`mktemp -d 2>/dev/null || mktemp -d -t 'valuetmpdir'`
-cp test/e2e/e2e-values.yaml ${tmpdir}/e2e-values.yaml
+tmpdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'valuetmpdir')
 
 echo "namespace: ${namespace}" >> ${tmpdir}/e2e-values.yaml
 #echo "watchedNamespaces: ${namespace}" >> ${tmpdir}/e2e-values.yaml
@@ -18,17 +17,17 @@ echo "catalog_namespace: ${namespace}" >> ${tmpdir}/e2e-values.yaml
 ./scripts/package-release.sh 1.0.0-e2e test/e2e/resources ${tmpdir}/e2e-values.yaml
 
 function cleanup {
-	kubectl delete namespace ${namespace}
+	kubectl delete namespace "${namespace}"
 	rm -rf test/e2e/resources
 }
 
 function cleanupAndExit {
 	exitCode=$?
 	if [ "$exitCode" -ne "0" ]; then
 		echo "error running tests. logs written to olm.log, catalog.log, and package.log";
-		kubectl -n ${namespace} logs -l app=olm-operator > olm.log;
-		kubectl -n ${namespace} logs -l app=catalog-operator > catalog.log;
-		kubectl -n ${namespace} logs -l app=package-server > package.log
+		kubectl -n "${namespace}" logs -l app=olm-operator > olm.log;
+		kubectl -n "${namespace}" logs -l app=catalog-operator > catalog.log;
+		kubectl -n "${namespace}" logs -l app=package-server > package.log
 	else
 		cleanup
 	fi
@@ -38,7 +37,7 @@ function cleanupAndExit {
 
 trap cleanupAndExit SIGINT SIGTERM EXIT
 
-./scripts/install_local.sh ${namespace} test/e2e/resources
+./scripts/install_local.sh "${namespace}" test/e2e/resources
 
 # run tests
 if [ -z "$1" ]; then