CCM-11726: Add run ID to trigger and filter (#648)

Author: nicki-nhs

.github/workflows/dispatch_internal_repo_workflow.yaml

@@ -58,26 +58,32 @@ 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 terraformAction "${{ inputs.terraformAction }}" \
-            '{
-              "ref": "${{ inputs.internalRef }}",
-              "inputs": (
-                (if $infraRepoName != "" then { "infraRepoName": $infraRepoName } else {} end) +
-                (if $terraformAction != "" then { "terraformAction": $terraformAction } else {} end) +
-                {
-                  "releaseVersion": $releaseVersion,
-                  "targetEnvironment": $targetEnvironment,
-                  "targetAccountGroup": $targetAccountGroup,
-                  "targetComponent": $targetComponent
-                }
-              )
-            }')
+          --arg infraRepoName "${{ inputs.infraRepoName }}" \
+          --arg releaseVersion "${{ inputs.releaseVersion }}" \
+          --arg targetEnvironment "${{ inputs.targetEnvironment }}" \
+          --arg targetAccountGroup "${{ inputs.targetAccountGroup }}" \
+          --arg targetComponent "${{ inputs.targetComponent }}" \
+          --arg terraformAction "${{ inputs.terraformAction }}" \
+          --arg callerRunId "$callerRunId" \
+          --arg targetWorkflow "${{ inputs.targetWorkflow }}" \
+          '{
+            "ref": "${{ inputs.internalRef }}",
+            "inputs": (
+              (if $infraRepoName != "" then { "infraRepoName": $infraRepoName } else {} end) +
+              (if $terraformAction != "" then { "terraformAction": $terraformAction } else {} end) +
+              {
+                "releaseVersion": $releaseVersion,
+                "targetEnvironment": $targetEnvironment,
+                "targetAccountGroup": $targetAccountGroup,
+                "targetComponent": $targetComponent
+              } +
+              (if ($targetWorkflow | test("dispatch-(acceptance|contextual|product|security)-tests-.*\\.yaml"))
+                then { "callerRunId": $callerRunId } else {} end)
+            )
+          }')
 
           # Trigger The workflow
           curl -L \
@@ -93,20 +99,34 @@ jobs:
           echo "Workflow triggered. Waiting for the workflow to complete.."
 
           # Poll GitHub API to check the workflow status
+
           workflow_run_url=""
-          for i in {1..12}; do
+          for i in {1..18}; do
             workflow_run_url=$(curl -s \
               -H "Accept: application/vnd.github+json" \
               -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&status=in_progress" \
-              | jq -r '.workflow_runs[]
-                | select(.name
-                | contains("'${{ inputs.targetEnvironment }}'") and
-                  contains("'${{ inputs.targetAccountGroup }}'") and
-                  contains("'${{ inputs.targetComponent }}'") and
-                  contains("'${{ inputs.terraformAction }}'"))
-                | .url')
+              "https://api.github.com/repos/NHSDigital/nhs-notify-internal/actions/runs?event=workflow_dispatch" \
+              | 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($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
+                  | .url')
 
             if [[ -n "$workflow_run_url" && "$workflow_run_url" != null ]]; then
               ui_url=${workflow_run_url/api./}