Merge branch 'main' into feature/CCM-13428-trigger-proxy-deploy

Author: masl2

.editorconfig

@@ -70,3 +70,6 @@ generated_code = true
 
 [/internal/events/**/*.schema.json]
 insert_final_newline = unset
+
+[/pact-contracts/pacts/**/*.json]
+insert_final_newline = unset

.github/actions/node-install/action.yaml

@@ -0,0 +1,27 @@
+name: 'npm install and setup'
+description: 'Setup node, authenticate github package repository and perform clean npm install'
+
+inputs:
+  node-version:
+    description: 'Node.js version'
+    required: true
+  GITHUB_TOKEN:
+    description: "Token for access to github package registry"
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - name: 'Use Node.js'
+      uses: actions/setup-node@v6
+      with:
+        node-version: '${{ inputs.node-version }}'
+        registry-url: 'https://npm.pkg.github.com'
+        scope: '@nhsdigital'
+
+    - name: 'Install dependencies'
+      shell: bash
+      env:
+        NODE_AUTH_TOKEN: ${{ inputs.GITHUB_TOKEN }}
+      run: |
+        npm ci

.github/workflows/pr_destroy_dynamic_env.yaml

@@ -3,6 +3,8 @@ name: PR Destroy Environment
 on:
   pull_request:
     types: [closed]
+    branches:
+      - '*'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

.github/workflows/stage-2-test.yaml

@@ -58,10 +58,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-${{ inputs.nodejs_version }}-
       - name: "Repo setup"
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          npm ci
+        uses: ./.github/actions/node-install
+        with:
+          node-version: ${{ inputs.nodejs_version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: "Generate dependencies"
         run: |
           npm run generate-dependencies --workspaces --if-present
@@ -82,10 +82,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-${{ inputs.nodejs_version }}-
       - name: "Repo setup"
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          npm ci
+        uses: ./.github/actions/node-install
+        with:
+          node-version: ${{ inputs.nodejs_version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: "Generate dependencies"
         run: |
           npm run generate-dependencies --workspaces --if-present
@@ -104,6 +104,37 @@ jobs:
         with:
           name: code-coverage-report
           path: ".reports/lcov.info"
+  test-pact:
+    name: "Pact tests"
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    env:
+      NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v5
+      - name: "Cache node_modules"
+        uses: actions/cache@v4
+        with:
+          path: |
+            **/node_modules
+          key: ${{ runner.os }}-node-${{ inputs.nodejs_version }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-${{ inputs.nodejs_version }}-
+      - name: "Repo setup"
+        uses: ./.github/actions/node-install
+        with:
+          node-version: ${{ inputs.nodejs_version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: "Generate dependencies"
+        run: npm run generate-dependencies --workspaces --if-present
+      - name: "Run PACT tests"
+        run: npm run test:pact --workspace tests
+      - name: Publish Pact Contracts
+        run: ./scripts/publish-pact-contracts.sh
   test-lint:
     name: "Linting"
     runs-on: ubuntu-latest
@@ -120,10 +151,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-${{ inputs.nodejs_version }}-
       - name: "Repo setup"
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          npm ci
+        uses: ./.github/actions/node-install
+        with:
+          node-version: ${{ inputs.nodejs_version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: "Generate dependencies"
         run: |
           npm run generate-dependencies --workspaces --if-present
@@ -146,10 +177,10 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node-${{ inputs.nodejs_version }}-
       - name: "Repo setup"
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          npm ci
+        uses: ./.github/actions/node-install
+        with:
+          node-version: ${{ inputs.nodejs_version }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: "Generate dependencies"
         run: |
           npm run generate-dependencies --workspaces --if-present

.gitignore

@@ -32,3 +32,6 @@ dist
 /specification/api/components/security/security.yml
 /specification/api/components/parameters/authorization/authorization.yml
 /scripts/JWT/*.pem
+
+# ignore PACTS
+.pacts

.gitleaksignore

@@ -18,3 +18,4 @@ d8aaf7e033bf78fff491caa148897be266b60f67:src/src.sln:ipv4:3
 e12407e09151898bfd8d049d57eee9db9977d56b:.github/copilot-instructions.md:generic-api-key:213
 4ad86108d4e08cd410061e8842dd3a2b3bee4867:scripts/JWT/README.md:generic-api-key:38
 504844c9838740c8c5235024919f0775ad817cde:pact-contracts/pacts/letter-rendering/supplier-api-letter-request-prepared.json:generic-api-key:10
+82cf3b2e89ea24b97c4ffc09e618700fb1b0aff3:pact-contracts/pacts/letter-rendering/supplier-api-letter-request-prepared.json:generic-api-key:10

infrastructure/terraform/components/api/module_lambda_get_letter.tf

@@ -25,7 +25,7 @@ module "get_letter" {
   handler_function_name   = "getLetter"
   runtime                 = "nodejs22.x"
   memory                  = 128
-  timeout                 = 5
+  timeout                 = 29
   log_level               = var.log_level
 
   force_lambda_code_deploy = var.force_lambda_code_deploy

infrastructure/terraform/components/api/module_lambda_get_letter_data.tf

@@ -25,7 +25,7 @@ module "get_letter_data" {
   handler_function_name   = "getLetterData"
   runtime                 = "nodejs22.x"
   memory                  = 128
-  timeout                 = 5
+  timeout                 = 29
   log_level               = var.log_level
 
   force_lambda_code_deploy = var.force_lambda_code_deploy

infrastructure/terraform/components/api/module_lambda_get_letters.tf

@@ -25,7 +25,7 @@ module "get_letters" {
   handler_function_name   = "getLetters"
   runtime                 = "nodejs22.x"
   memory                  = 128
-  timeout                 = 5
+  timeout                 = 29
   log_level               = var.log_level
 
   force_lambda_code_deploy = var.force_lambda_code_deploy

infrastructure/terraform/components/api/module_lambda_get_status.tf

@@ -25,7 +25,7 @@ module "get_status" {
   handler_function_name   = "getStatus"
   runtime                 = "nodejs22.x"
   memory                  = 128
-  timeout                 = 5
+  timeout                 = 29
   log_level               = var.log_level
 
   force_lambda_code_deploy = var.force_lambda_code_deploy