From 85e5c66f9e40654fced182b95fcec4152a151c63 Mon Sep 17 00:00:00 2001 From: RMcVelia Date: Tue, 5 Nov 2024 14:23:15 +0000 Subject: [PATCH] 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