Light, fluffy, and always free - The AWS Local Emulator alternative
fix(elbv2): stop mutating immutable fallbacks on the delete paths (#4030)
Abhigyaa0089b3548e0
diff --git a/src/main/java/io/github/hectorvent/floci/services/elbv2/ElbV2Service.java b/src/main/java/io/github/hectorvent/floci/services/elbv2/ElbV2Service.javaindex f0ac7b649f..690f400ee1 100644--- a/src/main/java/io/github/hectorvent/floci/services/elbv2/ElbV2Service.java+++ b/src/main/java/io/github/hectorvent/floci/services/elbv2/ElbV2Service.java@@ -101,6 +101,18 @@ public class ElbV2Service implements ResourceProvider {}}+ /**+ * Drops one entry from an ARN index. The list has to be looked up rather than defaulted:+ * {@code getOrDefault(key, List.of())} hands back an immutable list whose {@code remove}+ * throws, which the Query path reports as an {@code InternalFailure}.+ */+ private static void removeFromIndex(Map<String, List<String>> index, String key, String value) {+ List<String> entries = index.get(key);+ if (entries != null) {+ entries.remove(value);+ }+ }+private <V> void persistRegion(Map<String, Map<String, V>> resources, String region) {Map<String, V> regionResources = resources.get(region);if (regionResources != null) {@@ -248,16 +260,19 @@ public class ElbV2Service implements ResourceProvider {}public void deleteLoadBalancer(String region, String arn) {- Map<String, LoadBalancer> regionLbs = loadBalancers.getOrDefault(region, Map.of());+ Map<String, LoadBalancer> regionLbs = loadBalancers.get(region);+ if (regionLbs == null) {+ return; // AWS silently ignores non-existent LBs on delete+ }LoadBalancer lb = regionLbs.remove(arn);if (lb == null) {- return; // AWS silently ignores non-existent LBs on delete+ return;}// cascade: listeners → rulesList<String> listenerArns = lbToListeners.remove(arn);if (listenerArns != null) {- Map<String, Listener> regionListeners = listeners.getOrDefault(region, Map.of());- Map<String, Rule> regionRules = rules.getOrDefault(region, Map.of());+ Map<String, Listener> regionListeners = listeners.computeIfAbsent(region, k -> new ConcurrentHashMap<>());+ Map<String, Rule> regionRules = rules.computeIfAbsent(region, k -> new ConcurrentHashMap<>());for (String listenerArn : listenerArns) {dataPlane.stopListener(listenerArn);regionListeners.remove(listenerArn);@@ -540,15 +555,18 @@ public class ElbV2Service implements ResourceProvider {}public void deleteListener(String region, String listenerArn) {- Map<String, Listener> regionListeners = listeners.getOrDefault(region, Map.of());+ Map<String, Listener> regionListeners = listeners.get(region);+ if (regionListeners == null) {+ return;+ }Listener listener = regionListeners.remove(listenerArn);if (listener == null) {return;}dataPlane.stopListener(listenerArn);- lbToListeners.getOrDefault(listener.getLoadBalancerArn(), List.of()).remove(listenerArn);+ removeFromIndex(lbToListeners, listener.getLoadBalancerArn(), listenerArn);- Map<String, Rule> regionRules = rules.getOrDefault(region, Map.of());+ Map<String, Rule> regionRules = rules.computeIfAbsent(region, k -> new ConcurrentHashMap<>());List<String> ruleArns = listenerToRules.remove(listenerArn);if (ruleArns != null) {ruleArns.forEach(regionRules::remove);@@ -692,7 +710,7 @@ public class ElbV2Service implements ResourceProvider {String listenerArn = rule.getListenerArn();regionRules.remove(ruleArn);rules.put(region, regionRules);- listenerToRules.getOrDefault(listenerArn, List.of()).remove(ruleArn);+ removeFromIndex(listenerToRules, listenerArn, ruleArn);tags.remove(ruleArn);Listener listener = listeners.getOrDefault(region, Map.of()).get(listenerArn);if (listener != null) {diff --git a/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2ServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2ServiceTest.javaindex 2e63bf6b05..5d0ec31789 100644--- a/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2ServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/elbv2/ElbV2ServiceTest.java@@ -251,6 +251,28 @@ class ElbV2ServiceTest {assertEquals(listenerArn, listenerCaptor.getValue().getListenerArn());}+ @Test+ void deleteListenerIsIgnoredForRegionWithNoListeners() {+ String emptyRegion = "eu-central-1";++ service.deleteListener(emptyRegion, "arn:aws:elasticloadbalancing:" + emptyRegion+ + ":000000000000:listener/app/sample-lb/1111111111111111/2222222222222222");++ assertTrue(service.describeListeners(emptyRegion, null, null).isEmpty());+ verifyNoInteractions(dataPlane);+ }++ @Test+ void deleteLoadBalancerIsIgnoredForRegionWithNoLoadBalancers() {+ String emptyRegion = "eu-central-1";++ service.deleteLoadBalancer(emptyRegion, "arn:aws:elasticloadbalancing:" + emptyRegion+ + ":000000000000:loadbalancer/app/sample-lb/1111111111111111");++ assertTrue(service.describeLoadBalancers(emptyRegion, null, null, null, null).isEmpty());+ verifyNoInteractions(dataPlane);+ }+@Testvoid describeTargetHealthReturnsUnusedForExplicitUnregisteredTarget() {String tgArn = createTargetGroup("sample-tg");