Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(rds): persist PubliclyAccessible on Create/ModifyDBInstance and echo it on Describe (#2484)

hisham-coderd45a4371224f
diff --git a/src/main/java/io/github/hectorvent/floci/services/rds/RdsQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/rds/RdsQueryHandler.java
index 417d17eec6..6b18fd9bd6 100644
--- a/src/main/java/io/github/hectorvent/floci/services/rds/RdsQueryHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/rds/RdsQueryHandler.java
@@ -153,6 +153,12 @@ public class RdsQueryHandler {
// AWS defaults this to true when the request omits it - unlike most boolean flags here,
// which default to false.
boolean autoMinorVersionUpgrade = !"false".equalsIgnoreCase(params.getFirst("AutoMinorVersionUpgrade"));
+ Boolean publiclyAccessible;
+ try {
+ publiclyAccessible = parseOptionalBoolean(params, "PubliclyAccessible");
+ } catch (AwsException e) {
+ return AwsQueryResponse.error(e.getErrorCode(), e.getMessage(), AwsNamespaces.RDS, e.getHttpStatus());
+ }
if (dbInstanceClass == null) {
dbInstanceClass = "db.t3.micro";
@@ -168,7 +174,7 @@ public class RdsQueryHandler {
masterPassword, dbName, dbInstanceClass, allocatedStorage, iamEnabled,
paramGroupName, dbSubnetGroupName, dbClusterIdentifier, availabilityZone, multiAz,
manageMasterUserPassword, masterUserSecretKmsKeyId, tags, vpcSecurityGroupIds,
- optionGroupName, region, autoMinorVersionUpgrade, settings);
+ optionGroupName, region, autoMinorVersionUpgrade, settings, publiclyAccessible);
String result = dbInstanceXml(instance);
return Response.ok(AwsQueryResponse.envelope("CreateDBInstance", AwsNamespaces.RDS, result)).build();
} catch (AwsException e) {
@@ -355,12 +361,19 @@ public class RdsQueryHandler {
String autoMinorVersionUpgradeStr = params.getFirst("AutoMinorVersionUpgrade");
Boolean autoMinorVersionUpgrade = autoMinorVersionUpgradeStr != null
? Boolean.parseBoolean(autoMinorVersionUpgradeStr) : null;
+ Boolean publiclyAccessible;
+ try {
+ publiclyAccessible = parseOptionalBoolean(params, "PubliclyAccessible");
+ } catch (AwsException e) {
+ return AwsQueryResponse.error(e.getErrorCode(), e.getMessage(), AwsNamespaces.RDS, e.getHttpStatus());
+ }
try {
DbInstanceSettings settings = instanceSettings(params, false);
List<String> vpcSecurityGroupIds = vpcSecurityGroupIds(params);
DbInstance instance = service.modifyDbInstance(
id, newPassword, iamEnabled, dbSubnetGroupName,
- vpcSecurityGroupIds, optionGroupName, region, autoMinorVersionUpgrade, settings);
+ vpcSecurityGroupIds, optionGroupName, region, autoMinorVersionUpgrade,
+ settings, publiclyAccessible);
String result = dbInstanceXml(instance);
return Response.ok(AwsQueryResponse.envelope("ModifyDBInstance", AwsNamespaces.RDS, result)).build();
} catch (AwsException e) {
@@ -1492,7 +1505,7 @@ public class RdsQueryHandler {
.elem("MultiAZ", i.isMultiAz())
.elem("AutoMinorVersionUpgrade", i.isAutoMinorVersionUpgrade())
.elem("StorageType", "gp2")
- .elem("PubliclyAccessible", false)
+ .elem("PubliclyAccessible", i.isPubliclyAccessible())
.elem("AvailabilityZone", i.getAvailabilityZone() != null ? i.getAvailabilityZone() : config.defaultAvailabilityZone())
.elem("PreferredMaintenanceWindow", i.getPreferredMaintenanceWindow() != null
? i.getPreferredMaintenanceWindow() : DbInstanceSettings.DEFAULT_MAINTENANCE_WINDOW)
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.java
index 0557e375e3..1085b86dcd 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
@@ -511,7 +511,7 @@ public class RdsService implements Resettable, ResourceProvider {
dbName, dbInstanceClass, allocatedStorage, iamEnabled, paramGroupName,
dbSubnetGroupName, dbClusterIdentifier, availabilityZone, multiAz,
manageMasterUserPassword, masterUserSecretKmsKeyId, tags, vpcSecurityGroupIds,
- optionGroupName, region, autoMinorVersionUpgrade, DbInstanceSettings.defaults());
+ optionGroupName, region, autoMinorVersionUpgrade, DbInstanceSettings.defaults(), null);
}
public DbInstance createDbInstance(String id, String engineParam, String engineVersion,
@@ -528,6 +528,28 @@ public class RdsService implements Resettable, ResourceProvider {
String region,
boolean autoMinorVersionUpgrade,
DbInstanceSettings settings) {
+ return createDbInstance(id, engineParam, engineVersion, masterUsername, masterPassword,
+ dbName, dbInstanceClass, allocatedStorage, iamEnabled, paramGroupName,
+ dbSubnetGroupName, dbClusterIdentifier, availabilityZone, multiAz,
+ manageMasterUserPassword, masterUserSecretKmsKeyId, tags, vpcSecurityGroupIds,
+ optionGroupName, region, autoMinorVersionUpgrade, settings, null);
+ }
+
+ public DbInstance createDbInstance(String id, String engineParam, String engineVersion,
+ String masterUsername, String masterPassword,
+ String dbName, String dbInstanceClass,
+ int allocatedStorage, boolean iamEnabled,
+ String paramGroupName, String dbSubnetGroupName,
+ String dbClusterIdentifier, String availabilityZone,
+ boolean multiAz, boolean manageMasterUserPassword,
+ String masterUserSecretKmsKeyId,
+ Map<String, String> tags,
+ List<String> vpcSecurityGroupIds,
+ String optionGroupName,
+ String region,
+ boolean autoMinorVersionUpgrade,
+ DbInstanceSettings settings,
+ Boolean publiclyAccessible) {
validateInstanceSettings(settings);
String provisioningKey = "instance:" + currentAccountId() + ":"
+ dbResourceKey(effectiveRegion(region), id);
@@ -541,7 +563,7 @@ public class RdsService implements Resettable, ResourceProvider {
paramGroupName, dbSubnetGroupName, dbClusterIdentifier, availabilityZone,
multiAz, manageMasterUserPassword, masterUserSecretKmsKeyId, tags,
vpcSecurityGroupIds, optionGroupName, region, autoMinorVersionUpgrade,
- settings);
+ settings, publiclyAccessible);
} finally {
provisioningIds.remove(provisioningKey);
}
@@ -560,7 +582,8 @@ public class RdsService implements Resettable, ResourceProvider {
String optionGroupName,
String region,
boolean autoMinorVersionUpgrade,
- DbInstanceSettings settings) {
+ DbInstanceSettings settings,
+ Boolean publiclyAccessible) {
String effectiveRegion = effectiveRegion(region);
String dbiResourceId = "db-" + java.util.UUID.randomUUID().toString()
.replace("-", "").substring(0, 24).toUpperCase();
@@ -683,6 +706,9 @@ public class RdsService implements Resettable, ResourceProvider {
instance.setAutoMinorVersionUpgrade(autoMinorVersionUpgrade);
instance.setEngineIdentifier(engineIdentifier);
resolvedSettings.applyTo(instance);
+ instance.setPubliclyAccessible(publiclyAccessible != null
+ ? publiclyAccessible
+ : defaultPubliclyAccessible(engineParam, dbSubnetGroupName));
instance.setDbiResourceId(dbiResourceId);
instance.setDbInstanceArn(dbInstanceArn);
@@ -1367,7 +1393,17 @@ public class RdsService implements Resettable, ResourceProvider {
String optionGroupName, String region, Boolean autoMinorVersionUpgrade) {
return modifyDbInstance(id, newPassword, iamEnabled, dbSubnetGroupName,
vpcSecurityGroupIds, optionGroupName, region, autoMinorVersionUpgrade,
- DbInstanceSettings.unchanged());
+ DbInstanceSettings.unchanged(), null);
+ }
+
+ public DbInstance modifyDbInstance(
+ String id, String newPassword, Boolean iamEnabled,
+ String dbSubnetGroupName, List<String> vpcSecurityGroupIds,
+ String optionGroupName, String region, Boolean autoMinorVersionUpgrade,
+ DbInstanceSettings settings) {
+ return modifyDbInstance(id, newPassword, iamEnabled, dbSubnetGroupName,
+ vpcSecurityGroupIds, optionGroupName, region, autoMinorVersionUpgrade,
+ settings, null);
}
// synchronized like the tag and delete paths: an unguarded read-modify-write here could
@@ -1376,7 +1412,7 @@ public class RdsService implements Resettable, ResourceProvider {
String id, String newPassword, Boolean iamEnabled,
String dbSubnetGroupName, List<String> vpcSecurityGroupIds,
String optionGroupName, String region, Boolean autoMinorVersionUpgrade,
- DbInstanceSettings settings) {
+ DbInstanceSettings settings, Boolean publiclyAccessible) {
validateInstanceSettings(settings);
String effectiveRegion = effectiveRegion(region);
DbInstance instance = getDbInstance(id, effectiveRegion);
@@ -1419,6 +1455,9 @@ public class RdsService implements Resettable, ResourceProvider {
instance.setAutoMinorVersionUpgrade(autoMinorVersionUpgrade);
}
effective.applyTo(instance);
+ if (publiclyAccessible != null) {
+ instance.setPubliclyAccessible(publiclyAccessible);
+ }
putInstanceForScope(currentAccountId(), effectiveRegion, id, instance);
// The running auth proxy holds a password snapshot from start time, so swap it in place
@@ -1437,6 +1476,20 @@ public class RdsService implements Resettable, ResourceProvider {
settings.validate();
}
+ /**
+ * AWS's conditional default for {@code PubliclyAccessible} when {@code CreateDBInstance}
+ * omits it: with no subnet group given, Aurora engines default to not-publicly-accessible and
+ * every other engine defaults to publicly accessible; with a subnet group given, the default
+ * is publicly accessible only when that group is literally named {@code default}, whatever
+ * the engine.
+ */
+ private static boolean defaultPubliclyAccessible(String engineParam, String dbSubnetGroupName) {
+ if (dbSubnetGroupName != null && !dbSubnetGroupName.isBlank()) {
+ return "default".equalsIgnoreCase(dbSubnetGroupName);
+ }
+ return !isAuroraEngine(engineParam);
+ }
+
/**
* The windows that will be in effect after the request, checked against each other the way a
* live account checks them. On create ({@code current} null) a window given alone is paired
diff --git a/src/main/java/io/github/hectorvent/floci/services/rds/model/DbInstance.java b/src/main/java/io/github/hectorvent/floci/services/rds/model/DbInstance.java
index a6076ca8a7..da0b147564 100644
--- a/src/main/java/io/github/hectorvent/floci/services/rds/model/DbInstance.java
+++ b/src/main/java/io/github/hectorvent/floci/services/rds/model/DbInstance.java
@@ -44,6 +44,7 @@ public class DbInstance {
private String preferredBackupWindow;
private String preferredMaintenanceWindow;
private boolean copyTagsToSnapshot;
+ private boolean publiclyAccessible;
private Map<String, String> subnetAvailabilityZones = new LinkedHashMap<>();
private String dbiResourceId;
private String dbInstanceArn;
@@ -156,6 +157,9 @@ public class DbInstance {
this.autoMinorVersionUpgrade = autoMinorVersionUpgrade;
}
+ public boolean isPubliclyAccessible() { return publiclyAccessible; }
+ public void setPubliclyAccessible(boolean publiclyAccessible) { this.publiclyAccessible = publiclyAccessible; }
+
public Map<String, String> getSubnetAvailabilityZones() { return subnetAvailabilityZones; }
public void setSubnetAvailabilityZones(Map<String, String> subnetAvailabilityZones) {
this.subnetAvailabilityZones = subnetAvailabilityZones != null
diff --git a/src/test/java/io/github/hectorvent/floci/services/rds/RdsQueryHandlerTest.java b/src/test/java/io/github/hectorvent/floci/services/rds/RdsQueryHandlerTest.java
index 56ed1edae7..4ff76d3d80 100644
--- a/src/test/java/io/github/hectorvent/floci/services/rds/RdsQueryHandlerTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/rds/RdsQueryHandlerTest.java
@@ -103,6 +103,59 @@ class RdsQueryHandlerTest {
assertFalse(body.contains("<member><DBInstanceIdentifier>"), "Did not expect <member> wrapping DBInstance");
}
+ @Test
+ void describeDbInstances_echoesPubliclyAccessible() {
+ // AWS returns the requested value; a hard-coded false read back as drift for any client
+ // that persists it (Terraform's aws_db_instance re-issued ModifyDBInstance every apply).
+ DbInstance instance = makeInstance("mydb");
+ instance.setPubliclyAccessible(true);
+ when(service.listDbInstances(null, null)).thenReturn(List.of(instance));
+
+ String body = (String) handler.handle("DescribeDBInstances", params()).getEntity();
+
+ assertTrue(body.contains("<PubliclyAccessible>true</PubliclyAccessible>"), body);
+ }
+
+ @Test
+ void modifyDbInstance_forwardsPubliclyAccessible() {
+ when(service.modifyDbInstance(eq("mydb"), isNull(), isNull(), isNull(), any(), isNull(), any(),
+ isNull(), any(DbInstanceSettings.class), eq(true))).thenReturn(makeInstance("mydb"));
+ MultivaluedMap<String, String> p = params();
+ p.putSingle("DBInstanceIdentifier", "mydb");
+ p.putSingle("PubliclyAccessible", "true");
+
+ handler.handle("ModifyDBInstance", p);
+
+ verify(service).modifyDbInstance(eq("mydb"), isNull(), isNull(), isNull(), any(), isNull(), any(),
+ isNull(), any(DbInstanceSettings.class), eq(true));
+ }
+
+ @Test
+ void modifyDbInstance_rejectsMalformedPubliclyAccessible() {
+ MultivaluedMap<String, String> p = params();
+ p.putSingle("DBInstanceIdentifier", "mydb");
+ p.putSingle("PubliclyAccessible", "maybe");
+
+ Response response = handler.handle("ModifyDBInstance", p);
+
+ assertEquals(400, response.getStatus());
+ assertTrue(((String) response.getEntity()).contains("<Code>InvalidParameterValue</Code>"));
+ verify(service, never()).modifyDbInstance(any(), any(), any(), any(), any(), any(), any(), any(), any(), any());
+ }
+
+ @Test
+ void createDbInstance_rejectsMalformedPubliclyAccessible() {
+ MultivaluedMap<String, String> p = params();
+ p.putSingle("DBInstanceIdentifier", "mydb");
+ p.putSingle("Engine", "postgres");
+ p.putSingle("PubliclyAccessible", "yes");
+
+ Response response = handler.handle("CreateDBInstance", p);
+
+ assertEquals(400, response.getStatus());
+ assertTrue(((String) response.getEntity()).contains("<Code>InvalidParameterValue</Code>"));
+ }
+
@Test
void describeDbInstances_includesDbParameterGroupAttachment() {
DbInstance instance = makeInstance("mydb");
@@ -282,7 +335,7 @@ class RdsQueryHandlerTest {
when(service.listDbInstances(null, "us-west-2")).thenReturn(List.of());
when(service.getDbInstance("mydb", "us-west-2")).thenReturn(instance);
when(service.modifyDbInstance(
- eq("mydb"), isNull(), isNull(), isNull(), anyList(), isNull(), eq("us-west-2"), isNull(), any(DbInstanceSettings.class)))
+ eq("mydb"), isNull(), isNull(), isNull(), anyList(), isNull(), eq("us-west-2"), isNull(), any(DbInstanceSettings.class), isNull()))
.thenReturn(instance);
when(service.rebootDbInstance("mydb", "us-west-2")).thenReturn(instance);
when(service.listDbClusters(null, "us-west-2")).thenReturn(List.of());
@@ -308,7 +361,7 @@ class RdsQueryHandlerTest {
verify(service).getDbInstance("mydb", "us-west-2");
verify(service).deleteDbInstance("mydb", "us-west-2");
verify(service).modifyDbInstance(
- eq("mydb"), isNull(), isNull(), isNull(), anyList(), isNull(), eq("us-west-2"), isNull(), any(DbInstanceSettings.class));
+ eq("mydb"), isNull(), isNull(), isNull(), anyList(), isNull(), eq("us-west-2"), isNull(), any(DbInstanceSettings.class), isNull());
verify(service).rebootDbInstance("mydb", "us-west-2");
verify(service).listDbClusters(null, "us-west-2");
verify(service).getDbCluster("mycluster", "us-west-2");
@@ -489,7 +542,7 @@ class RdsQueryHandlerTest {
when(service.createDbInstance(eq("mydb"), eq("postgres"), eq("16.3"),
eq(null), eq(null), eq(null), eq("db.t3.micro"),
eq(20), eq(false), eq(null), eq(null), eq(null), eq(null), eq(false), eq(false), eq(null),
- eq(java.util.Map.of("example:ClusterId", "cluster-a", "Name", "mydb")), eq(List.of()), isNull(), isNull(), eq(true), any(DbInstanceSettings.class)))
+ eq(java.util.Map.of("example:ClusterId", "cluster-a", "Name", "mydb")), eq(List.of()), isNull(), isNull(), eq(true), any(DbInstanceSettings.class), isNull()))
.thenReturn(instance);
MultivaluedMap<String, String> p = params();
@@ -503,7 +556,7 @@ class RdsQueryHandlerTest {
verify(service).createDbInstance("mydb", "postgres", "16.3",
null, null, null, "db.t3.micro", 20, false, null, null, null, null, false, false, null,
- java.util.Map.of("example:ClusterId", "cluster-a", "Name", "mydb"), List.of(), null, null, true, DbInstanceSettings.defaults());
+ java.util.Map.of("example:ClusterId", "cluster-a", "Name", "mydb"), List.of(), null, null, true, DbInstanceSettings.defaults(), null);
}
@Test
@@ -513,7 +566,7 @@ class RdsQueryHandlerTest {
when(service.createDbInstance(eq("mydb"), eq("postgres"), eq("16.3"),
eq(null), eq(null), eq(null), eq("db.t3.micro"),
eq(20), eq(false), eq(null), eq(null), eq(null), eq(null), eq(false), eq(false), eq(null),
- eq(java.util.Map.of()), eq(List.of("sg-123", "sg-456")), isNull(), isNull(), eq(true), any(DbInstanceSettings.class)))
+ eq(java.util.Map.of()), eq(List.of("sg-123", "sg-456")), isNull(), isNull(), eq(true), any(DbInstanceSettings.class), isNull()))
.thenReturn(instance);
MultivaluedMap<String, String> p = params();
@@ -528,7 +581,7 @@ class RdsQueryHandlerTest {
assertTrue(body.contains("<VpcSecurityGroupId>sg-456</VpcSecurityGroupId>"));
verify(service).createDbInstance("mydb", "postgres", "16.3",
null, null, null, "db.t3.micro", 20, false, null, null, null, null, false, false, null,
- java.util.Map.of(), List.of("sg-123", "sg-456"), null, null, true, DbInstanceSettings.defaults());
+ java.util.Map.of(), List.of("sg-123", "sg-456"), null, null, true, DbInstanceSettings.defaults(), null);
}
@Test
@@ -544,7 +597,7 @@ class RdsQueryHandlerTest {
assertTrue(((String) response.getEntity()).contains("InvalidParameterValue"));
verify(service, never()).createDbInstance(any(), any(), any(), any(), any(), any(), any(),
anyInt(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), anyBoolean(),
- any(), any(), any(), any(), any(), anyBoolean());
+ any(), any(), any(), any(), any(), anyBoolean(), any(DbInstanceSettings.class), isNull());
}
@Test
@@ -644,7 +697,7 @@ class RdsQueryHandlerTest {
when(service.createDbInstance(eq("mydb"), eq("postgres"), eq("16.3"),
eq("admin"), eq("secret"), eq("dbname"), eq("db.t3.micro"),
eq(20), eq(false), eq(null), eq(null), eq(null), eq(null), eq(false), eq(false),
- eq(null), eq(java.util.Map.of()), eq(List.of()), isNull(), isNull(), eq(true), any(DbInstanceSettings.class)))
+ eq(null), eq(java.util.Map.of()), eq(List.of()), isNull(), isNull(), eq(true), any(DbInstanceSettings.class), isNull()))
.thenReturn(instance);
MultivaluedMap<String, String> p = params();
@@ -658,7 +711,7 @@ class RdsQueryHandlerTest {
verify(service).createDbInstance("mydb", "postgres", "16.3",
"admin", "secret", "dbname", "db.t3.micro", 20, false, null, null, null, null, false, false,
- null, java.util.Map.of(), List.of(), null, null, true, DbInstanceSettings.defaults());
+ null, java.util.Map.of(), List.of(), null, null, true, DbInstanceSettings.defaults(), null);
}
@Test
@@ -670,7 +723,7 @@ class RdsQueryHandlerTest {
when(service.createDbInstance(eq("mydb"), eq("postgres"), eq("16.3"),
eq("admin"), eq(null), eq("dbname"), eq("db.t3.micro"),
eq(20), eq(false), eq(null), eq(null), eq(null), eq(null), eq(false), eq(true),
- eq("kms-key-1"), eq(java.util.Map.of()), eq(List.of()), isNull(), isNull(), eq(true), any(DbInstanceSettings.class)))
+ eq("kms-key-1"), eq(java.util.Map.of()), eq(List.of()), isNull(), isNull(), eq(true), any(DbInstanceSettings.class), isNull()))
.thenReturn(instance);
MultivaluedMap<String, String> p = params();
@@ -689,7 +742,7 @@ class RdsQueryHandlerTest {
assertTrue(body.contains("<KmsKeyId>kms-key-1</KmsKeyId>"));
verify(service).createDbInstance("mydb", "postgres", "16.3",
"admin", null, "dbname", "db.t3.micro", 20, false, null, null, null, null, false, true,
- "kms-key-1", java.util.Map.of(), List.of(), null, null, true, DbInstanceSettings.defaults());
+ "kms-key-1", java.util.Map.of(), List.of(), null, null, true, DbInstanceSettings.defaults(), null);
}
@Test
@@ -702,7 +755,7 @@ class RdsQueryHandlerTest {
when(service.createDbInstance(eq("mydb"), eq("postgres"), eq("16.3"),
eq("admin"), eq("secret"), eq("dbname"), eq("db.t3.micro"),
eq(20), eq(false), eq(null), eq("default"), eq(null), eq("ap-northeast-1a"), eq(true),
- eq(false), eq(null), eq(java.util.Map.of()), eq(List.of()), isNull(), isNull(), eq(true), any(DbInstanceSettings.class)))
+ eq(false), eq(null), eq(java.util.Map.of()), eq(List.of()), isNull(), isNull(), eq(true), any(DbInstanceSettings.class), isNull()))
.thenReturn(instance);
MultivaluedMap<String, String> p = params();
@@ -732,7 +785,7 @@ class RdsQueryHandlerTest {
when(service.createDbInstance(eq("mydb"), eq("postgres"), eq("16.3"),
eq(null), eq(null), eq(null), eq("db.t3.micro"),
eq(20), eq(false), eq(null), eq(null), eq(null), eq(null), eq(false),
- eq(false), eq(null), eq(java.util.Map.of()), eq(List.of()), isNull(), isNull(), eq(false), any(DbInstanceSettings.class)))
+ eq(false), eq(null), eq(java.util.Map.of()), eq(List.of()), isNull(), isNull(), eq(false), any(DbInstanceSettings.class), isNull()))
.thenReturn(instance);
MultivaluedMap<String, String> p = params();
@@ -752,7 +805,7 @@ class RdsQueryHandlerTest {
when(service.createDbInstance(eq("mydb"), eq("postgres"), eq("16.3"),
eq("admin"), eq("secret"), eq("dbname"), eq("db.t3.micro"),
eq(20), eq(false), eq(null), eq("missing-subnet-group"), eq(null), eq(null), eq(false),
- eq(false), eq(null), eq(java.util.Map.of()), eq(List.of()), isNull(), isNull(), eq(true), any(DbInstanceSettings.class)))
+ eq(false), eq(null), eq(java.util.Map.of()), eq(List.of()), isNull(), isNull(), eq(true), any(DbInstanceSettings.class), isNull()))
.thenThrow(new AwsException("DBSubnetGroupNotFoundFault",
"DB subnet group missing-subnet-group not found.", 404));
@@ -844,7 +897,7 @@ class RdsQueryHandlerTest {
when(service.createDbInstance(eq("mydb"), eq("oracle"), eq("1.0"),
eq(null), eq(null), eq(null), eq("db.t3.micro"),
eq(20), eq(false), eq(null), eq(null), eq(null), eq(null), eq(false), eq(false),
- eq(null), eq(java.util.Map.of()), eq(List.of()), isNull(), isNull(), eq(true), any(DbInstanceSettings.class)))
+ eq(null), eq(java.util.Map.of()), eq(List.of()), isNull(), isNull(), eq(true), any(DbInstanceSettings.class), isNull()))
.thenThrow(new AwsException("InvalidParameterValue",
"Unsupported engine: oracle. Supported: postgres, mysql, mariadb.", 400));
@@ -2125,7 +2178,7 @@ class RdsQueryHandlerTest {
DbInstance instance = makeInstance("mydb");
when(service.createDbInstance(any(), any(), any(), any(), any(), any(), any(),
anyInt(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), anyBoolean(),
- any(), any(), anyList(), any(), any(), anyBoolean(), any(DbInstanceSettings.class)))
+ any(), any(), anyList(), any(), any(), anyBoolean(), any(DbInstanceSettings.class), isNull()))
.thenReturn(instance);
MultivaluedMap<String, String> p = params();
@@ -2137,7 +2190,7 @@ class RdsQueryHandlerTest {
assertEquals(200, response.getStatus());
verify(service).createDbInstance(eq("mydb"), eq("mysql"), any(), any(), any(), any(),
any(), anyInt(), anyBoolean(), any(), any(), any(), any(), anyBoolean(),
- anyBoolean(), any(), any(), anyList(), eq("og1"), any(), anyBoolean(), any(DbInstanceSettings.class));
+ anyBoolean(), any(), any(), anyList(), eq("og1"), any(), anyBoolean(), any(DbInstanceSettings.class), isNull());
}
// ──────────────────────────── Helpers ────────────────────────────
@@ -2410,7 +2463,7 @@ class RdsQueryHandlerTest {
DbInstance instance = makeInstance("mydb");
when(service.createDbInstance(any(), any(), any(), any(), any(), any(), any(),
anyInt(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), anyBoolean(),
- any(), any(), anyList(), any(), any(), anyBoolean(), any(DbInstanceSettings.class)))
+ any(), any(), anyList(), any(), any(), anyBoolean(), any(DbInstanceSettings.class), isNull()))
.thenReturn(instance);
MultivaluedMap<String, String> p = params();
@@ -2428,7 +2481,7 @@ class RdsQueryHandlerTest {
ArgumentCaptor<DbInstanceSettings> captor = ArgumentCaptor.forClass(DbInstanceSettings.class);
verify(service).createDbInstance(any(), any(), any(), any(), any(), any(), any(),
anyInt(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), anyBoolean(),
- any(), any(), anyList(), any(), any(), anyBoolean(), captor.capture());
+ any(), any(), anyList(), any(), any(), anyBoolean(), captor.capture(), isNull());
DbInstanceSettings settings = captor.getValue();
assertEquals(Boolean.TRUE, settings.storageEncrypted());
assertEquals("arn:aws:kms:us-east-1:123456789012:key/k1", settings.kmsKeyId());
@@ -2443,7 +2496,7 @@ class RdsQueryHandlerTest {
DbInstance instance = makeInstance("mydb");
when(service.createDbInstance(any(), any(), any(), any(), any(), any(), any(),
anyInt(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), anyBoolean(),
- any(), any(), anyList(), any(), any(), anyBoolean(), any(DbInstanceSettings.class)))
+ any(), any(), anyList(), any(), any(), anyBoolean(), any(DbInstanceSettings.class), isNull()))
.thenReturn(instance);
MultivaluedMap<String, String> p = params();
@@ -2454,7 +2507,7 @@ class RdsQueryHandlerTest {
ArgumentCaptor<DbInstanceSettings> captor = ArgumentCaptor.forClass(DbInstanceSettings.class);
verify(service).createDbInstance(any(), any(), any(), any(), any(), any(), any(),
anyInt(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), anyBoolean(),
- any(), any(), anyList(), any(), any(), anyBoolean(), captor.capture());
+ any(), any(), anyList(), any(), any(), anyBoolean(), captor.capture(), isNull());
assertEquals(DbInstanceSettings.defaults(), captor.getValue());
}
@@ -2472,7 +2525,7 @@ class RdsQueryHandlerTest {
assertTrue(body.contains("<Code>InvalidParameterValue</Code>"), body);
verify(service, never()).createDbInstance(any(), any(), any(), any(), any(), any(), any(),
anyInt(), anyBoolean(), any(), any(), any(), any(), anyBoolean(), anyBoolean(),
- any(), any(), anyList(), any(), any(), anyBoolean(), any(DbInstanceSettings.class));
+ any(), any(), anyList(), any(), any(), anyBoolean(), any(DbInstanceSettings.class), isNull());
}
@Test
@@ -2520,7 +2573,7 @@ class RdsQueryHandlerTest {
void modifyDbInstance_passesBackupSettingsToService() {
DbInstance instance = makeInstance("mydb");
when(service.modifyDbInstance(eq("mydb"), isNull(), isNull(), isNull(), anyList(), isNull(),
- isNull(), isNull(), any(DbInstanceSettings.class))).thenReturn(instance);
+ isNull(), isNull(), any(DbInstanceSettings.class), isNull())).thenReturn(instance);
MultivaluedMap<String, String> p = params();
p.add("DBInstanceIdentifier", "mydb");
@@ -2534,7 +2587,7 @@ class RdsQueryHandlerTest {
ArgumentCaptor<DbInstanceSettings> captor = ArgumentCaptor.forClass(DbInstanceSettings.class);
verify(service).modifyDbInstance(eq("mydb"), isNull(), isNull(), isNull(), anyList(), isNull(),
- isNull(), isNull(), captor.capture());
+ isNull(), isNull(), captor.capture(), isNull());
assertEquals(new DbInstanceSettings(null, null, 3, "01:00-01:30", null, true), captor.getValue());
}
@@ -2542,7 +2595,7 @@ class RdsQueryHandlerTest {
void unhandledExceptionRendersXmlInternalFailure() {
when(service.createDbInstance(any(), any(), any(), any(), any(), any(),
any(), anyInt(), anyBoolean(), any(), any(), any(), any(), anyBoolean(),
- anyBoolean(), any(), any(), any(), any(), any(), anyBoolean(), any()))
+ anyBoolean(), any(), any(), any(), any(), any(), anyBoolean(), any(), any()))
.thenThrow(new RuntimeException("Docker daemon connection failed"));
MultivaluedMap<String, String> p = params();
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.java
index 1dafb7ad8b..6f2ce1b781 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
@@ -236,6 +236,68 @@ class RdsServiceTest {
assertEquals(List.of("sg-updated-a", "sg-updated-b"), rdsService.getDbInstance("mydb").getVpcSecurityGroupIds());
}
+ @Test
+ void createAndModifyDbInstancePersistPubliclyAccessible() {
+ DbInstance instance = rdsService.createDbInstance("pubdb", "postgres", "13",
+ "admin", "password", "dbname", "db.t3.micro",
+ 20, false, null, null, null, null, false, false, null,
+ Map.of(), List.of(), null, null, true, DbInstanceSettings.defaults(), true);
+
+ assertTrue(instance.isPubliclyAccessible());
+ assertTrue(rdsService.getDbInstance("pubdb").isPubliclyAccessible());
+
+ DbInstance modified = rdsService.modifyDbInstance("pubdb", null, null, null,
+ null, null, null, null, DbInstanceSettings.unchanged(), false);
+
+ assertFalse(modified.isPubliclyAccessible());
+ assertFalse(rdsService.getDbInstance("pubdb").isPubliclyAccessible());
+ }
+
+ @Test
+ void createDbInstanceOmittedPubliclyAccessibleDefaultsTrueForNonAuroraWithNoSubnetGroup() {
+ DbInstance instance = rdsService.createDbInstance("plain-db", "postgres", "13",
+ "admin", "password", "dbname", "db.t3.micro",
+ 20, false, null, null, null, null, false, false, null,
+ Map.of(), List.of(), null, null, true, DbInstanceSettings.defaults());
+
+ assertTrue(instance.isPubliclyAccessible());
+ }
+
+ @Test
+ void createDbInstanceOmittedPubliclyAccessibleDefaultsFalseForAuroraWithNoSubnetGroup() {
+ rdsService.createDbCluster("aurora-cluster", "aurora-postgresql", "16.3",
+ "admin", "password", "dbname", false, null);
+
+ DbInstance member = rdsService.createDbInstance("aurora-member", "aurora-postgresql", "16.3",
+ "admin", "password", "dbname", "db.r5.large",
+ 20, false, null, null, "aurora-cluster", null, false, false, null,
+ Map.of(), List.of(), null, null, true, DbInstanceSettings.defaults());
+
+ assertFalse(member.isPubliclyAccessible());
+ }
+
+ @Test
+ void createDbInstanceOmittedPubliclyAccessibleDefaultsFalseForNamedNonDefaultSubnetGroup() {
+ rdsService.createDbSubnetGroup("custom-subnets", "test", List.of("subnet-default-a", "subnet-default-b"));
+
+ DbInstance instance = rdsService.createDbInstance("custom-subnet-db", "postgres", "13",
+ "admin", "password", "dbname", "db.t3.micro",
+ 20, false, null, "custom-subnets", null, null, false, false, null,
+ Map.of(), List.of(), null, null, true, DbInstanceSettings.defaults());
+
+ assertFalse(instance.isPubliclyAccessible());
+ }
+
+ @Test
+ void createDbInstanceOmittedPubliclyAccessibleDefaultsTrueForDefaultSubnetGroup() {
+ DbInstance instance = rdsService.createDbInstance("default-subnet-db", "postgres", "13",
+ "admin", "password", "dbname", "db.t3.micro",
+ 20, false, null, "default", null, null, false, false, null,
+ Map.of(), List.of(), null, null, true, DbInstanceSettings.defaults());
+
+ assertTrue(instance.isPubliclyAccessible());
+ }
+
@Test
void postgresImageUsesRequestedEngineVersionAndDefaultFlavor() {
assertEquals("postgres:18.1-alpine",