Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(cloudformation): preserve subnet public IP setting (#2031)

Aniket Shuklab62d1e762e61
diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationResourceProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationResourceProvisioner.java
index 75b34a830b..e6e6e60deb 100644
--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationResourceProvisioner.java
+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationResourceProvisioner.java
@@ -587,7 +587,11 @@ public class CloudFormationResourceProvisioner {
String vpcId = resolveOptional(props, "VpcId", engine);
String cidr = resolveOptional(props, "CidrBlock", engine);
String az = resolveOptional(props, "AvailabilityZone", engine);
+ String mapPublicIpOnLaunch = resolveOptional(props, "MapPublicIpOnLaunch", engine);
var subnet = ec2Service.createSubnet(region, vpcId, cidr, az);
+ if (mapPublicIpOnLaunch != null) {
+ ec2Service.modifySubnetAttribute(region, subnet.getSubnetId(), "mapPublicIpOnLaunch", mapPublicIpOnLaunch);
+ }
r.setPhysicalId(subnet.getSubnetId());
r.getAttributes().put("SubnetId", subnet.getSubnetId());
r.getAttributes().put("VpcId", subnet.getVpcId());
diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationEc2IntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationEc2IntegrationTest.java
index dbf1479775..265a47db59 100644
--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationEc2IntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationEc2IntegrationTest.java
@@ -10,6 +10,7 @@ import java.util.regex.Pattern;
import static io.restassured.RestAssured.given;
import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.equalTo;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -48,7 +49,8 @@ class CloudFormationEc2IntegrationTest {
"Properties": {
"VpcId": {"Ref": "Vpc"},
"CidrBlock": "10.0.1.0/24",
- "AvailabilityZone": "ap-southeast-2a"
+ "AvailabilityZone": "ap-southeast-2a",
+ "MapPublicIpOnLaunch": true
}
},
"Subnet2": {
@@ -107,6 +109,8 @@ class CloudFormationEc2IntegrationTest {
.post("/")
.then()
.statusCode(200)
+ .body("DescribeSubnetsResponse.subnetSet.item.find { it.availabilityZone == 'ap-southeast-2a' }.mapPublicIpOnLaunch",
+ equalTo("true"))
.extract().asString();
for (String subnetId : exportedSubnetIds) {