More mypy fixes (#4428)

Author: ssbarnea

examples/playbooks/action_plugins/some_action.py

@@ -3,7 +3,7 @@
 from ansible.plugins.action import ActionBase
 
 
-class ActionModule(ActionBase):  # type: ignore[misc]
+class ActionModule(ActionBase):  # type: ignore[misc,no-any-unimported]
     """Sample module."""
 
     def run(self, tmp=None, task_vars=None):  # type: ignore[no-untyped-def]

pyproject.toml

@@ -83,21 +83,25 @@ parallel = true
 source = ["src"]
 
 [tool.mypy]
+check_untyped_defs = true
 color_output = true
 disallow_any_generics = true
+disallow_any_unimported = true
 disallow_untyped_calls = true
 disallow_untyped_defs = true
 error_summary = true
-# disallow_any_unimported = True
-# warn_redundant_casts = True
-# warn_return_any = True
-# warn_unused_configs = True
 # site-packages is here to help vscode mypy integration getting confused
 exclude = "(.config|build|dist|test/local-content|site-packages|~/.pyenv|examples/playbooks/collections|plugins/modules)"
 # https://github.com/python/mypy/issues/12664
 incremental = false
+no_implicit_optional = true
 python_version = "3.10"
+show_error_code_links = true
+show_error_codes = true
 strict = true
+warn_redundant_casts = true
+warn_return_any = true
+warn_unused_configs = true
 
 [[tool.mypy.overrides]]
 ignore_errors = true

src/ansiblelint/app.py

@@ -33,7 +33,7 @@
 
 
 _logger = logging.getLogger(__package__)
-_CACHED_APP = None
+_CACHED_APP: App | None = None
 
 
 class App:

src/ansiblelint/rules/args.py

@@ -71,7 +71,7 @@ class ValidationPassedError(Exception):
     """Exception to be raised when validation passes."""
 
 
-class CustomAnsibleModule(basic.AnsibleModule):  # type: ignore[misc]
+class CustomAnsibleModule(basic.AnsibleModule):  # type: ignore[misc,no-any-unimported]
     """Mock AnsibleModule class."""
 
     def __init__(self, *args: Any, **kwargs: Any) -> None:
@@ -107,7 +107,7 @@ def matchtask(
         if module_name in self.module_aliases:
             return []
 
-        loaded_module: PluginLoadContext = load_plugin(module_name)
+        loaded_module: PluginLoadContext = load_plugin(module_name)  # type: ignore[no-any-unimported]
 
         # https://github.com/ansible/ansible-lint/issues/3200
         # since "ps1" modules cannot be executed on POSIX platforms, we will

src/ansiblelint/skip_utils.py

@@ -95,7 +95,7 @@ def get_rule_skips_from_line(
     return result
 
 
-def append_skipped_rules(
+def append_skipped_rules(  # type: ignore[no-any-unimported]
     pyyaml_data: AnsibleBaseYAMLObject,
     lintable: Lintable,
 ) -> AnsibleBaseYAMLObject:
@@ -143,7 +143,7 @@ def load_data(file_text: str) -> Any:
         return yaml.load_all(file_text)
 
 
-def _append_skipped_rules(
+def _append_skipped_rules(  # type: ignore[no-any-unimported]
     pyyaml_data: AnsibleBaseYAMLObject,
     lintable: Lintable,
 ) -> AnsibleBaseYAMLObject | None:

src/ansiblelint/testing/__init__.py

@@ -10,7 +10,7 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
-from ansiblelint.app import get_app
+from ansiblelint.app import App, get_app
 
 if TYPE_CHECKING:
     # https://github.com/PyCQA/pylint/issues/3240
@@ -27,7 +27,7 @@
 class RunFromText:
     """Use Runner on temp files created from testing text snippets."""
 
-    app = None
+    app: App | None = None
 
     def __init__(self, collection: RulesCollection) -> None:
         """Initialize a RunFromText instance with rules collection."""

src/ansiblelint/utils.py

@@ -96,7 +96,7 @@
 _logger = logging.getLogger(__name__)
 
 
-def parse_yaml_from_file(filepath: str) -> AnsibleBaseYAMLObject:
+def parse_yaml_from_file(filepath: str) -> AnsibleBaseYAMLObject:  # type: ignore[no-any-unimported]
     """Extract a decrypted YAML object from file."""
     dataloader = DataLoader()
     if hasattr(dataloader, "set_vault_secrets"):
@@ -114,7 +114,7 @@ def path_dwim(basedir: str, given: str) -> str:
     return str(dataloader.path_dwim(given))
 
 
-def ansible_templar(basedir: Path, templatevars: Any) -> Templar:
+def ansible_templar(basedir: Path, templatevars: Any) -> Templar:  # type: ignore[no-any-unimported]
     """Create an Ansible Templar using templatevars."""
     # `basedir` is the directory containing the lintable file.
     # Therefore, for tasks in a role, `basedir` has the form
@@ -244,7 +244,7 @@ def tokenize(value: str) -> tuple[list[str], dict[str, str]]:
     return (args, kwargs)
 
 
-def playbook_items(pb_data: AnsibleBaseYAMLObject) -> ItemsView:  # type: ignore[type-arg]
+def playbook_items(pb_data: AnsibleBaseYAMLObject) -> ItemsView:  # type: ignore[type-arg,no-any-unimported]
     """Return a list of items from within the playbook."""
     if isinstance(pb_data, dict):
         return pb_data.items()
@@ -740,7 +740,7 @@ def task_to_str(task: dict[str, Any]) -> str:
 
 
 # pylint: disable=too-many-nested-blocks
-def extract_from_list(
+def extract_from_list(  # type: ignore[no-any-unimported]
     blocks: AnsibleBaseYAMLObject,
     candidates: list[str],
     *,
@@ -913,15 +913,16 @@ def get_error_line(self, path: list[str | int]) -> int:
         return line
 
 
-def task_in_list(
+def task_in_list(  # type: ignore[no-any-unimported]
     data: AnsibleBaseYAMLObject,
     file: Lintable,
     kind: str,
     position: str = ".",
 ) -> Iterator[Task]:
     """Get action tasks from block structures."""
 
-    def each_entry(data: AnsibleBaseYAMLObject, position: str) -> Iterator[Task]:
+    def each_entry(data: AnsibleBaseYAMLObject, position: str) -> Iterator[Task]:  # type: ignore[no-any-unimported]
+
         if not data or not isinstance(data, Iterable):
             return
         for entry_index, entry in enumerate(data):
@@ -962,7 +963,7 @@ def each_entry(data: AnsibleBaseYAMLObject, position: str) -> Iterator[Task]:
         yield from each_entry(data, position)
 
 
-def add_action_type(
+def add_action_type(  # type: ignore[no-any-unimported]
     actions: AnsibleBaseYAMLObject, action_type: str
 ) -> AnsibleSequence:
     """Add action markers to task objects."""
@@ -980,7 +981,7 @@ def add_action_type(
 
 
 @cache
-def parse_yaml_linenumbers(
+def parse_yaml_linenumbers(  # type: ignore[no-any-unimported]
     lintable: Lintable,
 ) -> AnsibleBaseYAMLObject | None:
     """Parse yaml as ansible.utils.parse_yaml but with linenumbers.
@@ -1001,7 +1002,7 @@ def compose_node(parent: yaml.nodes.Node | None, index: int) -> yaml.nodes.Node:
         return node
 
     # signature of AnsibleConstructor.construct_mapping
-    def construct_mapping(
+    def construct_mapping(  # type: ignore[no-any-unimported]
         node: yaml.MappingNode,
         deep: bool = False,  # noqa: FBT002
     ) -> AnsibleMapping:
@@ -1183,7 +1184,7 @@ def parse_examples_from_plugin(lintable: Lintable) -> tuple[int, str]:
 
 
 @lru_cache
-def load_plugin(name: str) -> PluginLoadContext:
+def load_plugin(name: str) -> PluginLoadContext:  # type: ignore[no-any-unimported]
     """Return loaded ansible plugin/module."""
     loaded_module = action_loader.find_plugin_with_context(
         name,

src/ansiblelint/yaml_utils.py

@@ -45,7 +45,7 @@
 _logger = logging.getLogger(__name__)
 
 
-class CustomYamlLintConfig(YamlLintConfig):  # type: ignore[misc]
+class CustomYamlLintConfig(YamlLintConfig):  # type: ignore[misc,no-any-unimported]
     """Extension of YamlLintConfig."""
 
     def __init__(

test/test_skiputils.py

@@ -187,6 +187,7 @@ def test_playbook_noqa2(default_text_runner: RunFromText) -> None:
         ),
     ),
 )
+# type: ignore[no-any-unimported]
 def test_append_skipped_rules(
     lintable: Lintable,
     yaml: AnsibleBaseYAMLObject,