saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Support loading entrypoints by passing a module instead of a function.

Browse source 
Fixes #58939
This commit is contained in:
Pedro Algarvio 2021-02-25 06:39:10 +00:00 • committed by Megan Wilhite
parent d8ffb0a454
commit 65e40ca272
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/58939.added Normal file
View file

@ -0,0 +1 @@
Support loading entrypoints by passing a module instead of a function.

16
salt/loader.py
View file

@ -139,7 +139,21 @@ def _module_dirs(
):
try:
loaded_entry_point = entry_point.load()
for path in loaded_entry_point():
if isinstance(loaded_entry_point, types.ModuleType):
# New way of defining entrypoints
# [options.entry_points]
# salt.loader=
# runner_dirs = thirpartypackage.runners
# module_dirs = thirpartypackage.modules
loaded_entry_point_paths = loaded_entry_point.__path__
else:
# Old way of defining loader entry points
# [options.entry_points]
# salt.loader=
# runner_dirs = thirpartypackage.loader:func_to_get_list_of_dirs
# module_dirs = thirpartypackage.loader:func_to_get_list_of_dirs
loaded_entry_point_paths = loaded_entry_point()
for path in loaded_entry_point_paths:
ext_type_types.append(path)
except Exception as exc: # pylint: disable=broad-except
entry_point_details = entrypoints.name_and_version_from_entry_point(

4
tests/unit/test_loader.py
View file

@ -1,6 +1,6 @@
"""
unit.loader
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
tests.unit.test_loader
~~~~~~~~~~~~~~~~~~~~~~
Test Salt's loader
"""