Light, fluffy, and always free - The AWS Local Emulator alternative
fix(wafv2): return WAFNonexistentItemException as 400 (#4117)
Matheus Andréa6d330384ea3
diff --git a/src/main/java/io/github/hectorvent/floci/services/wafv2/WafV2Service.java b/src/main/java/io/github/hectorvent/floci/services/wafv2/WafV2Service.javaindex 669c0d42a3..70615c733e 100644--- a/src/main/java/io/github/hectorvent/floci/services/wafv2/WafV2Service.java+++ b/src/main/java/io/github/hectorvent/floci/services/wafv2/WafV2Service.java@@ -266,7 +266,7 @@ public class WafV2Service {.anyMatch(a -> a.getArn().equals(webAclArn));if (!known) {throw new AwsException("WAFNonexistentItemException",- "AWS WAF couldn't perform the operation because your resource doesn't exist.", 404);+ "AWS WAF couldn't perform the operation because your resource doesn't exist.", 400);}associationStore.put(resourceArn, webAclArn);}@@ -304,7 +304,7 @@ public class WafV2Service {public String getLoggingConfiguration(String resourceArn) {return loggingStore.get(resourceArn).orElseThrow(() -> new AwsException(- "WAFNonexistentItemException", "No logging configuration for: " + resourceArn, 404));+ "WAFNonexistentItemException", "No logging configuration for: " + resourceArn, 400));}public void deleteLoggingConfiguration(String resourceArn) {@@ -323,7 +323,7 @@ public class WafV2Service {public String getPermissionPolicy(String resourceArn) {return policyStore.get(resourceArn).orElseThrow(() -> new AwsException(- "WAFNonexistentItemException", "No policy for: " + resourceArn, 404));+ "WAFNonexistentItemException", "No policy for: " + resourceArn, 400));}public void deletePermissionPolicy(String resourceArn) {@@ -370,7 +370,7 @@ public class WafV2Service {if (rg != null) {return rg;}- throw new AwsException("WAFNonexistentItemException", "Resource not found: " + resourceArn, 404);+ throw new AwsException("WAFNonexistentItemException", "Resource not found: " + resourceArn, 400);}private Map<String, String> tagsOf(Object resource) {@@ -383,7 +383,7 @@ public class WafV2Service {} else if (resource instanceof RuleGroup g) {return g.getTags();}- throw new AwsException("WAFNonexistentItemException", "Resource not found.", 404);+ throw new AwsException("WAFNonexistentItemException", "Resource not found.", 400);}private void persistTagged(Object resource) {@@ -422,10 +422,10 @@ public class WafV2Service {}V resource = store.get(key(scope, id)).orElseThrow(() -> new AwsException("WAFNonexistentItemException",- "AWS WAF couldn't perform the operation because your resource doesn't exist.", 404));+ "AWS WAF couldn't perform the operation because your resource doesn't exist.", 400));if (!name.equals(nameOf(resource))) {throw new AwsException("WAFNonexistentItemException",- "AWS WAF couldn't perform the operation because your resource doesn't exist.", 404);+ "AWS WAF couldn't perform the operation because your resource doesn't exist.", 400);}return resource;}diff --git a/src/test/java/io/github/hectorvent/floci/services/wafv2/WafV2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/wafv2/WafV2IntegrationTest.javaindex 6a63dd6129..e96347ed80 100644--- a/src/test/java/io/github/hectorvent/floci/services/wafv2/WafV2IntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/wafv2/WafV2IntegrationTest.java@@ -104,10 +104,10 @@ class WafV2IntegrationTest {@Test@Order(5)- void getWebAclWithWrongNameReturnsNotFound() {+ void getWebAclWithWrongNameReturnsNonexistentItem() {call("GetWebACL","{\"Name\":\"wrong-name\",\"Scope\":\"REGIONAL\",\"Id\":\"" + webAclId + "\"}")- .then().statusCode(404)+ .then().statusCode(400).body("__type", equalTo("WAFNonexistentItemException"));}@@ -127,7 +127,7 @@ class WafV2IntegrationTest {+ "\"LockToken\":\"" + webAclLockToken + "\",\"Description\":\"must-not-apply\","+ "\"VisibilityConfig\":{\"SampledRequestsEnabled\":true,"+ "\"CloudWatchMetricsEnabled\":true,\"MetricName\":\"acl\"}}")- .then().statusCode(404)+ .then().statusCode(400).body("__type", equalTo("WAFNonexistentItemException"));call("GetWebACL",@@ -142,7 +142,7 @@ class WafV2IntegrationTest {call("DeleteWebACL","{\"Name\":\"wrong-name\",\"Scope\":\"REGIONAL\",\"Id\":\"" + webAclId + "\","+ "\"LockToken\":\"" + webAclLockToken + "\"}")- .then().statusCode(404)+ .then().statusCode(400).body("__type", equalTo("WAFNonexistentItemException"));call("GetWebACL",@@ -228,7 +228,7 @@ class WafV2IntegrationTest {void wrongNamesAreRejectedForAllResourceTypes() {call("GetIPSet","{\"Name\":\"wrong-name\",\"Scope\":\"REGIONAL\",\"Id\":\"" + ipSetId + "\"}")- .then().statusCode(404).body("__type", equalTo("WAFNonexistentItemException"));+ .then().statusCode(400).body("__type", equalTo("WAFNonexistentItemException"));String ipLock = call("GetIPSet","{\"Name\":\"floci-waf-ips\",\"Scope\":\"REGIONAL\",\"Id\":\"" + ipSetId + "\"}")@@ -237,12 +237,12 @@ class WafV2IntegrationTest {+ "\"Description\":\"must-not-apply\",\"Addresses\":[\"10.0.0.1/32\"],"+ "\"LockToken\":\"" + ipLock + "\"";call("UpdateIPSet", "{\"Name\":\"wrong-name\"," + ipUpdate + "}")- .then().statusCode(404).body("__type", equalTo("WAFNonexistentItemException"));+ .then().statusCode(400).body("__type", equalTo("WAFNonexistentItemException"));call("UpdateIPSet", "{" + ipUpdate + "}").then().statusCode(400).body("__type", equalTo("WAFInvalidParameterException"));call("DeleteIPSet", "{\"Name\":\"wrong-name\",\"Scope\":\"REGIONAL\",\"Id\":\""+ ipSetId + "\",\"LockToken\":\"" + ipLock + "\"}")- .then().statusCode(404).body("__type", equalTo("WAFNonexistentItemException"));+ .then().statusCode(400).body("__type", equalTo("WAFNonexistentItemException"));call("DeleteIPSet", "{\"Scope\":\"REGIONAL\",\"Id\":\"" + ipSetId+ "\",\"LockToken\":\"" + ipLock + "\"}").then().statusCode(400).body("__type", equalTo("WAFInvalidParameterException"));@@ -265,21 +265,21 @@ class WafV2IntegrationTest {call("GetRegexPatternSet","{\"Name\":\"wrong-name\",\"Scope\":\"REGIONAL\",\"Id\":\"" + regexId + "\"}")- .then().statusCode(404).body("__type", equalTo("WAFNonexistentItemException"));+ .then().statusCode(400).body("__type", equalTo("WAFNonexistentItemException"));call("GetRuleGroup","{\"Name\":\"wrong-name\",\"Scope\":\"REGIONAL\",\"Id\":\"" + ruleGroupId + "\"}")- .then().statusCode(404).body("__type", equalTo("WAFNonexistentItemException"));+ .then().statusCode(400).body("__type", equalTo("WAFNonexistentItemException"));String regexUpdate = "\"Scope\":\"REGIONAL\",\"Id\":\"" + regexId + "\","+ "\"Description\":\"must-not-apply\",\"RegularExpressionList\":[{\"RegexString\":\"bar\"}],"+ "\"LockToken\":\"" + regexLock + "\"";call("UpdateRegexPatternSet", "{\"Name\":\"wrong-name\"," + regexUpdate + "}")- .then().statusCode(404).body("__type", equalTo("WAFNonexistentItemException"));+ .then().statusCode(400).body("__type", equalTo("WAFNonexistentItemException"));call("UpdateRegexPatternSet", "{" + regexUpdate + "}").then().statusCode(400).body("__type", equalTo("WAFInvalidParameterException"));call("DeleteRegexPatternSet", "{\"Name\":\"wrong-name\",\"Scope\":\"REGIONAL\",\"Id\":\""+ regexId + "\",\"LockToken\":\"" + regexLock + "\"}")- .then().statusCode(404).body("__type", equalTo("WAFNonexistentItemException"));+ .then().statusCode(400).body("__type", equalTo("WAFNonexistentItemException"));call("DeleteRegexPatternSet", "{\"Scope\":\"REGIONAL\",\"Id\":\"" + regexId+ "\",\"LockToken\":\"" + regexLock + "\"}").then().statusCode(400).body("__type", equalTo("WAFInvalidParameterException"));@@ -289,12 +289,12 @@ class WafV2IntegrationTest {String ruleGroupUpdate = "\"Scope\":\"REGIONAL\",\"Id\":\"" + ruleGroupId + "\","+ "\"Rules\":[],\"LockToken\":\"" + ruleGroupLock + "\"";call("UpdateRuleGroup", "{\"Name\":\"wrong-name\"," + ruleGroupUpdate + "}")- .then().statusCode(404).body("__type", equalTo("WAFNonexistentItemException"));+ .then().statusCode(400).body("__type", equalTo("WAFNonexistentItemException"));call("UpdateRuleGroup", "{" + ruleGroupUpdate + "}").then().statusCode(400).body("__type", equalTo("WAFInvalidParameterException"));call("DeleteRuleGroup", "{\"Name\":\"wrong-name\",\"Scope\":\"REGIONAL\",\"Id\":\""+ ruleGroupId + "\",\"LockToken\":\"" + ruleGroupLock + "\"}")- .then().statusCode(404).body("__type", equalTo("WAFNonexistentItemException"));+ .then().statusCode(400).body("__type", equalTo("WAFNonexistentItemException"));call("DeleteRuleGroup", "{\"Scope\":\"REGIONAL\",\"Id\":\"" + ruleGroupId+ "\",\"LockToken\":\"" + ruleGroupLock + "\"}").then().statusCode(400).body("__type", equalTo("WAFInvalidParameterException"));@@ -380,10 +380,34 @@ class WafV2IntegrationTest {@Test@Order(18)- void getMissingWebAclReturnsNotFound() {+ void getMissingWebAclReturnsNonexistentItem() {call("GetWebACL","{\"Name\":\"nope\",\"Scope\":\"REGIONAL\",\"Id\":\"00000000-0000-0000-0000-000000000000\"}")- .then().statusCode(404)+ .then().statusCode(400)+ .body("__type", equalTo("WAFNonexistentItemException"));+ }++ @Test+ @Order(19)+ void arnLookupsOnMissingResourcesReturnNonexistentItemAs400() {+ String missingArn = "arn:aws:wafv2:us-east-1:000000000000:regional/webacl/nope/"+ + "00000000-0000-0000-0000-000000000000";++ call("GetLoggingConfiguration", "{\"ResourceArn\":\"" + missingArn + "\"}")+ .then().statusCode(400)+ .body("__type", equalTo("WAFNonexistentItemException"));++ call("GetPermissionPolicy", "{\"ResourceArn\":\"" + missingArn + "\"}")+ .then().statusCode(400)+ .body("__type", equalTo("WAFNonexistentItemException"));++ call("ListTagsForResource", "{\"ResourceARN\":\"" + missingArn + "\"}")+ .then().statusCode(400)+ .body("__type", equalTo("WAFNonexistentItemException"));++ call("AssociateWebACL", "{\"WebACLArn\":\"" + missingArn + "\","+ + "\"ResourceArn\":\"arn:aws:elasticloadbalancing:us-east-1:000000000000:loadbalancer/app/x/y\"}")+ .then().statusCode(400).body("__type", equalTo("WAFNonexistentItemException"));}}