preproduction database restore

DFE-Digital · Nov 4, 2024 · b4f94e0 · b4f94e0
1 parent a62d224
commit b4f94e0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/.github/workflows/database-ptr.yml b/.github/workflows/database-ptr.yml
@@ -10,7 +10,7 @@ on:
         type: choice
         options:
           - test
-          - preproduction
+          - preprod
           - production
       confirm-production:
         description: Must be set to true if restoring production
@@ -46,7 +46,7 @@ jobs:
       - name: Set environment variables
         run: |
           source global_config/${{ inputs.environment }}.sh
-          tf_vars_file=${{ env.TF_VARS_PATH }}/${{ inputs.environment }}/variables.tfvars.json
+          tf_vars_file=${{ env.TF_VARS_PATH }}/${{ env.ENVIRONMENT }}/variables.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
 

diff --git a/.github/workflows/database-restore.yml b/.github/workflows/database-restore.yml
@@ -11,7 +11,7 @@ on:
         options:
           - development
           - test
-          - preproduction
+          - preprod
           - production
       confirm-production:
         description: Must be set to true if restoring production
@@ -46,7 +46,7 @@ jobs:
       - name: Set environment variables
         run: |
           source global_config/${{ inputs.environment }}.sh
-          tf_vars_file=${{ env.TF_VARS_PATH }}/${{ inputs.environment }}/variables.tfvars.json
+          tf_vars_file=${{ env.TF_VARS_PATH }}/${{ env.ENVIRONMENT }}/variables.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 "STORAGE_ACCOUNT_NAME=${AZURE_RESOURCE_PREFIX}${SERVICE_SHORT}dbbkp${CONFIG_SHORT}sa" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
         with:
           storage-account: ${{ env.STORAGE_ACCOUNT_NAME }}
           resource-group: ${{ env.RESOURCE_GROUP_NAME }}
-          app-name: ${{ env.SERVICE_NAME }}-${{ inputs.environment }}-web
+          app-name: ${{ env.SERVICE_NAME }}-${{ env.ENVIRONMENT }}-web
           cluster: ${{ env.CLUSTER }}
           azure-credentials: ${{ secrets.AZURE_CREDENTIALS }}
           backup-file: ${{ env.BACKUP_FILE }}
diff --git a/global_config/preproduction.sh b/global_config/preproduction.sh