Merge pull request #1287 from DFE-Digital/616-deploy-workflow-update-…

…retrieve-webhook Update Retrieve Slack webhook from KV Steps
DFE-Digital · Sep 1, 2023 · 153b9cd · 153b9cd
2 parents cf8393b + 67194a2
commit 153b9cd
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -36,10 +36,8 @@ jobs:
         id: fetch-slack-webhook
         with:
           inlineScript: |
-            SECRET_VALUE=$(az keyvault secret show --name "SLACK-WEBHOOK" --vault-name "${{ secrets.INFRA_KEY_VAULT}}" --query "value")
-            SANITIZED_SECRET=$(echo $SECRET_VALUE | tr -d \")
-            echo "::add-mask::$SANITIZED_SECRET"
-            echo "SLACK-WEBHOOK=$SANITIZED_SECRET" >> $GITHUB_OUTPUT
+            SECRET_VALUE=$(az keyvault secret show --name "SLACK-WEBHOOK" --vault-name "${{ secrets.INFRA_KEY_VAULT}}" --query "value" -o tsv)
+            echo "SLACK-WEBHOOK=$SECRET_VALUE" >> $GITHUB_OUTPUT
 
       - name: Set up Docker Buildx
         id: buildx
@@ -110,10 +108,8 @@ jobs:
         id: fetch-slack-webhook
         with:
           inlineScript: |
-            SECRET_VALUE=$(az keyvault secret show --name "SLACK-WEBHOOK" --vault-name "${{ secrets.INFRA_KEY_VAULT}}" --query "value")
-            SANITIZED_SECRET=$(echo $SECRET_VALUE | tr -d \")
-            echo "::add-mask::$SANITIZED_SECRET"
-            echo "SLACK-WEBHOOK=$SANITIZED_SECRET" >> $GITHUB_OUTPUT
+            SECRET_VALUE=$(az keyvault secret show --name "SLACK-WEBHOOK" --vault-name "${{ secrets.INFRA_KEY_VAULT}}" --query "value" -o tsv)
+            echo "SLACK-WEBHOOK=$SECRET_VALUE" >> $GITHUB_OUTPUT
 
       - name: Trigger Development Deployment
         uses: ./.github/workflows/actions/deploy_v2
@@ -156,10 +152,8 @@ jobs:
         id: fetch-slack-webhook
         with:
           inlineScript: |
-            SECRET_VALUE=$(az keyvault secret show --name "SLACK-WEBHOOK" --vault-name "${{ secrets.INFRA_KEY_VAULT}}" --query "value")
-            SANITIZED_SECRET=$(echo $SECRET_VALUE | tr -d \")
-            echo "::add-mask::$SANITIZED_SECRET"
-            echo "SLACK-WEBHOOK=$SANITIZED_SECRET" >> $GITHUB_OUTPUT
+            SECRET_VALUE=$(az keyvault secret show --name "SLACK-WEBHOOK" --vault-name "${{ secrets.INFRA_KEY_VAULT}}" --query "value" -o tsv)
+            echo "SLACK-WEBHOOK=$SECRET_VALUE" >> $GITHUB_OUTPUT
 
       - name: Trigger Test Deployment
         uses: ./.github/workflows/actions/deploy_v2
@@ -201,10 +195,8 @@ jobs:
         id: fetch-slack-webhook
         with:
           inlineScript: |
-            SECRET_VALUE=$(az keyvault secret show --name "SLACK-WEBHOOK" --vault-name "${{ secrets.INFRA_KEY_VAULT}}" --query "value")
-            SANITIZED_SECRET=$(echo $SECRET_VALUE | tr -d \")
-            echo "::add-mask::$SANITIZED_SECRET"
-            echo "SLACK-WEBHOOK=$SANITIZED_SECRET" >> $GITHUB_OUTPUT
+            SECRET_VALUE=$(az keyvault secret show --name "SLACK-WEBHOOK" --vault-name "${{ secrets.INFRA_KEY_VAULT}}" --query "value" -o tsv)
+            echo "SLACK-WEBHOOK=$SECRET_VALUE" >> $GITHUB_OUTPUT
 
       - name: Trigger Production  Deployment
         uses: ./.github/workflows/actions/deploy_v2