From caaea747737883a6bf94498ed1941f4512fdbb65 Mon Sep 17 00:00:00 2001
From: syedimranhassan <imran.hassan@arbisoft.com>
Date: Tue, 12 Dec 2023 12:59:24 +0500
Subject: [PATCH] chore: Update check dead lock job to run for whitelisted
 regions

---
 devops/jobs/ExportRDSDeadLocks.groovy  | 6 ++++++
 devops/jobs/ListMysqlProcess.groovy    | 6 +++---
 devops/resources/export-dead-locks.sh  | 5 ++++-
 devops/resources/list-mysql-process.sh | 6 +++---
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/devops/jobs/ExportRDSDeadLocks.groovy b/devops/jobs/ExportRDSDeadLocks.groovy
index e47d98a1e..335dcbef1 100644
--- a/devops/jobs/ExportRDSDeadLocks.groovy
+++ b/devops/jobs/ExportRDSDeadLocks.groovy
@@ -40,6 +40,11 @@ class ExportRDSDeadLocks {
                         rdsignore = "${rdsignore}-i ${ignore} "
                     }
 
+                    def whitelistregions = ""
+                    configuration.REGION_LIST.each { include ->
+                        whitelistregions = "${whitelistregions}-r ${include} "
+                    }
+
                     environmentVariables {
                         env('AWS_DEFAULT_REGION', extraVars.get('REGION'))
                         env('ENVIRONMENT', environment)
@@ -47,6 +52,7 @@ class ExportRDSDeadLocks {
                         env('PORT', extraVars.get('PORT'))
                         env('INDEXNAME', INDEXNAME)
                         env('RDSIGNORE', rdsignore)
+                        env('WHITELISTREGIONS', whitelistregions)
                     }
 
                     multiscm {
diff --git a/devops/jobs/ListMysqlProcess.groovy b/devops/jobs/ListMysqlProcess.groovy
index f72139aff..e599f1787 100644
--- a/devops/jobs/ListMysqlProcess.groovy
+++ b/devops/jobs/ListMysqlProcess.groovy
@@ -37,16 +37,16 @@ class ListMysqlProcess {
                         rdsignore = "${rdsignore}-i ${ignore} "
                     }
 
-                    def regioninclude = ""
+                    def whitelistregions = ""
                     configuration.REGION_LIST.each { include ->
-                        regioninclude = "${regioninclude}-r ${include} "
+                        whitelistregions = "${whitelistregions}-r ${include} "
                     }
 
                     environmentVariables {
                         env('AWS_DEFAULT_REGION', extraVars.get('REGION'))
                         env('ENVIRONMENT', environment)
                         env('RDSIGNORE', rdsignore)
-                        env('REGIONINCLUDE', regioninclude)
+                        env('WHITELISTREGIONS', whitelistregions)
                     }
 
                     multiscm {
diff --git a/devops/resources/export-dead-locks.sh b/devops/resources/export-dead-locks.sh
index c7d44d0b8..381992316 100644
--- a/devops/resources/export-dead-locks.sh
+++ b/devops/resources/export-dead-locks.sh
@@ -22,5 +22,8 @@ set -x
 if [[ ! -v RDSIGNORE ]]; then
     RDSIGNORE=""
 fi
+if [[ ! -v WHITELISTREGIONS ]]; then
+    WHITELISTREGIONS=""
+fi
 
-python export_dead_locks.py --environment ${ENVIRONMENT} --hostname ${HOSTNAME} --port ${PORT} --indexname ${INDEXNAME} ${RDSIGNORE}
+python export_dead_locks.py --environment ${ENVIRONMENT} --hostname ${HOSTNAME} --port ${PORT} --indexname ${INDEXNAME} ${RDSIGNORE} ${WHITELISTREGIONS}
diff --git a/devops/resources/list-mysql-process.sh b/devops/resources/list-mysql-process.sh
index 1d86c8e8c..c700834b2 100644
--- a/devops/resources/list-mysql-process.sh
+++ b/devops/resources/list-mysql-process.sh
@@ -22,8 +22,8 @@ set -x
 if [[ ! -v RDSIGNORE ]]; then
     RDSIGNORE=""
 fi
-if [[ ! -v REGIONINCLUDE ]]; then
-    REGIONINCLUDE=""
+if [[ ! -v WHITELISTREGIONS ]]; then
+    WHITELISTREGIONS=""
 fi
 
-python list_mysql_process.py --environment ${ENVIRONMENT} ${RDSIGNORE} ${REGIONINCLUDE}
+python list_mysql_process.py --environment ${ENVIRONMENT} ${RDSIGNORE} ${WHITELISTREGIONS}