Fix regression in RDS validator (#2346)

markpeek · web-flow · commit 9aeb4ae6a76a · 2025-12-03T14:01:42.000-08:00
diff --git a/tests/test_rds.py b/tests/test_rds.py
@@ -271,6 +271,45 @@ def test_gp3_storage_performance(self):
         ):
             i.to_dict()
 
+        # Check startswith match for oracle and sqlserver engines
+        i = rds.DBInstance(
+            "Database2",
+            Engine="oracle-se2",
+            EngineVersion="15.3",
+            StorageType="gp3",
+            Iops=10000,
+            AllocatedStorage="10",
+            MasterUsername="test",
+            MasterUserPassword="test",
+        )
+        with self.assertRaisesRegex(
+            ValueError,
+            r"AllocatedStorage must be at least 200",
+        ):
+            i.to_dict()
+
+        i.AllocatedStorage = "200"
+        i.to_dict()
+
+        i = rds.DBInstance(
+            "Database2",
+            Engine="sqlserver-se",
+            EngineVersion="15.3",
+            StorageType="gp3",
+            Iops=1000,
+            AllocatedStorage="10",
+            MasterUsername="test",
+            MasterUserPassword="test",
+        )
+        with self.assertRaisesRegex(
+            ValueError,
+            r"AllocatedStorage must be at least 20",
+        ):
+            i.to_dict()
+
+        i.AllocatedStorage = "20"
+        i.to_dict()
+
     def test_io1_storage_type_and_iops(self):
         i = rds.DBInstance(
             "NoAZAndMultiAZ",
diff --git a/troposphere/validators/rds.py b/troposphere/validators/rds.py
@@ -483,9 +483,9 @@ def validate_dbinstance(self) -> None:
         max_iops_to_allocated_storage_ratio = 500.0
         if engine in ["mariadb", "mysql", "postgres"]:
             min_storage_size = 400
-        elif engine in ["oracle"]:
+        elif engine.startswith("oracle"):
             min_storage_size = 200
-        elif engine in ["sqlserver"]:
+        elif engine.startswith("sqlserver"):
             min_storage_size = 20
             min_iops_to_allocated_storage_ratio = 0.5
         else:
