Light, fluffy, and always free - The AWS Local Emulator alternative
fix(networkfirewall): honor dry run for rule groups and policies (#4799)
Aniket Shuklaa82d8aacad93
diff --git a/src/main/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallService.java b/src/main/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallService.javaindex a7f0b2978f..e51ef21aa0 100644--- a/src/main/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallService.java+++ b/src/main/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallService.java@@ -117,7 +117,11 @@ public class NetworkFirewallService {response.remove("Rules");}}- ruleGroups.put(resourceArn(existing), replacement);+ if (request.path("DryRun").asBoolean(false)) {+ replacement.put("UpdateToken", existing.path("UpdateToken").asText());+ } else {+ ruleGroups.put(resourceArn(existing), replacement);+ }return replacement.deepCopy();}@@ -150,7 +154,11 @@ public class NetworkFirewallService {requireObject(request, "FirewallPolicy");ObjectNode replacement = replacementOf(existing, request, "FirewallPolicy", "FirewallPolicyResponse",FIREWALL_POLICY_UPDATE_FIELDS);- firewallPolicies.put(resourceArn(existing), replacement);+ if (request.path("DryRun").asBoolean(false)) {+ replacement.put("UpdateToken", existing.path("UpdateToken").asText());+ } else {+ firewallPolicies.put(resourceArn(existing), replacement);+ }return replacement.deepCopy();}@@ -510,6 +518,7 @@ public class NetworkFirewallService {ObjectNode responseInfo = copyObject(request);JsonNode body = responseInfo.remove(requestBodyField);responseInfo.remove("UpdateToken");+ responseInfo.remove("DryRun");responseInfo.put(arnField, resourceArn);responseInfo.put(idField, deterministicHex(resourceArn, 32));responseInfo.put(nameField, name);@@ -521,7 +530,9 @@ public class NetworkFirewallService {}stored.set(responseField, responseInfo);stored.put("UpdateToken", UUID.randomUUID().toString());- store.put(resourceArn, stored);+ if (!request.path("DryRun").asBoolean(false)) {+ store.put(resourceArn, stored);+ }return stored.deepCopy();}diff --git a/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallIntegrationTest.javaindex 08d060990d..022ea9384b 100644--- a/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/networkfirewall/NetworkFirewallIntegrationTest.java@@ -499,6 +499,64 @@ class NetworkFirewallIntegrationTest {.body("message", equalTo("RuleGroup already exists: duplicate-rule-group"));}+ @Test+ void dryRunRuleGroupCreateAndUpdate_validateButDoNotPersist() {+ String name = "dry-run-rule-group";+ String create = "{\"RuleGroupName\":\"" + name + "\",\"Type\":\"STATEFUL\","+ + "\"Capacity\":100,\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"pass ip any any\"}}}";+ call("CreateRuleGroup", create.substring(0, create.length() - 1) + ",\"DryRun\":true}")+ .statusCode(200)+ .body("RuleGroupResponse.RuleGroupName", equalTo(name))+ .body("RuleGroupResponse.DryRun", nullValue());+ call("DescribeRuleGroup", "{\"RuleGroupName\":\"" + name + "\"}")+ .statusCode(400)+ .body("__type", equalTo("ResourceNotFoundException"));++ String token = call("CreateRuleGroup", create).statusCode(200).extract().path("UpdateToken");+ String arn = "arn:aws:network-firewall:us-east-1:723679240095:stateful-rulegroup/" + name;+ String update = "{\"RuleGroupArn\":\"" + arn + "\",\"UpdateToken\":\"" + token + "\","+ + "\"RuleGroup\":{\"RulesSource\":{\"RulesString\":\"drop ip any any\"}},\"DryRun\":true}";+ call("UpdateRuleGroup", update).statusCode(200)+ .body("RuleGroup.RulesSource.RulesString", equalTo("drop ip any any"))+ .body("UpdateToken", equalTo(token));+ call("DescribeRuleGroup", "{\"RuleGroupArn\":\"" + arn + "\"}").statusCode(200)+ .body("RuleGroup.RulesSource.RulesString", equalTo("pass ip any any"))+ .body("UpdateToken", equalTo(token));+ call("UpdateRuleGroup", update.replace(token, "stale-token"))+ .statusCode(400)+ .body("__type", equalTo("InvalidTokenException"));+ }++ @Test+ void dryRunFirewallPolicyCreateAndUpdate_validateButDoNotPersist() {+ String name = "dry-run-firewall-policy";+ String create = "{\"FirewallPolicyName\":\"" + name + "\",\"FirewallPolicy\":{"+ + "\"StatelessDefaultActions\":[\"aws:pass\"],"+ + "\"StatelessFragmentDefaultActions\":[\"aws:pass\"]}}";+ call("CreateFirewallPolicy", create.substring(0, create.length() - 1) + ",\"DryRun\":true}")+ .statusCode(200)+ .body("FirewallPolicyResponse.FirewallPolicyName", equalTo(name))+ .body("FirewallPolicyResponse.DryRun", nullValue());+ call("DescribeFirewallPolicy", "{\"FirewallPolicyName\":\"" + name + "\"}")+ .statusCode(400)+ .body("__type", equalTo("ResourceNotFoundException"));++ String token = call("CreateFirewallPolicy", create).statusCode(200).extract().path("UpdateToken");+ String arn = "arn:aws:network-firewall:us-east-1:723679240095:firewall-policy/" + name;+ String update = "{\"FirewallPolicyArn\":\"" + arn + "\",\"UpdateToken\":\"" + token + "\","+ + "\"FirewallPolicy\":{\"StatelessDefaultActions\":[\"aws:drop\"],"+ + "\"StatelessFragmentDefaultActions\":[\"aws:drop\"]},\"DryRun\":true}";+ call("UpdateFirewallPolicy", update).statusCode(200)+ .body("FirewallPolicy.StatelessDefaultActions[0]", equalTo("aws:drop"))+ .body("UpdateToken", equalTo(token));+ call("DescribeFirewallPolicy", "{\"FirewallPolicyArn\":\"" + arn + "\"}").statusCode(200)+ .body("FirewallPolicy.StatelessDefaultActions[0]", equalTo("aws:pass"))+ .body("UpdateToken", equalTo(token));+ call("UpdateFirewallPolicy", update.replace(token, "stale-token"))+ .statusCode(400)+ .body("__type", equalTo("InvalidTokenException"));+ }+@Testvoid deleteFirewall_returnsTheDeletedFirewallAndItsStatus() {String name = "DeletableFirewall";