Merge branch 'main' into feature/CCM-17337-Publish-Supplier-Configuration-Event

Author: masl2

.env.template

@@ -1,12 +1,26 @@
-ENVIRONMENT=$ENV_NAME
-API_KEY=
-HEADERAUTH=
-PR_NUMBER=prxx # remove if needs to run against main
-NHSD_APIM_TOKEN=
+# Your github Personal Access Token (PAT)
+GITHUB_TOKEN=
+
+# Apigee proxy name to be used for test execution
+# nhs-notify-supplier--internal-dev--nhs-notify-supplier-PR-XX
 PROXY_NAME=
-# * nhs-notify-supplier--internal-dev--nhs-notify-supplier
-# * nhs-notify-supplier--internal-dev--nhs-notify-supplier-PR-XX
-# * nhs-notify-supplier--ref--nhs-notify-supplier -- ref env
+
+# APIM env to run e2e tests against, other options are: ref, int, prod
+API_ENVIRONMENT=internal-dev
+
+# Used for component and e2e tests
+# Account group controls default account id mapping for tests.
+# If omitted, tests default to dev:
+# TARGET_ACCOUNT_GROUP=nhs-notify-supplier-api-dev
+# Mapping used by tests:
+# nhs-notify-supplier-api-dev -> 820178564574
+# nhs-notify-supplier-api-nonprod -> 885964308133
+# nhs-notify-supplier-api-prod -> blocked (tests are intentionally disabled for prod)
+TARGET_ACCOUNT_GROUP=nhs-notify-supplier-api-dev
+
+# Resource namespace used to resolve AWS resource names for tests (main, pr123)
+# remove if needs to run against main
+TARGET_ENVIRONMENT=prxx
 
 # API Keys
 # ========
@@ -22,9 +36,9 @@ export STATUS_ENDPOINT_API_KEY=xxx
 
 # Private Keys
 # ============
-# private key used to generate authentication for tests ran against the internal-dev and internal-qa
-export NON_PROD_PRIVATE_KEY=xxx # path to the private key file
-# private key used to generate authentication for tests ran against the int environment
+# private key path used to generate authentication for tests ran against the internal-dev and internal-qa
+export NON_PROD_PRIVATE_KEY=xxx
+# private key path used to generate authentication for tests ran against the int environment
 export INTEGRATION_PRIVATE_KEY=xxx
-# private key used to generate authentication for tests ran against the prod environment
+# private key path used to generate authentication for tests ran against the prod environment
 export PRODUCTION_PRIVATE_KEY=xxx

…ns/acceptance-tests-component/action.yml …s/acceptance-tests-components/action.yml.github/actions/acceptance-tests-component/action.yml renamed to .github/actions/acceptance-tests-components/action.yml .github/actions/acceptance-tests-component/action.yml renamed to .github/actions/acceptance-tests-components/action.yml

@@ -14,6 +14,10 @@ inputs:
     description: Name of the component under test
     required: true
 
+  targetAccountGroup:
+    description: Name of the account group under test (e.g. nhs-notify-supplier-api-dev)
+    required: true
+
 runs:
   using: "composite"
 
@@ -39,5 +43,6 @@ runs:
       shell: bash
       env:
         TARGET_ENVIRONMENT: ${{ inputs.targetEnvironment }}
+        TARGET_ACCOUNT_GROUP: ${{ inputs.targetAccountGroup }}
       run: |
         make test-${{ inputs.testType }}

.github/actions/acceptance-tests-e2e/action.yml

@@ -5,6 +5,9 @@ inputs:
   targetEnvironment:
     description: Name of the environment under test
     required: true
+  targetAccountGroup:
+    description: Name of the account group under test
+    required: true
 
 runs:
   using: "composite"
@@ -65,6 +68,7 @@ runs:
       env:
         TARGET_ENVIRONMENT: ${{ inputs.targetEnvironment }}
         PR_NUMBER: ${{ steps.set_pr_number.outputs.pr_number }}
+        TARGET_ACCOUNT_GROUP: ${{ inputs.targetAccountGroup }}
       run: |
         echo "$DEV_E2E_KEYS_PRIVATE" > "${GITHUB_WORKSPACE}/internal-dev-test-1.pem"
         chmod 600 "${GITHUB_WORKSPACE}/internal-dev-test-1.pem"

.github/actions/acceptance-tests/action.yml

@@ -11,8 +11,7 @@ inputs:
     required: true
 
   targetAccountGroup:
