From eb7f30bf75179d092512aab90a5dfc3a74772942 Mon Sep 17 00:00:00 2001
From: Ankit Bhardwaj <ankit.bhardwaj@navi.com>
Date: Tue, 27 Aug 2024 15:49:32 +0530
Subject: [PATCH] INFRA-3552 | Ankit Bhardwaj | fix tests

---
 .../sample_infra_manifest/aurora-db-tf/deploy.sh                | 2 +-
 .../sample_infra_manifest/aws-roles-tf/deploy.sh                | 2 +-
 .../sample_infra_manifest/aws-s3-bucket-tf/deploy.sh            | 2 +-
 .../sample_infra_manifest/document-db-tf/deploy.sh              | 2 +-
 .../sample_infra_manifest/dynamo-db-tf/deploy.sh                | 2 +-
 .../sample_infra_manifest/elastic-cache-tf/deploy.sh            | 2 +-
 testdata/expected_output/sample_infra_manifest/rds-tf/deploy.sh | 2 +-
 .../rds-tf/scripts/run_additional_scripts.sh                    | 2 +-
 .../sample_infra_manifest_2/aurora-db-tf/deploy.sh              | 2 +-
 .../sample_infra_manifest_2/aws-roles-tf/deploy.sh              | 2 +-
 .../sample_infra_manifest_2/aws-s3-bucket-tf/deploy.sh          | 2 +-
 .../sample_infra_manifest_2/document-db-tf/deploy.sh            | 2 +-
 .../sample_infra_manifest_2/dynamo-db-tf/deploy.sh              | 2 +-
 .../sample_infra_manifest_2/elastic-cache-tf/deploy.sh          | 2 +-
 .../expected_output/sample_infra_manifest_2/rds-tf/deploy.sh    | 2 +-
 .../rds-tf/scripts/run_additional_scripts.sh                    | 2 +-
 .../sample_infra_manifest_flink/aurora-db-tf/deploy.sh          | 2 +-
 .../sample_infra_manifest_flink/aws-roles-tf/deploy.sh          | 2 +-
 .../sample_infra_manifest_flink/aws-s3-bucket-tf/deploy.sh      | 2 +-
 .../sample_infra_manifest_flink/document-db-tf/deploy.sh        | 2 +-
 .../sample_infra_manifest_flink/dynamo-db-tf/deploy.sh          | 2 +-
 .../sample_infra_manifest_flink/elastic-cache-tf/deploy.sh      | 2 +-
 .../sample_infra_manifest_flink/rds-tf/deploy.sh                | 2 +-
 .../rds-tf/scripts/run_additional_scripts.sh                    | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/testdata/expected_output/sample_infra_manifest/aurora-db-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest/aurora-db-tf/deploy.sh
index 13be2f4..976dadc 100755
--- a/testdata/expected_output/sample_infra_manifest/aurora-db-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest/aurora-db-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 additional_terraform_options=""
 additional_terraform_options="${additional_terraform_options} -auto-approve"
diff --git a/testdata/expected_output/sample_infra_manifest/aws-roles-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest/aws-roles-tf/deploy.sh
index a098337..f958199 100755
--- a/testdata/expected_output/sample_infra_manifest/aws-roles-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest/aws-roles-tf/deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # exit when any command fails
-set -e
+set -xe
 
 additional_terraform_options=""
 additional_kube_options=""
diff --git a/testdata/expected_output/sample_infra_manifest/aws-s3-bucket-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest/aws-s3-bucket-tf/deploy.sh
index 3414a28..74645af 100755
--- a/testdata/expected_output/sample_infra_manifest/aws-s3-bucket-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest/aws-s3-bucket-tf/deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # exit when any command fails
-set -e
+set -xe
 
 additional_terraform_options=""
 
diff --git a/testdata/expected_output/sample_infra_manifest/document-db-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest/document-db-tf/deploy.sh
index 5212ead..95e19e8 100755
--- a/testdata/expected_output/sample_infra_manifest/document-db-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest/document-db-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 additional_terraform_options=""
 
