update logic in rule E3686 (#3367)

Author: kddejong

Diff for: src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/serverless_exclusive.json

@@ -1,21 +1,56 @@
 {
  "additionalProperties": true,
- "description": "When creating a serverless 'EngineMode' don't specify 'ScalingConfiguration'",
- "else": {},
- "if": {
-  "properties": {
-   "EngineMode": {
-    "const": "serverless"
+ "allOf": [
+  {
+   "if": {
+    "properties": {
+     "EngineMode": {
+      "const": "provisioned"
+     }
+    },
+    "required": [
+     "EngineMode"
+    ],
+    "type": "object"
+   },
+   "then": {
+    "properties": {
+     "ScalingConfiguration": false
+    }
    }
   },
-  "required": [
-   "EngineMode"
-  ],
-  "type": "object"
- },
- "then": {
-  "properties": {
-   "ScalingConfiguration": false
+  {
+   "if": {
+    "properties": {
+     "EngineMode": {
+      "const": "serverless"
+     }
+    },
+    "required": [
+     "EngineMode"
+    ],
+    "type": "object"
+   },
+   "then": {
+    "properties": {
+     "ServerlessV2ScalingConfiguration": false
+    }
+   }
+  },
+  {
+   "if": {
+    "properties": {
+     "EngineMode": false
+    },
+    "type": "object"
+   },
+   "then": {
+    "properties": {
+     "ScalingConfiguration": false,
+     "ServerlessV2ScalingConfiguration": false
+    }
+   }
   }
- }
+ ],
+ "description": "When creating a serverless 'EngineMode' don't specify 'ServerlessV2ScalingConfiguration'"
 }

Diff for: src/cfnlint/rules/resources/rds/DbClusterServerlessExclusive.py

@@ -14,11 +14,11 @@
 
 class DbClusterServerlessExclusive(CfnLintJsonSchema):
     id = "E3686"
-    shortdesc = (
-        "Validate when using a serverless RDS DB certain properties aren't needed"
-    )
+    shortdesc = "Validate allowed properties when using a serverless RDS DB cluster"
     description = (
-        "When creating a serverless 'EngineMode' don't specify 'ScalingConfiguration'"
+        "Validate that when EngineMode is 'serverless' or 'provisioned' that the "
+        "appropriate allowed properties are provided. If 'EngineMode' is not provided "
+        "make sure serverless properties don't exist at all."
     )
     tags = ["resources"]
 
@@ -32,4 +32,15 @@ def __init__(self) -> None:
         )
 
     def message(self, instance: Any, err: ValidationError) -> str:
-        return "Additional properties are not allowed ('ScalingConfiguration')"
+
+        # validator None means the schema is falsy
+        if err.validator is None:
+            if instance.get("EngineMode") in ["serverless", "provisioned"]:
+                return (
+                    f"EngineMode {instance.get('EngineMode')!r} "
+                    f" doesn't allow additional properties {err.path[0]!r}"
+                )
+            else:
+                return "Additional properties are not allowed " f"({err.path[0]!r})"
+
+        return err.message

Diff for: test/unit/rules/resources/rds/test_db_cluster_serverless_exclusive.py

@@ -35,20 +35,87 @@ def rule():
             [],
         ),
         (
-            {"EngineMode": "serverless", "ScalingConfiguration": "foo"},
+            {"EngineMode": "serverless", "ServerlessV2ScalingConfiguration": "foo"},
             [
                 ValidationError(
-                    "Additional properties are not allowed ('ScalingConfiguration')",
+                    (
+                        "EngineMode 'serverless'  doesn't allow additional "
+                        "properties 'ServerlessV2ScalingConfiguration'"
+                    ),
+                    rule=DbClusterServerlessExclusive(),
+                    path=deque(["ServerlessV2ScalingConfiguration"]),
+                    validator=None,
+                    schema_path=deque(
+                        [
+                            "allOf",
+                            1,
+                            "then",
+                            "properties",
+                            "ServerlessV2ScalingConfiguration",
+                        ]
+                    ),
+                )
+            ],
+        ),
+        (
+            {"EngineMode": "provisioned", "ScalingConfiguration": "foo"},
+            [
+                ValidationError(
+                    (
+                        "EngineMode 'provisioned'  doesn't allow "
+                        "additional properties 'ScalingConfiguration'"
+                    ),
+                    rule=DbClusterServerlessExclusive(),
+                    path=deque(["ScalingConfiguration"]),
+                    validator=None,
+                    schema_path=deque(
+                        ["allOf", 0, "then", "properties", "ScalingConfiguration"]
+                    ),
+                )
+            ],
+        ),
+        (
+            {"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"},
+            [
+                ValidationError(
+                    (
+                        "Additional properties are not allowed "
+                        "('ScalingConfiguration')"
+                    ),
                     rule=DbClusterServerlessExclusive(),
                     path=deque(["ScalingConfiguration"]),
                     validator=None,
-                    schema_path=deque(["then", "properties", "ScalingConfiguration"]),
+                    schema_path=deque(
+                        ["allOf", 2, "then", "properties", "ScalingConfiguration"]
+                    ),
                 )
             ],
         ),
     ],
 )
 def test_validate(instance, expected, rule, validator):
     errs = list(rule.validate(validator, "", instance, {}))
-
     assert errs == expected, f"Expected {expected} got {errs}"