From b1e44c26cfbeac3fb334caf25575b95b5c93db70 Mon Sep 17 00:00:00 2001
From: Rishi Kumar <rsi.dev17@gmail.com>
Date: Fri, 30 Aug 2024 05:37:07 +0530
Subject: [PATCH] chore: Make the script and guide more robust

---
 docs/pg-migration-guide/README.md                   |  3 +--
 modules/postgresql/gcp/bin/create-dms.sh            |  2 +-
 modules/postgresql/gcp/bin/postgres-perms-update.sh | 10 ++++++++--
 modules/postgresql/gcp/bin/terraform-db-swap.sh     |  2 +-
 modules/postgresql/gcp/bin/terraform-state-rm.sh    |  2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/docs/pg-migration-guide/README.md b/docs/pg-migration-guide/README.md
index 9117888b..c4020efa 100644
--- a/docs/pg-migration-guide/README.md
+++ b/docs/pg-migration-guide/README.md
@@ -214,10 +214,9 @@ Get the promoted instance PG15 connection string by running
 $ tofu output --raw source_instance > pg_connection.txt
 ```
 
-
 ```sh
 #TODO | Need to do a dry run again
-$ ./postgres-perms-update.sh <db-name-whose-perms-we-want-to-be-fixed>
+$ ./postgres-perms-update.sh <main.tf directory> <db-name-whose-perms-we-want-to-be-fixed>
 ```
 
 # Step 4: Promote the instance
diff --git a/modules/postgresql/gcp/bin/create-dms.sh b/modules/postgresql/gcp/bin/create-dms.sh
index 0c09ca30..5c2a41ae 100755
--- a/modules/postgresql/gcp/bin/create-dms.sh
+++ b/modules/postgresql/gcp/bin/create-dms.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -ex
+set -e
 
 # the directory we want to run the script in
 dir=${1}
diff --git a/modules/postgresql/gcp/bin/postgres-perms-update.sh b/modules/postgresql/gcp/bin/postgres-perms-update.sh
index a9fd9d64..94cb7619 100755
--- a/modules/postgresql/gcp/bin/postgres-perms-update.sh
+++ b/modules/postgresql/gcp/bin/postgres-perms-update.sh
@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
-set -ex
+set -e
+
+dir=${1}
+DB_NAME=${2}
+
+pushd ${dir}
 
-DB_NAME=${1}
 NEW_OWNER=${DB_NAME}-user
 # READ PG_CON from a file
 PG_CON=$(cat pg_connection.txt)
@@ -29,3 +33,5 @@ for sequence in $sequences; do
 done
 
 echo "Ownership of all tables in $DB_NAME has been granted to $NEW_OWNER."
+
+popd
diff --git a/modules/postgresql/gcp/bin/terraform-db-swap.sh b/modules/postgresql/gcp/bin/terraform-db-swap.sh
index 1860f785..91dd5205 100755
--- a/modules/postgresql/gcp/bin/terraform-db-swap.sh
+++ b/modules/postgresql/gcp/bin/terraform-db-swap.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -ex
+set -e
 
 dir=${1}
 module_prefix=${2}
diff --git a/modules/postgresql/gcp/bin/terraform-state-rm.sh b/modules/postgresql/gcp/bin/terraform-state-rm.sh
index 900ffcbf..c80c2912 100755
--- a/modules/postgresql/gcp/bin/terraform-state-rm.sh
+++ b/modules/postgresql/gcp/bin/terraform-state-rm.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -ex
+set -e
 
 dir=${1}
 module_prefix=${2}