Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(ec2): apply cidr-block filter in DescribeSubnets (#1864)

Leandro-ft8f3597c2052a
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 a80c0d0547..43b471fabf 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
@@ -2708,6 +2708,7 @@ public class Ec2Service implements ContainerTeardown {
case "vpc-id" -> matchesValue(values, subnet.getVpcId());
case "state" -> matchesValue(values, subnet.getState());
case "availabilityZone", "availability-zone" -> matchesValue(values, subnet.getAvailabilityZone());
+ case "cidr-block", "cidrBlock", "cidr" -> matchesValue(values, subnet.getCidrBlock());
default -> true;
};
}
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 65d42f44ce..71175bbc6f 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
@@ -683,6 +683,57 @@ class Ec2IntegrationTest {
.body("DescribeSubnetsResponse.subnetSet.item.subnetId", equalTo(subnetId));
}
+ @Test
+ @Order(23)
+ void describeSubnetsByCidrBlockFilter() {
+ String isolatedVpcId = given()
+ .formParam("Action", "CreateVpc")
+ .formParam("CidrBlock", "10.10.0.0/16")
+ .header("Authorization", AUTH_HEADER)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .extract().path("CreateVpcResponse.vpc.vpcId");
+
+ String firstSubnetId = given()
+ .formParam("Action", "CreateSubnet")
+ .formParam("VpcId", isolatedVpcId)
+ .formParam("CidrBlock", "10.10.1.0/24")
+ .formParam("AvailabilityZone", "us-east-1a")
+ .header("Authorization", AUTH_HEADER)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .extract().path("CreateSubnetResponse.subnet.subnetId");
+
+ given()
+ .formParam("Action", "CreateSubnet")
+ .formParam("VpcId", isolatedVpcId)
+ .formParam("CidrBlock", "10.10.2.0/24")
+ .formParam("AvailabilityZone", "us-east-1b")
+ .header("Authorization", AUTH_HEADER)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200);
+
+ given()
+ .formParam("Action", "DescribeSubnets")
+ .formParam("Filter.1.Name", "vpc-id")
+ .formParam("Filter.1.Value.1", isolatedVpcId)
+ .formParam("Filter.2.Name", "cidr-block")
+ .formParam("Filter.2.Value.1", "10.10.1.0/24")
+ .header("Authorization", AUTH_HEADER)
+ .when()
+ .post("/")
+ .then()
+ .statusCode(200)
+ .body("DescribeSubnetsResponse.subnetSet.item.subnetId", equalTo(firstSubnetId))
+ .body("DescribeSubnetsResponse.subnetSet.item.cidrBlock", equalTo("10.10.1.0/24"));
+ }
+
@Test
@Order(21)
void createSubnetHasAssignIpv6AddressOnCreation() {