V1 - more typing and cleanup (#3296)

* More cleanup of unused code
* Add more typing for validate functions

Author: kddejong

setup.cfg

@@ -1,7 +1,2 @@
 [metadata]
 description_file = README.md
-
-[flake8]
-ignore = F401,E722,E203,W503,E713,F402,F841,E302
-max-line-length = 230
-exclude = .git,.hg,.svn,test,setup.py,__pycache__

src/cfnlint/jsonschema/_keywords.py

@@ -489,7 +489,7 @@ def properties(
             yield from validator.descend(
                 instance[p],
                 subschema,
-                path=k[0] if len(k) > 0 else p,
+                path=k[0] if k else p,
                 schema_path=p,
                 property_path=p,
             )

src/cfnlint/rules/jsonschema/CfnLintJsonSchema.py

@@ -9,7 +9,7 @@
 from typing import Any, Sequence
 
 from cfnlint.helpers import load_resource
-from cfnlint.jsonschema import ValidationError
+from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
 from cfnlint.jsonschema.exceptions import best_match
 from cfnlint.rules.jsonschema.Base import BaseJsonSchema
 
@@ -58,7 +58,9 @@ def _iter_errors(self, validator, instance):
         for err in errs:
             yield self._clean_error(err)
 
-    def validate(self, validator, keywords, instance, schema):
+    def validate(
+        self, validator: Validator, keywords: Any, instance: Any, schema: dict[str, Any]
+    ) -> ValidationResult:
         # if the schema has a description will only replace the message with that
         # description and use the best error for the location information
         if not self._use_schema_arg:

src/cfnlint/rules/jsonschema/CfnLintJsonSchemaRegional.py

@@ -7,15 +7,17 @@
 
 from typing import Any
 
-from cfnlint.jsonschema import ValidationError
+from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
 from cfnlint.rules.jsonschema.CfnLintJsonSchema import CfnLintJsonSchema
 
 
 class CfnLintJsonSchemaRegional(CfnLintJsonSchema):
     def message(self, instance: Any, err: ValidationError) -> str:
         return err.message
 
-    def validate(self, validator, keywords, instance, schema):
+    def validate(
+        self, validator: Validator, keywords: Any, instance: Any, schema: dict[str, Any]
+    ) -> ValidationResult:
         for region in validator.context.regions:
             region_validator = validator.evolve(
                 context=validator.context.evolve(regions=[region]),

src/cfnlint/rules/resources/BothUpdateReplacePolicyDeletionPolicyNeeded.py

@@ -3,10 +3,12 @@
 SPDX-License-Identifier: MIT-0
 """
 
+from __future__ import annotations
+
 from typing import Any
 
 import cfnlint.data.schemas.other.resources as resources_schemas
-from cfnlint.jsonschema import ValidationError
+from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
 from cfnlint.rules.jsonschema.CfnLintJsonSchema import CfnLintJsonSchema, SchemaDetails
 
 
@@ -37,7 +39,9 @@ def message(self, instance: Any, err: ValidationError) -> str:
             "are needed to protect resource from deletion"
         )
 
-    def validate(self, validator, keywords, instance, schema):
+    def validate(
+        self, validator: Validator, keywords: Any, instance: Any, schema: dict[str, Any]
+    ) -> ValidationResult:
         resource_type = instance.get("Type")
         if resource_type in [
             "AWS::Lambda::Version",

src/cfnlint/rules/resources/CfnInit.py

@@ -3,8 +3,13 @@
 SPDX-License-Identifier: MIT-0
 """
 
+from __future__ import annotations
+
+from typing import Any
+
 import cfnlint.data.schemas.other.resources
 from cfnlint.helpers import FUNCTIONS
+from cfnlint.jsonschema import ValidationResult, Validator
 from cfnlint.rules.jsonschema.CfnLintJsonSchema import CfnLintJsonSchema, SchemaDetails
 
 
@@ -26,7 +31,9 @@ def __init__(self) -> None:
             all_matches=True,
         )
 
-    def validate(self, validator, keywords, instance, schema):
+    def validate(
+        self, validator: Validator, keywords: Any, instance: Any, schema: dict[str, Any]
+    ) -> ValidationResult:
         cfn_validator = self.extend_validator(
             validator=validator,
             schema=self._schema,

src/cfnlint/rules/resources/RetentionPeriodOnResourceTypesWithAutoExpiringContent.py

@@ -3,10 +3,12 @@
 SPDX-License-Identifier: MIT-0
 """
 
+from __future__ import annotations
+
 from typing import Any, Dict, List
 
 import cfnlint.data.schemas.extensions.aws_rds_dbinstance
-from cfnlint.jsonschema import ValidationError
+from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
 from cfnlint.rules.jsonschema.CfnLintJsonSchema import CfnLintJsonSchema, SchemaDetails
 
 
@@ -100,7 +102,9 @@ def message(self, instance: Any, err: ValidationError) -> str:
             "values to avoid data loss on resource)"
         )
 
-    def validate(self, validator, keywords, instance, schema):
+    def validate(
+        self, validator: Validator, keywords: Any, instance: Any, schema: dict[str, Any]
+    ) -> ValidationResult:
         if len(validator.context.path.cfn_path) < 1:
             return
 

src/cfnlint/rules/resources/backup/BackupPlanLifecycleRule.py

@@ -3,9 +3,12 @@
 SPDX-License-Identifier: MIT-0
 """
 
+from __future__ import annotations
+
 from collections import deque
+from typing import Any
 
-from cfnlint.jsonschema import ValidationError
+from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
 from cfnlint.rules.jsonschema.CfnLintKeyword import CfnLintKeyword
 
 
@@ -32,7 +35,9 @@ def __init__(self) -> None:
             ]
         )
 
-    def validate(self, validator, uI, instance, schema):
+    def validate(
+        self, validator: Validator, uI: Any, instance: Any, schema: dict[str, Any]
+    ) -> ValidationResult:
         delete_after_days = instance.get("DeleteAfterDays")
         move_to_cold_storage_after_days = instance.get("MoveToColdStorageAfterDays")
 

src/cfnlint/rules/resources/certificatemanager/DomainValidationOptions.py

@@ -3,9 +3,12 @@
 SPDX-License-Identifier: MIT-0
 """
 
+from __future__ import annotations
+
 from collections import deque
+from typing import Any
 
-from cfnlint.jsonschema import ValidationError
+from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
 from cfnlint.rules.jsonschema.CfnLintKeyword import CfnLintKeyword
 
 
@@ -34,7 +37,9 @@ def __init__(self):
             ]
         )
 
-    def validate(self, validator, _, instance, schema):
+    def validate(
+        self, validator: Validator, _, instance: Any, schema: dict[str, Any]
+    ) -> ValidationResult:
         if not isinstance(instance, dict):
             return
 

src/cfnlint/rules/resources/cloudfront/Aliases.py

@@ -3,9 +3,14 @@
 SPDX-License-Identifier: MIT-0
 """
 
+from __future__ import annotations
+
+from typing import Any
+
 import regex as re
 
 from cfnlint.helpers import REGEX_DYN_REF
+from cfnlint.jsonschema import ValidationResult, Validator
 from cfnlint.rules.jsonschema.CfnLintKeyword import CfnLintKeyword
 
 
@@ -26,7 +31,9 @@ def __init__(self):
             ]
         )
 
