CCM-11726 Fix dispatch

Author: nicki-nhs

.github/workflows/dispatch_internal_repo_workflow.yaml

@@ -58,14 +58,16 @@ jobs:
       - name: Trigger nhs-notify-internal workflow
         shell: bash
         run: |
+          callerRunId="${GITHUB_RUN_ID}-${{ inputs.jobName }}-${GITHUB_RUN_ATTEMPT}"
+
           DISPATCH_EVENT=$(jq -ncM \
           --arg infraRepoName "${{ inputs.infraRepoName }}" \
-          --arg releaseVersion ${{ inputs.releaseVersion }} \
-          --arg targetEnvironment ${{ inputs.targetEnvironment }} \
-          --arg targetAccountGroup ${{ inputs.targetAccountGroup }} \
-          --arg targetComponent ${{ inputs.targetComponent }} \
+          --arg releaseVersion "${{ inputs.releaseVersion }}" \
+          --arg targetEnvironment "${{ inputs.targetEnvironment }}" \
+          --arg targetAccountGroup "${{ inputs.targetAccountGroup }}" \
+          --arg targetComponent "${{ inputs.targetComponent }}" \
           --arg terraformAction "${{ inputs.terraformAction }}" \
-          --arg callerRunId "${GITHUB_RUN_ID}-${{ inputs.jobName }}-${GITHUB_RUN_ATTEMPT}"\
+          --arg callerRunId "$callerRunId" \
           --arg targetWorkflow "${{ inputs.targetWorkflow }}" \
           '{
             "ref": "${{ inputs.internalRef }}",
@@ -78,7 +80,7 @@ jobs:
                 "targetAccountGroup": $targetAccountGroup,
                 "targetComponent": $targetComponent
               } +
-              (if ($targetWorkflow | test("dispatch-(acceptance|contextual|product|security)-tests-.*.yaml"))
+              (if ($targetWorkflow | test("dispatch-(acceptance|contextual|product|security)-tests-.*\\.yaml"))
                 then { "callerRunId": $callerRunId } else {} end)
             )
           }')
@@ -97,7 +99,6 @@ jobs:
           echo "Workflow triggered. Waiting for the workflow to complete.."
 
           # Poll GitHub API to check the workflow status
-          callerRunId="${GITHUB_RUN_ID}-${{ inputs.jobName }}-${GITHUB_RUN_ATTEMPT}"
 
           workflow_run_url=""
           for i in {1..18}; do
@@ -106,16 +107,22 @@ jobs:
               -H "Authorization: Bearer ${{ secrets.PR_TRIGGER_PAT }}" \
               -H "X-GitHub-Api-Version: 2022-11-28" \
               "https://api.github.com/repos/NHSDigital/nhs-notify-internal/actions/runs?event=workflow_dispatch" \
-              | jq -r --arg callerRunId "$callerRunId" \
-                    --arg targetWorkflow "${{ inputs.targetWorkflow }}" \
+              | jq -r \
+                  --arg callerRunId "$callerRunId" \
+                  --arg targetWorkflow "${{ inputs.targetWorkflow }}" \
+                  --arg targetEnvironment "${{ inputs.targetEnvironment }}" \
+                  --arg targetAccountGroup "${{ inputs.targetAccountGroup }}" \
+                  --arg targetComponent "${{ inputs.targetComponent }}" \
+                  --arg terraformAction "${{ inputs.terraformAction }}" \
                 '.workflow_runs[]
                   | select(.path == ".github/workflows/" + $targetWorkflow)
                   | select(.name
-                  | contains("'${{ inputs.targetEnvironment }}'") and
-                    contains("'${{ inputs.targetAccountGroup }}'") and
-                    contains("'${{ inputs.targetComponent }}'") and
-                    contains("'${{ inputs.terraformAction }}'"))
-                  | if ($targetWorkflow | test("dispatch-(acceptance|contextual|product|security)-tests-.*.yaml"))
+                      | contains($targetEnvironment)
+                      and contains($targetAccountGroup)
+                      and contains($targetComponent)
+                      and contains($terraformAction)
+                  )
+                  | if ($targetWorkflow | test("dispatch-(acceptance|contextual|product|security)-tests-.*\\.yaml"))
                       then select(.name | contains("caller:" + $callerRunId))
                       else .
                     end