Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix collection loading #223

Merged
merged 3 commits into from
Feb 14, 2023
Merged

Fix collection loading #223

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4efe7e2
src/ansible_compat/runtime.py: Fix collection loading
apatard Feb 13, 2023
6c81e64
Collection path is a list
ssbarnea Feb 14, 2023
e0b4a3e
Merge branch 'main' into collection_finder_fix
ssbarnea Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/ansible_compat/runtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,12 @@ def _ensure_module_available(self) -> None:
# For ansible 2.15+ we need to initialize the plugin loader
# https://github.com/ansible/ansible-lint/issues/2945
if not Runtime.initialized: # noqa: F823
col_path = [f"{self.cache_dir}/collections"]
if self.version >= Version("2.15.0.dev0"):
# pylint: disable=import-outside-toplevel,no-name-in-module
from ansible.plugins.loader import init_plugin_loader

init_plugin_loader([])
init_plugin_loader(col_path)
else:
# noinspection PyProtectedMember
from ansible.utils.collection_loader._collection_finder import ( # pylint: disable=import-outside-toplevel
Expand All @@ -142,10 +143,12 @@ def _ensure_module_available(self) -> None:

# noinspection PyProtectedMember
# pylint: disable=protected-access
col_path += self.config.collections_paths
col_path += os.path.dirname(
os.environ.get(ansible_collections_path(), ".")
).split(":")
_AnsibleCollectionFinder(
paths=[
os.path.dirname(os.environ.get(ansible_collections_path(), "."))
]
paths=col_path
)._install() # pylint: disable=protected-access
Runtime.initialized = True

Expand Down