Merge branch 'main' into feature/CCM-12616_mesh_poll_retrieve

Author: lapenna-bjss

.gitleaksignore

@@ -15,3 +15,7 @@ cc74128e4207833109339e96f3aaebf3cd40dd65:src/TESTING_PLAN.md:ipv4:2507
 973c8a1feb76f3cd8743ce27b14e4acc4252240c:src/TESTING_PLAN.md:ipv4:2507
 cc74128e4207833109339e96f3aaebf3cd40dd65:src/TESTING_PLAN.md:ipv4:2507
 791619daf5af4806da7266fa301c0e82145b6de8:src/TESTING_PLAN.md:ipv4:2507
+f8546e35b77b69ba7b15dbe3174d2d7e375200ef:utils/utils/src/__tests__/key-generation/validate-private-key.test.ts:private-key:7
+f8546e35b77b69ba7b15dbe3174d2d7e375200ef:utils/utils/src/__tests__/key-generation/get-private-key.test.ts:private-key:23
+f8546e35b77b69ba7b15dbe3174d2d7e375200ef:utils/utils/src/__tests__/key-generation/get-private-key.test.ts:private-key:30
+f8546e35b77b69ba7b15dbe3174d2d7e375200ef:utils/utils/src/__tests__/key-generation/get-private-key.test.ts:private-key:46

README.md

@@ -0,0 +1,23 @@
+resource "aws_cloudwatch_event_rule" "mesh_inbox_message_downloaded" {
+  name           = "${local.csi}-mesh-inbox-message-downloaded"
+  description    = "MESH inbox message downloaded event rule"
+  event_bus_name = aws_cloudwatch_event_bus.main.name
+
+  event_pattern = jsonencode({
+    "detail" : {
+      "type" : [
+        "uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1"
+      ],
+      "dataschemaversion" : [{
+        "prefix" : "1."
+      }]
+    }
+  })
+}
+
+resource "aws_cloudwatch_event_target" "mesh_inbox_message_downloaded" {
+  rule           = aws_cloudwatch_event_rule.mesh_inbox_message_downloaded.name
+  arn            = module.sqs_ttl.sqs_queue_arn
+  target_id      = "mesh-inbox-message-downloaded-target"
+  event_bus_name = aws_cloudwatch_event_bus.main.name
+}

infrastructure/terraform/components/dl/cloudwatch_event_rule_mesh_inbox_message_downloaded.tf

@@ -1,6 +1,6 @@
 import { createHandler } from 'apis/sqs-trigger-lambda';
 import type { SQSEvent } from 'aws-lambda';
