Light, fluffy, and always free - The AWS Local Emulator alternative
fix(elb): populate source security group (#3807)
XuJiana2de4ac8a2a9
diff --git a/src/main/java/io/github/hectorvent/floci/services/elb/ElbClassicService.java b/src/main/java/io/github/hectorvent/floci/services/elb/ElbClassicService.javaindex 40dac4d04c..7efeccecb4 100644--- a/src/main/java/io/github/hectorvent/floci/services/elb/ElbClassicService.java+++ b/src/main/java/io/github/hectorvent/floci/services/elb/ElbClassicService.java@@ -3,10 +3,12 @@ package io.github.hectorvent.floci.services.elb;import com.fasterxml.jackson.core.type.TypeReference;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.dns.EmbeddedDnsServer;import io.github.hectorvent.floci.core.storage.StorageBackedMap;import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.ec2.Ec2Service;+import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;import io.github.hectorvent.floci.services.ec2.model.Subnet;import io.github.hectorvent.floci.services.elb.model.ClassicHealthCheck;import io.github.hectorvent.floci.services.elb.model.ClassicListener;@@ -53,19 +55,29 @@ public class ElbClassicService {private final ElbClassicHealthChecker healthChecker;private final StorageFactory storageFactory;private final EmulatorConfig config;+ private final RegionResolver regionResolver;// region → load balancer name → recordprivate Map<String, Map<String, ClassicLoadBalancer>> loadBalancers = new ConcurrentHashMap<>();- @Injectpublic ElbClassicService(Ec2Service ec2Service,ElbClassicHealthChecker healthChecker,StorageFactory storageFactory,EmulatorConfig config) {+ this(ec2Service, healthChecker, storageFactory, config, null);+ }++ @Inject+ public ElbClassicService(Ec2Service ec2Service,+ ElbClassicHealthChecker healthChecker,+ StorageFactory storageFactory,+ EmulatorConfig config,+ RegionResolver regionResolver) {this.ec2Service = ec2Service;this.healthChecker = healthChecker;this.storageFactory = storageFactory;this.config = config;+ this.regionResolver = regionResolver;}@PostConstruct@@ -138,6 +150,7 @@ public class ElbClassicService {lb.setCreatedTime(Instant.now());lb.setListeners(new ArrayList<>(listeners));lb.setSecurityGroups(securityGroups != null ? new ArrayList<>(securityGroups) : new ArrayList<>());+ populateSourceSecurityGroup(region, lb);lb.setHealthCheck(ClassicHealthCheck.defaults());if (tags != null && !tags.isEmpty()) {lb.setTags(new LinkedHashMap<>(tags));@@ -178,6 +191,28 @@ public class ElbClassicService {return result;}+ private void populateSourceSecurityGroup(String region, ClassicLoadBalancer lb) {+ if (lb.getSecurityGroups() == null || lb.getSecurityGroups().isEmpty()) {+ lb.setSourceSecurityGroupOwnerAlias(null);+ lb.setSourceSecurityGroupName(null);+ return;+ }++ String sourceGroupId = lb.getSecurityGroups().getFirst();+ List<SecurityGroup> matches = ec2Service.describeSecurityGroups(+ region, List.of(sourceGroupId), List.of(), Map.of());+ if (matches.isEmpty()) {+ lb.setSourceSecurityGroupOwnerAlias(null);+ lb.setSourceSecurityGroupName(null);+ return;+ }++ SecurityGroup sourceGroup = matches.getFirst();+ lb.setSourceSecurityGroupOwnerAlias(+ regionResolver != null ? regionResolver.getAccountId() : sourceGroup.getOwnerId());+ lb.setSourceSecurityGroupName(sourceGroup.getGroupName());+ }+/** Deletes a load balancer. Deleting one that does not exist succeeds, as it does on AWS. */public void deleteLoadBalancer(String region, String name) {Map<String, ClassicLoadBalancer> regionLbs = loadBalancers.get(region);@@ -325,6 +360,7 @@ public class ElbClassicService {public List<String> applySecurityGroups(String region, String name, List<String> securityGroups) {ClassicLoadBalancer lb = requireLoadBalancer(region, name);lb.setSecurityGroups(new ArrayList<>(securityGroups));+ populateSourceSecurityGroup(region, lb);persist(region);return List.copyOf(lb.getSecurityGroups());}diff --git a/src/test/java/io/github/hectorvent/floci/services/elb/ElbClassicIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/elb/ElbClassicIntegrationTest.javaindex 89719c6cd6..4adf94b82d 100644--- a/src/test/java/io/github/hectorvent/floci/services/elb/ElbClassicIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/elb/ElbClassicIntegrationTest.java@@ -29,6 +29,11 @@ class ElbClassicIntegrationTest {private static final String AUTH ="AWS4-HMAC-SHA256 Credential=test/20260427/us-east-1/elasticloadbalancing/aws4_request";+ private static final String SOURCE_GROUP_ACCOUNT = "333333333333";+ private static final String SOURCE_GROUP_ELB_AUTH = "AWS4-HMAC-SHA256 Credential="+ + SOURCE_GROUP_ACCOUNT + "/20260427/us-east-1/elasticloadbalancing/aws4_request";+ private static final String SOURCE_GROUP_EC2_AUTH = "AWS4-HMAC-SHA256 Credential="+ + SOURCE_GROUP_ACCOUNT + "/20260427/us-east-1/ec2/aws4_request";private static final String V1 = "2012-06-01";private static final String V2 = "2015-12-01";private static final String CLASSIC_XMLNS =@@ -568,4 +573,53 @@ class ElbClassicIntegrationTest {.statusCode(400).body("ErrorResponse.Error.Code", equalTo("LoadBalancerNotFound"));}++ @Test+ @Order(19)+ void describeIncludesTheAttachedSecurityGroupsOwnerAndName() {+ String groupId = given()+ .formParam("Action", "CreateSecurityGroup")+ .formParam("Version", "2016-11-15")+ .formParam("GroupName", "elb-source-sg")+ .formParam("GroupDescription", "Classic ELB source group")+ .header("Authorization", SOURCE_GROUP_EC2_AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .extract().xmlPath().getString("CreateSecurityGroupResponse.groupId");++ String loadBalancerName = "classic-elb-source-group";+ given()+ .formParam("Action", "CreateLoadBalancer")+ .formParam("Version", V1)+ .formParam("LoadBalancerName", loadBalancerName)+ .formParam("Subnets.member.1", subnetA())+ .formParam("SecurityGroups.member.1", groupId)+ .formParam("Listeners.member.1.Protocol", "TCP")+ .formParam("Listeners.member.1.LoadBalancerPort", "443")+ .formParam("Listeners.member.1.InstanceProtocol", "TCP")+ .formParam("Listeners.member.1.InstancePort", "8443")+ .header("Authorization", SOURCE_GROUP_ELB_AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200);++ given()+ .formParam("Action", "DescribeLoadBalancers")+ .formParam("Version", V1)+ .formParam("LoadBalancerNames.member.1", loadBalancerName)+ .header("Authorization", SOURCE_GROUP_ELB_AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("DescribeLoadBalancersResponse.DescribeLoadBalancersResult"+ + ".LoadBalancerDescriptions.member.SourceSecurityGroup.OwnerAlias",+ equalTo(SOURCE_GROUP_ACCOUNT))+ .body("DescribeLoadBalancersResponse.DescribeLoadBalancersResult"+ + ".LoadBalancerDescriptions.member.SourceSecurityGroup.GroupName",+ equalTo("elb-source-sg"));+ }}diff --git a/src/test/java/io/github/hectorvent/floci/services/elb/ElbClassicServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/elb/ElbClassicServiceTest.javaindex 0213abea6c..ae66c8a737 100644--- a/src/test/java/io/github/hectorvent/floci/services/elb/ElbClassicServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/elb/ElbClassicServiceTest.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.elb;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.services.ec2.Ec2Service;+import io.github.hectorvent.floci.services.ec2.model.SecurityGroup;import io.github.hectorvent.floci.services.ec2.model.Subnet;import io.github.hectorvent.floci.services.elb.model.ClassicHealthCheck;import io.github.hectorvent.floci.services.elb.model.ClassicListener;@@ -152,6 +153,20 @@ class ElbClassicServiceTest {assertTrue(service.describeLoadBalancers("eu-west-1", null).isEmpty());}+ @Test+ void createPopulatesTheSourceSecurityGroupFromTheFirstAttachedGroup() {+ SecurityGroup sourceGroup = new SecurityGroup();+ sourceGroup.setGroupId("sg-1");+ sourceGroup.setGroupName("elb-sg");+ sourceGroup.setOwnerId("333333333333");+ when(ec2Service.describeSecurityGroups(+ REGION, List.of("sg-1"), List.of(), Map.of())).thenReturn(List.of(sourceGroup));+ ClassicLoadBalancer created = create("my-elb");++ assertEquals("333333333333", created.getSourceSecurityGroupOwnerAlias());+ assertEquals("elb-sg", created.getSourceSecurityGroupName());+ }+@Testvoid configureHealthCheckStoresAndRearmsTheChecker() {ClassicLoadBalancer lb = create("my-elb");