Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
resource "aws_cloudwatch_event_rule" "data_plane" {
name = "${local.csi}-data-plane"
description = "Data plane event rule"
event_bus_name = aws_cloudwatch_event_bus.main.name

event_pattern = jsonencode({
"detail" : {
"plane" : [
"data"
],
}
})
}

resource "aws_cloudwatch_event_target" "data-plane-main-bus-target" {
rule = aws_cloudwatch_event_rule.data_plane.name
arn = module.eventpub.sns_topic.arn
event_bus_name = aws_cloudwatch_event_bus.main.name

input_path = "$.detail"
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ data "aws_iam_policy_document" "sns_publish" {
condition {
test = "ArnEquals"
variable = "aws:SourceArn"
values = [aws_cloudwatch_event_rule.letter_prepared.arn]
values = [aws_cloudwatch_event_rule.letter_prepared.arn,
aws_cloudwatch_event_rule.data_plane.arn
]
}
}
}
7 changes: 5 additions & 2 deletions lambdas/core-notifier-lambda/src/__tests__/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,11 @@ export const mockResponse: SingleMessageResponse = {

export const validPdmEvent: PDMResourceAvailable = {
id: 'event-id-123',
source:
'/nhs/england/notify/development/dev-12345/data-plane/digitalletters/pdm',
plane: 'data',
dataschemaversion: '1.0.0',
source: '/nhs/england/notify/development/dev-12345/digitalletters/pdm',
dataschema:
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-pdm-resource-available-data.schema.json',
specversion: '1.0',
type: 'uk.nhs.notify.digital.letters.pdm.resource.available.v1',
time: '2025-12-15T10:00:00Z',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ describe('mapper', () => {
specversion: '1.0',
id: 'event-123',
source: 'pdm-service',
plane: 'data',
dataschemaversion: '1.0.0',
subject: 'resource/available',
type: 'uk.nhs.notify.digital.letters.pdm.resource.available.v1',
time: '2024-01-15T10:30:00Z',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ const createValidItemDequeuedBody = (
detail: {
specversion: '1.0',
id: `event-${messageReference}`,
source:
'/nhs/england/notify/development/primary/data-plane/digitalletters/queue',
plane: 'data',
dataschemaversion: '1.0.0',
source: '/nhs/england/notify/development/primary/digitalletters/queue',
subject: `message/${messageReference}`,
type: 'uk.nhs.notify.digital.letters.queue.item.dequeued.v1',
time: '2026-01-19T12:00:00Z',
Expand Down Expand Up @@ -319,7 +320,7 @@ describe('SQS Handler', () => {
specversion: '1.0',
id: 'event-001',
source:
'/nhs/england/notify/development/primary/data-plane/digitalletters/queue',
'/nhs/england/notify/development/primary/digitalletters/queue',
type: 'uk.nhs.notify.wrong.event.type.v1',
time: '2026-01-19T12:00:00Z',
data: {
Expand Down Expand Up @@ -386,7 +387,7 @@ describe('SQS Handler', () => {
specversion: '1.0',
id: 'event-001',
source:
'/nhs/england/notify/development/primary/data-plane/digitalletters/queue',
'/nhs/england/notify/development/primary/digitalletters/queue',
type: 'uk.nhs.notify.digital.letters.queue.item.dequeued.v1',
time: '2026-01-19T12:00:00Z',
data: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def create_downloaded_event_dict(event_id: str) -> Dict[str, str | int | Dict[st
"specversion": "1.0",
"source": (
"/nhs/england/notify/production/primary/"
'data-plane/digitalletters/mesh'
'digitalletters/mesh'
),
"subject": (
'customer/920fca11-596a-4eca-9c47-99f624614658/'
Expand All @@ -18,6 +18,7 @@ def create_downloaded_event_dict(event_id: str) -> Dict[str, str | int | Dict[st
"type": (
'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1'
),
"plane": "data",
"time": '2026-01-08T10:00:00Z',
"recordedtime": '2026-01-08T10:00:00Z',
"severitynumber": 2,
Expand All @@ -28,6 +29,7 @@ def create_downloaded_event_dict(event_id: str) -> Dict[str, str | int | Dict[st
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/'
'digital-letters-mesh-inbox-message-downloaded-data.schema.json'
),
"dataschemaversion": '1.0.0',
"datacategory": "non-sensitive",
"dataclassification": "public",
"dataregulation": "GDPR",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,14 @@ def create_invalid_sqs_record(event_id: str) -> Dict[str, str]:
'detail': {
'id': event_id,
'specversion': '1.0',
'source': '/nhs/england/notify/production/primary/data-plane/digitalletters/mesh',
'source': '/nhs/england/notify/production/primary/digitalletters/mesh',
'subject': (
'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/'
'769acdd4-6a47-496f-999f-76a6fd2c3959'
),
'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1',
'plane': 'data',
'dataschemaversion': '1.0.0',
'time': '2026-01-08T10:00:00Z',
'recordedtime': '2026-01-08T10:00:00Z',
'severitynumber': 2,
Expand Down Expand Up @@ -155,6 +157,8 @@ def test_publish_success(
'time': fixed_time.isoformat(),
'recordedtime': fixed_time.isoformat(),
'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.acknowledged.v1',
'plane': 'data',
'dataschemaversion': '1.0.0',
'dataschema': (
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/'
'digital-letters-mesh-inbox-message-acknowledged-data.schema.json'
Expand Down
2 changes: 2 additions & 0 deletions lambdas/mesh-acknowledge/mesh_acknowledge/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ def publish_acknowledged_event(
'time': now,
'recordedtime': now,
'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.acknowledged.v1',
'plane': 'data',
'dataschemaversion': '1.0.0',
'dataschema': (
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/'
'digital-letters-mesh-inbox-message-acknowledged-data.schema.json'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,12 @@ def create_valid_cloud_event():
return {
'id': str(uuid4()),
'specversion': '1.0',
'source': '/nhs/england/notify/development/primary/data-plane/digitalletters/mesh',
'source': '/nhs/england/notify/development/primary/digitalletters/mesh',
'subject': 'customer/00000000-0000-0000-0000-000000000000/recipient/00000000-0000-0000-0000-000000000000',
'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.received.v1',
'plane': 'data',
'dataschemaversion': '1.0.0',
'datacontenttype': 'application/json',
'time': '2023-01-01T12:00:00Z',
'recordedtime': '2023-01-01T12:00:00Z',
'severitynumber': 2,
Expand Down Expand Up @@ -159,9 +162,12 @@ def test_process_sqs_message_success(self, mock_datetime):

# Verify CloudEvent envelope fields
assert published_event['type'] == 'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1'
assert published_event['source'] == '/nhs/england/notify/development/primary/data-plane/digitalletters/mesh'
assert published_event['source'] == '/nhs/england/notify/development/primary/digitalletters/mesh'
assert published_event['subject'] == 'customer/00000000-0000-0000-0000-000000000000/recipient/00000000-0000-0000-0000-000000000000'
assert published_event['time'] == '2025-11-19T15:30:45+00:00'
assert published_event['plane'] == 'data'
assert published_event['dataschemaversion'] == '1.0.0'
assert published_event['datacontenttype'] == 'application/json'
assert 'id' in published_event
assert 'tracestate' not in published_event
assert 'partitionkey' not in published_event
Expand Down
2 changes: 2 additions & 0 deletions lambdas/mesh-download/mesh_download/processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ def _publish_downloaded_event(self, incoming_event, message_uri):
'time': now,
'recordedtime': now,
'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1',
'plane': 'data',
'dataschemaversion': '1.0.0',
'dataschema': (
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/'
'digital-letters-mesh-inbox-message-downloaded-data.schema.json'
Expand Down
7 changes: 5 additions & 2 deletions lambdas/mesh-poll/mesh_poll/processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ def __init__(self, **kwargs):

environment = 'development'
deployment = 'primary'
plane = 'data-plane'
self.__cloud_event_source = (
f'/nhs/england/notify/{environment}/{deployment}/{plane}/'
f'/nhs/england/notify/{environment}/{deployment}/'
'digitalletters/mesh'
)

Expand Down Expand Up @@ -163,6 +162,8 @@ def _publish_mesh_inbox_message_received_event(self, event_detail):
f'{event_detail["data"]["messageReference"]}'
),
'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.received.v1',
'plane': 'data',
'dataschemaversion': '1.0.0',
'time': now,
'recordedtime': now,
'severitynumber': 2,
Expand Down Expand Up @@ -199,6 +200,8 @@ def _publish_mesh_inbox_message_invalid_event(self, event_detail):
'source': self.__cloud_event_source,
'subject': f'customer/{event_detail["data"]["senderId"]}',
'type': 'uk.nhs.notify.digital.letters.mesh.inbox.message.invalid.v1',
'plane': 'data',
'dataschemaversion': '1.0.0',
'time': now,
'recordedtime': now,
'severitynumber': 3,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ describe('sqs-handler', () => {
specversion: '1.0',
id: 'test-id',
source: '/test',
plane: 'data',
dataschemaversion: '1.0.0',
datacontenttype: 'application/json',
dataschema:
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-safe-data.schema.json',
type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
time: '2024-01-01T00:00:00Z',
data: {
Expand Down Expand Up @@ -107,6 +112,11 @@ describe('sqs-handler', () => {
specversion: '1.0',
id: 'test-id-1',
source: '/test',
plane: 'data',
dataschema:
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-safe-data.schema.json',
dataschemaversion: '1.0.0',
datacontenttype: 'application/json',
type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
time: '2024-01-01T00:00:00Z',
data: {
Expand All @@ -125,6 +135,11 @@ describe('sqs-handler', () => {
specversion: '1.0',
id: 'test-id-2',
source: '/test',
plane: 'data',
dataschema:
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-quarantined-data.schema.json',
dataschemaversion: '1.0.0',
datacontenttype: 'application/json',
type: 'uk.nhs.notify.digital.letters.print.file.quarantined.v1',
time: '2024-01-01T00:00:00Z',
data: {
Expand Down Expand Up @@ -190,6 +205,11 @@ describe('sqs-handler', () => {
specversion: '1.0',
id: 'test-id',
source: '/test',
plane: 'data',
dataschemaversion: '1.0.0',
datacontenttype: 'application/json',
dataschema:
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-safe-data.schema.json',
type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
time: '2024-01-01T00:00:00Z',
data: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,12 @@ describe('mapper', () => {
specversion: '1.0',
id: 'mocked-uuid-12345',
subject: `customer/${senderId}/recipient/${messageReference}`,
source:
'/nhs/england/notify/production/primary/data-plane/digitalletters/print',
source: '/nhs/england/notify/production/primary/digitalletters/print',
plane: 'data',
dataschema:
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-safe-data.schema.json',
dataschemaversion: '1.0.0',
datacontenttype: 'application/json',
traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
time: '2024-01-15T10:30:00.000Z',
Expand Down Expand Up @@ -99,8 +103,12 @@ describe('mapper', () => {
specversion: '1.0',
id: 'mocked-uuid-12345',
subject: `customer/${senderId}/recipient/${messageReference}`,
source:
'/nhs/england/notify/production/primary/data-plane/digitalletters/print',
plane: 'data',
dataschema:
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-quarantined-data.schema.json',
dataschemaversion: '1.0.0',
datacontenttype: 'application/json',
source: '/nhs/england/notify/production/primary/digitalletters/print',
traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
type: 'uk.nhs.notify.digital.letters.print.file.quarantined.v1',
time: '2024-01-15T10:30:00.000Z',
Expand Down
16 changes: 12 additions & 4 deletions lambdas/move-scanned-files-lambda/src/domain/mapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,12 @@ export function createFileSafeEvent(
specversion: '1.0',
id: randomUUID(),
subject: `customer/${senderId}/recipient/${messageReference}`,
source:
'/nhs/england/notify/production/primary/data-plane/digitalletters/print', // Note CCM-13892.
plane: 'data',
dataschema:
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-safe-data.schema.json',
dataschemaversion: '1.0.0',
datacontenttype: 'application/json',
source: '/nhs/england/notify/production/primary/digitalletters/print', // Note CCM-13892.
traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01', // Note CCM-14255.
type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
time: new Date().toISOString(),
Expand All @@ -37,8 +41,12 @@ export function createFileQuarantinedEvent(
specversion: '1.0',
id: randomUUID(),
subject: `customer/${senderId}/recipient/${messageReference}`,
source:
'/nhs/england/notify/production/primary/data-plane/digitalletters/print', // Note CCM-13892.
plane: 'data',
dataschema:
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-file-quarantined-data.schema.json',
dataschemaversion: '1.0.0',
datacontenttype: 'application/json',
source: '/nhs/england/notify/production/primary/digitalletters/print', // Note CCM-13892.
traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01', // Note CCM-14255.
type: 'uk.nhs.notify.digital.letters.print.file.quarantined.v1',
time: new Date().toISOString(),
Expand Down
5 changes: 3 additions & 2 deletions lambdas/pdm-poll-lambda/src/__tests__/test-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import {
const baseEvent = {
id: '550e8400-e29b-41d4-a716-446655440001',
specversion: '1.0',
source:
'/nhs/england/notify/production/primary/data-plane/digitalletters/pdm',
source: '/nhs/england/notify/production/primary/digitalletters/pdm',
subject:
'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
plane: 'data',
dataschemaversion: '1.0.0',
type: 'uk.nhs.notify.digital.letters.pdm.resource.submitted.v1',
time: '2023-06-20T12:00:00Z',
recordedtime: '2023-06-20T12:00:00.250Z',
Expand Down
5 changes: 3 additions & 2 deletions lambdas/pdm-uploader-lambda/src/__tests__/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ import { MESHInboxMessageDownloaded } from 'digital-letters-events';
export const mockEvent: MESHInboxMessageDownloaded = {
id: 'a449d419-e683-4ab4-9291-a0451b5cef8e',
specversion: '1.0',
source:
'/nhs/england/notify/production/primary/data-plane/digitalletters/mesh',
source: '/nhs/england/notify/production/primary/digitalletters/mesh',
plane: 'data',
dataschemaversion: '1.0.0',
subject:
'customer/920fca11-596a-4eca-9c47-99f624614658/recipient/769acdd4-6a47-496f-999f-76a6fd2c3959',
type: 'uk.nhs.notify.digital.letters.mesh.inbox.message.downloaded.v1',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ describe('SQS Handler', () => {
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-pdf-analysed-data.schema.json',
type: 'uk.nhs.notify.digital.letters.print.pdf.analysed.v1',
source:
'/nhs/england/notify/production/primary/data-plane/digitalletters/print',
'/nhs/england/notify/production/primary/digitalletters/print',
data: {
senderId: fileSafeEvent.data.senderId,
messageReference: fileSafeEvent.data.messageReference,
Expand Down
5 changes: 3 additions & 2 deletions lambdas/print-analyser/src/__tests__/test-data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
export const fileSafeEvent: FileSafe = {
id: '550e8400-e29b-41d4-a716-446655440001',
specversion: '1.0',
source:
'/nhs/england/notify/production/primary/data-plane/digitalletters/print',
source: '/nhs/england/notify/production/primary/digitalletters/print',
plane: 'data',
dataschemaversion: '1.0.0',
subject:
'letter-origin/digital-letters/letter/f47ac10b-58cc-4372-a567-0e02b2c3d479',
type: 'uk.nhs.notify.digital.letters.print.file.safe.v1',
Expand Down Expand Up @@ -57,4 +58,4 @@
});

export const fivePagePdf = () =>
readFileSync(path.join(__dirname, 'five-page.pdf'));

Check warning on line 61 in lambdas/print-analyser/src/__tests__/test-data.ts

View workflow job for this annotation

GitHub Actions / Test stage / Linting

Found readFileSync from package "node:fs" with non literal argument at index 0
3 changes: 1 addition & 2 deletions lambdas/print-analyser/src/apis/sqs-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ function generateUpdatedEvent(event: FileSafe, pdfInfo: PdfInfo): PDFAnalysed {
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-pdf-analysed-data.schema.json',
type: 'uk.nhs.notify.digital.letters.print.pdf.analysed.v1',
// NOTE: CCM-13892 Generate event digital letters source property from scratch
source:
'/nhs/england/notify/production/primary/data-plane/digitalletters/print',
source: '/nhs/england/notify/production/primary/digitalletters/print',
data: {
senderId,
messageReference,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ const createValidEvent = (overrides = {}): PDFAnalysed => ({
type: 'uk.nhs.notify.digital.letters.print.pdf.analysed.v1',
dataschema:
'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-print-pdf-analysed-data.schema.json',
source:
'/nhs/england/notify/production/primary/data-plane/digitalletters/print',
plane: 'data',
dataschemaversion: '1.0.0',
datacontenttype: 'application/json',
source: '/nhs/england/notify/production/primary/digitalletters/print',
specversion: '1.0',
traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
severitynumber: 2,
Expand Down
Loading
Loading