Make task_in_list receive a lintable (#3414)

Co-authored-by: Ajinkya Udgirkar <ajinkyaudgirkar@gmail.com>
ansible · May 9, 2023 · 3473542 · 3473542
1 parent 9ad441c
commit 3473542
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/ansiblelint/rules/__init__.py b/src/ansiblelint/rules/__init__.py
@@ -159,7 +159,7 @@ def matchtasks(self, file: Lintable) -> list[MatchError]:  # noqa: C901
         for task in ansiblelint.utils.task_in_list(
             data=file.data,
             kind=file.kind,
-            filename=str(file.path),
+            file=file,
         ):
             if task.error is not None:
                 # normalize_task converts AnsibleParserError to MatchError

diff --git a/src/ansiblelint/schemas/__store__.json b/src/ansiblelint/schemas/__store__.json
@@ -24,7 +24,7 @@
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/inventory.json"
   },
   "meta": {
-    "etag": "449550c81ab905d3ac30b2672bf23a43cf1a71eef168ab08e8caee8c4a32bce6",
+    "etag": "7cbcda4e9454961d843f5b2b37349bafdf387d01e8ad6772e0a4c89868aaa55c",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/meta.json"
   },
   "meta-runtime": {

diff --git a/src/ansiblelint/utils.py b/src/ansiblelint/utils.py
@@ -832,7 +832,7 @@ def __iter__(self) -> Generator[str, None, None]:
 
 def task_in_list(  # noqa: C901
     data: AnsibleBaseYAMLObject,
-    filename: str,
+    file: Lintable,
     kind: str,
     position: str = ".",
 ) -> Iterator[Task]:
@@ -853,7 +853,7 @@ def each_entry(data: AnsibleBaseYAMLObject, position: str) -> Iterator[Task]:
             for block in [k for k in entry if k in NESTED_TASK_KEYS]:
                 yield from task_in_list(
                     data=entry[block],
-                    filename=filename,
+                    file=file,
                     kind="tasks",
                     position=f"{_pos}.{block}",
                 )

diff --git a/test/test_utils.py b/test/test_utils.py
@@ -431,7 +431,7 @@ def test_task_in_list(file: str, names: list[str], positions: list[str]) -> None
     lintable = Lintable(file)
     assert lintable.kind
     tasks = list(
-        utils.task_in_list(data=lintable.data, filename=file, kind=lintable.kind),
+        utils.task_in_list(data=lintable.data, file=lintable, kind=lintable.kind),
     )
     assert len(tasks) == len(names)
     for index, task in enumerate(tasks):

diff --git a/test/test_yaml_utils.py b/test/test_yaml_utils.py
@@ -37,7 +37,7 @@ def test_tasks_in_list_empty_file(empty_lintable: Lintable) -> None:
     res = list(
         task_in_list(
             data=empty_lintable,
-            filename=str(empty_lintable.path),
+            file=empty_lintable,
             kind=empty_lintable.kind,
         ),
     )