Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(ec2): return real AWS error for unknown availability zone name (#5529)

Matheus Oliveira06f0e06fc15c
diff --git a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2Service.java b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2Service.java
index 3283d4f703..7e14cd82bf 100644
--- a/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2Service.java
+++ b/src/main/java/io/github/hectorvent/floci/services/ec2/Ec2Service.java
@@ -9352,7 +9352,7 @@ public class Ec2Service implements ContainerTeardown, ResourceProvider, Resettab
}
if (!found) {
throw new AwsException("InvalidParameterValue",
- "The zone name '" + requestedName + "' is not valid for this region.", 400);
+ "Invalid availability zone: [" + requestedName + "]", 400);
}
}
allZones.removeIf(az -> !requestedNames.contains(az.get("zoneName")));
diff --git a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.java
index 1ae317adfd..de30e52879 100644
--- a/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/ec2/Ec2IntegrationTest.java
@@ -207,7 +207,8 @@ class Ec2IntegrationTest {
.post("/")
.then()
.statusCode(400)
- .body("Response.Errors.Error.Code", equalTo("InvalidParameterValue"));
+ .body("Response.Errors.Error.Code", equalTo("InvalidParameterValue"))
+ .body("Response.Errors.Error.Message", equalTo("Invalid availability zone: [us-east-1aa]"));
}
@Test