Light, fluffy, and always free - The AWS Local Emulator alternative
fix(cloudformation): publish EC2 SecurityGroup Id and Instance VpcId for Fn::GetAtt (#4155)
Hector Venturae60cf84922a2
diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2InstanceCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2InstanceCfnProvisioner.javaindex 74e1067451..cd39654894 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2InstanceCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2InstanceCfnProvisioner.java@@ -301,6 +301,11 @@ public class Ec2InstanceCfnProvisioner implements CfnResourceProvisioner {} else {r.getAttributes().remove("AvailabilityZone");}+ if (instance.getVpcId() != null) {+ r.getAttributes().put("VpcId", instance.getVpcId());+ } else {+ r.getAttributes().remove("VpcId");+ }}/** Reconciles the instance tags to the template when the instance is kept in place. */diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupCfnProvisioner.javaindex 7a6f8adba7..ed3fed4397 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupCfnProvisioner.java@@ -84,6 +84,8 @@ public class Ec2SecurityGroupCfnProvisioner implements CfnResourceProvisioner {// Ref on AWS::EC2::SecurityGroup returns the group id for VPC security groups.r.setPhysicalId(sg.getGroupId());r.getAttributes().put("GroupId", sg.getGroupId());+ // Id is the schema's primary identifier and equals the group id, the same value as GroupId.+ r.getAttributes().put("Id", sg.getGroupId());if (sg.getVpcId() != null) {r.getAttributes().put("VpcId", sg.getVpcId());}diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2InstanceCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2InstanceCfnProvisionerTest.javaindex fe94f95ff0..d99cd249a6 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2InstanceCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2InstanceCfnProvisionerTest.java@@ -62,6 +62,7 @@ class Ec2InstanceCfnProvisionerTest {instance.setPrivateDnsName("ip-10-0-0-5.ec2.internal");instance.setPublicDnsName("ec2-54-0-0-5.compute-1.amazonaws.com");instance.setPlacement(new Placement("us-east-1a"));+ instance.setVpcId("vpc-1");stubLaunch(instance);StackResource r = resource("Server");@@ -69,9 +70,10 @@ class Ec2InstanceCfnProvisionerTest {assertEquals("i-1", r.getPhysicalId());assertEquals(Set.of("InstanceId", "PrivateIp", "PublicIp", "PrivateDnsName", "PublicDnsName",- "AvailabilityZone"), r.getAttributes().keySet());+ "AvailabilityZone", "VpcId"), r.getAttributes().keySet());assertEquals("10.0.0.5", r.getAttributes().get("PrivateIp"));assertEquals("us-east-1a", r.getAttributes().get("AvailabilityZone"));+ assertEquals("vpc-1", r.getAttributes().get("VpcId"));verify(ec2).awaitContainerLaunch(instance);}diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupCfnProvisionerTest.javaindex ec47026b74..c0c94246d9 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/provisioners/Ec2SecurityGroupCfnProvisionerTest.java@@ -47,7 +47,7 @@ class Ec2SecurityGroupCfnProvisionerTest {private final ObjectMapper mapper = new ObjectMapper();@Test- void createPublishesGroupIdAndVpcIdOnly() throws Exception {+ void createPublishesGroupIdIdAndVpcId() throws Exception {when(ec2.createSecurityGroup("us-east-1", "web", "web tier", "vpc-1")).thenReturn(group("sg-1", "web", "web tier", "vpc-1"));StackResource r = resource("WebSg");@@ -57,8 +57,9 @@ class Ec2SecurityGroupCfnProvisionerTest {"""), ctx(null));assertEquals("sg-1", r.getPhysicalId());- assertEquals(Set.of("GroupId", "VpcId"), r.getAttributes().keySet());+ assertEquals(Set.of("GroupId", "Id", "VpcId"), r.getAttributes().keySet());assertEquals("sg-1", r.getAttributes().get("GroupId"));+ assertEquals("sg-1", r.getAttributes().get("Id"));assertEquals("vpc-1", r.getAttributes().get("VpcId"));}diff --git a/src/test/resources/cloudformation/getatt-attribute-gaps.tsv b/src/test/resources/cloudformation/getatt-attribute-gaps.tsvindex 0564a620df..89305d3988 100644--- a/src/test/resources/cloudformation/getatt-attribute-gaps.tsv+++ b/src/test/resources/cloudformation/getatt-attribute-gaps.tsv@@ -3,12 +3,10 @@ AWS::CodeBuild::Project Id schema gives no description; AWS's Id may differ fromAWS::CodePipeline::CustomActionType Id schema gives no description; the custom action has no separate id in FlociAWS::CodePipeline::Webhook Id schema gives no description; Floci keys webhooks by nameAWS::EC2::Instance State not published yet: Floci tracks the instance state, setting it is a separate change to what Fn::GetAtt returns-AWS::EC2::Instance VpcId not published yet: the instance's VPC comes from its subnet, setting it is a separate change to what Fn::GetAtt returnsAWS::EC2::NatGateway AutoProvisionZones availability-mode NAT gateways are not emulatedAWS::EC2::NatGateway AutoScalingIps availability-mode NAT gateways are not emulatedAWS::EC2::NatGateway EniId the NAT gateway's network interface is not createdAWS::EC2::NatGateway RouteTableId availability-mode NAT gateways are not emulated-AWS::EC2::SecurityGroup Id not published yet: the group id is already published as GroupId, adding Id is a separate change to what Fn::GetAtt returnsAWS::EC2::Subnet BlockPublicAccessStates VPC block public access is not emulatedAWS::EC2::Subnet Ipv6CidrBlocks IPv6 CIDR association is not emulatedAWS::EC2::Subnet NetworkAclAssociationId the subnet's default network ACL association is not created with the subnet