Fix: change so we can set USE_CURRENT_USER=0

Author: ROunofF

hack/create-infrastructure.sh

@@ -16,12 +16,15 @@ bash $SCRIPT_DIR/update-iam-role.sh $environment
 
 sleep 5
 
+pids=()
+
 cluster_exists=0
 aws eks describe-cluster --name "${EKS_CLUSTER_NAME}" &> /dev/null || cluster_exists=$?
 
 if [ $cluster_exists -ne 0 ] && [[ "$cluster" == "standard" || "$cluster" == "all" ]]; then
   echo "Creating cluster ${EKS_CLUSTER_NAME}"
-  bash $SCRIPT_DIR/exec.sh "${environment}" 'cat /cluster/eksctl/cluster.yaml /cluster/eksctl/access-entries.yaml | envsubst | eksctl create cluster -f -'&
+  bash $SCRIPT_DIR/exec.sh "${environment}" 'cat /cluster/eksctl/cluster.yaml /cluster/eksctl/access-entries.yaml | envsubst | eksctl create cluster -f -' &
+  pids+=($!)
 else
   echo "Cluster ${EKS_CLUSTER_NAME} already exists"
 fi
@@ -31,9 +34,12 @@ aws eks describe-cluster --name "${EKS_CLUSTER_AUTO_NAME}" &> /dev/null || auto_
 
 if [ $auto_cluster_exists -ne 0 ] && [[ "$cluster" == "auto" || "$cluster" == "all" ]]; then
   echo "Creating auto mode cluster ${EKS_CLUSTER_AUTO_NAME}"
-  bash $SCRIPT_DIR/exec.sh "${environment}" 'cat /cluster/eksctl/cluster-auto.yaml /cluster/eksctl/access-entries.yaml | envsubst | eksctl create cluster -f -'&
+  bash $SCRIPT_DIR/exec.sh "${environment}" 'cat /cluster/eksctl/cluster-auto.yaml /cluster/eksctl/access-entries.yaml | envsubst | eksctl create cluster -f -' &
+  pids+=($!)
 else
   echo "Auto mode cluster ${EKS_CLUSTER_AUTO_NAME} already exists"
 fi
 
-wait
+for pid in "${pids[@]}"; do
+  wait "$pid" || exit 1
+done

hack/exec.sh

@@ -20,10 +20,10 @@ container_image='eks-workshop-environment'
 (cd $SCRIPT_DIR/../lab && $CONTAINER_CLI build -q -t $container_image .)
 
 
-if [ -z "$SKIP_CREDENTIALS" -a -z "$USE_CURRENT_USER" ]; then
+if [ "${SKIP_CREDENTIALS:-0}" = "0" ] && [ "${USE_CURRENT_USER:-0}" = "0" ]; then
   echo "Passing temp AWS credentials"
   source $SCRIPT_DIR/lib/generate-aws-creds.sh
-elif [ -n "${USE_CURRENT_USER:-}" ]; then
+elif [ "${USE_CURRENT_USER:-0}" != "0" ]; then
   if [ -z "$AWS_ACCESS_KEY_ID" ]; then
     echo "No AWS_ACCESS_KEY_ID found, please check your AWS credentials"
     exit 1