V1 Rework the last of the awsType rules (#3263)

* Rework the last of the awsType rules * Fix an issue with path in SnapStart * Remove aws type and cleanup additional checks
aws-cloudformation · May 24, 2024 · 6af0e42 · 6af0e42
1 parent a8ce012
commit 6af0e42
Show file tree

Hide file tree

Showing 26 changed files with 472 additions and 269 deletions.
diff --git a/src/cfnlint/data/schemas/other/metadata/configuration.json b/src/cfnlint/data/schemas/other/metadata/configuration.json
@@ -20,12 +20,8 @@
   }
  },
  "properties": {
-  "AWS::CloudFormation::Interface": {
-   "awsType": "CfnMetadataInterface"
-  },
-  "cfn-lint": {
-   "awsType": "CfnMetadataCfnLint"
-  }
+  "AWS::CloudFormation::Interface": {},
+  "cfn-lint": {}
  },
  "type": "object"
 }
diff --git a/src/cfnlint/data/schemas/other/outputs/configuration.json b/src/cfnlint/data/schemas/other/outputs/configuration.json
@@ -18,9 +18,6 @@
    "additionalProperties": false,
    "properties": {
     "Condition": {
-     "awsType": [
-      "CfnCondition"
-     ],
      "type": [
       "string"
      ]

diff --git a/src/cfnlint/data/schemas/other/resources/configuration.json b/src/cfnlint/data/schemas/other/resources/configuration.json
@@ -1,42 +1,8 @@
 {
- "additionalProperties": {
-  "$ref": "#/definitions/ResourceConfiguration"
- },
+ "additionalProperties": false,
  "definitions": {
-  "CloudFormationInitConfig": {
-   "properties": {
-    "config": {
-     "properties": {
-      "commands": {
-       "awsType": "CfnInitCommands"
-      },
-      "files": {
-       "awsType": "CfnInitFiles"
-      },
-      "groups": {
-       "awsType": "CfnInitGroups"
-      },
-      "packages": {
-       "awsType": "CfnInitPackages"
-      },
-      "services": {
-       "awsType": "CfnInitServices"
-      },
-      "sources": {
-       "awsType": "CfnInitSources"
-      },
-      "users": {
-       "awsType": "CfnInitUsers"
-      }
-     },
-     "type": "object"
-    }
-   },
-   "type": "object"
-  },
   "ResourceConfiguration": {
    "additionalProperties": false,
-   "awsType": "CfnResourceProperties",
    "else": {
     "not": {
      "required": [
@@ -61,15 +27,12 @@
    },
    "properties": {
     "Condition": {
-     "awsType": "CfnCondition",
      "type": "string"
     },
     "CreationPolicy": {
      "type": "object"
     },
-    "DeletionPolicy": {
-     "awsType": "CfnDeletionPolicy"
-    },
+    "DeletionPolicy": {},
     "DependsOn": {
      "items": {
       "type": "string"
@@ -79,19 +42,13 @@
       "array"
      ]
     },
-    "Metadata": {
-     "awsType": "CfnResourceMetadata"
-    },
+    "Metadata": {},
     "Properties": {},
     "Type": {
      "type": "string"
     },
-    "UpdatePolicy": {
-     "type": "object"
-    },
-    "UpdateReplacePolicy": {
-     "awsType": "CfnResourceUpdateReplacePolicy"
-    },
+    "UpdatePolicy": {},
+    "UpdateReplacePolicy": {},
     "Version": {
      "type": "string"
     }
@@ -100,13 +57,9 @@
     "Type"
    ],
    "then": {
-    "not": {
-     "required": [
-      "CreationPolicy",
-      "UpdatePolicy"
-     ]
-    },
     "properties": {
+     "CreationPolicy": false,
+     "UpdatePolicy": false,
      "Version": {
       "type": "string"
      }
@@ -116,9 +69,13 @@
   }
  },
  "maxProperties": 500,
+ "patternProperties": {
+  "^[a-zA-Z0-9]+$": {
+   "$ref": "#/definitions/ResourceConfiguration"
+  }
+ },
  "propertyNames": {
-  "maxLength": 255,
-  "pattern": "^[a-zA-Z0-9]+$"
+  "maxLength": 255
  },
  "type": "object"
 }
diff --git a/src/cfnlint/data/schemas/other/resources/metadata.json b/src/cfnlint/data/schemas/other/resources/metadata.json
@@ -1,47 +1,19 @@
 {
- "allOf": [
-  {
-   "type": [
-    "object",
-    "array"
-   ]
-  },
-  {
+ "additionalProperties": {
+  "type": [
+   "object",
+   "string"
+  ]
+ },
+ "properties": {
+  "AWS::CloudFormation::Init": {
    "additionalProperties": true,
-   "properties": {
-    "AWS::CloudFormation::Init": {
-     "properties": {
-      "config": {
-       "properties": {
-        "commands": {
-         "awsType": "CfnInitCommands"
-        },
-        "files": {
-         "awsType": "CfnInitFiles"
-        },
-        "groups": {
-         "awsType": "CfnInitGroups"
-        },
-        "packages": {
-         "awsType": "CfnInitPackages"
-        },
-        "services": {
-         "awsType": "CfnInitServices"
-        },
-        "sources": {
-         "awsType": "CfnInitSources"
-        },
-        "users": {
-         "awsType": "CfnInitUsers"
-        }
-       },
-       "type": "object"
-      }
-     },
-     "type": "object"
-    }
-   },
+   "properties": {},
    "type": "object"
   }
+ },
+ "type": [
+  "object",
+  "array"
  ]
 }
diff --git a/src/cfnlint/data/schemas/other/template/configuration.json b/src/cfnlint/data/schemas/other/template/configuration.json
@@ -16,21 +16,11 @@
   "Description": {
    "type": "string"
   },
-  "Mappings": {
-   "awsType": "CfnMappings"
-  },
-  "Metadata": {
-   "awsType": "CfnMetadata"
-  },
-  "Outputs": {
-   "awsType": "CfnOutputs"
-  },
-  "Parameters": {
-   "awsType": "CfnParameters"
-  },
-  "Resources": {
-   "awsType": "CfnResources"
-  },
+  "Mappings": {},
+  "Metadata": {},
+  "Outputs": {},
+  "Parameters": {},
+  "Resources": {},
   "Rules": {
    "type": "object"
   },

diff --git a/src/cfnlint/jsonschema/_keywords.py b/src/cfnlint/jsonschema/_keywords.py
@@ -491,7 +491,7 @@ def properties(
                 subschema,
                 path=k[0] if len(k) > 0 else p,
                 schema_path=p,
-                property_path=k[0] if len(k) > 0 else p,
+                property_path=p,
             )
 
 

diff --git a/src/cfnlint/rules/_Rule.py b/src/cfnlint/rules/_Rule.py
@@ -219,6 +219,8 @@ def __repr__(self):
         return f"{self.id}: {self.shortdesc}"
 
     def __eq__(self, other):
+        if other is None:
+            return False
         return self.id == other.id
 
     @property

diff --git a/src/cfnlint/rules/conditions/Condition.py b/src/cfnlint/rules/conditions/Condition.py
@@ -18,11 +18,11 @@ class Condition(BaseFn):
     tags = ["functions", "and"]
 
     def __init__(self) -> None:
-        super().__init__("Fn::And", ("boolean",))
+        super().__init__("Condition", ("boolean",))
         self.condition = self.validate
 
     def schema(self, validator, instance) -> Dict[str, Any]:
         return {
             "type": "string",
-            "awsType": "CfnCondition",
+            "enum": list(validator.context.conditions.keys()),
         }
diff --git a/src/cfnlint/rules/jsonschema/AwsType.py b/src/cfnlint/rules/jsonschema/AwsType.py
diff --git a/src/cfnlint/rules/jsonschema/CfnLint.py b/src/cfnlint/rules/jsonschema/CfnLint.py
@@ -3,6 +3,7 @@
 SPDX-License-Identifier: MIT-0
 """
 
+from cfnlint.jsonschema._utils import Unset
 from cfnlint.rules import CloudFormationLintRule
 
 
@@ -19,6 +20,7 @@ def cfnLint(self, validator, keywords, instance, schema):
                 add_cfn_lint_keyword=False,
             )
         )
+
         for keyword in keywords:
             for rule in self.child_rules.values():
                 if rule is None:
@@ -30,5 +32,6 @@ def cfnLint(self, validator, keywords, instance, schema):
                     if rule_keyword == keyword:
                         for err in rule.validate(validator, keyword, instance, schema):
                             if err.rule is None:
-                                err.rule = rule
+                                if isinstance(err.validator, Unset):
+                                    err.rule = rule
                             yield err
diff --git a/src/cfnlint/rules/jsonschema/CfnLintJsonSchema.py b/src/cfnlint/rules/jsonschema/CfnLintJsonSchema.py
@@ -10,7 +10,6 @@
 
 from cfnlint.helpers import load_resource
 from cfnlint.jsonschema import ValidationError
-from cfnlint.jsonschema._keywords import type
 from cfnlint.jsonschema.exceptions import best_match
 from cfnlint.rules.jsonschema.Base import BaseJsonSchema
 
@@ -38,8 +37,6 @@ def __init__(
             )
             self._use_schema_arg = False
 
-        self.validators["type"] = type
-
     @property
     def schema(self):
         return self._schema
@@ -70,7 +67,10 @@ def validate(self, validator, keywords, instance, schema):
         cfn_validator = self.extend_validator(
             validator=validator,
             schema=schema,
-            context=validator.context.evolve(functions=[]),
+            context=validator.context.evolve(
+                functions=[],
+                strict_types=True,
+            ),
         )
 
         yield from self._iter_errors(cfn_validator, instance)
diff --git a/src/cfnlint/rules/jsonschema/JsonSchema.py b/src/cfnlint/rules/jsonschema/JsonSchema.py
@@ -7,6 +7,7 @@
 from cfnlint.data.schemas.other import template as schema_template
 from cfnlint.helpers import load_resource
 from cfnlint.jsonschema import CfnTemplateValidator
+from cfnlint.jsonschema._keywords_cfn import cfn_type
 from cfnlint.rules.jsonschema.Base import BaseJsonSchema
 from cfnlint.template import Template
 
@@ -27,7 +28,6 @@ def __init__(self):
         """Init"""
         super().__init__()
         self.rule_set = {
-            "awsType": "E1100",
             "cfnLint": "E1101",
             "condition": "E8007",
             "dynamicReference": "E1050",
@@ -55,7 +55,7 @@ def __init__(self):
         self.config_definition = {"sections": {"default": "", "type": "string"}}
         self.configure()
         self.validators = {
-            "awsType": None,
+            "type": cfn_type,
         }
 
     @property