From 207a74243488381a96c8c8a41d67e561fc43bec0 Mon Sep 17 00:00:00 2001 From: Colin Saliceti Date: Thu, 2 Jan 2025 12:52:25 +0000 Subject: [PATCH] TEMP --- .github/workflows/database-backup.yml | 2 +- .github/workflows/postgres-ptr.yml | 6 ++++-- .github/workflows/postgres-restore.yml | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/database-backup.yml b/.github/workflows/database-backup.yml index 0545c560d..552e98276 100644 --- a/.github/workflows/database-backup.yml +++ b/.github/workflows/database-backup.yml @@ -79,7 +79,7 @@ jobs: echo "SLACK_WEBHOOK=$SLACK_WEBHOOK" >> $GITHUB_OUTPUT - name: Backup ${{ env.DEPLOY_ENV }} postgres - uses: DFE-Digital/github-actions/backup-postgres@master + uses: DFE-Digital/github-actions/backup-postgres@oidc-ga with: storage-account: ${{ env.STORAGE_ACCOUNT_NAME }} resource-group: ${{ env.RESOURCE_GROUP_NAME }} diff --git a/.github/workflows/postgres-ptr.yml b/.github/workflows/postgres-ptr.yml index caf88f5f4..e215f6f19 100644 --- a/.github/workflows/postgres-ptr.yml +++ b/.github/workflows/postgres-ptr.yml @@ -60,11 +60,13 @@ jobs: echo "NEW_DB_SERVER=${NEW_DB_SERVER}" >> $GITHUB_ENV - name: Restore ${{ inputs.environment }} postgres - uses: DFE-Digital/github-actions/ptr-postgres@master + uses: DFE-Digital/github-actions/ptr-postgres@oidc-ga with: resource-group: ${{ env.RESOURCE_GROUP_NAME }} source-server: ${{ env.DB_SERVER }} new-server: ${{ env.NEW_DB_SERVER }} restore-time: ${{ inputs.restore-time }} cluster: ${{ env.CLUSTER }} - azure-credentials: ${{ secrets.AZURE_CREDENTIALS}} + azure-client-id: ${{ secrets.AZURE_CLIENT_ID }} + azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} + azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }} diff --git a/.github/workflows/postgres-restore.yml b/.github/workflows/postgres-restore.yml index 118cec34f..cd5ead9e2 100644 --- a/.github/workflows/postgres-restore.yml +++ b/.github/workflows/postgres-restore.yml @@ -59,11 +59,13 @@ jobs: echo "BACKUP_FILE=$BACKUP_FILE" >> $GITHUB_ENV - name: Restore ${{ inputs.environment }} postgres - uses: DFE-Digital/github-actions/restore-postgres-backup@master + uses: DFE-Digital/github-actions/restore-postgres-backup@oidc-ga with: storage-account: ${{ env.STORAGE_ACCOUNT_NAME }} resource-group: ${{ env.RESOURCE_GROUP_NAME }} app-name: ${{ env.SERVICE_NAME }}-${{ inputs.environment }} cluster: ${{ env.CLUSTER }} - azure-credentials: ${{ secrets.AZURE_CREDENTIALS }} + azure-client-id: ${{ secrets.AZURE_CLIENT_ID }} + azure-subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }} + azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }} backup-file: ${{ env.BACKUP_FILE }}