-    def validate(self, validator, _, instance, schema):
+    def validate(
+        self, validator: Validator, _, instance: Any, schema: dict[str, Any]
+    ) -> ValidationResult:
 
         if isinstance(instance, str):
             if re.match(REGEX_DYN_REF, instance):

src/cfnlint/rules/resources/events/RuleScheduleExpression.py

@@ -3,7 +3,11 @@
 SPDX-License-Identifier: MIT-0
 """
 
-from cfnlint.jsonschema import ValidationError
+from __future__ import annotations
+
+from typing import Any
+
+from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
 from cfnlint.rules.jsonschema.CfnLintKeyword import CfnLintKeyword
 
 
@@ -20,7 +24,9 @@ def initialize(self, cfn):
         """Initialize the rule"""
         self.__init__(["Resources/AWS::Events::Rule/Properties/ScheduleExpression"])
 
-    def validate(self, validator, keywords, instance, schema):
+    def validate(
+        self, validator: Validator, keywords: Any, instance: Any, schema: dict[str, Any]
+    ) -> ValidationResult:
         # Value is either "cron()" or "rate()"
         if not validator.is_type(instance, "string"):
             return

src/cfnlint/rules/resources/iam/IdentityPolicy.py

@@ -31,6 +31,3 @@ def __init__(self):
             "identity",
             "policy_identity.json",
         )
-
-    def validate(self, validator, policy_type, policy, schema):
-        yield from super().validate(validator, policy_type, policy, schema)

src/cfnlint/rules/resources/iam/Permissions.py

@@ -3,9 +3,13 @@
 SPDX-License-Identifier: MIT-0
 """
 
+from __future__ import annotations
+
+from typing import Any
+
 from cfnlint.data import AdditionalSpecs
 from cfnlint.helpers import ensure_list, load_resource