-    description: Name of the account group under test
-    default: nhs-notify-template-management-dev
+    description: Name of the account group under test (e.g. nhs-notify-supplier-api-dev)
     required: true
 
   targetComponent:
@@ -24,16 +23,18 @@ runs:
 
   steps:
 
-    - name: Run component tests
+    - name: Run components tests (sandbox and component tests)
       if: ${{ inputs.testType != 'e2e' }}
-      uses: ./.github/actions/acceptance-tests-component
+      uses: ./.github/actions/acceptance-tests-components
       with:
         testType: ${{ inputs.testType }}
         targetEnvironment: ${{ inputs.targetEnvironment }}
         targetComponent: ${{ inputs.targetComponent }}
+        targetAccountGroup: ${{ inputs.targetAccountGroup }}
 
     - name: Run e2e tests
-      if: ${{ inputs.testType == 'e2e' && inputs.targetEnvironment == 'main' }}
+      if: ${{ inputs.testType == 'e2e' }}
       uses: ./.github/actions/acceptance-tests-e2e
       with:
         targetEnvironment: ${{ inputs.targetEnvironment }}
+        targetAccountGroup: ${{ inputs.targetAccountGroup }}

.github/actions/build-proxies/action.yml

@@ -72,19 +72,6 @@ runs:
           echo "TARGET_DOMAIN=suppliers.dev.nhsnotify.national.nhs.uk" >> $GITHUB_ENV
         fi
 
-        if [ -z $PR_NUMBER ]
-        then
-          echo "INSTANCE=$PROXYGEN_API_NAME" >> $GITHUB_ENV
-          echo "TARGET=https://main.$TARGET_DOMAIN" >> $GITHUB_ENV
-          echo "SANDBOX_TAG=latest" >> $GITHUB_ENV
-          echo "MTLS_NAME=notify-supplier-mtls" >> $GITHUB_ENV
-        else
-          echo "TARGET=https://pr$PR_NUMBER.$TARGET_DOMAIN" >> $GITHUB_ENV
-          echo "INSTANCE=$PROXYGEN_API_NAME-PR-$PR_NUMBER" >> $GITHUB_ENV
-          echo "SANDBOX_TAG=pr$PR_NUMBER" >> $GITHUB_ENV
-          echo "MTLS_NAME=notify-supplier-mtls-pr$PR_NUMBER" >> $GITHUB_ENV
-        fi
-
     - name: Set APIM_ENV
       shell: bash
       run: |

.github/actions/test-types.json

@@ -1,5 +1,4 @@
 [
   "component",
-  "e2e",
-  "sandbox"
+  "e2e"
 ]

.github/workflows/cicd-1-pull-request.yaml

@@ -33,7 +33,7 @@ jobs:
       deploy_proxy: ${{ steps.deploy_proxy.outputs.deploy_proxy }}
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: "Set CI/CD variables"
         id: variables
         run: |

.github/workflows/cicd-4-pr-title-check.yaml

@@ -15,6 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Check PR title format"
-        uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-pr-title-format@4e781d1d72739015821a380871aa5a66d070177c # 3.1.0
+        uses: NHSDigital/nhs-notify-shared-modules/.github/actions/check-pr-title-format@5be2f2e952a6f439fb673e04aac5f5b7afcc2c2f # 4.0.1
         with:
           title: ${{ github.event.pull_request.title }}

.github/workflows/deploy-dynamic-env-proxy.yaml

@@ -29,7 +29,8 @@ jobs:
 
       - name: Resolve nodejs version
         id: toolversions
-        run: echo "nodejs_version=$(grep '^nodejs\s' .tool-versions | cut -f2 -d' ')" >>
+        run:
+          echo "nodejs_version=$(grep '^nodejs\s' .tool-versions | cut -f2 -d' ')" >>
           "$GITHUB_OUTPUT"
 
       - name: "Check if pull request exists for this branch and set

.github/workflows/pr_closed.yaml

@@ -56,9 +56,9 @@ jobs:
       packages: read
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup NodeJS
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: ".tool-versions"
           registry-url: "https://npm.pkg.github.com"
@@ -92,7 +92,7 @@ jobs:
       packages: read
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: "Repo setup"
         uses: ./.github/actions/node-install
         with:
@@ -115,9 +115,9 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Setup NodeJS
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: ".tool-versions"
           registry-url: "https://npm.pkg.github.com"