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

Author: masl2

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

@@ -37,7 +37,6 @@ runs:
     - name: "Repo setup"
       uses: ./.github/actions/node-install
       with:
-        node-version: ${{ steps.nodejs_version.outputs.nodejs_version }}
         GITHUB_TOKEN: ${{ env.GITHUB_TOKEN }}
 
     - name: "Set PR NUMBER"

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

@@ -2,9 +2,6 @@ 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
@@ -15,7 +12,7 @@ runs:
     - name: 'Use Node.js'
       uses: actions/setup-node@v6
       with:
-        node-version: '${{ inputs.node-version }}'
+        node-version-file: '.tool-versions'
         registry-url: 'https://npm.pkg.github.com'
         scope: '@nhsdigital'
 

.github/workflows/pr_closed.yaml

@@ -80,7 +80,7 @@ jobs:
       - name: Setup NodeJS
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ inputs.nodejs_version }}
+          node-version-file: '.tool-versions'
           registry-url: 'https://npm.pkg.github.com'
 
       - name: check if local version differs from latest published version
@@ -113,19 +113,14 @@ jobs:
     steps:
       - name: "Checkout code"
         uses: actions/checkout@v5.0.0
-      - name: Setup NodeJS
-        uses: actions/setup-node@v4
+      - name: "Repo setup"
+        uses: ./.github/actions/node-install
         with:
-          node-version: ${{ inputs.nodejs_version }}
-          registry-url: 'https://npm.pkg.github.com'
-      - name: "Install dependencies"
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: npm ci
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: "Run provider contract tests"
         run: make test-contract
         env:
-          GITHUB_PACKAGES_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   publish-event-schemas:
     name: Publish event schemas package to GitHub package registry
@@ -145,7 +140,7 @@ jobs:
       - name: Setup NodeJS
         uses: actions/setup-node@v4
         with:
-          node-version: ${{ inputs.nodejs_version }}
+          node-version-file: '.tool-versions'
           registry-url: 'https://npm.pkg.github.com'
 
       - name: Install dependencies

Makefile

@@ -106,6 +106,9 @@ test-component:
 test-performance:
 	(cd tests && npm install && npm run test:performance)
 
+test-contract: # Run provider contract tests @Testing
+	npm run test:contracts --workspace tests/contracts/provider
+
 version:
 	rm -f .version
 	make version-create-effective-file dir=.

infrastructure/terraform/components/api/README.md