-from cfnlint.jsonschema import ValidationError
+from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
 from cfnlint.rules.jsonschema.CfnLintKeyword import CfnLintKeyword
 
 
@@ -26,7 +30,9 @@ def __init__(self):
         )
         self.service_map = self.load_service_map()
 
-    def validate(self, validator, _, instance, schema):
+    def validate(
+        self, validator: Validator, _, instance: Any, schema: dict[str, Any]
+    ) -> ValidationResult:
         actions = ensure_list(instance)
 
         for action in actions:

src/cfnlint/rules/resources/iam/Policy.py

@@ -9,7 +9,7 @@
 from typing import Any, List
 
 from cfnlint.helpers import load_resource
-from cfnlint.jsonschema import Validator
+from cfnlint.jsonschema import ValidationResult, Validator
 from cfnlint.rules.jsonschema.CfnLintJsonSchema import CfnLintJsonSchema
 from cfnlint.schema.resolver import RefResolver
 
@@ -50,7 +50,13 @@ def __init__(
             self.resolver = RefResolver.from_schema(self.identity_schema, store=store)
 
     # pylint: disable=unused-argument
-    def validate(self, validator, policy_type, policy, schema):
+    def validate(
+        self,
+        validator: Validator,
+        policy_type: Any,
+        policy: Any,
+        schema: dict[str, Any],
+    ) -> ValidationResult:
         # First time child rules are configured against the rule
         # so we can run this now
         if validator.is_type(policy, "string"):

src/cfnlint/rules/resources/iam/RoleArnPattern.py

@@ -3,9 +3,13 @@
 SPDX-License-Identifier: MIT-0
 """
 
+from __future__ import annotations
+
+from typing import Any
+
 import regex as re
 
-from cfnlint.jsonschema import ValidationError
+from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
 from cfnlint.rules.jsonschema.CfnLintKeyword import CfnLintKeyword
 
 
@@ -33,7 +37,9 @@ def __init__(self) -> None:
         )
 
     # pylint: disable=unused-argument
-    def validate(self, validator, aZ, arn, schema):
+    def validate(
+        self, validator: Validator, aZ: Any, arn: Any, schema: dict[str, Any]
+    ) -> ValidationResult:
         if not validator.is_type(arn, "string"):
             return
 

src/cfnlint/rules/resources/lmbd/DeprecatedRuntimeEnd.py

@@ -3,11 +3,14 @@
 SPDX-License-Identifier: MIT-0
 """
 
+from __future__ import annotations
+
 from datetime import datetime
+from typing import Any
 
 from cfnlint.data import AdditionalSpecs
 from cfnlint.helpers import load_resource
-from cfnlint.jsonschema import ValidationError
+from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
 from cfnlint.rules.jsonschema.CfnLintKeyword import CfnLintKeyword
 
 
@@ -31,7 +34,9 @@ def __init__(self):
         )
 
     # pylint: disable=unused-argument
-    def validate(self, validator, v, runtime, schema):
+    def validate(
+        self, validator: Validator, v: Any, runtime: Any, schema: dict[str, Any]
+    ) -> ValidationResult:
         runtime_data = self.deprecated_runtimes.get(runtime)
         if not runtime_data:
             return
@@ -49,4 +54,4 @@ def validate(self, validator, v, runtime, schema):
             )
 
         if self.child_rules["W2531"]:
-            yield from self.child_rules["W2531"].lambdaruntime(runtime, runtime_data)
+            yield from self.child_rules["W2531"].lambdaruntime(runtime, runtime_data)  # type: ignore

src/cfnlint/rules/resources/lmbd/SnapStart.py

@@ -3,7 +3,11 @@
 SPDX-License-Identifier: MIT-0
 """
 
-from cfnlint.jsonschema import ValidationError
+from __future__ import annotations
+
+from typing import Any
+
+from cfnlint.jsonschema import ValidationError, ValidationResult, Validator
 from cfnlint.rules.jsonschema.CfnLintKeyword import CfnLintKeyword
 
 
@@ -24,14 +28,16 @@ def __init__(self):
             ["Resources/AWS::Lambda::Function/Properties/SnapStart/ApplyOn"]
         )
 
-    def validate(self, validator, _, instance, schema):
+    def validate(
+        self, validator: Validator, _, instance: Any, schema: dict[str, Any]
+    ) -> ValidationResult:
         if not validator.is_type(instance, "string"):
             return
 
         if instance != "PublishedVersions":
             return
 
-        resource_name = validator.context.path.path[1]
+        resource_name: str = str(validator.context.path.path[1])
         lambda_version_type = "AWS::Lambda::Version"
         if list(
             validator.cfn.get_resource_children(resource_name, [lambda_version_type])