From 636380415b0e806a7f9c07c37f33cb883ac73278 Mon Sep 17 00:00:00 2001
From: aidenvaines-bjss <aiden.vaines@bjss.com>
Date: Mon, 16 Jun 2025 11:11:16 +0100
Subject: [PATCH 1/2] CCM-10258 adding plane prop path selector

---
 .../modules/eventpub/lambda/eventpub/src/index.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/infrastructure/modules/eventpub/lambda/eventpub/src/index.js b/infrastructure/modules/eventpub/lambda/eventpub/src/index.js
index aa62531..34fef22 100644
--- a/infrastructure/modules/eventpub/lambda/eventpub/src/index.js
+++ b/infrastructure/modules/eventpub/lambda/eventpub/src/index.js
@@ -18,6 +18,7 @@ function validateEvent(event) {
         'source',
         'specversion',
         'type',
+        'plane',
         'subject',
         'time',
         'datacontenttype',
@@ -49,7 +50,7 @@ function validateEvent(event) {
 }
 
 async function sendToEventBridge(events, eventBusArn) {
-    // console.info(`Sending ${events.length} events to EventBridge: ${eventBusArn}`);
+    console.debug(`Sending ${events.length} events to EventBridge: ${eventBusArn}`);
 
     const failedEvents = [];
     for (let i = 0; i < events.length; i += EVENTBRIDGE_MAX_BATCH_SIZE) {
@@ -64,7 +65,7 @@ async function sendToEventBridge(events, eventBusArn) {
         let attempts = 0;
         while (attempts < MAX_RETRIES) {
             try {
-                // console.info(`Attempt ${attempts + 1}: Sending batch of ${entries.length} events.`);
+                console.debug(`Attempt ${attempts + 1}: Sending batch of ${entries.length} events.`);
 
                 const response = await eventBridge.send(new PutEventsCommand({ Entries: entries }));
                 response.FailedEntryCount && response.Entries.forEach((entry, idx) => {
@@ -100,7 +101,7 @@ async function sendToDLQ(events) {
 }
 
 exports.handler = async (snsEvent) => {
-    // console.info(`Received SNS event with ${snsEvent.Records.length} records.`);
+    console.debug(`Received SNS event with ${snsEvent.Records.length} records.`);
 
     if (THROTTLE_DELAY_MS > 0) {
         console.info(`Throttling enabled. Delaying processing by ${THROTTLE_DELAY_MS}ms`);
@@ -111,14 +112,14 @@ exports.handler = async (snsEvent) => {
     const validEvents = records.filter(validateEvent);
     const invalidEvents = records.filter(event => !validateEvent(event));
 
-    // console.info(`Valid events: ${validEvents.length}, Invalid events: ${invalidEvents.length}`);
+    console.debug(`Valid events: ${validEvents.length}, Invalid events: ${invalidEvents.length}`);
 
     if (invalidEvents.length) await sendToDLQ(invalidEvents);
 
-    const dataEvents = validEvents.filter(event => event.type === 'data');
-    const controlEvents = validEvents.filter(event => event.type === 'control');
+    const dataEvents = validEvents.filter(event => event.plane === 'data');
+    const controlEvents = validEvents.filter(event => event.plane === 'control');
 
-    // console.info(`Data events: ${dataEvents.length}, Control events: ${controlEvents.length}`);
+    console.debug(`Data events: ${dataEvents.length}, Control events: ${controlEvents.length}`);
 
     const failedDataEvents = await sendToEventBridge(dataEvents, DATA_PLANE_EVENT_BUS_ARN);
     const failedControlEvents = await sendToEventBridge(controlEvents, CONTROL_PLANE_EVENT_BUS_ARN);

From fd1bf078dbf0007aaf13eb6295d4043cb915f642 Mon Sep 17 00:00:00 2001
From: aidenvaines-bjss <aiden.vaines@bjss.com>
Date: Mon, 16 Jun 2025 11:20:09 +0100
Subject: [PATCH 2/2] CCM-10258 fixing out of bound log entries

---
 .../modules/eventpub/lambda/eventpub/src/index.js     | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/infrastructure/modules/eventpub/lambda/eventpub/src/index.js b/infrastructure/modules/eventpub/lambda/eventpub/src/index.js
index 34fef22..742f653 100644
--- a/infrastructure/modules/eventpub/lambda/eventpub/src/index.js
+++ b/infrastructure/modules/eventpub/lambda/eventpub/src/index.js
@@ -50,10 +50,10 @@ function validateEvent(event) {
 }
 
 async function sendToEventBridge(events, eventBusArn) {
-    console.debug(`Sending ${events.length} events to EventBridge: ${eventBusArn}`);
+  const failedEvents = [];
 
-    const failedEvents = [];
-    for (let i = 0; i < events.length; i += EVENTBRIDGE_MAX_BATCH_SIZE) {
+  for (let i = 0; i < events.length; i += EVENTBRIDGE_MAX_BATCH_SIZE) {
+        console.debug(`Sending ${events.length} events to EventBridge: ${eventBusArn}`);
         const batch = events.slice(i, i + EVENTBRIDGE_MAX_BATCH_SIZE);
         const entries = batch.map(event => ({
             Source: 'custom.event',
@@ -93,9 +93,8 @@ async function sendToEventBridge(events, eventBusArn) {
 }
 
 async function sendToDLQ(events) {
-    console.warn(`Sending ${events.length} failed events to DLQ`);
-
-    for (const event of events) {
+  for (const event of events) {
+        console.warn(`Sending ${events.length} failed events to DLQ`);
         await sqs.send(new SendMessageCommand({ QueueUrl: DLQ_URL, MessageBody: JSON.stringify(event) }));
     }
 }