Fix bugs introduced by linting changes.

Author: RLIndia

deploy.sh

@@ -400,6 +400,10 @@ if [ $stack_status -eq 2 ]; then
 fi
 if [ $stack_status -eq 0 ]; then
 	create_cognito_pool "$userpoolstackname"
+	if ! create_cognito_pool "$userpoolstackname"; then
+		aws cloudformation describe-stack-events --stack-name "$userpoolstackname"
+		exit 1
+	fi	
 fi
 
 #Capture User Pool Client ID
@@ -434,7 +438,10 @@ if [ $stack_status -eq 2 ]; then
 	stack_status=0
 fi
 if [ $stack_status -eq 0 ]; then
-	create_doc_db "$docdbstackname"
+	if ! create_doc_db "$docdbstackname"; then
+		aws cloudformation describe-stack-events --stack-name "$docdbstackname"
+		exit 1
+	fi		
 fi
 calculate_duration "DocumentDB Instance Creation" "$docdb_start_time"
 
@@ -467,7 +474,10 @@ if [ $stack_status -eq 2 ]; then
 	stack_status=0
 fi
 if [ $stack_status -eq 0 ]; then
-	create_image_builder "$imgbldrstackname"
+	if ! create_image_builder "$imgbldrstackname"; then
+		aws cloudformation describe-stack-events --stack-name "$imgbldrstackname"
+		exit 1
+	fi	
 fi
 calculate_duration "Image Builder Stack Creation" "$imgbldr_start_time"
 
@@ -496,7 +506,10 @@ if [ $stack_status -eq 2 ]; then
 	stack_status=0
 fi
 if [ $stack_status -eq 0 ]; then
-	create_main_stack "$mainstackname"
+	if ! create_main_stack "$mainstackname"; then
+		aws cloudformation describe-stack-events --stack-name "$mainstackname"
+		exit 1
+	fi
 fi
 echo "Obtaining MainStack outputs"
 portalinstance_id=$(aws cloudformation describe-stack-resources --stack-name "$mainstackname" --logical-resource-id "RGEC2Instance" | jq -r '.StackResources[] | .PhysicalResourceId')

scripts/fixsecrets.sh

@@ -1,15 +1,17 @@
 #!/bin/bash
-version="0.1.3"
+version="0.1.4"
 echo "Fixing secrets...(fixsecrets.sh v$version)"
 
 [ -z "$RG_HOME" ] && RG_HOME='/opt/deploy/sp2'
 echo "RG_HOME=$RG_HOME"
 
-cd "$RG_HOME" || echo "Could not cd to $RG_HOME" && exit 1
 old_secrets=$(docker secret ls | grep -i sp2prod | awk '{print $1}')
 if [ ! -z "$old_secrets" ]; then
 	echo "Found old secrets. Removing..."
-	docker secret rm "$old_secrets"
+	echo "$old_secrets" |
+		while IFS=$'\n' read -r mysecret; do
+			docker secret rm "$mysecret"
+		done
 fi
-docker secret create sp2prod-config.json ./config/config.json
-docker secret create sp2prod-alert-config.json ./config/alert-config.json
+docker secret create sp2prod-config.json "${RG_HOME}/config/config.json"
+docker secret create sp2prod-alert-config.json "${RG_HOME}/config/alert-config.json"