Reduce the number of times we run apply (#233)

awslabs · Jun 30, 2023 · f05d172 · f05d172
1 parent fa1ad3e
commit f05d172
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 63 deletions.
diff --git a/ai-ml/emr-spark-rapids/install.sh b/ai-ml/emr-spark-rapids/install.sh
@@ -20,9 +20,8 @@ targets=(
 for target in "${targets[@]}"
 do
   echo "Applying module $target..."
-  terraform apply -target="$target" -auto-approve
-  apply_output=$(terraform apply -target="$target" -auto-approve 2>&1)
-  if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+  apply_output=$(terraform apply -target="$target" -auto-approve 2>&1 | tee /dev/tty)
+  if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
     echo "SUCCESS: Terraform apply of $target completed successfully"
   else
     echo "FAILED: Terraform apply of $target failed"
@@ -32,9 +31,8 @@ done
 
 # Final apply to catch any remaining resources
 echo "Applying remaining resources..."
-terraform apply -auto-approve
-apply_output=$(terraform apply -auto-approve 2>&1)
-if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+apply_output=$(terraform apply -auto-approve 2>&1 | tee /dev/tty)
+if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
   echo "SUCCESS: Terraform apply of all modules completed successfully"
 else
   echo "FAILED: Terraform apply of all modules failed"

diff --git a/ai-ml/ray/terraform/install.sh b/ai-ml/ray/terraform/install.sh
@@ -5,9 +5,8 @@ terraform init || echo "\"terraform init\" failed"
 
 
 echo "Applying ..."
-terraform apply -auto-approve
-apply_output=$(terraform apply -auto-approve 2>&1)
-if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+apply_output=$(terraform apply -auto-approve 2>&1 | tee /dev/tty)
+if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
   echo "SUCCESS: Terraform apply completed successfully"
 else
   echo "FAILED: Terraform apply failed"

diff --git a/analytics/terraform/datahub-on-eks/install.sh b/analytics/terraform/datahub-on-eks/install.sh
@@ -24,9 +24,8 @@ targets=(
 for target in "${targets[@]}"
 do
   echo "Applying module $target..."
-  terraform apply -target="$target" -auto-approve
-  apply_output=$(terraform apply -target="$target" -auto-approve 2>&1)
-  if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+  apply_output=$(terraform apply -target="$target" -auto-approve 2>&1 | tee /dev/tty)
+  if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
     echo "SUCCESS: Terraform apply of $target completed successfully"
   else
     echo "FAILED: Terraform apply of $target failed"
@@ -36,9 +35,8 @@ done
 
 # Final apply to catch any remaining resources
 echo "Applying remaining resources..."
-terraform apply -auto-approve
-apply_output=$(terraform apply -auto-approve 2>&1)
-if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+apply_output=$(terraform apply -auto-approve 2>&1 | tee /dev/tty)
+if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
   echo "SUCCESS: Terraform apply of all modules completed successfully"
 else
   echo "FAILED: Terraform apply of all modules failed"

diff --git a/analytics/terraform/emr-eks-ack/install.sh b/analytics/terraform/emr-eks-ack/install.sh
@@ -21,9 +21,8 @@ targets=(
 for target in "${targets[@]}"
 do
   echo "Applying module $target..."
-  terraform apply -target="$target" -var="region=$region" -auto-approve
-  apply_output=$(terraform apply -target="$target" -var="region=$region" -auto-approve 2>&1)
-  if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+  apply_output=$(terraform apply -target="$target" -var="region=$region" -auto-approve 2>&1 | tee /dev/tty)
+  if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
     echo "SUCCESS: Terraform apply of $target completed successfully"
   else
     echo "FAILED: Terraform apply of $target failed"
@@ -33,9 +32,8 @@ done
 
 # Final apply to catch any remaining resources
 echo "Applying remaining resources..."
-terraform apply -var="region=$region" -auto-approve
-apply_output=$(terraform apply -var="region=$region" -auto-approve 2>&1)
-if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+apply_output=$(terraform apply -var="region=$region" -auto-approve 2>&1 | tee /dev/tty)
+if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
   echo "SUCCESS: Terraform apply of all modules completed successfully"
 else
   echo "FAILED: Terraform apply of all modules failed"

diff --git a/analytics/terraform/emr-eks-fargate/install.sh b/analytics/terraform/emr-eks-fargate/install.sh
@@ -16,9 +16,8 @@ targets=(
 for target in "${targets[@]}"
 do
   echo "Applying module $target..."
-  terraform apply -target="$target" -var="region=$region" -auto-approve
-  apply_output=$(terraform apply -target="$target" -var="region=$region" -auto-approve 2>&1)
-  if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+  apply_output=$(terraform apply -target="$target" -var="region=$region" -auto-approve 2>&1 | tee /dev/tty)
+  if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
     echo "SUCCESS: Terraform apply of $target completed successfully"
   else
     echo "FAILED: Terraform apply of $target failed"
@@ -28,9 +27,8 @@ done
 
 # Final apply to catch any remaining resources
 echo "Applying remaining resources..."
-terraform apply -var="region=$region" -auto-approve
-apply_output=$(terraform apply -var="region=$region" -auto-approve 2>&1)
-if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+apply_output=$(terraform apply -var="region=$region" -auto-approve 2>&1 | tee /dev/tty)
+if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
   echo "SUCCESS: Terraform apply of all modules completed successfully"
 else
   echo "FAILED: Terraform apply of all modules failed"

diff --git a/analytics/terraform/emr-eks-karpenter/install.sh b/analytics/terraform/emr-eks-karpenter/install.sh
@@ -21,9 +21,8 @@ targets=(
 for target in "${targets[@]}"
 do
   echo "Applying module $target..."
-  terraform apply -target="$target" -auto-approve
-  apply_output=$(terraform apply -target="$target" -auto-approve 2>&1)
-  if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+  apply_output=$(terraform apply -target="$target" -auto-approve 2>&1 | tee /dev/tty)
+  if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
     echo "SUCCESS: Terraform apply of $target completed successfully"
   else
     echo "FAILED: Terraform apply of $target failed"
@@ -33,9 +32,8 @@ done
 
 # Final apply to catch any remaining resources
 echo "Applying remaining resources..."
-terraform apply -auto-approve
-apply_output=$(terraform apply -auto-approve 2>&1)
-if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+apply_output=$(terraform apply -auto-approve 2>&1 | tee /dev/tty)
+if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
   echo "SUCCESS: Terraform apply of all modules completed successfully"
 else
   echo "FAILED: Terraform apply of all modules failed"

diff --git a/analytics/terraform/spark-k8s-operator/install.sh b/analytics/terraform/spark-k8s-operator/install.sh
@@ -21,9 +21,8 @@ terraform init --upgrade
 for target in "${targets[@]}"
 do
   echo "Applying module $target..."
-  terraform apply -target="$target" -var="region=$region" -auto-approve
-  apply_output=$(terraform apply -target="$target" -var="region=$region" -auto-approve 2>&1)
-  if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+  apply_output=$(terraform apply -target="$target" -var="region=$region" -auto-approve 2>&1 | tee /dev/tty)
+  if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
     echo "SUCCESS: Terraform apply of $target completed successfully"
   else
     echo "FAILED: Terraform apply of $target failed"
@@ -33,9 +32,8 @@ done
 
 # Final apply to catch any remaining resources
 echo "Applying remaining resources..."
-terraform apply -var="region=$region" -auto-approve
-apply_output=$(terraform apply -var="region=$region" -auto-approve 2>&1)
-if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+apply_output=$(terraform apply -var="region=$region" -auto-approve 2>&1 | tee /dev/tty)
+if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
   echo "SUCCESS: Terraform apply of all modules completed successfully"
 else
   echo "FAILED: Terraform apply of all modules failed"

diff --git a/distributed-databases/cloudnative-postgres/install.sh b/distributed-databases/cloudnative-postgres/install.sh
@@ -21,9 +21,8 @@ targets=(
 for target in "${targets[@]}"
 do
   echo "Applying module $target..."
-  terraform apply -target="$target" -var="region=$region" -auto-approve
-  apply_output=$(terraform apply -target="$target" -var="region=$region" -auto-approve 2>&1)
-  if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+  apply_output=$(terraform apply -target="$target" -var="region=$region" -auto-approve 2>&1 | tee /dev/tty)
+  if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
     echo "SUCCESS: Terraform apply of $target completed successfully"
   else
     echo "FAILED: Terraform apply of $target failed"
@@ -33,9 +32,8 @@ done
 
 # Final apply to catch any remaining resources
 echo "Applying remaining resources..."
-terraform apply -var="region=$region" -auto-approve
-apply_output=$(terraform apply -var="region=$region" -auto-approve 2>&1)
-if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+apply_output=$(terraform apply -var="region=$region" -auto-approve 2>&1 | tee /dev/tty)
+if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
   echo "SUCCESS: Terraform apply of all modules completed successfully"
 else
   echo "FAILED: Terraform apply of all modules failed"

diff --git a/streaming/flink/install.sh b/streaming/flink/install.sh
@@ -20,9 +20,8 @@ terraform init --upgrade
 for target in "${targets[@]}"
 do
   echo "Applying module $target..."
-  terraform apply -target="$target" -var="region=$region" -auto-approve
-  apply_output=$(terraform apply -target="$target" -var="region=$region" -auto-approve 2>&1)
-  if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+  apply_output=$(terraform apply -target="$target" -var="region=$region" -auto-approve 2>&1 | tee /dev/tty)
+  if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
     echo "SUCCESS: Terraform apply of $target completed successfully"
   else
     echo "FAILED: Terraform apply of $target failed"
@@ -32,9 +31,8 @@ done
 
 # Final apply to catch any remaining resources
 echo "Applying remaining resources..."
-terraform apply -var="region=$region" -auto-approve
-apply_output=$(terraform apply -var="region=$region" -auto-approve 2>&1)
-if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+apply_output=$(terraform apply -var="region=$region" -auto-approve 2>&1 | tee /dev/tty)
+if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
   echo "SUCCESS: Terraform apply of all modules completed successfully"
 else
   echo "FAILED: Terraform apply of all modules failed"

diff --git a/streaming/kafka/install.sh b/streaming/kafka/install.sh
@@ -15,9 +15,8 @@ targets=(
 for target in "${targets[@]}"
 do
   echo "Applying module $target..."
-  terraform apply -target="$target" -auto-approve
-  apply_output=$(terraform apply -target="$target" -auto-approve 2>&1)
-  if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+  apply_output=$(terraform apply -target="$target" -auto-approve 2>&1 | tee /dev/tty)
+  if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
     echo "SUCCESS: Terraform apply of $target completed successfully"
   else
     echo "FAILED: Terraform apply of $target failed"
@@ -27,9 +26,8 @@ done
 
 # Final apply to catch any remaining resources
 echo "Applying remaining resources..."
-terraform apply -auto-approve
-apply_output=$(terraform apply -auto-approve 2>&1)
-if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+apply_output=$(terraform apply -auto-approve 2>&1 | tee /dev/tty)
+if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
   echo "SUCCESS: Terraform apply of all modules completed successfully"
 else
   echo "FAILED: Terraform apply of all modules failed"

diff --git a/workshop/emr-eks/install.sh b/workshop/emr-eks/install.sh
@@ -15,9 +15,8 @@ targets=(
 for target in "${targets[@]}"
 do
   echo "Applying module $target..."
-  terraform apply -target="$target" -auto-approve
-  apply_output=$(terraform apply -target="$target" -auto-approve 2>&1)
-  if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+  apply_output=$(terraform apply -target="$target" -auto-approve 2>&1 | tee /dev/tty)
+  if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
     echo "SUCCESS: Terraform apply of $target completed successfully"
   else
     echo "FAILED: Terraform apply of $target failed"
@@ -27,9 +26,8 @@ done
 
 # Final apply to catch any remaining resources
 echo "Applying remaining resources..."
-terraform apply -auto-approve
-apply_output=$(terraform apply -auto-approve 2>&1)
-if [[ $? -eq 0 && $apply_output == *"Apply complete"* ]]; then
+apply_output=$(terraform apply -auto-approve 2>&1 | tee /dev/tty)
+if [[ ${PIPESTATUS[0]} -eq 0 && $apply_output == *"Apply complete"* ]]; then
   echo "SUCCESS: Terraform apply of all modules completed successfully"
 else
   echo "FAILED: Terraform apply of all modules failed"