Merge branch 'master' into feat/summary/az-func-weekly-task-owner-rep…

…ort-worker

pipelines/environment-pipeline.yml

@@ -51,18 +51,19 @@ stages:
               azureSubscription: 'FRA Automation Non-Prod'
               coreAzureSubscription: 'PROJECT_PORTAL (63b791ae-b2bc-41a1-ac66-806c4e69bffe)'
 
-          ## To get the pr slots to talk to the correct databases, we need to kill the key vault secret for connection string.
+          ## To get the pr slots to talk to the correct databases, we need to disable the key vault secret for connection string.
           ## The secret would override the direct env property used to target the correct db.
+          ## Cannot delete as this would only soft delete the secret and now allow subsequent deployment to create the secret again.
           - task: AzurePowerShell@5
-            displayName: 'Remove db connection string secret'
+            displayName: 'Disable db connection string secret'
             inputs:
               azureSubscription: 'PROJECT_PORTAL (63b791ae-b2bc-41a1-ac66-806c4e69bffe)'
               ScriptType: InlineScript
               FailOnStandardError: true
               azurePowerShellVersion: 'LatestVersion'
               Inline: |
-                Write-Host "Deleting secret @ kv-fap-resources-pr/ConnectionStrings--ResourcesDbContext"
-                Remove-AzKeyVaultSecret -VaultName kv-fap-resources-pr -Name ConnectionStrings--ResourcesDbContext -Force
+                Write-Host "Disabling secret @ kv-fap-resources-pr/ConnectionStrings--ResourcesDbContext"
+                Update-AzKeyVaultSecret -VaultName kv-fap-resources-pr -Name ConnectionStrings--ResourcesDbContext -Enable $False
 
 
 - stage: DeployQA