Light, fluffy, and always free - The AWS Local Emulator alternative
fix(elasticache): report a ConfigurationEndpoint only for cluster-mode-enabled replication groups (#4469)
Abhigya5af1d4048ef2
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ElastiCacheTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ElastiCacheTest.javaindex 8b0635c6f7..d621bba029 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ElastiCacheTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/ElastiCacheTest.java@@ -16,9 +16,11 @@ import software.amazon.awssdk.services.elasticache.model.DeleteReplicationGroupRimport software.amazon.awssdk.services.elasticache.model.DeleteUserRequest;import software.amazon.awssdk.services.elasticache.model.DescribeReplicationGroupsRequest;import software.amazon.awssdk.services.elasticache.model.DescribeUsersRequest;+import software.amazon.awssdk.services.elasticache.model.Endpoint;import software.amazon.awssdk.services.elasticache.model.InputAuthenticationType;import software.amazon.awssdk.services.elasticache.model.ModifyReplicationGroupRequest;import software.amazon.awssdk.services.elasticache.model.ModifyUserRequest;+import software.amazon.awssdk.services.elasticache.model.ReplicationGroup;import software.amazon.awssdk.services.elasticache.model.ElastiCacheException;import java.io.IOException;@@ -87,11 +89,13 @@ class ElastiCacheTest {assertThat(response.replicationGroup().replicationGroupId()).isEqualTo(groupId);assertThat(response.replicationGroup().status()).isEqualTo("available");- assertThat(response.replicationGroup().configurationEndpoint()).isNotNull();- assertThat(response.replicationGroup().configurationEndpoint().address()).isEqualTo(TestFixtures.proxyHost());+ assertThat(response.replicationGroup().clusterEnabled()).isFalse();+ assertThat(response.replicationGroup().configurationEndpoint()).isNull();+ assertThat(response.replicationGroup().nodeGroups()).hasSize(1);+ assertThat(primaryEndpoint(response.replicationGroup()).address()).isEqualTo(TestFixtures.proxyHost());assertThat(response.replicationGroup().authTokenEnabled()).isTrue();- firstProxyPort = response.replicationGroup().configurationEndpoint().port();+ firstProxyPort = primaryEndpoint(response.replicationGroup()).port();groupCreated = true;}@@ -106,7 +110,8 @@ class ElastiCacheTest {assertThat(response.replicationGroups()).hasSize(1);assertThat(response.replicationGroups().get(0).replicationGroupId()).isEqualTo(groupId);- assertThat(response.replicationGroups().get(0).configurationEndpoint().port()).isEqualTo(firstProxyPort);+ assertThat(response.replicationGroups().get(0).configurationEndpoint()).isNull();+ assertThat(primaryEndpoint(response.replicationGroups().get(0)).port()).isEqualTo(firstProxyPort);}@Test@@ -315,9 +320,13 @@ class ElastiCacheTest {.authToken(authToken).build());- assertThat(response.replicationGroup().configurationEndpoint().port()).isEqualTo(firstProxyPort);+ assertThat(primaryEndpoint(response.replicationGroup()).port()).isEqualTo(firstProxyPort);groupCreated = false;- firstProxyPort = response.replicationGroup().configurationEndpoint().port();+ firstProxyPort = primaryEndpoint(response.replicationGroup()).port();+ }++ private static Endpoint primaryEndpoint(ReplicationGroup group) {+ return group.nodeGroups().get(0).primaryEndpoint();}private static void requireGroup() {diff --git a/src/main/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheQueryHandler.javaindex 8743fbd3f8..208825b7d8 100644--- a/src/main/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheQueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheQueryHandler.java@@ -962,7 +962,7 @@ private Response handleCreateCacheParameterGroup(MultivaluedMap<String, String>appendSingleNodeGroup(xml, g, members, ep);}xml.end("NodeGroups");- if (ep != null) {+ if (g.isClusterEnabled() && ep != null) {xml.start("ConfigurationEndpoint").elem("Address", ep.address()).elem("Port", (long) ep.port())diff --git a/src/test/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheIntegrationTest.javaindex ad48ebe447..3f84653b66 100644--- a/src/test/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheIntegrationTest.java@@ -19,6 +19,7 @@ import java.nio.charset.StandardCharsets;import java.util.List;import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.containsString;import static org.hamcrest.Matchers.equalTo;import static org.hamcrest.Matchers.not;import static org.hamcrest.Matchers.notNullValue;@@ -94,11 +95,11 @@ class ElastiCacheIntegrationTest {.body("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.ReplicationGroupId", equalTo(GROUP_ID)).body("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.Status", equalTo("available")).body("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.AuthTokenEnabled", equalTo("true"))- .body("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.ConfigurationEndpoint.Address", equalTo("localhost"))- .body("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.ConfigurationEndpoint.Port", notNullValue())+ .body("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.NodeGroups.NodeGroup.PrimaryEndpoint.Address", equalTo("localhost"))+ .body("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.NodeGroups.NodeGroup.PrimaryEndpoint.Port", notNullValue()).extract().xmlPath()- .getInt("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.ConfigurationEndpoint.Port");+ .getInt("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.NodeGroups.NodeGroup.PrimaryEndpoint.Port");}@Test@@ -114,8 +115,11 @@ class ElastiCacheIntegrationTest {.statusCode(200).body("DescribeReplicationGroupsResponse.DescribeReplicationGroupsResult.ReplicationGroups.ReplicationGroup.ReplicationGroupId",equalTo(GROUP_ID))- .body("DescribeReplicationGroupsResponse.DescribeReplicationGroupsResult.ReplicationGroups.ReplicationGroup.ConfigurationEndpoint.Port",- equalTo(String.valueOf(firstProxyPort)));+ .body("DescribeReplicationGroupsResponse.DescribeReplicationGroupsResult.ReplicationGroups.ReplicationGroup.NodeGroups.NodeGroup.PrimaryEndpoint.Port",+ equalTo(String.valueOf(firstProxyPort)))+ .body("DescribeReplicationGroupsResponse.DescribeReplicationGroupsResult.ReplicationGroups.ReplicationGroup.ClusterEnabled",+ equalTo("false"))+ .body(not(containsString("<ConfigurationEndpoint>")));}@Test@@ -235,7 +239,7 @@ class ElastiCacheIntegrationTest {.statusCode(200).extract().xmlPath()- .getInt("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.ConfigurationEndpoint.Port");+ .getInt("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.NodeGroups.NodeGroup.PrimaryEndpoint.Port");// User associated with GROUP_ID should be rejected on CROSS_GROUP_IDString reply = sendCommand(crossGroupPort, respArray("AUTH", USER_NAME, INITIAL_PASSWORD));@@ -345,10 +349,10 @@ class ElastiCacheIntegrationTest {.post("/").then().statusCode(200)- .body("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.ConfigurationEndpoint.Address", equalTo("localhost"))+ .body("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.NodeGroups.NodeGroup.PrimaryEndpoint.Address", equalTo("localhost")).extract().xmlPath()- .getInt("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.ConfigurationEndpoint.Port");+ .getInt("CreateReplicationGroupResponse.CreateReplicationGroupResult.ReplicationGroup.NodeGroups.NodeGroup.PrimaryEndpoint.Port");assertEquals(firstProxyPort, reusedPort);diff --git a/src/test/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheQueryHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheQueryHandlerTest.javaindex 40e7cebc86..2b443594d7 100644--- a/src/test/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheQueryHandlerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/elasticache/ElastiCacheQueryHandlerTest.java@@ -104,6 +104,8 @@ class ElastiCacheQueryHandlerTest {assertTrue(body.contains("<CacheClusterId>grp-0002-001</CacheClusterId>"));assertFalse(body.contains("<PrimaryEndpoint>"),"Cluster-mode node groups carry Slots, not a PrimaryEndpoint");+ assertTrue(body.contains(+ "<ConfigurationEndpoint><Address>localhost</Address><Port>6379</Port></ConfigurationEndpoint>"), body);}@Test@@ -125,6 +127,8 @@ class ElastiCacheQueryHandlerTest {assertTrue(body.contains("<ClusterId>grp-001</ClusterId>"));assertTrue(body.contains("<PrimaryEndpoint><Address>localhost</Address><Port>6379</Port></PrimaryEndpoint>"));assertTrue(body.contains("<CurrentRole>primary</CurrentRole>"));+ assertFalse(body.contains("<ConfigurationEndpoint>"),+ "A cluster-mode-disabled group reports its endpoints under NodeGroups only");}@Test