-import { $TtlItemEvent, TtlItemEvent } from 'utils';
+import { $TtlItemBusEvent, TtlItemBusEvent } from 'utils';
 import { randomUUID } from 'node:crypto';
 
 jest.mock('node:crypto', () => ({
@@ -18,29 +18,32 @@ describe('createHandler', () => {
   let logger: any;
   let handler: any;
 
-  const validItem: TtlItemEvent = {
-    profileversion: '1.0.0',
-    profilepublished: '2025-10',
-    id: '999999999-9999-9999-9999-999999999999',
-    specversion: '1.0',
-    source: '/nhs/england/notify/production/primary/data-plane/digital-letters',
-    subject:
-      'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
-    type: 'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1',
-    time: '2000-01-02T02:00:00Z',
-    recordedtime: '2000-01-01T01:00:00Z',
-    severitynumber: 2,
-    traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
-    datacontenttype: 'application/json',
-    dataschema:
-      'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10/digital-letter-base-data.schema.json',
-    dataschemaversion: '1.0',
-    severitytext: 'INFO',
-    data: {
-      messageUri: 'https://example.com/ttl/resource',
-      'digital-letter-id': '123e4567-e89b-12d3-a456-426614174000',
-      messageReference: 'ref1',
-      senderId: 'sender1',
+  const validItem: TtlItemBusEvent = {
+    detail: {
+      profileversion: '1.0.0',
+      profilepublished: '2025-10',
+      id: '550e8400-e29b-41d4-a716-446655440001',
+      specversion: '1.0',
+      source:
+        '/nhs/england/notify/production/primary/data-plane/digital-letters',
+      subject:
+        'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
+      type: 'uk.nhs.notify.digital.letters.sent.v1',
+      time: '2023-06-20T12:00:00Z',
+      recordedtime: '2023-06-20T12:00:00.250Z',
+      severitynumber: 2,
+      traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
+      datacontenttype: 'application/json',
+      dataschema:
+        'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10/digital-letter-base-data.schema.json',
+      dataschemaversion: '1.0',
+      severitytext: 'INFO',
+      data: {
+        messageUri: 'https://example.com/ttl/resource',
+        'digital-letter-id': '123e4567-e89b-12d3-a456-426614174000',
+        messageReference: 'ref1',
+        senderId: 'sender1',
+      },
     },
   };
 
@@ -53,7 +56,7 @@ describe('createHandler', () => {
 
   it('processes a valid SQS event and returns success', async () => {
     jest
-      .spyOn($TtlItemEvent, 'safeParse')
+      .spyOn($TtlItemBusEvent, 'safeParse')
       .mockReturnValue({ success: true, data: validItem });
     createTtl.send.mockResolvedValue('sent');
     const event: SQSEvent = {
@@ -63,10 +66,10 @@ describe('createHandler', () => {
     const res = await handler(event);
 
     expect(res.batchItemFailures).toEqual([]);
-    expect(createTtl.send).toHaveBeenCalledWith(validItem);
+    expect(createTtl.send).toHaveBeenCalledWith(validItem.detail);
     expect(eventPublisher.sendEvents).toHaveBeenCalledWith([
       {
-        ...validItem,
+        ...validItem.detail,
         id: '550e8400-e29b-41d4-a716-446655440001',
         time: '2023-06-20T12:00:00.250Z',
         recordedtime: '2023-06-20T12:00:00.250Z',
@@ -84,7 +87,7 @@ describe('createHandler', () => {
   it('handles parse failure and logs error', async () => {
     const zodError = { errors: [] } as any;
     jest
-      .spyOn($TtlItemEvent, 'safeParse')
+      .spyOn($TtlItemBusEvent, 'safeParse')
       .mockReturnValue({ success: false, error: zodError });
     const event: SQSEvent = {
       Records: [{ body: '{}', messageId: 'msg2' }],
@@ -108,7 +111,7 @@ describe('createHandler', () => {
 
   it('handles createTtl.send failure', async () => {
     jest
-      .spyOn($TtlItemEvent, 'safeParse')
+      .spyOn($TtlItemBusEvent, 'safeParse')
       .mockReturnValue({ success: true, data: validItem });
     createTtl.send.mockResolvedValue('failed');
     const event: SQSEvent = {
@@ -127,7 +130,7 @@ describe('createHandler', () => {
   });
 
   it('handles thrown error and logs', async () => {
-    jest.spyOn($TtlItemEvent, 'safeParse').mockImplementation(() => {
+    jest.spyOn($TtlItemBusEvent, 'safeParse').mockImplementation(() => {
       throw new Error('bad json');
     });
     const event: SQSEvent = {
@@ -179,7 +182,7 @@ describe('createHandler', () => {
 
   it('processes multiple successful events and sends them as a batch', async () => {
     jest
-      .spyOn($TtlItemEvent, 'safeParse')
+      .spyOn($TtlItemBusEvent, 'safeParse')
       .mockReturnValue({ success: true, data: validItem });
     createTtl.send.mockResolvedValue('sent');
     const sqsEvent: SQSEvent = {
@@ -196,21 +199,21 @@ describe('createHandler', () => {
     expect(createTtl.send).toHaveBeenCalledTimes(3);
     expect(eventPublisher.sendEvents).toHaveBeenCalledWith([
       {
-        ...validItem,
+        ...validItem.detail,
         id: '550e8400-e29b-41d4-a716-446655440001',
         time: '2023-06-20T12:00:00.250Z',
         recordedtime: '2023-06-20T12:00:00.250Z',
         type: 'uk.nhs.notify.digital.letters.queue.item.enqueued.v1',
       },
       {
-        ...validItem,
+        ...validItem.detail,
         id: '550e8400-e29b-41d4-a716-446655440001',
         time: '2023-06-20T12:00:00.250Z',
         recordedtime: '2023-06-20T12:00:00.250Z',
         type: 'uk.nhs.notify.digital.letters.queue.item.enqueued.v1',
       },
       {
-        ...validItem,
+        ...validItem.detail,
         id: '550e8400-e29b-41d4-a716-446655440001',
         time: '2023-06-20T12:00:00.250Z',
         recordedtime: '2023-06-20T12:00:00.250Z',
@@ -227,7 +230,7 @@ describe('createHandler', () => {
 
   it('handles partial event publishing failures and logs warning', async () => {
     jest
-      .spyOn($TtlItemEvent, 'safeParse')
+      .spyOn($TtlItemBusEvent, 'safeParse')
       .mockReturnValue({ success: true, data: validItem });
     createTtl.send.mockResolvedValue('sent');
     const failedEvents = [validItem];
@@ -245,14 +248,14 @@ describe('createHandler', () => {
     expect(res.batchItemFailures).toEqual([]);
     expect(eventPublisher.sendEvents).toHaveBeenCalledWith([
       {
-        ...validItem,
+        ...validItem.detail,
         id: '550e8400-e29b-41d4-a716-446655440001',
         time: '2023-06-20T12:00:00.250Z',
         recordedtime: '2023-06-20T12:00:00.250Z',
         type: 'uk.nhs.notify.digital.letters.queue.item.enqueued.v1',
       },
       {
-        ...validItem,
+        ...validItem.detail,
         id: '550e8400-e29b-41d4-a716-446655440001',
         time: '2023-06-20T12:00:00.250Z',
         recordedtime: '2023-06-20T12:00:00.250Z',
@@ -268,7 +271,7 @@ describe('createHandler', () => {
 
   it('handles event publishing exception and logs warning', async () => {
     jest
-      .spyOn($TtlItemEvent, 'safeParse')
+      .spyOn($TtlItemBusEvent, 'safeParse')
       .mockReturnValue({ success: true, data: validItem });
     createTtl.send.mockResolvedValue('sent');
     const publishError = new Error('EventBridge error');
@@ -283,7 +286,7 @@ describe('createHandler', () => {
     expect(res.batchItemFailures).toEqual([]);
     expect(eventPublisher.sendEvents).toHaveBeenCalledWith([
       {
-        ...validItem,
+        ...validItem.detail,
         id: '550e8400-e29b-41d4-a716-446655440001',
         time: '2023-06-20T12:00:00.250Z',
         recordedtime: '2023-06-20T12:00:00.250Z',
@@ -299,7 +302,7 @@ describe('createHandler', () => {
 
   it('does not call eventPublisher when no successful events', async () => {
     jest
-      .spyOn($TtlItemEvent, 'safeParse')
+      .spyOn($TtlItemBusEvent, 'safeParse')
       .mockReturnValue({ success: true, data: validItem });
     createTtl.send.mockResolvedValue('failed');
 
@@ -321,7 +324,7 @@ describe('createHandler', () => {
 
   it('handles mixed success and failure scenarios', async () => {
     jest
-      .spyOn($TtlItemEvent, 'safeParse')
+      .spyOn($TtlItemBusEvent, 'safeParse')
       .mockReturnValueOnce({ success: true, data: validItem })
       .mockReturnValueOnce({ success: false, error: { errors: [] } as any })
       .mockReturnValueOnce({ success: true, data: validItem });
@@ -345,7 +348,7 @@ describe('createHandler', () => {
     ]);
     expect(eventPublisher.sendEvents).toHaveBeenCalledWith([
       {
-        ...validItem,
+        ...validItem.detail,
         id: '550e8400-e29b-41d4-a716-446655440001',
         time: '2023-06-20T12:00:00.250Z',
         recordedtime: '2023-06-20T12:00:00.250Z',

lambdas/ttl-create-lambda/src/__tests__/apis/sqs-trigger-lambda.test.ts

@@ -5,7 +5,7 @@ import type {
 } from 'aws-lambda';
 import { randomUUID } from 'node:crypto';
 import type { CreateTtl, CreateTtlOutcome } from 'app/create-ttl';
-import { $TtlItemEvent, EventPublisher, Logger, TtlItemEvent } from 'utils';
+import { $TtlItemBusEvent, EventPublisher, Logger, TtlItemEvent } from 'utils';
 
 interface ProcessingResult {
   result: CreateTtlOutcome;
@@ -34,7 +34,7 @@ export const createHandler = ({
             data: item,
             error: parseError,
             success: parseSuccess,
-          } = $TtlItemEvent.safeParse(JSON.parse(body));
+          } = $TtlItemBusEvent.safeParse(JSON.parse(body));
 
           if (!parseSuccess) {
             logger.error({
@@ -45,14 +45,14 @@ export const createHandler = ({
             return { result: 'failed' };
           }
 
-          const result = await createTtl.send(item);
+          const result = await createTtl.send(item.detail);
 
           if (result === 'failed') {
             batchItemFailures.push({ itemIdentifier: messageId });
             return { result: 'failed' };
           }
 
-          return { result, item };
+          return { result, item: item.detail };
         } catch (error) {
           logger.error({
             err: error,