Merge pull request #162 from NHSDigital/aiva2/CCM-7407_AddingDedicatedJobsPerMicroserviceg

CCM-7407 target new dedicated jobs for builds

Author: aidenvaines-cgi

.github/workflows/pr_merge.yaml

@@ -22,12 +22,13 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        component: [dnsroot]
+        component: [acct, app]
 
-    uses: ./.github/workflows/trigger_internal_repo_build.yaml
+    uses: ./.github/workflows/reusable_internal_repo_build.yaml
     secrets: inherit
     with:
       release_version: main
+      target_workflow: "dispatch-deploy-static-notify-web-template-management-env.yaml"
       tf_environment: "main"
       tf_group: "nhs-notify-template-management-dev"
       tf_component: ${{ matrix.component }}

.github/workflows/release_created.yaml

@@ -11,20 +11,22 @@ concurrency:
 jobs:
   deploy-main:
     name: Deploy changes to main in nonprod AWS Account
-    runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write
+      contents: read
 
     strategy:
       max-parallel: 1
       matrix:
-        component: [dnsroot]
+        component: [acct, app]
 
-    steps:
-      - name: Trigger nhs-notify-internal static environment workflow deployments
-        uses: ./.github/workflows/trigger_internal_repo_build.yaml
-        with:
-          secrets: inherit
-          release_version: ${{ github.event.release.tag_name }}
-          tf_environment: "main"
-          tf_group: "nhs-notify-template-management-nonprod"
-          tf_component: ${{ matrix.component }}
-          tf_action: "apply"
+    uses: ./.github/workflows/reusable_internal_repo_build.yaml
+    secrets: inherit
+    with:
+      release_version: ${{ github.event.release.tag_name }}
+      target_workflow: "dispatch-deploy-static-notify-web-template-management-env.yaml"
+      tf_environment: "main"
+      tf_group: "nhs-notify-template-management-nonprod"
+      tf_component: ${{ matrix.component }}
+      tf_action: "apply"

…rkflows/trigger_internal_repo_build.yaml …kflows/reusable_internal_repo_build.yaml.github/workflows/trigger_internal_repo_build.yaml renamed to .github/workflows/reusable_internal_repo_build.yaml .github/workflows/trigger_internal_repo_build.yaml renamed to .github/workflows/reusable_internal_repo_build.yaml

@@ -1,4 +1,4 @@
-name: Trigger Notify Internal Infrastructure Deployment
+name: Call Notify Internal Infrastructure Deployment
 ## Sub workflow which plans and deploys Notify components as part of the workflow.
 ## Review Gates may be required to proceed on triggered builds.
 
@@ -9,6 +9,10 @@ on:
         type: string
         description: The Github release version, commit, or tag.
         default: main
+      target_workflow:
+        type: string
+        description: The name of the github workflow to call.
+        default: main
       tf_environment:
         type: string
         description: The Terraform environment to deploy
@@ -44,18 +48,15 @@ jobs:
         shell: bash
         run: |
           set -x
-          this_repo_name=$(echo ${{ github.repository }} | cut -d'/' -f2)
 
           DISPATCH_EVENT=$(jq -ncM \
-            --arg infraRepoName "${this_repo_name}" \
             --arg releaseVersion ${{ inputs.release_version }} \
             --arg targetEnvironment ${{ inputs.tf_environment }} \
             --arg targetAccountGroup ${{ inputs.tf_group }} \
             --arg targetComponent ${{ inputs.tf_component }} \
             --arg terraformAction ${{ inputs.tf_action }} \
             '{ "ref": "main",
               "inputs": {
-                "infraRepoName": $infraRepoName,
                 "releaseVersion", $releaseVersion,
                 "targetEnvironment", $targetEnvironment,
                 "targetAccountGroup", $targetAccountGroup,
@@ -72,7 +73,7 @@ jobs:
             -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/workflows/dispatch-deploy-static-env.yaml/dispatches \
+            "https://api.github.com/repos/NHSDigital/nhs-notify-internal/actions/workflows/${{ inputs.target_workflow }}/dispatches" \
             -d "${DISPATCH_EVENT}"
 
           echo "Workflow triggered successfully. HTTP response. Waiting for the workflow to complete.."