@@ -17,6 +17,7 @@ No requirements.
 | <a name="input_core_environment"></a> [core\_environment](#input\_core\_environment) | Environment of Core | `string` | `"prod"` | no |
 | <a name="input_default_tags"></a> [default\_tags](#input\_default\_tags) | A map of default tags to apply to all taggable resources within the component | `map(string)` | `{}` | no |
 | <a name="input_disable_gateway_execute_endpoint"></a> [disable\_gateway\_execute\_endpoint](#input\_disable\_gateway\_execute\_endpoint) | Disable the execution endpoint for the API Gateway | `bool` | `true` | no |
+| <a name="input_enable_api_data_trace"></a> [enable\_api\_data\_trace](#input\_enable\_api\_data\_trace) | Enable API Gateway data trace logging | `bool` | `false` | no |
 | <a name="input_enable_event_cache"></a> [enable\_event\_cache](#input\_enable\_event\_cache) | Enable caching of events to an S3 bucket | `bool` | `false` | no |
 | <a name="input_enable_sns_delivery_logging"></a> [enable\_sns\_delivery\_logging](#input\_enable\_sns\_delivery\_logging) | Enable SNS Delivery Failure Notifications | `bool` | `false` | no |
 | <a name="input_environment"></a> [environment](#input\_environment) | The name of the tfscaffold environment | `string` | n/a | yes |

infrastructure/terraform/components/api/api_gateway_method_settings.tf

@@ -6,6 +6,6 @@ resource "aws_api_gateway_method_settings" "main" {
   settings {
     metrics_enabled    = true
     logging_level      = "INFO"
-    data_trace_enabled = true
+    data_trace_enabled = var.enable_api_data_trace
   }
 }

infrastructure/terraform/components/api/variables.tf

@@ -187,3 +187,9 @@ variable "letter_event_source" {
   description = "Source value to use for the letter status event updates"
   default     = "/data-plane/supplier-api/nhs-supplier-api-prod/main/update-status"
 }
+
+variable "enable_api_data_trace" {
+  type        = bool
+  description = "Enable API Gateway data trace logging"
+  default     = false
+}

internal/events/package.json

@@ -50,5 +50,5 @@
     "typecheck": "tsc --noEmit"
   },
   "types": "dist/index.d.ts",
-  "version": "1.0.9"
+  "version": "1.0.10"
 }

internal/events/schemas/examples/letter.ACCEPTED.json

@@ -1,26 +1,29 @@
 {
   "data": {
     "billingRef": "1y3q9v1zzzz",
-    "domainId": "f47ac10b-58cc-4372-a567-0e02b2c3d479",
+    "domainId": "e9dc9ee9-b2f8-4ef2-8351-73a9a29f8e96_38U220Ghb1WXF8hCK6hL0LGya3Y_38U23YjtnKSZypvaCSb07adMOlq",
     "groupId": "client_template",
     "origin": {
       "domain": "letter-rendering",
       "event": "f47ac10b-58cc-4372-a567-0e02b2c3d479",
-      "source": "/data-plane/letter-rendering/prod/render-pdf",
-      "subject": "client/00f3b388-bbe9-41c9-9e76-052d37ee8988/letter-request/0o5Fs0EELR0fUjHjbCnEtdUwQe4_0o5Fs0EELR0fUjHjbCnEtdUwQe5"
+      "source": "/data-plane/letter-rendering/comms-mgr-prod/prod",
+      "subject": "client/e9dc9ee9-b2f8-4ef2-8351-73a9a29f8e96/letter-request/38U220Ghb1WXF8hCK6hL0LGya3Y_38U23YjtnKSZypvaCSb07adMOlq"
     },
     "specificationId": "1y3q9v1zzzz",
-    "status": "ACCEPTED"
+    "status": "ACCEPTED",
+    "supplierId": "supplier-12345"
   },
   "datacontenttype": "application/json",
   "dataschema": "https://notify.nhs.uk/cloudevents/schemas/supplier-api/letter.ACCEPTED.1.0.0.schema.json",
+  "dataschemaversion": "1.0.0",
   "id": "23f1f09c-a555-4d9b-8405-0b33490bc920",
+  "plane": "data",
   "recordedtime": "2025-08-28T08:45:00.000Z",
   "severitynumber": 2,
   "severitytext": "INFO",
   "source": "/data-plane/supplier-api/nhs-supplier-api-prod/main/update-status",
   "specversion": "1.0",
-  "subject": "letter-origin/letter-rendering/letter/f47ac10b-58cc-4372-a567-0e02b2c3d479",
+  "subject": "letter-origin/letter-rendering/letter/e9dc9ee9-b2f8-4ef2-8351-73a9a29f8e96_38U220Ghb1WXF8hCK6hL0LGya3Y_38U23YjtnKSZypvaCSb07adMOlq",
   "time": "2025-08-28T08:45:00.000Z",
   "traceparent": "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01",
   "type": "uk.nhs.notify.supplier-api.letter.ACCEPTED.v1"

internal/events/schemas/examples/letter.CANCELLED.json

@@ -0,0 +1,32 @@
+{
+  "data": {
+    "billingRef": "1y3q9v1zzzz",
+    "domainId": "e9dc9ee9-b2f8-4ef2-8351-73a9a29f8e96_38U220Ghb1WXF8hCK6hL0LGya3Y_38U23YjtnKSZypvaCSb07adMOlq",
+    "groupId": "client_template",
+    "origin": {
+      "domain": "letter-rendering",
+      "event": "f47ac10b-58cc-4372-a567-0e02b2c3d479",
+      "source": "/data-plane/letter-rendering/comms-mgr-prod/prod",
+      "subject": "client/e9dc9ee9-b2f8-4ef2-8351-73a9a29f8e96/letter-request/38U220Ghb1WXF8hCK6hL0LGya3Y_38U23YjtnKSZypvaCSb07adMOlq"
+    },
+    "reasonCode": "CANCELLATION_CODE",
+    "reasonText": "Cancellation reason",
+    "specificationId": "1y3q9v1zzzz",
+    "status": "CANCELLED",
+    "supplierId": "supplier-12345"
+  },
+  "datacontenttype": "application/json",
+  "dataschema": "https://notify.nhs.uk/cloudevents/schemas/supplier-api/letter.CANCELLED.1.0.0.schema.json",
+  "dataschemaversion": "1.0.0",
+  "id": "23f1f09c-a555-4d9b-8405-0b33490bc920",
+  "plane": "data",
+  "recordedtime": "2025-08-28T08:45:00.000Z",
+  "severitynumber": 2,
+  "severitytext": "INFO",
+  "source": "/data-plane/supplier-api/nhs-supplier-api-prod/main/update-status",
+  "specversion": "1.0",
+  "subject": "letter-origin/letter-rendering/letter/e9dc9ee9-b2f8-4ef2-8351-73a9a29f8e96_38U220Ghb1WXF8hCK6hL0LGya3Y_38U23YjtnKSZypvaCSb07adMOlq",
+  "time": "2025-08-28T08:45:00.000Z",
+  "traceparent": "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01",
+  "type": "uk.nhs.notify.supplier-api.letter.CANCELLED.v1"
+}