Recognize import_role and import_role when using fqcn (#2034)

Author: ssbarnea

.github/workflows/tox.yml

@@ -156,7 +156,7 @@ jobs:
       WSLENV: FORCE_COLOR:PYTEST_REQPASS:TOXENV:TOX_PARALLEL_NO_SPINNER
       # Number of expected test passes, safety measure for accidental skip of
       # tests. Update value if you add/remove tests.
-      PYTEST_REQPASS: 548
+      PYTEST_REQPASS: 550
 
     steps:
       - name: Activate WSL1

src/ansiblelint/utils.py

@@ -334,9 +334,14 @@ def _taskshandlers_children(
             results.append(children)
             continue
 
-        if (
-            "include_role" in task_handler or "import_role" in task_handler
-        ):  # lgtm [py/unreachable-statement]
+        including_commands = (
+            "import_role",
+            "ansible.builtin.import_role",
+            "include_role",
+            "ansible.builtin.include_role",
+        )
+        if any(x in task_handler for x in including_commands):
+            # lgtm [py/unreachable-statement]
             task_handler = normalize_task_v2(task_handler)
             _validate_task_handler_action_for_role(task_handler["action"])
             results.extend(

test/include-import-role.yml

@@ -8,44 +8,76 @@
 from ansiblelint.rules import RulesCollection
 from ansiblelint.runner import Runner
 
-ROLE_TASKS_MAIN = """
+ROLE_TASKS_MAIN = """\
+---
 - name: shell instead of command
   shell: echo hello world
+  changed_when: false
 """
 
-ROLE_TASKS_WORLD = """
-- command: echo this is a task without a name
+ROLE_TASKS_WORLD = """\
+---
+- debug: msg="this is a task without a name"
 """
 
-PLAY_IMPORT_ROLE = """
+PLAY_IMPORT_ROLE = """\
+---
 - hosts: all
 
   tasks:
-    - import_role:
+    - name: some import
+      import_role:
         name: test-role
 """
 
-PLAY_IMPORT_ROLE_INLINE = """
+PLAY_IMPORT_ROLE_FQCN = """\
+---
 - hosts: all
 
   tasks:
-    - import_role: name=test-role
+    - name: some import
+      ansible.builtin.import_role:
+        name: test-role
+"""
+
+PLAY_IMPORT_ROLE_INLINE = """\
+---
+- hosts: all
+
+  tasks:
+    - name: some import
+      import_role: name=test-role
 """
 
-PLAY_INCLUDE_ROLE = """
+PLAY_INCLUDE_ROLE = """\
+---
 - hosts: all
 
   tasks:
-    - include_role:
+    - name: some import
+      include_role:
         name: test-role
         tasks_from: world
 """
 
-PLAY_INCLUDE_ROLE_INLINE = """
+PLAY_INCLUDE_ROLE_FQCN = """\
+---
 - hosts: all
 
   tasks:
-    - include_role: name=test-role tasks_from=world
+    - name: some import
+      ansible.builtin.include_role:
+        name: test-role
+        tasks_from: world
+"""
+
+PLAY_INCLUDE_ROLE_INLINE = """\
+---
+- hosts: all
+
+  tasks:
+    - name: some import
+      include_role: name=test-role tasks_from=world
 """
 
 
@@ -67,19 +99,29 @@ def fixture_playbook_path(request: SubRequest, tmp_path: Path) -> str:
     (
         pytest.param(
             PLAY_IMPORT_ROLE,
-            ["only when shell functionality is required"],
+            ["only when shell functionality is required", "All tasks should be named"],
             id="IMPORT_ROLE",
         ),
+        pytest.param(
+            PLAY_IMPORT_ROLE_FQCN,
+            ["only when shell functionality is required", "All tasks should be named"],
+            id="IMPORT_ROLE_FQCN",
+        ),
         pytest.param(
             PLAY_IMPORT_ROLE_INLINE,
-            ["only when shell functionality is require"],
+            ["only when shell functionality is require", "All tasks should be named"],
             id="IMPORT_ROLE_INLINE",
         ),
         pytest.param(
             PLAY_INCLUDE_ROLE,
             ["only when shell functionality is require", "All tasks should be named"],
             id="INCLUDE_ROLE",
         ),
+        pytest.param(
+            PLAY_INCLUDE_ROLE_FQCN,
+            ["only when shell functionality is require", "All tasks should be named"],
+            id="INCLUDE_ROLE_FQCN",
+        ),
         pytest.param(
             PLAY_INCLUDE_ROLE_INLINE,
             ["only when shell functionality is require", "All tasks should be named"],
@@ -92,7 +134,11 @@ def test_import_role2(
     default_rules_collection: RulesCollection, playbook_path: str, messages: List[str]
 ) -> None:
     """Test that include_role digs deeper than import_role."""
-    runner = Runner(playbook_path, rules=default_rules_collection)
+    runner = Runner(
+        playbook_path, rules=default_rules_collection, skip_list=["fqcn-builtins"]
+    )
     results = runner.run()
     for message in messages:
         assert message in str(results)
+    # Ensure no other unexpected messages are present
+    assert len(messages) == len(results), results