Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(autoscaling): validate monitoring booleans (#3219)

Franklin G. Mendoza84a7ce67e4c8
diff --git a/src/main/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingQueryHandler.java
index e99e2a2c4f..9360bcf346 100644
--- a/src/main/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingQueryHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingQueryHandler.java
@@ -1405,7 +1405,7 @@ public class AutoScalingQueryHandler {
private Boolean nullableBoolParam(MultivaluedMap<String, String> p, String key) {
String val = p.getFirst(key);
if (val == null || val.isBlank()) { return null; }
- return Boolean.parseBoolean(val);
+ return parseOptionalBoolean(val, key);
}
private List<LaunchConfigurationBlockDeviceMapping> parseLaunchConfigurationBlockDeviceMappings(
@@ -1516,7 +1516,7 @@ public class AutoScalingQueryHandler {
"1 validation error detected: Value '" + val + "' at '" + key
+ "' failed to satisfy constraint: Member must be a valid boolean", 400);
}
- return Boolean.parseBoolean(val);
+ return parseOptionalBoolean(val, key);
}
private String intString(Integer value) {
diff --git a/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingIntegrationTest.java
index 1109300bb5..b5f6a1392a 100644
--- a/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/autoscaling/AutoScalingIntegrationTest.java
@@ -134,6 +134,23 @@ class AutoScalingIntegrationTest {
@Test
@Order(44)
+ void launchConfigurationRejectsInvalidInstanceMonitoringBoolean() {
+ given()
+ .formParam("Action", "CreateLaunchConfiguration")
+ .formParam("LaunchConfigurationName", "my-lc-invalid-monitoring")
+ .formParam("ImageId", "ami-12345678")
+ .formParam("InstanceType", "t3.micro")
+ .formParam("InstanceMonitoring.Enabled", "not-a-boolean")
+ .header("Authorization", AUTH)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(400)
+ .body(containsString("ValidationError"));
+ }
+
+ @Test
+ @Order(45)
void launchConfigurationRejectsAMappingWithoutADeviceName() {
given()
.formParam("Action", "CreateLaunchConfiguration")