Light, fluffy, and always free - The AWS Local Emulator alternative
fix(eventbridge): support account, region, and nested detail pattern matching (#725)
Christine Nguyen860e35f6afe2
diff --git a/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeService.java b/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeService.javaindex 5749ed7d92..82b9692b21 100644--- a/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeService.java+++ b/src/main/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeService.java@@ -639,6 +639,20 @@ public class EventBridgeService {return false;}}+ JsonNode accountField = pattern.get("account");+ if (accountField != null && accountField.isArray()) {+ String eventAccount = regionResolver.getAccountId();+ if (!matchesArrayField(accountField, eventAccount)) {+ return false;+ }+ }+ JsonNode regionField = pattern.get("region");+ if (regionField != null && regionField.isArray()) {+ String eventRegion = regionResolver.getDefaultRegion();+ if (!matchesArrayField(regionField, eventRegion)) {+ return false;+ }+ }JsonNode detailPattern = pattern.get("detail");if (detailPattern != null && detailPattern.isObject()) {Object eventDetail = event.get("Detail");@@ -647,15 +661,8 @@ public class EventBridgeService {return false;}JsonNode detailNode = objectMapper.readTree(detailStr);- var fields = detailPattern.fields();- while (fields.hasNext()) {- var field = fields.next();- JsonNode expected = field.getValue();- JsonNode actual = detailNode.get(field.getKey());- String actualStr = actual != null ? actual.asText(null) : null;- if (expected.isArray() && !matchesArrayField(expected, actualStr)) {- return false;- }+ if (!matchesDetailNode(detailNode, detailPattern)) {+ return false;}}JsonNode resourcesPattern = pattern.get("resources");@@ -676,6 +683,37 @@ public class EventBridgeService {}}+ private boolean matchesDetailNode(JsonNode actual, JsonNode pattern) {+ var fields = pattern.fields();+ while (fields.hasNext()) {+ var field = fields.next();+ JsonNode expected = field.getValue();+ JsonNode actualField = actual.get(field.getKey());+ if (expected.isArray()) {+ String actualStr = actualField != null ? actualField.asText(null) : null;+ if (!matchesArrayField(expected, actualStr)) {+ return false;+ }+ } else if (expected.isObject()) {+ if (actualField == null || actualField.isNull()) {+ return false;+ }+ JsonNode nestedActual = actualField;+ if (actualField.isTextual()) {+ try {+ nestedActual = objectMapper.readTree(actualField.asText());+ } catch (Exception e) {+ return false;+ }+ }+ if (!matchesDetailNode(nestedActual, expected)) {+ return false;+ }+ }+ }+ return true;+ }+private boolean matchesArrayField(JsonNode arrayNode, String value) {for (JsonNode element : arrayNode) {if (matchesSingleElement(element, value)) {diff --git a/src/test/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeServiceTest.javaindex 8b163ca0d6..c2df0da170 100644--- a/src/test/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/eventbridge/EventBridgeServiceTest.java@@ -483,4 +483,73 @@ class EventBridgeServiceTest {assertTrue(service.matchesPattern(event, "{\"detail\":{\"status\":[{\"exists\":true}]}}"));assertTrue(service.matchesPattern(event, "{\"detail\":{\"other\":[{\"exists\":false}]}}"));}- }\ No newline at end of file++ @Test+ void matchesPatternByAccount_matches() {+ Map<String, Object> event = Map.of("Source", "my.app", "DetailType", "Order");+ assertTrue(service.matchesPattern(event, "{\"account\":[\"000000000000\"]}"));+ }++ @Test+ void matchesPatternByAccount_noMatch() {+ Map<String, Object> event = Map.of("Source", "my.app", "DetailType", "Order");+ assertFalse(service.matchesPattern(event, "{\"account\":[\"999999999999\"]}"));+ }++ @Test+ void matchesPatternByRegion_matches() {+ Map<String, Object> event = Map.of("Source", "my.app", "DetailType", "Order");+ assertTrue(service.matchesPattern(event, "{\"region\":[\"us-east-1\"]}"));+ }++ @Test+ void matchesPatternByRegion_noMatch() {+ Map<String, Object> event = Map.of("Source", "my.app", "DetailType", "Order");+ assertFalse(service.matchesPattern(event, "{\"region\":[\"eu-west-1\"]}"));+ }++ @Test+ void matchesPatternByNestedDetail_matches() {+ Map<String, Object> event = Map.of(+ "Source", "my.app",+ "Detail", "{\"object\":{\"path\":\"uploads/image.png\",\"size\":1024}}"+ );+ assertTrue(service.matchesPattern(event,+ "{\"detail\":{\"object\":{\"path\":[{\"prefix\":\"uploads/\"}]}}}"));+ }++ @Test+ void matchesPatternByNestedDetail_noMatch() {+ Map<String, Object> event = Map.of(+ "Source", "my.app",+ "Detail", "{\"object\":{\"path\":\"downloads/file.txt\",\"size\":1024}}"+ );+ assertFalse(service.matchesPattern(event,+ "{\"detail\":{\"object\":{\"path\":[{\"prefix\":\"uploads/\"}]}}}"));+ }++ @Test+ void matchesPatternByDeeplyNestedDetail() {+ Map<String, Object> event = Map.of(+ "Source", "my.app",+ "Detail", "{\"a\":{\"b\":{\"c\":\"deep-value\"}}}"+ );+ assertTrue(service.matchesPattern(event,+ "{\"detail\":{\"a\":{\"b\":{\"c\":[\"deep-value\"]}}}}"));+ assertFalse(service.matchesPattern(event,+ "{\"detail\":{\"a\":{\"b\":{\"c\":[\"wrong\"]}}}}"));+ }++ @Test+ void matchesPatternCombinesAccountRegionAndDetail() {+ Map<String, Object> event = Map.of(+ "Source", "my.app",+ "DetailType", "Order",+ "Detail", "{\"status\":\"CONFIRMED\"}"+ );+ assertTrue(service.matchesPattern(event,+ "{\"source\":[\"my.app\"],\"account\":[\"000000000000\"],\"region\":[\"us-east-1\"],\"detail\":{\"status\":[\"CONFIRMED\"]}}"));+ assertFalse(service.matchesPattern(event,+ "{\"source\":[\"my.app\"],\"account\":[\"999999999999\"],\"detail\":{\"status\":[\"CONFIRMED\"]}}"));+ }+}