Increase coverage and update rules

src/cfnlint/data/AdditionalSchemas/resource/configuration.json

@@ -28,7 +28,7 @@
     },
     "Type": {
       "type": "string",
-      "cfnType": true
+      "awsType": true
     },
     "UpdateReplacePolicy": {
       "type": "string",

src/cfnlint/data/ExtendedProviderSchema/all/aws-autoscaling-autoscalinggroup.json

@@ -6,6 +6,16 @@
       "aws-autoscaling-autoscalinggroup/onlyone"
     ]
   },
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZones/awsType",
+    "value": "AvailabilityZones"
+  },
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZones/items/awsType",
+    "value": "AvailabilityZone"
+  },
   {
     "op": "add",
     "path": "/definitions/LaunchTemplateSpecification/cfnSchema",

src/cfnlint/data/ExtendedProviderSchema/all/aws-dax-cluster.json

@@ -0,0 +1,12 @@
+[
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZones/awsType",
+    "value": "AvailabilityZones"
+  },
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZones/items/awsType",
+    "value": "AvailabilityZone"
+  }
+]

src/cfnlint/data/ExtendedProviderSchema/all/aws-dms-replicationinstance.json

@@ -0,0 +1,7 @@
+[
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  }
+]

src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-host.json

@@ -0,0 +1,7 @@
+[
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  }
+]

src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-instance.json

@@ -14,5 +14,10 @@
       "aws-ec2-instance/blockdevicemapping-virtualname-exclusive",
       "aws-ec2-instance/blockdevicemapping-onlyone"
     ]
+  },
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
   }
 ]

src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-launchtemplate.json

@@ -3,5 +3,10 @@
     "op": "add",
     "path": "/definitions/BlockDeviceMapping/cfnSchema",
     "value": ["aws-ec2-launchtemplate/blockdevicemapping-virtualname"]
+  },
+  {
+    "op": "add",
+    "path": "/definitions/Placement/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
   }
 ]

src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-spotfleet.json

@@ -11,5 +11,15 @@
     "op": "add",
     "path": "/definitions/SpotFleetRequestConfigData/cfnSchema",
     "value": ["aws-ec2-spotfleet/spotfleetrequestconfigdata-onlyone"]
+  },
+  {
+    "op": "add",
+    "path": "/definitions/LaunchTemplateOverrides/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  },
+  {
+    "op": "add",
+    "path": "/definitions/SpotPlacement/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
   }
 ]

src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-subnet.json

@@ -0,0 +1,7 @@
+[
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  }
+]

src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-volume.json

@@ -0,0 +1,7 @@
+[
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  }
+]

src/cfnlint/data/ExtendedProviderSchema/all/aws-elasticloadbalancing-loadbalancer.json

@@ -0,0 +1,12 @@
+[
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZones/awsType",
+    "value": "AvailabilityZones"
+  },
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZones/items/awsType",
+    "value": "AvailabilityZone"
+  }
+]

src/cfnlint/data/ExtendedProviderSchema/all/aws-elasticloadbalancingv2-targetgroup.json

@@ -0,0 +1,7 @@
+[
+  {
+    "op": "add",
+    "path": "/definitions/TargetDescription/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  }
+]

src/cfnlint/data/ExtendedProviderSchema/all/aws-emr-cluster.json

@@ -0,0 +1,7 @@
+[
+  {
+    "op": "add",
+    "path": "/definitions/PlacementType/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  }
+]

src/cfnlint/data/ExtendedProviderSchema/all/aws-glue-connection.json

@@ -0,0 +1,7 @@
+[
+  {
+    "op": "add",
+    "path": "/definitions/PhysicalConnectionRequirements/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  }
+]

src/cfnlint/data/ExtendedProviderSchema/all/aws-opsworks-instance.json

@@ -6,5 +6,10 @@
       "aws-opsworks-instance/blockdevicemapping-virtualname",
       "aws-opsworks-instance/blockdevicemapping-onlyone"  
     ]
+  },
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
   }
