From a6955a9989ca9e7fb2d1e5293e9d17ee0322f05f Mon Sep 17 00:00:00 2001
From: RMcVelia <rick.mcvelia@gmail.com>
Date: Tue, 5 Nov 2024 10:33:46 +0000
Subject: [PATCH 1/2] use AZURE_RESOURCE_PREFIX in db restore workflows

---
 .github/workflows/postgres-ptr.yml     | 4 ++--
 .github/workflows/postgres-restore.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/postgres-ptr.yml b/.github/workflows/postgres-ptr.yml
index ef148ca218c..d7067f2acf0 100644
--- a/.github/workflows/postgres-ptr.yml
+++ b/.github/workflows/postgres-ptr.yml
@@ -49,9 +49,9 @@ jobs:
         source global_config/${{ inputs.environment }}.sh
         tf_vars_file=${TF_VARS_PATH}/${{ inputs.environment }}.tfvars.json
         echo "CLUSTER=$(jq -r '.cluster' ${tf_vars_file})" >> $GITHUB_ENV
-        echo "RESOURCE_GROUP_NAME=${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-rg" >> $GITHUB_ENV
+        echo "RESOURCE_GROUP_NAME=${RESOURCE_NAME_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-rg" >> $GITHUB_ENV
 
-        DB_SERVER="${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-pg"
+        DB_SERVER="${RESOURCE_NAME_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-pg"
         if [[ -n "${{ inputs.new-db-server }}" ]]; then
           NEW_DB_SERVER="${{ inputs.new-db-server }}"
         else
diff --git a/.github/workflows/postgres-restore.yml b/.github/workflows/postgres-restore.yml
index 1241adac848..da8158ff555 100644
--- a/.github/workflows/postgres-restore.yml
+++ b/.github/workflows/postgres-restore.yml
@@ -49,9 +49,9 @@ jobs:
         tf_vars_file=${{ env.TF_VARS_PATH }}/${{ inputs.environment }}.tfvars.json
         echo "CLUSTER=$(jq -r '.cluster' ${tf_vars_file})" >> $GITHUB_ENV
         echo "AKS_ENV=$(jq -r '.app_environment' ${tf_vars_file})" >> $GITHUB_ENV
-        echo "RESOURCE_GROUP_NAME=${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-rg" >> $GITHUB_ENV
-        echo "STORAGE_ACCOUNT_NAME=${AZURE_RESOURCE_PREFIX}${SERVICE_SHORT}dbbkp${CONFIG_SHORT}sa" >> $GITHUB_ENV
-        echo "DB_SERVER=${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-pg" >> $GITHUB_ENV
+        echo "RESOURCE_GROUP_NAME=${RESOURCE_NAME_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-rg" >> $GITHUB_ENV
+        echo "STORAGE_ACCOUNT_NAME=${RESOURCE_NAME_PREFIX}${SERVICE_SHORT}dbbkp${CONFIG_SHORT}sa" >> $GITHUB_ENV
+        echo "DB_SERVER=${RESOURCE_NAME_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-pg" >> $GITHUB_ENV
         TODAY=$(date +"%F")
         echo "BACKUP_FILE=${SERVICE_SHORT}_${CONFIG_SHORT}_${TODAY}.sql" >> $GITHUB_ENV
         if [ "${{ inputs.backup-file }}" != "" ]; then

From 85e5c66f9e40654fced182b95fcec4152a151c63 Mon Sep 17 00:00:00 2001
From: RMcVelia <rick.mcvelia@gmail.com>
Date: Tue, 5 Nov 2024 14:23:15 +0000
Subject: [PATCH 2/2] fix server name in db workflows

---
 .github/workflows/backup-db.yml        | 2 +-
 .github/workflows/postgres-ptr.yml     | 2 +-
 .github/workflows/postgres-restore.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/backup-db.yml b/.github/workflows/backup-db.yml
index 60ddc291b48..03a290c8bbb 100644
--- a/.github/workflows/backup-db.yml
+++ b/.github/workflows/backup-db.yml
@@ -57,7 +57,7 @@ jobs:
         echo "RESOURCE_GROUP_NAME=${RESOURCE_NAME_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-rg" >> $GITHUB_ENV
         echo "STORAGE_ACCOUNT_NAME=${RESOURCE_NAME_PREFIX}${SERVICE_SHORT}dbbkp${CONFIG_SHORT}sa" >> $GITHUB_ENV
         TODAY=$(date +"%F")
-        echo "DB_SERVER=${RESOURCE_NAME_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-pg" >> $GITHUB_ENV
+        echo "DB_SERVER=${RESOURCE_NAME_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-psql" >> $GITHUB_ENV
         if [ "${BACKUP_FILE}" == "schedule" ]; then
           BACKUP_FILE=${SERVICE_SHORT}_${CONFIG_SHORT}_${TODAY}
         elif [ "${BACKUP_FILE}" == "default" ]; then
diff --git a/.github/workflows/postgres-ptr.yml b/.github/workflows/postgres-ptr.yml
index d7067f2acf0..cc8ec006a43 100644
--- a/.github/workflows/postgres-ptr.yml
+++ b/.github/workflows/postgres-ptr.yml
@@ -51,7 +51,7 @@ jobs:
         echo "CLUSTER=$(jq -r '.cluster' ${tf_vars_file})" >> $GITHUB_ENV
         echo "RESOURCE_GROUP_NAME=${RESOURCE_NAME_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-rg" >> $GITHUB_ENV
 
-        DB_SERVER="${RESOURCE_NAME_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-pg"
+        DB_SERVER="${RESOURCE_NAME_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-psql"
         if [[ -n "${{ inputs.new-db-server }}" ]]; then
           NEW_DB_SERVER="${{ inputs.new-db-server }}"
         else
diff --git a/.github/workflows/postgres-restore.yml b/.github/workflows/postgres-restore.yml
index da8158ff555..ed63d0df958 100644
--- a/.github/workflows/postgres-restore.yml
+++ b/.github/workflows/postgres-restore.yml
@@ -51,7 +51,7 @@ jobs:
         echo "AKS_ENV=$(jq -r '.app_environment' ${tf_vars_file})" >> $GITHUB_ENV
         echo "RESOURCE_GROUP_NAME=${RESOURCE_NAME_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-rg" >> $GITHUB_ENV
         echo "STORAGE_ACCOUNT_NAME=${RESOURCE_NAME_PREFIX}${SERVICE_SHORT}dbbkp${CONFIG_SHORT}sa" >> $GITHUB_ENV
-        echo "DB_SERVER=${RESOURCE_NAME_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-pg" >> $GITHUB_ENV
+        echo "DB_SERVER=${RESOURCE_NAME_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-psql" >> $GITHUB_ENV
         TODAY=$(date +"%F")
         echo "BACKUP_FILE=${SERVICE_SHORT}_${CONFIG_SHORT}_${TODAY}.sql" >> $GITHUB_ENV
         if [ "${{ inputs.backup-file }}" != "" ]; then