Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(elasticache): report transit encryption, not the auth-token flag (#2844)

Allen Sanborn90d1a1931022
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.java
index 7e10a17090..b0c23f9caf 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
@@ -370,8 +370,8 @@ public class ElastiCacheQueryHandler {
.elem("ReplicationGroupId", g.getReplicationGroupId())
.elem("AutoMinorVersionUpgrade", true)
.elem("AuthTokenEnabled", authTokenEnabled)
- .elem("TransitEncryptionEnabled", authTokenEnabled)
- .elem("AtRestEncryptionEnabled", false);
+ .elem("TransitEncryptionEnabled", transitEncryptionEnabled(g))
+ .elem("AtRestEncryptionEnabled", g.isAtRestEncryptionEnabled());
if (g.getEngine() != null) {
xml.elem("Engine", g.getEngine());
}
@@ -745,6 +745,18 @@ private Response handleCreateCacheParameterGroup(MultivaluedMap<String, String>
return xml.end("CacheCluster").build();
}
+ /**
+ * TransitEncryptionEnabled is not AuthTokenEnabled. An auth token forces encryption in transit,
+ * so a PASSWORD group is always encrypted — but the reverse does not hold: a group created with
+ * {@code TransitEncryptionEnabled=true} and no token is encrypted in transit too, and this
+ * handler records exactly that request as {@link AuthMode#IAM}. Reporting the auth-token flag
+ * for both answers false for such a group, which is permanent drift for Terraform's
+ * aws_elasticache_replication_group: it reads transit_encryption_enabled back on every plan.
+ */
+ private static boolean transitEncryptionEnabled(ReplicationGroup g) {
+ return g.getAuthMode() != AuthMode.NO_AUTH;
+ }
+
private String replicationGroupXml(ReplicationGroup g) {
Endpoint ep = g.getConfigurationEndpoint();
boolean authTokenEnabled = g.getAuthMode() == AuthMode.PASSWORD;
@@ -755,7 +767,7 @@ private Response handleCreateCacheParameterGroup(MultivaluedMap<String, String>
.elem("Description", g.getDescription())
.elem("Status", g.getStatus().wireName())
.elem("AuthTokenEnabled", authTokenEnabled)
- .elem("TransitEncryptionEnabled", authTokenEnabled)
+ .elem("TransitEncryptionEnabled", transitEncryptionEnabled(g))
.elem("AtRestEncryptionEnabled", g.isAtRestEncryptionEnabled())
.elem("ClusterEnabled", g.isClusterEnabled())
.elem("ClusterMode", g.isClusterEnabled() ? "enabled" : "disabled")
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.java
index 3037b45ec7..5a68e37d74 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
@@ -287,6 +287,57 @@ class ElastiCacheQueryHandlerTest {
assertTrue(body.contains("<ARN>arn:aws:elasticache:us-east-1:000000000000:replicationgroup:g1</ARN>"), body);
}
+ /**
+ * A group created with TransitEncryptionEnabled=true and no auth token is recorded as
+ * AuthMode.IAM. Reporting the auth-token flag as TransitEncryptionEnabled answered false for
+ * it, which Terraform reads back on every plan as drift on transit_encryption_enabled.
+ */
+ @Test
+ void describeReplicationGroups_reportsTransitEncryptionWithoutAnAuthToken() {
+ ReplicationGroup g = new ReplicationGroup("g1", "d", ReplicationGroupStatus.AVAILABLE,
+ AuthMode.IAM, new Endpoint("localhost", 6379), Instant.now(), 6379);
+ when(service.listReplicationGroups("g1")).thenReturn(List.of(g));
+ MultivaluedMap<String, String> p = params();
+ p.add("ReplicationGroupId", "g1");
+
+ String body = (String) handler.handle("DescribeReplicationGroups", p, "us-east-1").getEntity();
+
+ assertTrue(body.contains("<TransitEncryptionEnabled>true</TransitEncryptionEnabled>"), body);
+ // ... and it is still distinct from AuthTokenEnabled, which only a token sets.
+ assertTrue(body.contains("<AuthTokenEnabled>false</AuthTokenEnabled>"), body);
+ }
+
+ @Test
+ void describeReplicationGroups_reportsNoTransitEncryptionForAPlainGroup() {
+ when(service.listReplicationGroups("g1")).thenReturn(List.of(group("g1")));
+ MultivaluedMap<String, String> p = params();
+ p.add("ReplicationGroupId", "g1");
+
+ String body = (String) handler.handle("DescribeReplicationGroups", p, "us-east-1").getEntity();
+
+ assertTrue(body.contains("<TransitEncryptionEnabled>false</TransitEncryptionEnabled>"), body);
+ }
+
+ /**
+ * The member-cluster view of the same group reported AtRestEncryptionEnabled as a hardcoded
+ * false, so DescribeCacheClusters contradicted DescribeReplicationGroups about one group.
+ */
+ @Test
+ void describeCacheClusters_reportTheGroupsRealEncryptionFlags() {
+ ReplicationGroup group = new ReplicationGroup("grp", "d", ReplicationGroupStatus.AVAILABLE,
+ AuthMode.IAM, new Endpoint("localhost", 6379), Instant.now(), 6379);
+ group.setAtRestEncryptionEnabled(true);
+ when(service.listMemberCacheClusters("grp-0001-001")).thenReturn(List.of(
+ new ElastiCacheService.MemberCacheCluster(group, "grp-0001-001", 6379, true)));
+
+ MultivaluedMap<String, String> params = params();
+ params.putSingle("CacheClusterId", "grp-0001-001");
+ String body = (String) handler.handle("DescribeCacheClusters", params, "us-east-1").getEntity();
+
+ assertTrue(body.contains("<TransitEncryptionEnabled>true</TransitEncryptionEnabled>"), body);
+ assertTrue(body.contains("<AtRestEncryptionEnabled>true</AtRestEncryptionEnabled>"), body);
+ }
+
@Test
void listTagsForResource_readsAReplicationGroupByItsArn() {
ReplicationGroup g = group("g1");