Fix isinstance check (#79159)

Use GalaxyAPI for isinstance check instead of RoleDistributionServer, since the latter is defined in __main__ sometimes (when running integration tests or ansible-galaxy from source) and importing from ansible.cli.galaxy won't reference the same object.

lib/ansible/galaxy/role.py

@@ -33,6 +33,7 @@ from shutil import rmtree
 
 from ansible import context
 from ansible.errors import AnsibleError, AnsibleParserError
+from ansible.galaxy.api import GalaxyAPI
 from ansible.galaxy.user_agent import user_agent
 from ansible.module_utils._text import to_native, to_text
 from ansible.module_utils.common.yaml import yaml_dump, yaml_load
@@ -105,9 +106,7 @@ class GalaxyRole(object):
 
     @property
     def api(self):
-        # prevent recursive imports
+        if not isinstance(self._api, GalaxyAPI):
-        from ansible.cli.galaxy import RoleDistributionServer
-        if isinstance(self._api, RoleDistributionServer):
             return self._api.api
         return self._api
 

test/integration/targets/ansible-galaxy-role/tasks/main.yml

@@ -1,3 +1,6 @@
+- name: Install role from Galaxy (should not fail with AttributeError)
+  command: ansible-galaxy role install ansible.nope -vvvv --ignore-errors
+
 - name: Archive directories
   file:
     state: directory