Light, fluffy, and always free - The AWS Local Emulator alternative
refactor(cloudformation): collapse RDS DBCluster createDbCluster overload branching (#3531)
Matheus Andréc30df8378152
diff --git a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/RdsCfnProvisioner.java b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/RdsCfnProvisioner.javaindex 8199db611f..1b3e2d902a 100644--- a/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/RdsCfnProvisioner.java+++ b/src/main/java/io/github/hectorvent/floci/services/cloudformation/provisioners/RdsCfnProvisioner.java@@ -413,22 +413,10 @@ public class RdsCfnProvisioner implements CfnResourceProvisioner {resolveOptionalWithoutDynamicReferences(props, "MasterUserPassword", engine), region, true);boolean iamEnabled = parseBoolProp(props, "EnableIAMDatabaseAuthentication", engine);String parameterGroup = resolveOptional(props, "DBClusterParameterGroupName", 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,- false, null, engineMode, storageEncrypted);- }+ cluster = rdsService.createDbCluster(id, engineName, engineVersion, masterUsername,+ masterPassword, databaseName, iamEnabled, parameterGroup, null, null, false, region,+ serverlessV2MinCapacity, serverlessV2MaxCapacity, serverlessV2SecondsUntilAutoPause,+ false, null, engineMode, storageEncrypted);}r.setPhysicalId(cluster.getDbClusterIdentifier());r.getAttributes().put("DBClusterIdentifier", cluster.getDbClusterIdentifier());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 5d837d3672..343948dee5 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@@ -183,7 +183,8 @@ class RdsCfnProvisionerTest {when(cluster.getDbClusterArn()).thenReturn("arn:aws:rds:us-east-1:000000000000:cluster:mycluster");when(cluster.getDbClusterResourceId()).thenReturn("cluster-ABCDEFGHIJKLMNOP");when(rdsService.createDbCluster(any(), any(), any(), any(), any(), any(), anyBoolean(), any(),- any(), any(), anyBoolean(), any()))+ any(), any(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),+ anyBoolean())).thenReturn(cluster);StackResource r = provision("Cluster", "AWS::RDS::DBCluster", """@@ -201,7 +202,8 @@ class RdsCfnProvisionerTest {// service, so it belongs in the attributes rather than in the gaps file.assertEquals("cluster-ABCDEFGHIJKLMNOP", r.getAttributes().get("DBClusterResourceId"));verify(rdsService).createDbCluster("mycluster", "aurora-postgresql", "16.3",- "admin", "secret", "appdb", false, null, null, null, false, "us-east-1");+ "admin", "secret", "appdb", false, null, null, null, false, "us-east-1",+ null, null, null, false, null, null, false);}@Test@@ -209,7 +211,8 @@ class RdsCfnProvisionerTest {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(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),+ anyBoolean())).thenReturn(cluster);provision("Cluster", "AWS::RDS::DBCluster", """@@ -217,7 +220,8 @@ class RdsCfnProvisionerTest {""", "us-west-2");verify(rdsService).createDbCluster("mycluster", "aurora-postgresql", null,- null, null, null, false, null, null, null, false, "us-west-2");+ null, null, null, false, null, null, null, false, "us-west-2",+ null, null, null, false, null, null, false);}@Test@@ -225,7 +229,8 @@ class RdsCfnProvisionerTest {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()))+ any(), any(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),+ anyBoolean())).thenReturn(cluster);provision("Cluster", "AWS::RDS::DBCluster", """@@ -236,7 +241,7 @@ class RdsCfnProvisionerTest {verify(rdsService).createDbCluster("mycluster", "aurora-postgresql", null,null, null, null, false, null, null, null, false, "us-east-1",- 0.0, 16.0, 600);+ 0.0, 16.0, 600, false, null, null, false);}@Test@@ -293,7 +298,8 @@ class RdsCfnProvisionerTest {when(cluster.getDbClusterIdentifier()).thenReturn("mycluster");when(cluster.getEndpoint()).thenReturn(new DbEndpoint("mycluster.local", 5432));when(rdsService.createDbCluster(any(), any(), any(), any(), any(), any(), anyBoolean(), any(),- any(), any(), anyBoolean(), any()))+ any(), any(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),+ anyBoolean())).thenReturn(cluster);provision("Cluster", "AWS::RDS::DBCluster", """@@ -305,7 +311,8 @@ class RdsCfnProvisionerTest {verify(rdsService).createDbCluster(eq("mycluster"), eq("aurora-postgresql"), eq("16.3"),eq("resolved-user"), eq("resolved-secret"), eq("appdb"), anyBoolean(), any(),- any(), any(), anyBoolean(), any());+ any(), any(), anyBoolean(), any(),+ any(), any(), any(), anyBoolean(), any(), any(), anyBoolean());verify(secretsManagerService, times(2)).getSecretValue("my-secret", null, null, "us-west-2");}@@ -346,7 +353,8 @@ class RdsCfnProvisionerTest {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(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),+ anyBoolean())).thenReturn(cluster);provision("Cluster", "AWS::RDS::DBCluster", """@@ -358,7 +366,8 @@ class RdsCfnProvisionerTest {verify(rdsService).createDbCluster(eq("mycluster"), eq("aurora-postgresql"), any(), eq("admin"),eq("resolved-secret"), any(), anyBoolean(), any(), any(), any(),- anyBoolean(), eq("us-east-1"));+ anyBoolean(), eq("us-east-1"),+ any(), any(), any(), anyBoolean(), any(), any(), anyBoolean());verify(secretsManagerService).getSecretValue("my-secret", null, null, "us-east-1");}@@ -372,7 +381,8 @@ class RdsCfnProvisionerTest {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(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),+ anyBoolean())).thenReturn(cluster);String secretArn =@@ -386,7 +396,8 @@ class RdsCfnProvisionerTest {verify(rdsService).createDbCluster(eq("mycluster"), eq("aurora-postgresql"), any(), eq("admin"),eq("resolved-secret"), any(), anyBoolean(), any(), any(), any(),- anyBoolean(), eq("us-east-1"));+ anyBoolean(), eq("us-east-1"),+ any(), any(), any(), anyBoolean(), any(), any(), anyBoolean());verify(secretsManagerService).getSecretValue(secretArn, null, null, "us-west-2");}@@ -400,7 +411,8 @@ class RdsCfnProvisionerTest {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(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),+ anyBoolean())).thenReturn(cluster);String secretArn =@@ -414,7 +426,8 @@ class RdsCfnProvisionerTest {verify(rdsService).createDbCluster(eq("mycluster"), eq("aurora-postgresql"), any(), eq("admin"),eq("resolved-secret"), any(), anyBoolean(), any(), any(), any(),- anyBoolean(), eq("us-east-1"));+ anyBoolean(), eq("us-east-1"),+ any(), any(), any(), anyBoolean(), any(), any(), anyBoolean());verify(secretsManagerService).getSecretValue(secretArn, null, null, "us-west-2");}@@ -428,7 +441,8 @@ class RdsCfnProvisionerTest {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(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),+ anyBoolean())).thenReturn(cluster);String secretArn =@@ -442,7 +456,8 @@ class RdsCfnProvisionerTest {verify(rdsService).createDbCluster(eq("mycluster"), eq("aurora-postgresql"), any(), eq("admin"),eq("resolved-secret"), any(), anyBoolean(), any(), any(), any(),- anyBoolean(), eq("us-east-1"));+ anyBoolean(), eq("us-east-1"),+ any(), any(), any(), anyBoolean(), any(), any(), anyBoolean());verify(secretsManagerService).getSecretValue(secretArn, null, null, "us-west-2");}@@ -522,7 +537,8 @@ class RdsCfnProvisionerTest {when(cluster.getDbClusterIdentifier()).thenReturn("mycluster");when(cluster.getEndpoint()).thenReturn(new DbEndpoint("mycluster.local", 5432));when(rdsService.createDbCluster(any(), any(), any(), any(), any(), any(), anyBoolean(), any(),- any(), any(), anyBoolean(), any()))+ any(), any(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),+ anyBoolean())).thenReturn(cluster);provision("Cluster", "AWS::RDS::DBCluster", """@@ -535,7 +551,8 @@ class RdsCfnProvisionerTest {// The {{resolve:ssm:<name>}} dynamic reference is substituted with the parameter value.verify(rdsService).createDbCluster(eq("mycluster"), eq("aurora-postgresql"), eq("16.3"),eq("admin"), eq("resolved-ssm"), eq("appdb"), anyBoolean(), any(),- any(), any(), anyBoolean(), any());+ any(), any(), anyBoolean(), any(),+ any(), any(), any(), anyBoolean(), any(), any(), anyBoolean());}@Test@@ -546,7 +563,8 @@ class RdsCfnProvisionerTest {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(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),+ anyBoolean())).thenReturn(cluster);StackResource resource = provision("Cluster", "AWS::RDS::DBCluster", """@@ -558,7 +576,8 @@ class RdsCfnProvisionerTest {assertEquals("CREATE_COMPLETE", resource.getStatus());verify(rdsService).createDbCluster(eq("mycluster"), eq("aurora-postgresql"), any(),eq("resolved-user"), eq("secret"), any(), anyBoolean(), any(),- any(), any(), anyBoolean(), eq("us-east-1"));+ any(), any(), anyBoolean(), eq("us-east-1"),+ any(), any(), any(), anyBoolean(), any(), any(), anyBoolean());}@Test@@ -569,7 +588,8 @@ class RdsCfnProvisionerTest {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(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),+ anyBoolean())).thenReturn(cluster);StackResource resource = provision("Cluster", "AWS::RDS::DBCluster", """@@ -581,7 +601,8 @@ class RdsCfnProvisionerTest {assertEquals("CREATE_COMPLETE", resource.getStatus());verify(rdsService).createDbCluster(eq("mycluster"), eq("aurora-postgresql"), any(),eq("admin"), eq("first,second"), any(), anyBoolean(), any(),- any(), any(), anyBoolean(), eq("us-east-1"));+ any(), any(), anyBoolean(), eq("us-east-1"),+ any(), any(), any(), anyBoolean(), any(), any(), anyBoolean());}@Test@@ -673,7 +694,8 @@ class RdsCfnProvisionerTest {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(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),+ anyBoolean())).thenReturn(cluster);StackResource resource = provision("Cluster", "AWS::RDS::DBCluster", """@@ -685,7 +707,8 @@ class RdsCfnProvisionerTest {assertEquals("CREATE_COMPLETE", resource.getStatus());verify(rdsService).createDbCluster(eq("mycluster"), eq("aurora-postgresql"), any(),eq("admin"), eq("first-password"), any(), anyBoolean(), any(),- any(), any(), anyBoolean(), eq("us-west-2"));+ any(), any(), anyBoolean(), eq("us-west-2"),+ any(), any(), any(), anyBoolean(), any(), any(), anyBoolean());verify(ssmService, never()).getParameter(any(), any());}@@ -701,7 +724,8 @@ class RdsCfnProvisionerTest {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(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),+ anyBoolean())).thenReturn(cluster);StackResource resource = provision("Cluster", "AWS::RDS::DBCluster", """@@ -713,7 +737,8 @@ class RdsCfnProvisionerTest {assertEquals("CREATE_COMPLETE", resource.getStatus());verify(rdsService).createDbCluster(eq("mycluster"), eq("aurora-postgresql"), any(),eq("admin"), eq("first-password"), any(), anyBoolean(), any(),- any(), any(), anyBoolean(), eq("us-west-2"));+ any(), any(), anyBoolean(), eq("us-west-2"),+ any(), any(), any(), anyBoolean(), any(), any(), anyBoolean());verify(ssmService, never()).getParameter(any(), any());}@@ -1301,7 +1326,8 @@ class RdsCfnProvisionerTest {assertEquals("mycluster", r.getPhysicalId());verify(rdsService, never()).createDbCluster(any(), any(), any(), any(), any(), any(),- anyBoolean(), any(), any(), any(), anyBoolean(), any());+ anyBoolean(), any(), any(), any(), anyBoolean(), any(), any(), any(), any(),+ anyBoolean(), any(), any(), anyBoolean());verify(rdsService).modifyDbCluster("mycluster", "secret", false,null, null, null, "us-east-1");}@@ -1315,10 +1341,6 @@ class RdsCfnProvisionerTest {doReturn(invocation.getArgument(0)).when(created).getDbClusterIdentifier();return created;};- when(rdsService.createDbCluster(any(), any(), any(), any(), any(), any(), anyBoolean(), any(),- any(), any(), anyBoolean(), any())).thenAnswer(echo);- when(rdsService.createDbCluster(any(), any(), any(), any(), any(), any(), anyBoolean(), any(),- any(), any(), anyBoolean(), any(), any(), any(), any())).thenAnswer(echo);when(rdsService.createDbCluster(any(), any(), any(), any(), any(), any(), anyBoolean(), any(),any(), any(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), any(), any(),anyBoolean())).thenAnswer(echo);@@ -1621,7 +1643,8 @@ class RdsCfnProvisionerTest {String replacement = r.getPhysicalId();assertNotEquals(PRIOR_CLUSTER, replacement);verify(rdsService).createDbCluster(replacement, "aurora-postgresql", null, null, null,- "reports", false, null, null, null, false, "us-east-1");+ "reports", false, null, null, null, false, "us-east-1",+ null, null, null, false, null, null, false);verify(rdsService, never()).modifyDbCluster(any(), any(), any(), any(), any(), any(), any());verify(rdsService, never()).deleteDbCluster(any(), any());assertEquals(PRIOR_CLUSTER, provisioner.updateCleanupPhysicalId(r));@@ -1689,7 +1712,8 @@ class RdsCfnProvisionerTest {verify(rdsService).modifyDbCluster(created.getPhysicalId(), "rotated", false,null, null, null, "us-east-1");verify(rdsService, times(1)).createDbCluster(any(), any(), any(), any(), any(), any(),- anyBoolean(), any(), any(), any(), anyBoolean(), any());+ anyBoolean(), any(), any(), any(), anyBoolean(), any(), any(), any(), any(),+ anyBoolean(), any(), any(), anyBoolean());assertEquals(record, r.getAttributes().get(CREATE_ONLY_ATTR));assertFalse(r.getAttributes().containsKey(CREATE_ONLY_PRIOR_ATTR));assertFalse(provisioner.hasReplacementUpdate(r));@@ -1788,7 +1812,8 @@ class RdsCfnProvisionerTest {assertEquals(prior, again.getPhysicalId(), "the rolled-back template describes the prior cluster");verify(rdsService).modifyDbCluster(prior, null, false, null, null, null, "us-east-1");verify(rdsService, times(2)).createDbCluster(any(), any(), any(), any(), any(), any(),- anyBoolean(), any(), any(), any(), anyBoolean(), any());+ anyBoolean(), any(), any(), any(), anyBoolean(), any(), any(), any(), any(),+ anyBoolean(), any(), any(), anyBoolean());}@Test