Light, fluffy, and always free - The AWS Local Emulator alternative
fix(lambda): propagate SQS FIFO system attributes to ESM event (#1527)
Stuart Lang21a7939e46cb
diff --git a/src/main/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePoller.java b/src/main/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePoller.javaindex ca2d5c47e1..0704a64cca 100644--- a/src/main/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePoller.java+++ b/src/main/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePoller.java@@ -285,6 +285,15 @@ public class SqsEventSourcePoller {attrs.put("SentTimestamp", String.valueOf(msg.getSentTimestamp().toEpochMilli()));attrs.put("SenderId", AwsArnUtils.accountOrDefault(esm.getEventSourceArn(), "000000000000"));attrs.put("ApproximateFirstReceiveTimestamp", String.valueOf(System.currentTimeMillis()));+ if (msg.getSequenceNumber() > 0) {+ attrs.put("SequenceNumber", String.valueOf(msg.getSequenceNumber()));+ }+ if (msg.getMessageGroupId() != null) {+ attrs.put("MessageGroupId", msg.getMessageGroupId());+ }+ if (msg.getMessageDeduplicationId() != null) {+ attrs.put("MessageDeduplicationId", msg.getMessageDeduplicationId());+ }// Populate messageAttributes from the message modelObjectNode msgAttrs = record.putObject("messageAttributes");if (msg.getMessageAttributes() != null) {diff --git a/src/test/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePollerTest.java b/src/test/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePollerTest.javaindex c791dcaacd..e06ac50df6 100644--- a/src/test/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePollerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/lambda/SqsEventSourcePollerTest.java@@ -205,6 +205,46 @@ class SqsEventSourcePollerTest {assertEquals("v2", records.get(1).get("messageAttributes").get("attr2").get("stringValue").asText());}+ @Test+ void buildSqsEventIncludesFifoSystemAttributes() throws Exception {+ Message msg = new Message();+ msg.setBody("hello-fifo");+ msg.setSentTimestamp(Instant.parse("2026-01-15T10:30:00Z"));+ msg.setMessageGroupId("groupA");+ msg.setSequenceNumber(27);+ msg.setMessageDeduplicationId("6e809cbda0732ac4845916a59016f954");++ EventSourceMapping esm = new EventSourceMapping();+ esm.setEventSourceArn("arn:aws:sqs:us-east-1:123456789012:my-queue.fifo");+ esm.setRegion("us-east-1");++ String event = poller.buildSqsEvent(List.of(msg), esm);+ JsonNode attrs = OBJECT_MAPPER.readTree(event).get("Records").get(0).get("attributes");++ assertEquals("groupA", attrs.get("MessageGroupId").asText());+ assertEquals("27", attrs.get("SequenceNumber").asText());+ assertEquals("6e809cbda0732ac4845916a59016f954",+ attrs.get("MessageDeduplicationId").asText());+ }++ @Test+ void buildSqsEventOmitsFifoSystemAttributesForStandardQueueMessages() throws Exception {+ Message msg = new Message();+ msg.setBody("hello");+ msg.setSentTimestamp(Instant.parse("2026-01-15T10:30:00Z"));++ EventSourceMapping esm = new EventSourceMapping();+ esm.setEventSourceArn("arn:aws:sqs:us-east-1:123456789012:my-queue");+ esm.setRegion("us-east-1");++ String event = poller.buildSqsEvent(List.of(msg), esm);+ JsonNode attrs = OBJECT_MAPPER.readTree(event).get("Records").get(0).get("attributes");++ assertNull(attrs.get("MessageGroupId"));+ assertNull(attrs.get("SequenceNumber"));+ assertNull(attrs.get("MessageDeduplicationId"));+ }+@Testvoid buildSqsEventUsesDefaultAccountWhenArnParsingFails() throws Exception {Message msg = new Message();