Light, fluffy, and always free - The AWS Local Emulator alternative
feat(cloudformation): pass EngineMode and StorageEncrypted to RDS clusters (#3482)
Matheus Oliveira4471e92a0f56
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.javaindex 98b0d27424..0700e3e4ea 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@@ -1461,14 +1461,23 @@ public class CloudFormationResourceProvisioner {String databaseName = resolveOptional(props, "DatabaseName", engine);boolean iamEnabled = parseBoolProp(props, "EnableIAMDatabaseAuthentication", engine);String parameterGroup = resolveOptional(props, "DBClusterParameterGroupName", engine);- if (serverlessV2MinCapacity == null && serverlessV2MaxCapacity == null- && serverlessV2SecondsUntilAutoPause == null) {- cluster = rdsService.createDbCluster(id, engineName, engineVersion, masterUsername,- masterPassword, databaseName, iamEnabled, parameterGroup, null, null, false, region);+ String engineMode = resolveOptional(props, "EngineMode", engine);+ boolean storageEncrypted = parseBoolProp(props, "StorageEncrypted", engine);+ if (engineMode == null && !storageEncrypted) {+ if (serverlessV2MinCapacity == null && serverlessV2MaxCapacity == null+ && serverlessV2SecondsUntilAutoPause == null) {+ cluster = rdsService.createDbCluster(id, engineName, engineVersion, masterUsername,+ masterPassword, databaseName, iamEnabled, parameterGroup, null, null, false, region);+ } else {+ cluster = rdsService.createDbCluster(id, engineName, engineVersion, masterUsername,+ masterPassword, databaseName, iamEnabled, parameterGroup, null, null, false, region,+ serverlessV2MinCapacity, serverlessV2MaxCapacity, serverlessV2SecondsUntilAutoPause);+ }} else {cluster = rdsService.createDbCluster(id, engineName, engineVersion, masterUsername,masterPassword, databaseName, iamEnabled, parameterGroup, null, null, false, region,- serverlessV2MinCapacity, serverlessV2MaxCapacity, serverlessV2SecondsUntilAutoPause);+ serverlessV2MinCapacity, serverlessV2MaxCapacity, serverlessV2SecondsUntilAutoPause,+ false, null, engineMode, storageEncrypted);}deleteRenamedResource(priorPhysicalId, id, rdsService::deleteDbCluster, "DB cluster");}diff --git a/src/test/java/io/github/hectorvent/floci/services/cloudformation/RdsCfnProvisionerTest.java b/src/test/java/io/github/hectorvent/floci/services/cloudformation/RdsCfnProvisionerTest.javaindex 9224b2b656..682cfb5e30 100644--- a/src/test/java/io/github/hectorvent/floci/services/cloudformation/RdsCfnProvisionerTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/cloudformation/RdsCfnProvisionerTest.java@@ -220,6 +220,25 @@ class RdsCfnProvisionerTest {0.0, 16.0, 600);}+ @Test+ void provisionsDbClusterWithEngineModeAndStorageEncrypted() {+ DbCluster cluster = mock(DbCluster.class);+ when(cluster.getDbClusterIdentifier()).thenReturn("mycluster");+ when(rdsService.createDbCluster(any(), any(), any(), any(), any(), any(), anyBoolean(), any(),+ any(), any(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),+ anyBoolean()))+ .thenReturn(cluster);++ provision("Cluster", "AWS::RDS::DBCluster", """+ {"DBClusterIdentifier":"mycluster","Engine":"aurora-postgresql",+ "EngineMode":"serverless","StorageEncrypted":true}+ """);++ verify(rdsService).createDbCluster("mycluster", "aurora-postgresql", null,+ null, null, null, false, null, null, null, false, "us-east-1",+ null, null, null, false, null, "serverless", true);+ }+@Testvoid rejectsNonNumericServerlessV2Capacity() {// A non-numeric capacity is invalid input, not an absent value: the stack fails rather than