Fix some discovered issues (#3050)

aws-cloudformation · Apr 26, 2024 · 4553489 · 4553489
1 parent 8df7874
commit 4553489
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/cfnlint/data/schemas/other/resources/configuration.json b/src/cfnlint/data/schemas/other/resources/configuration.json
@@ -100,9 +100,7 @@
     "Metadata": {
      "$ref": "#/definitions/Metadata"
     },
-    "Properties": {
-     "awsType": "CfnResourceProperties"
-    },
+    "Properties": {},
     "Type": {
      "type": "string"
     },

diff --git a/src/cfnlint/decode/mark.py b/src/cfnlint/decode/mark.py
@@ -2,6 +2,7 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
+
 from dataclasses import dataclass
 
 

diff --git a/src/cfnlint/jsonschema/_filter.py b/src/cfnlint/jsonschema/_filter.py
@@ -66,9 +66,9 @@ def _filter_schemas(self, schema, validator: Any) -> Tuple[Any, Any]:
         # Adding these items to the schema
         # will allow us to continue to check the nested elements
         if "cfnLint" not in standard_schema:
-            if (
-                "object" in ensure_list(standard_schema.get("type", []))
-                and "properties" not in standard_schema
+            if "object" in ensure_list(standard_schema.get("type", [])) and not any(
+                p not in standard_schema
+                for p in ["properties", "additionalProperties", "patternProperties"]
             ):
                 standard_schema["patternProperties"] = {
                     ".*": {"type": _all_types},