Light, fluffy, and always free - The AWS Local Emulator alternative
fix(rds): delete managed instance secrets (#5330)
David Phillipsc70e1b05ee18
diff --git a/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java b/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.javaindex 51258901fe..1b54b122be 100644--- a/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/rds/RdsService.java@@ -2602,6 +2602,16 @@ public class RdsService implements Resettable, ResourceProvider {*/private void detachManagedMasterUserSecret(DbCluster cluster, String region) {String secretArn = cluster.getMasterUserSecretArn();+ if (secretArn == null || secretsManagerService == null) {+ return;+ }+ detachManagedMasterUserSecret(secretArn, region);+ cluster.setMasterUserSecretArn(null);+ cluster.setMasterUserSecretStatus(null);+ cluster.setMasterUserSecretKmsKeyId(null);+ }++ private void detachManagedMasterUserSecret(String secretArn, String region) {if (secretArn == null || secretsManagerService == null) {return;}@@ -2610,9 +2620,6 @@ public class RdsService implements Resettable, ResourceProvider {} catch (RuntimeException e) {LOG.debugv(e, "Managed master user secret {0} could not be deleted", secretArn);}- cluster.setMasterUserSecretArn(null);- cluster.setMasterUserSecretStatus(null);- cluster.setMasterUserSecretKmsKeyId(null);}/**@@ -3760,6 +3767,7 @@ public class RdsService implements Resettable, ResourceProvider {"DB instance " + id + " is registered with a DB proxy target group.", 400);}+ String clusterId = instance.getDbClusterIdentifier();instance.setStatus(DbInstanceStatus.DELETING);putInstanceForScope(currentAccountId(), effectiveRegion, id, instance);detachReadReplicaLinksBeforeDelete(instance);@@ -3769,7 +3777,6 @@ public class RdsService implements Resettable, ResourceProvider {proxyManager.stopProxy(rdsResourceRelayKey(instance.getDbInstanceArn(), id));}- String clusterId = instance.getDbClusterIdentifier();if (clusterId == null || clusterId.isBlank()) {// Standalone, so stop its container and clean up its Docker volume. Neither exists in// mock mode, and an instance with no container and no reachable daemon has nothing@@ -3786,6 +3793,7 @@ public class RdsService implements Resettable, ResourceProvider {resolvedInstanceStorageResourceId(instance),resolvedInstanceDockerVolumeName(instance));}+ detachManagedMasterUserSecret(instance.getMasterUserSecretArn(), effectiveRegion);} else {// Cluster member — remove from cluster's member listDbCluster cluster = findClusterForScope(diff --git a/src/test/java/io/github/hectorvent/floci/services/rds/RdsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/rds/RdsServiceTest.javaindex cd21ab9d2b..3c9d798b88 100644--- a/src/test/java/io/github/hectorvent/floci/services/rds/RdsServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/rds/RdsServiceTest.java@@ -1,5 +1,6 @@package io.github.hectorvent.floci.services.rds;+import com.fasterxml.jackson.databind.ObjectMapper;import io.github.hectorvent.floci.config.EmulatorConfig;import io.github.hectorvent.floci.core.common.AwsException;import io.github.hectorvent.floci.core.common.RegionResolver;@@ -9,6 +10,7 @@ import io.github.hectorvent.floci.core.common.docker.DockerHostResolver;import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;import io.github.hectorvent.floci.core.storage.InMemoryStorage;import io.github.hectorvent.floci.core.storage.StorageBackend;+import io.github.hectorvent.floci.core.storage.StorageFactory;import io.github.hectorvent.floci.services.ec2.Ec2Service;import io.github.hectorvent.floci.services.ec2.model.Subnet;import io.github.hectorvent.floci.services.ec2.model.Vpc;@@ -1090,6 +1092,122 @@ class RdsServiceTest {new Secret.Tag("aws:rds:primaryDBInstanceArn", instance.getDbInstanceArn())));}+ @Test+ void deleteDbInstanceDeletesManagedMasterPasswordSecret() {+ SecretsManagerService secretsManager = mock(SecretsManagerService.class);+ Secret secret = new Secret();+ String secretArn = "arn:aws:secretsmanager:us-east-1:123456789012:secret:rds!db-secret";+ secret.setArn(secretArn);+ when(secretsManager.createSecret(any(), any(), eq(null), any(), eq(null), any(), eq("rds"), eq("us-east-1")))+ .thenReturn(secret);+ RdsService service = newService(containerManager, proxyManager,+ new InMemoryStorage<>(), new InMemoryStorage<>(),+ new InMemoryStorage<>(), new InMemoryStorage<>(), secretsManager);+ service.createDbInstance("mydb", "postgres", "13",+ "admin", null, "dbname", "db.t3.micro",+ 20, true, null, null, null, true, null);++ service.deleteDbInstance("mydb");++ verify(secretsManager).deleteSecret(secretArn, null, true, "us-east-1");+ assertEquals(0, service.listDbInstances(null).size());+ }++ @Test+ void deleteDbInstanceCompletesWhenManagedSecretHasReplicas() {+ StorageFactory factory = mock(StorageFactory.class);+ when(factory.<Secret>create(eq("secretsmanager"), any(), any()))+ .thenReturn(AccountAwareStorageBackend.inMemory("123456789012"));+ EmulatorConfig.SecretsManagerServiceConfig secretsConfig = mock(EmulatorConfig.SecretsManagerServiceConfig.class);+ when(config.services().secretsmanager()).thenReturn(secretsConfig);+ when(secretsConfig.defaultRecoveryWindowDays()).thenReturn(30);+ SecretsManagerService secretsManager = new SecretsManagerService(+ factory, config, regionResolver, null, new ObjectMapper(), null);+ RdsService service = newService(containerManager, proxyManager,+ new InMemoryStorage<>(), new InMemoryStorage<>(),+ new InMemoryStorage<>(), new InMemoryStorage<>(), secretsManager);+ DbInstance instance = service.createDbInstance("replicated-secret-db", "postgres", "13",+ "admin", null, "dbname", "db.t3.micro",+ 20, true, null, null, null, true, null);+ String secretArn = instance.getMasterUserSecretArn();+ secretsManager.replicateSecretToRegions(secretArn,+ List.of(new SecretsManagerService.ReplicaRegion("us-west-2", null)), false, "us-east-1");+ clearInvocations(containerManager, proxyManager);++ service.deleteDbInstance("replicated-secret-db");++ assertTrue(service.listDbInstances(null).isEmpty());+ verify(containerManager).stop(any());+ verify(containerManager).removeVolume(any(), any(), any());+ verify(proxyManager).stopProxy(any());+ assertNotNull(secretsManager.getSecretValue(secretArn, null, null, "us-east-1"));+ assertNotNull(secretsManager.describeSecret(secretArn, "us-east-1").getReplicationStatus());+ }++ @Test+ void deleteDbInstanceCompletesWhenSecretCleanupFails() {+ SecretsManagerService secretsManager = mock(SecretsManagerService.class);+ Secret secret = new Secret();+ String secretArn = "arn:aws:secretsmanager:us-east-1:123456789012:secret:rds!db-secret";+ secret.setArn(secretArn);+ when(secretsManager.createSecret(any(), any(), eq(null), any(), eq(null), any(), eq("rds"), eq("us-east-1")))+ .thenReturn(secret);+ RdsService service = newService(containerManager, proxyManager,+ new InMemoryStorage<>(), new InMemoryStorage<>(),+ new InMemoryStorage<>(), new InMemoryStorage<>(), secretsManager);+ service.createDbInstance("mydb", "postgres", "13",+ "admin", null, "dbname", "db.t3.micro",+ 20, true, null, null, null, true, null);++ when(secretsManager.deleteSecret(secretArn, null, true, "us-east-1"))+ .thenThrow(new IllegalStateException("Secret cleanup unavailable"));++ service.deleteDbInstance("mydb");++ verify(secretsManager).deleteSecret(secretArn, null, true, "us-east-1");+ assertTrue(service.listDbInstances(null).isEmpty());+ }++ @Test+ void deleteDbInstanceToleratesAlreadyMissingManagedSecret() {+ SecretsManagerService secretsManager = mock(SecretsManagerService.class);+ Secret secret = new Secret();+ String secretArn = "arn:aws:secretsmanager:us-east-1:123456789012:secret:rds!db-secret";+ secret.setArn(secretArn);+ when(secretsManager.createSecret(any(), any(), eq(null), any(), eq(null), any(), eq("rds"), eq("us-east-1")))+ .thenReturn(secret);+ RdsService service = newService(containerManager, proxyManager,+ new InMemoryStorage<>(), new InMemoryStorage<>(),+ new InMemoryStorage<>(), new InMemoryStorage<>(), secretsManager);+ service.createDbInstance("mydb", "postgres", "13",+ "admin", null, "dbname", "db.t3.micro",+ 20, true, null, null, null, true, null);++ when(secretsManager.deleteSecret(secretArn, null, true, "us-east-1"))+ .thenThrow(new AwsException("ResourceNotFoundException", "Secret already removed", 400));++ service.deleteDbInstance("mydb");++ verify(secretsManager).deleteSecret(secretArn, null, true, "us-east-1");+ assertEquals(0, service.listDbInstances(null).size());+ }++ @Test+ void deleteDbInstanceDoesNotDeleteSecretsForUnmanagedPassword() {+ SecretsManagerService secretsManager = mock(SecretsManagerService.class);+ RdsService service = newService(containerManager, proxyManager,+ new InMemoryStorage<>(), new InMemoryStorage<>(),+ new InMemoryStorage<>(), new InMemoryStorage<>(), secretsManager);+ service.createDbInstance("mydb", "postgres", "13",+ "admin", "password", "dbname", "db.t3.micro",+ 20, true, null, null, null);++ service.deleteDbInstance("mydb");++ verify(secretsManager, never()).deleteSecret(any(), any(), anyBoolean(), any());+ assertEquals(0, service.listDbInstances(null).size());+ }+@Testvoid createDbClusterWithManagedMasterPasswordCreatesSecret() {when(config.services().rds().mock()).thenReturn(true);