-]
+]

src/cfnlint/data/ExtendedProviderSchema/all/aws-rds-dbcluster.json

@@ -7,5 +7,15 @@
       "aws-rds-dbcluster/snapshotidentifier-exclusive",
       "aws-rds-dbcluster/serverless-exclusive"
     ]
+  },
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZones/awsType",
+    "value": "AvailabilityZones"
+  },
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZones/items/awsType",
+    "value": "AvailabilityZone"
   }
 ]

src/cfnlint/data/ExtendedProviderSchema/all/aws-rds-dbinstance.json

@@ -6,5 +6,10 @@
       "aws-rds-dbinstance/sourcedbinstanceidentifier-exclusive",
       "aws-rds-dbinstance/aurora-exclusive"
     ]
+  },
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
   }
 ]

src/cfnlint/helpers.py

@@ -17,11 +17,9 @@
 import re
 import sys
 from io import BytesIO
-from typing import Dict, List
+from typing import List
 from urllib.request import Request, urlopen, urlretrieve
 
-import jsonpatch
-
 LOGGER = logging.getLogger(__name__)
 
 SPEC_REGIONS = {
@@ -110,17 +108,21 @@
 FUNCTION_NOT = "Fn::Not"
 FUNCTION_EQUALS = "Fn::Equals"
 
-PSEUDOPARAMS = [
+PSEUDOPARAMS_SINGLE = [
     "AWS::AccountId",
-    "AWS::NotificationARNs",
-    "AWS::NoValue",
     "AWS::Partition",
     "AWS::Region",
     "AWS::StackId",
     "AWS::StackName",
     "AWS::URLSuffix",
 ]
 
+PSEUDOPARAMS_MULTIPLE = [
+    "AWS::NotificationARNs",
+]
+
+PSEUDOPARAMS = ["AWS::NoValue"] + PSEUDOPARAMS_SINGLE + PSEUDOPARAMS_MULTIPLE
+
 LIMITS = {
     "Mappings": {"number": 200, "attributes": 200, "name": 255},  # in characters
     "Outputs": {
@@ -220,15 +222,10 @@ def __getitem__(self, item):
         return possible_items[longest_match]
 
     def __contains__(self, item):
-        for k, v in self.items():
-            if isinstance(v, dict):
-                if v.get("Type") == "MODULE":
-                    if re.match(k, item):
-                        return True
-                else:
-                    if k == item:
-                        return True
-            elif re.match(k, item):
+        if isinstance(item, (dict, list)):
+            return False
+        for k, _ in self.items():
+            if re.fullmatch(k, item):
                 return True
         return False
 
@@ -328,7 +325,6 @@ def get_url_retrieve(url: str, caching: bool = False) -> str:
     """
 
     if caching:
-        # Need to wrap this in a try, as URLLib2 in Python2 doesn't support HEAD requests
         req = Request(url, method="HEAD")
         with urlopen(req) as res:
             if res.info().get("ETag"):
@@ -380,19 +376,6 @@ def load_resource(package, filename="us-east-1.json"):
 REGISTRY_SCHEMAS: List[dict] = []
 
 
-def merge_spec(source, destination):
-    """Recursive merge spec dict"""
-
-    for key, value in source.items():
-        if isinstance(value, dict):
-            node = destination.setdefault(key, {})
-            merge_spec(value, node)
-        else:
-            destination[key] = value
-
-    return destination
-
-
 def is_custom_resource(resource_type):
     """Return True if resource_type is a custom resource"""
     return resource_type and (
@@ -486,21 +469,3 @@ def onerror(os_error):
                 result.extend(create_rules(mod))
 
     return result
-
-
-def apply_json_patch(data: Dict, patches: List[Dict], region: str) -> Dict:
-    # Process the generic patches 1 by 1 so we can "ignore" failed ones
-    for patch in patches:
-        try:
-            jsonpatch.JsonPatch([patch]).apply(data, in_place=True)
-        except jsonpatch.JsonPatchConflict:
-            LOGGER.debug("Patch (%s) not applied in region %s", patch, region)
-        except jsonpatch.JsonPointerException:
-            # Debug as the parent element isn't supported in the region
-            LOGGER.debug(
-                "Parent element not found for patch (%s) in region %s",
-                patches,
-                region,
-            )
-
-    return data

src/cfnlint/jsonschema/_utils.py

@@ -14,3 +14,11 @@ class Unset:
 
     def __repr__(self):
         return "<unset>"
+
+
+def unbool(element, true=object(), false=object()):
+    if element is True:
+        return true
+    if element is False:
+        return false
+    return element

src/cfnlint/jsonschema/_validators.py

@@ -15,10 +15,10 @@
     equal,
     extras_msg,
     find_additional_properties,
-    unbool,
     uniq,
 )
 
+from cfnlint.jsonschema._utils import unbool
 from cfnlint.jsonschema.exceptions import ValidationError
 
 

src/cfnlint/rules/__init__.py

@@ -54,9 +54,6 @@ def wrapper(self, filename: str, cfn: Template, *args, **kwargs):
             if match_type == "match_resource_properties":
                 if args[1] not in self.resource_property_types:
                     return []
-            elif match_type == "match_resource_sub_properties":
-                if args[1] not in self.resource_sub_property_types:
-                    return []
 
             start = datetime.now()
             LOGGER.debug("Starting match function for rule %s at %s", self.id, start)
@@ -220,7 +217,6 @@ def configure(self, configs=None, experimental=False):
 
     match: Callable[[Template], List[RuleMatch]] = None  # type: ignore
     match_resource_properties: Callable[[Dict, str, List[str], Template], List[RuleMatch]] = None  # type: ignore
-    match_resource_sub_properties: Callable[[Dict, str, List[str], Template], List[RuleMatch]] = None  # type: ignore
 
     @matching("match")
     # pylint: disable=W0613
@@ -238,16 +234,6 @@ def matchall_resource_properties(
             resource_properties, property_type, path, cfn
         )
 
-    @matching("match_resource_sub_properties")
-    # pylint: disable=W0613
-    def matchall_resource_sub_properties(
-        self, filename, cfn, resource_properties, property_type, path
-    ):
-        """Check for resource properties type"""
-        return self.match_resource_sub_properties(  # pylint: disable=E1102
-            resource_properties, property_type, path, cfn
-        )
-
 
 # pylint: disable=too-many-instance-attributes
 class RulesCollection:

src/cfnlint/rules/functions/GetAtt.py

@@ -10,7 +10,7 @@
 from jsonschema.exceptions import best_match
 from jsonschema.validators import extend
 
-from cfnlint.jsonschema import ValidationError
+from cfnlint.jsonschema import ValidationError, _utils
 from cfnlint.rules import CloudFormationLintRule, RuleMatch
 from cfnlint.template import Template
 
@@ -26,19 +26,12 @@ class GetAtt(CloudFormationLintRule):
     source_url = "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-getatt.html"
     tags = ["functions", "getatt"]
 
-    def _unbool(self, element, true=object(), false=object()):
-        if element is True:
-            return true
-        if element is False:
-            return false
-        return element
-
     # pylint: disable=unused-argument
     def _enum(self, validator, enums, instance, schema):
         enums.sort()
         if instance in (0, 1):
-            unbooled = self._unbool(instance)
-            if all(unbooled != self._unbool(each) for each in enums):
+            unbooled = _utils.unbool(instance)
+            if all(unbooled != _utils.unbool(each) for each in enums):
                 yield ValidationError(f"{instance!r} is not one of {enums!r}")
         elif instance not in enums:
             if validator.is_type(instance, "string"):