Merge branch 'main' into fix/issue/3426

aws-cloudformation · Jun 27, 2024 · 8ddb942 · 8ddb942
2 parents b0fa598 + c79124f
commit 8ddb942
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/serverless_exclusive.json b/src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/serverless_exclusive.json
@@ -46,8 +46,7 @@
    },
    "then": {
     "properties": {
-     "ScalingConfiguration": false,
-     "ServerlessV2ScalingConfiguration": false
+     "ScalingConfiguration": false
     }
    }
   }

diff --git a/test/unit/rules/resources/rds/test_db_cluster_serverless_exclusive.py b/test/unit/rules/resources/rds/test_db_cluster_serverless_exclusive.py
@@ -76,26 +76,7 @@ def rule():
         ),
         (
             {"ServerlessV2ScalingConfiguration": "foo"},
-            [
-                ValidationError(
-                    (
-                        "Additional properties are not allowed "
-                        "('ServerlessV2ScalingConfiguration')"
-                    ),
-                    rule=DbClusterServerlessExclusive(),
-                    path=deque(["ServerlessV2ScalingConfiguration"]),
-                    validator=None,
-                    schema_path=deque(
-                        [
-                            "allOf",
-                            2,
-                            "then",
-                            "properties",
-                            "ServerlessV2ScalingConfiguration",
-                        ]
-                    ),
-                )
-            ],
+            [],
         ),
         (
             {"ScalingConfiguration": "foo"},