Merge branch 'main' into fix/CCM-14248_letter-map-source-to-match-core

Author: masl2

.env.template

@@ -3,3 +3,27 @@ API_KEY=
 HEADERAUTH=
 PR_NUMBER=prxx # remove if needs to run against main
 NHSD_APIM_TOKEN=
+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
+
+# API Keys
+# ========
+# In order to find out the value of an environments given API key, follow these steps
+# 1. Log in to Non-Prod
+# 2. Navigate to 'Publish' > 'Apps' and search for the app linked to authentication
+# 3. Copy the "key" from the Credentials related to the app
+# Note: For INT and higher environments use developer portal https://identity.prod.api.platform.nhs.uk/
+export NON_PROD_API_KEY=xxx
+export INTEGRATION_API_KEY=xxx
+export PRODUCTION_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
+export INTEGRATION_PRIVATE_KEY=xxx
+# private key used to generate authentication for tests ran against the prod environment
+export PRODUCTION_PRIVATE_KEY=xxx

.github/CODEOWNERS

@@ -5,7 +5,7 @@
 /.github/                   @NHSDigital/nhs-notify-supplier-api-admins
 *.code-workspace            @NHSDigital/nhs-notify-supplier-api-admins
 /docs/                      @NHSDigital/nhs-notify-supplier-api
-/infrastructure/terraform/  @NHSDigital/nhs-notify-platform @NHSDigital/nhs-notify-supplier-api-admins
+/infrastructure/terraform/  @NHSDigital/nhs-notify-platform
 
 # Root level AGENTS.md owned by platform.
 AGENTS.md                   @NHSDigital/nhs-notify-platform

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

@@ -31,28 +31,28 @@ runs:
         make build VERSION="${{ inputs.version }}"
 
     - name: Upload abstractions artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         path: "src/server/abstractions/bin/Release"
         name: libs-abstractions-${{ inputs.version }}
         include-hidden-files: true
 
     - name: Upload data artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         path: "src/server/data/bin/Release"
         name: libs-data-${{ inputs.version }}
         include-hidden-files: true
 
     - name: Upload letter artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         path: "src/server/letter/bin/Release"
         name: libs-letter-${{ inputs.version }}
         include-hidden-files: true
 
     - name: Upload host artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         path: "src/server/host/bin/Release"
         name: libs-host-${{ inputs.version }}
@@ -75,7 +75,7 @@ runs:
         outputs: type=docker,dest=${{ runner.temp }}/myimage/myimage.tar
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: libs-host-docker-${{ inputs.version }}
         path: ${{ runner.temp }}/myimage

.github/actions/build-oas-spec/action.yml

@@ -68,7 +68,7 @@ runs:
         fi
 
     - name: Upload API OAS specification artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         path: "build"
         name: api-oas-specification-${{ inputs.apimEnv }}${{ inputs.version != '' && format('-{0}', inputs.version) || '' }}

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

@@ -96,7 +96,7 @@ runs:
         echo "APIM_ENV=$APIM_ENV" >> $GITHUB_ENV
 
     - name: Upload OAS Spec
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: ${{ env.APIM_ENV }}-build-output
         path: ./build

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

@@ -56,31 +56,31 @@ runs:
         make build VERSION="${{ inputs.version }}"
 
     - name: Upload html artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         path: "sdk/html"
         name: sdk-html-${{ inputs.version }}
 
     - name: Upload swagger artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         path: "sdk/swagger"
         name: sdk-swagger-${{ inputs.version }}
 
     - name: Upload ts artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         path: "sdk/typescript"
         name: sdk-ts-${{ inputs.version }}
 
     - name: Upload python artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         path: "sdk/python"
         name: sdk-python-${{ inputs.version }}
 
     - name: Upload csharp artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         path: "sdk/csharp"
         name: sdk-csharp-${{ inputs.version }}

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

@@ -36,13 +36,13 @@ runs:
         make build VERSION="${{ inputs.version }}"
 
     - name: Upload csharp-server artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         path: "server/csharp-server"
         name: server-csharp-${{ inputs.version }}
 
     - name: Upload csharp-server docker artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         path: "server/Dockerfile"
         name: server-csharp-docker-${{ inputs.version }}

.github/actions/create-lines-of-code-report/action.yaml

@@ -32,7 +32,7 @@ runs:
       run: zip lines-of-code-report.json.zip lines-of-code-report.json
     - name: "Upload CLOC report as an artefact"
       if: ${{ !env.ACT }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: lines-of-code-report.json.zip
         path: ./lines-of-code-report.json.zip

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

@@ -0,0 +1,22 @@
+name: E2E tests
+description: "Run end-to-end tests for this repo"
+
+runs:
+  using: "composite"
+
+  steps:
+    - name: Install poetry and e2e test dependencies
+      shell: bash
+      run: |
+        pipx install poetry
+        cd tests/e2e-tests && poetry install
+
+    - name: Run e2e tests
+      shell: bash
+      run: |
+        echo "$INTERNAL_DEV_TEST_PEM" > "${GITHUB_WORKSPACE}/internal-dev-test-1.pem"
+        chmod 600 "${GITHUB_WORKSPACE}/internal-dev-test-1.pem"
+        export PROXY_NAME=nhs-notify-supplier--internal-dev--nhs-notify-supplier
+        export API_ENVIRONMENT=internal-dev
+        export NON_PROD_PRIVATE_KEY="${GITHUB_WORKSPACE}/internal-dev-test-1.pem"
+        make .internal-dev-test

.github/actions/lint-terraform/action.yaml

@@ -7,15 +7,16 @@ inputs:
 runs:
   using: "composite"
   steps:
+    - name: "Install Terraform binary"
+      shell: bash
+      run: |
+        asdf plugin add terraform || true
+        asdf install terraform || true
     - name: "Check Terraform format"
       shell: bash
       run: |
         check_only=true scripts/githooks/check-terraform-format.sh
     - name: "Validate Terraform"
       shell: bash
       run: |
-        stacks=${{ inputs.root-modules }}
-        for dir in $(find infrastructure/environments -maxdepth 1 -mindepth 1 -type d; echo ${stacks//,/$'\n'}); do
-          dir=$dir opts='-backend=false' make terraform-init
-          dir=$dir make terraform-validate
-        done
+        make terraform-validate-all