From 43e04d2c5acd9cd1a96c646b6d0f34d4d7317edd Mon Sep 17 00:00:00 2001
From: Rowan Gill <rowan.gill1@nhs.net>
Date: Mon, 23 Oct 2023 14:33:10 +0100
Subject: [PATCH] feature/PI-43-stored-properties secret stuff 3

---
 .github/workflows/_deploy.yml                   | 10 +++++++++-
 .github/workflows/deploy-parameters-nonprod.yml |  9 ---------
 .github/workflows/deploy-parameters-prod.yml    |  9 ---------
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/_deploy.yml b/.github/workflows/_deploy.yml
index 02cc28090..8cf8ef78e 100644
--- a/.github/workflows/_deploy.yml
+++ b/.github/workflows/_deploy.yml
@@ -28,8 +28,17 @@ env:
   # SLACK_WEBHOOK_URL: ${{ secrets.DEPLOY_ENV_SLACK_HOOK_URL }}
 
 jobs:
+  parse-secrets:
+    runs-on: [self-hosted, ci]
+    steps:
+      - id: parse-secrets
+        run: |
+          echo "::add-mask::${{ secrets.CI_ROLE_NAME }}"
+          echo "CI_ROLE_NAME=${{ secrets.CI_ROLE_NAME }}" >> $GITHUB_ENV
+
   get-branch-from-workflow-file:
     runs-on: [self-hosted, ci]
+    needs: [parse-secrets]
     outputs:
       branch_name: ${{ steps.get_branch.outputs.branch_name }}
     steps:
@@ -53,7 +62,6 @@ jobs:
 
   helpers--truststore-pull:
     needs: [get-branch-from-workflow-file, build]
-    name: Terraform plan - ${{ inputs.workspace }})
     runs-on: [self-hosted, ci]
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/deploy-parameters-nonprod.yml b/.github/workflows/deploy-parameters-nonprod.yml
index ac33b0441..ea68cd7f7 100644
--- a/.github/workflows/deploy-parameters-nonprod.yml
+++ b/.github/workflows/deploy-parameters-nonprod.yml
@@ -14,17 +14,8 @@ on:
           - int
 
 jobs:
-  parse-secrets:
-    runs-on: [self-hosted, ci]
-    steps:
-      - id: parse-secrets
-        run: |
-          echo "::add-mask::${{ secrets.CI_ROLE_NAME }}"
-          echo "CI_ROLE_NAME=${{ secrets.CI_ROLE_NAME }}" >> $GITHUB_ENV
-
   deploy:
     uses: ./.github/workflows/_deploy.yml
-    needs: [parse-secrets]
     with:
       workspace: ${{ inputs.workspace }}
       parameter-deploy: "parameter_deploy"
diff --git a/.github/workflows/deploy-parameters-prod.yml b/.github/workflows/deploy-parameters-prod.yml
index e73b9f773..90e2eed5b 100644
--- a/.github/workflows/deploy-parameters-prod.yml
+++ b/.github/workflows/deploy-parameters-prod.yml
@@ -4,17 +4,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  parse-secrets:
-    runs-on: [self-hosted, ci]
-    steps:
-      - id: parse-secrets
-        run: |
-          echo "::add-mask::${{ secrets.CI_ROLE_NAME }}"
-          echo "CI_ROLE_NAME=${{ secrets.CI_ROLE_NAME }}" >> $GITHUB_ENV
-
   deploy:
     uses: ./.github/workflows/_deploy.yml
-    needs: [parse-secrets]
     with:
       workspace: prod
       parameter-deploy: "parameter_deploy"