diff --git a/testdata/expected_output/sample_infra_manifest/dynamo-db-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest/dynamo-db-tf/deploy.sh
index 97fa75a..7b06bb5 100755
--- a/testdata/expected_output/sample_infra_manifest/dynamo-db-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest/dynamo-db-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 additional_terraform_options=""
 
diff --git a/testdata/expected_output/sample_infra_manifest/elastic-cache-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest/elastic-cache-tf/deploy.sh
index 59c3438..502dc58 100755
--- a/testdata/expected_output/sample_infra_manifest/elastic-cache-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest/elastic-cache-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 additional_terraform_options=""
 
diff --git a/testdata/expected_output/sample_infra_manifest/rds-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest/rds-tf/deploy.sh
index f86db03..9cfc944 100755
--- a/testdata/expected_output/sample_infra_manifest/rds-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest/rds-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 function state_migration() {
     # remove option group from terraform state as option group api is removed by aws for postgres and we can't delete option group as its used by snapshot.
diff --git a/testdata/expected_output/sample_infra_manifest/rds-tf/scripts/run_additional_scripts.sh b/testdata/expected_output/sample_infra_manifest/rds-tf/scripts/run_additional_scripts.sh
index b42ec93..a5b862c 100755
--- a/testdata/expected_output/sample_infra_manifest/rds-tf/scripts/run_additional_scripts.sh
+++ b/testdata/expected_output/sample_infra_manifest/rds-tf/scripts/run_additional_scripts.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -xe
 
 PRE_OR_POST_APPLY=$1
 
diff --git a/testdata/expected_output/sample_infra_manifest_2/aurora-db-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest_2/aurora-db-tf/deploy.sh
index 00b0eee..47839b2 100755
--- a/testdata/expected_output/sample_infra_manifest_2/aurora-db-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest_2/aurora-db-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 additional_terraform_options=""
 additional_terraform_options="${additional_terraform_options} -auto-approve"
diff --git a/testdata/expected_output/sample_infra_manifest_2/aws-roles-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest_2/aws-roles-tf/deploy.sh
index 5c21a21..baa0336 100755
--- a/testdata/expected_output/sample_infra_manifest_2/aws-roles-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest_2/aws-roles-tf/deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # exit when any command fails
-set -e
+set -xe
 
 additional_terraform_options=""
 additional_kube_options=""
diff --git a/testdata/expected_output/sample_infra_manifest_2/aws-s3-bucket-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest_2/aws-s3-bucket-tf/deploy.sh
index 8878e43..3e2ac44 100755
--- a/testdata/expected_output/sample_infra_manifest_2/aws-s3-bucket-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest_2/aws-s3-bucket-tf/deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # exit when any command fails
-set -e
+set -xe
 
 additional_terraform_options=""
 
diff --git a/testdata/expected_output/sample_infra_manifest_2/document-db-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest_2/document-db-tf/deploy.sh
index 77824ed..561723a 100755
--- a/testdata/expected_output/sample_infra_manifest_2/document-db-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest_2/document-db-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 additional_terraform_options=""
 
diff --git a/testdata/expected_output/sample_infra_manifest_2/dynamo-db-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest_2/dynamo-db-tf/deploy.sh
index e263d86..d389344 100755
--- a/testdata/expected_output/sample_infra_manifest_2/dynamo-db-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest_2/dynamo-db-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 additional_terraform_options=""
 
diff --git a/testdata/expected_output/sample_infra_manifest_2/elastic-cache-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest_2/elastic-cache-tf/deploy.sh
index 8d3d4a1..8468f15 100755
--- a/testdata/expected_output/sample_infra_manifest_2/elastic-cache-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest_2/elastic-cache-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 additional_terraform_options=""
 
diff --git a/testdata/expected_output/sample_infra_manifest_2/rds-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest_2/rds-tf/deploy.sh
index c26599b..35a5ce3 100755
--- a/testdata/expected_output/sample_infra_manifest_2/rds-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest_2/rds-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 function state_migration() {
     # remove option group from terraform state as option group api is removed by aws for postgres and we can't delete option group as its used by snapshot.
diff --git a/testdata/expected_output/sample_infra_manifest_2/rds-tf/scripts/run_additional_scripts.sh b/testdata/expected_output/sample_infra_manifest_2/rds-tf/scripts/run_additional_scripts.sh
index 5996ac9..62a0eb4 100755
--- a/testdata/expected_output/sample_infra_manifest_2/rds-tf/scripts/run_additional_scripts.sh
+++ b/testdata/expected_output/sample_infra_manifest_2/rds-tf/scripts/run_additional_scripts.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -xe
 
 PRE_OR_POST_APPLY=$1
 
diff --git a/testdata/expected_output/sample_infra_manifest_flink/aurora-db-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest_flink/aurora-db-tf/deploy.sh
index 00b0eee..47839b2 100755
--- a/testdata/expected_output/sample_infra_manifest_flink/aurora-db-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest_flink/aurora-db-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 additional_terraform_options=""
 additional_terraform_options="${additional_terraform_options} -auto-approve"
diff --git a/testdata/expected_output/sample_infra_manifest_flink/aws-roles-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest_flink/aws-roles-tf/deploy.sh
index 6a5fea1..6463548 100755
--- a/testdata/expected_output/sample_infra_manifest_flink/aws-roles-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest_flink/aws-roles-tf/deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # exit when any command fails
-set -e
+set -xe
 
 additional_terraform_options=""
 additional_kube_options=""
diff --git a/testdata/expected_output/sample_infra_manifest_flink/aws-s3-bucket-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest_flink/aws-s3-bucket-tf/deploy.sh
index 8878e43..3e2ac44 100755
--- a/testdata/expected_output/sample_infra_manifest_flink/aws-s3-bucket-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest_flink/aws-s3-bucket-tf/deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # exit when any command fails
-set -e
+set -xe
 
 additional_terraform_options=""
 
diff --git a/testdata/expected_output/sample_infra_manifest_flink/document-db-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest_flink/document-db-tf/deploy.sh
index 77824ed..561723a 100755
--- a/testdata/expected_output/sample_infra_manifest_flink/document-db-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest_flink/document-db-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 additional_terraform_options=""
 
diff --git a/testdata/expected_output/sample_infra_manifest_flink/dynamo-db-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest_flink/dynamo-db-tf/deploy.sh
index e263d86..d389344 100755
--- a/testdata/expected_output/sample_infra_manifest_flink/dynamo-db-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest_flink/dynamo-db-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 additional_terraform_options=""
 
diff --git a/testdata/expected_output/sample_infra_manifest_flink/elastic-cache-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest_flink/elastic-cache-tf/deploy.sh
index 8d3d4a1..8468f15 100755
--- a/testdata/expected_output/sample_infra_manifest_flink/elastic-cache-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest_flink/elastic-cache-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 additional_terraform_options=""
 
diff --git a/testdata/expected_output/sample_infra_manifest_flink/rds-tf/deploy.sh b/testdata/expected_output/sample_infra_manifest_flink/rds-tf/deploy.sh
index c26599b..35a5ce3 100755
--- a/testdata/expected_output/sample_infra_manifest_flink/rds-tf/deploy.sh
+++ b/testdata/expected_output/sample_infra_manifest_flink/rds-tf/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -e
+set -xe
 
 function state_migration() {
     # remove option group from terraform state as option group api is removed by aws for postgres and we can't delete option group as its used by snapshot.
diff --git a/testdata/expected_output/sample_infra_manifest_flink/rds-tf/scripts/run_additional_scripts.sh b/testdata/expected_output/sample_infra_manifest_flink/rds-tf/scripts/run_additional_scripts.sh
index 5996ac9..62a0eb4 100755
--- a/testdata/expected_output/sample_infra_manifest_flink/rds-tf/scripts/run_additional_scripts.sh
+++ b/testdata/expected_output/sample_infra_manifest_flink/rds-tf/scripts/run_additional_scripts.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -xe
 
 PRE_OR_POST_APPLY=$1