Update coverage on some of the converted rules (#2586)

aws-cloudformation · Feb 14, 2023 · 85e3793 · 85e3793
1 parent a9602e7
commit 85e3793
Show file tree

Hide file tree

Showing 32 changed files with 323 additions and 222 deletions.
diff --git a/src/cfnlint/data/AdditionalSchemas/resource/configuration.json b/src/cfnlint/data/AdditionalSchemas/resource/configuration.json
@@ -28,7 +28,7 @@
     },
     "Type": {
       "type": "string",
-      "cfnType": true
+      "awsType": true
     },
     "UpdateReplacePolicy": {
       "type": "string",

diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-autoscaling-autoscalinggroup.json b/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",

diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-dax-cluster.json b/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"
+  }
+]
diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-dms-replicationinstance.json b/src/cfnlint/data/ExtendedProviderSchema/all/aws-dms-replicationinstance.json
@@ -0,0 +1,7 @@
+[
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  }
+]
diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-host.json b/src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-host.json
@@ -0,0 +1,7 @@
+[
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  }
+]
diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-instance.json b/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"
   }
 ]
diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-launchtemplate.json b/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"
   }
 ]
diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-spotfleet.json b/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"
   }
 ]
diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-subnet.json b/src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-subnet.json
@@ -0,0 +1,7 @@
+[
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  }
+]
diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-volume.json b/src/cfnlint/data/ExtendedProviderSchema/all/aws-ec2-volume.json
@@ -0,0 +1,7 @@
+[
+  {
+    "op": "add",
+    "path": "/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  }
+]
diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-elasticloadbalancing-loadbalancer.json b/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"
+  }
+]
diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-elasticloadbalancingv2-targetgroup.json b/src/cfnlint/data/ExtendedProviderSchema/all/aws-elasticloadbalancingv2-targetgroup.json
@@ -0,0 +1,7 @@
+[
+  {
+    "op": "add",
+    "path": "/definitions/TargetDescription/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  }
+]
diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-emr-cluster.json b/src/cfnlint/data/ExtendedProviderSchema/all/aws-emr-cluster.json
@@ -0,0 +1,7 @@
+[
+  {
+    "op": "add",
+    "path": "/definitions/PlacementType/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  }
+]
diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-glue-connection.json b/src/cfnlint/data/ExtendedProviderSchema/all/aws-glue-connection.json
@@ -0,0 +1,7 @@
+[
+  {
+    "op": "add",
+    "path": "/definitions/PhysicalConnectionRequirements/properties/AvailabilityZone/awsType",
+    "value": "AvailabilityZone"
+  }
+]
diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-opsworks-instance.json b/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"
   }
-]
+]
diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-rds-dbcluster.json b/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"
   }
 ]
diff --git a/src/cfnlint/data/ExtendedProviderSchema/all/aws-rds-dbinstance.json b/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"
   }
 ]
diff --git a/src/cfnlint/jsonschema/_utils.py b/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
diff --git a/src/cfnlint/jsonschema/_validators.py b/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
 
 

diff --git a/src/cfnlint/rules/functions/GetAtt.py b/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"):

diff --git a/src/cfnlint/rules/resources/Configuration.py b/src/cfnlint/rules/resources/Configuration.py
@@ -27,7 +27,7 @@ def __init__(self):
         self.regions = []
         self.validator = create_validator(
             validators={
-                "cfnType": self._cfnType,
+                "awsType": self._awsType,
             },
             cfn=None,
             rules=None,
@@ -38,7 +38,7 @@ def initialize(self, cfn):
         self.regions = cfn.regions
 
     # pylint: disable=unused-argument
-    def _cfnType(self, validator, iT, instance, schema):
+    def _awsType(self, validator, iT, instance, schema):
         if not validator.is_type(instance, "string"):
             return
         for region in self.regions:

diff --git a/src/cfnlint/rules/resources/properties/AllowedValue.py b/src/cfnlint/rules/resources/properties/AllowedValue.py
@@ -2,7 +2,7 @@
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 SPDX-License-Identifier: MIT-0
 """
-from cfnlint.jsonschema import ValidationError
+from cfnlint.jsonschema import ValidationError, _utils
 from cfnlint.rules import CloudFormationLintRule
 
 
@@ -18,13 +18,6 @@ class AllowedValue(CloudFormationLintRule):
         "W2030": None,
     }
 
-    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):
         if isinstance(instance, dict):
@@ -34,8 +27,8 @@ def enum(self, validator, enums, instance, schema):
                         yield from self.child_rules["W2030"].validate(v, enums)
                         return
         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:
             yield ValidationError(f"{instance!r} is not one of {enums!r}")