Update workflows with github-actions changes

DFE-Digital · Oct 16, 2024 · 6d3f271 · 6d3f271
1 parent 37c9ca4
commit 6d3f271
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 51 deletions.
diff --git a/.github/workflows/backup-db.yml b/.github/workflows/backup-db.yml
@@ -41,6 +41,10 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
+    - uses: azure/login@v2
+      with:
+        creds: ${{ secrets.AZURE_CREDENTIALS }}
+
     - name: Set environment variables
       run: |
         source global_config/${DEPLOY_ENV}.sh
@@ -60,6 +64,15 @@ jobs:
         echo "BACKUP_FILE=${BACKUP_FILE}" >> $GITHUB_ENV
         echo "KEYVAULT_NAME=${AZURE_RESOURCE_PREFIX}-${SERVICE_SHORT}-${CONFIG_SHORT}-inf-kv" >> $GITHUB_ENV
 
+    - name: Fetch secrets from key vault
+      uses: azure/CLI@v2
+      id: key-vault-secrets
+      with:
+        inlineScript: |
+          SLACK_WEBHOOK=$(az keyvault secret show --name "SLACK-WEBHOOK" --vault-name ${KEYVAULT_NAME} --query "value" -o tsv)
+          echo "::add-mask::$SLACK_WEBHOOK"
+          echo "SLACK_WEBHOOK=$SLACK_WEBHOOK" >> $GITHUB_OUTPUT
+
     - name: Backup ${{ env.DEPLOY_ENV }} postgres
       uses: DFE-Digital/github-actions/backup-postgres@master
       with:
@@ -70,33 +83,4 @@ jobs:
         azure-credentials: ${{ secrets.AZURE_CREDENTIALS }}
         backup-file: ${{ env.BACKUP_FILE }}.sql
         db-server-name: ${{ inputs.db-server }}
-
-    - name: Backup Summary
-      if: success()
-      run: |
-        NOW=$(TZ=Europe/London date +"%F %R")
-        echo 'BACKUP SUCCESSFUL!' >> $GITHUB_STEP_SUMMARY
-        echo '  ENV: ${{ env.DEPLOY_ENV }}' >> $GITHUB_STEP_SUMMARY
-        echo "  AT : ${NOW}" >> $GITHUB_STEP_SUMMARY
-        echo '  DB SERVER: ${{ inputs.db-server || env.DB_SERVER  }}' >> $GITHUB_STEP_SUMMARY
-        echo '  STORAGE ACCOUNT: ${{ env.STORAGE_ACCOUNT_NAME }}' >> $GITHUB_STEP_SUMMARY
-        echo '  FILENAME: ${{ env.BACKUP_FILE }}.sql.gz' >> $GITHUB_STEP_SUMMARY
-
-    - name: Get Slack webhook
-      uses: Azure/get-keyvault-secrets@v1
-      if: failure()
-      id: key-vault-secrets
-      with:
-        keyvault: ${{ env.KEYVAULT_NAME }}
-        secrets: "SLACK-WEBHOOK"
-
-    - name: Notify Slack channel on job failure
-      if: failure()
-      uses: rtCamp/action-slack-notify@v2
-      env:
-        SLACK_USERNAME: CI Deployment
-        SLACK_TITLE: Database backup failure
-        SLACK_MESSAGE: Production database backup job failed
-        SLACK_WEBHOOK: ${{ steps.key-vault-secrets.outputs.SLACK-WEBHOOK }}
-        SLACK_COLOR: failure
-        SLACK_FOOTER: Sent from backup job in backup-db workflow
+        slack-webhook: ${{ steps.key-vault-secrets.outputs.SLACK_WEBHOOK }}
diff --git a/.github/workflows/postgres-ptr.yml b/.github/workflows/postgres-ptr.yml
@@ -67,14 +67,3 @@ jobs:
         restore-time: ${{ inputs.restore-time }}
         cluster: ${{ env.CLUSTER }}
         azure-credentials: ${{ secrets.AZURE_CREDENTIALS}}
-
-    - name: Restore Summary
-      if: success()
-      run: |
-        NOW=$(TZ=Europe/London date +"%F %R")
-        echo 'RESTORE SUCCESSFUL!' >> $GITHUB_STEP_SUMMARY
-        echo '  ENV: ${{ inputs.environment }}' >> $GITHUB_STEP_SUMMARY
-        echo "  AT : ${NOW}" >> $GITHUB_STEP_SUMMARY
-        echo '  SOURCE SERVER: ${{ env.DB_SERVER }}' >> $GITHUB_STEP_SUMMARY
-        echo '  RESTORED SERVER: ${{ env.NEW_DB_SERVER }}' >> $GITHUB_STEP_SUMMARY
-        echo '  RESTORE POINT: ${{ inputs.restore-time }} UTC' >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/postgres-restore.yml b/.github/workflows/postgres-restore.yml
@@ -66,13 +66,3 @@ jobs:
         cluster: ${{ env.CLUSTER }}
         azure-credentials: ${{ secrets.AZURE_CREDENTIALS }}
         backup-file: ${{ env.BACKUP_FILE }}
-
-    - name: Restore Summary
-      if: success()
-      run: |
-        NOW=$(TZ=Europe/London date +"%F %R")
-        echo 'RESTORE SUCCESSFUL!' >> $GITHUB_STEP_SUMMARY
-        echo '  ENV: ${{ inputs.environment }}' >> $GITHUB_STEP_SUMMARY
-        echo "  AT : ${NOW}" >> $GITHUB_STEP_SUMMARY
-        echo '  DB SERVER: ${{ env.DB_SERVER }}' >> $GITHUB_STEP_SUMMARY
-        echo '  BACKUP FILE RESTORED: ${{ env.BACKUP_FILE }}' >> $GITHUB_STEP_SUMMARY