Use old-style Salt entrypoints for improved backwards compatibility.

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
saltstack · Mar 20, 2022 · fba5174 · fba5174
1 parent ea38cee
commit fba5174
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/changelog/98.improvement.rst b/changelog/98.improvement.rst
@@ -0,0 +1 @@
+Use old-style Salt entrypoints for improved backwards compatibility.
diff --git a/setup.cfg b/setup.cfg
@@ -69,7 +69,8 @@ pytest11=
   salt-factories-log-server = saltfactories.plugins.log_server
   salt-factories-loader-mock = saltfactories.plugins.loader
 salt.loader =
-  salt-factories = saltfactories.utils.saltext
+  engines_dirs      = saltfactories.utils.saltext:get_engines_dirs
+  log_handlers_dirs =  saltfactories.utils.saltext:get_log_handlers_dirs
 
 [bdist_wheel]
 universal = false

diff --git a/src/saltfactories/utils/saltext/__init__.py b/src/saltfactories/utils/saltext/__init__.py
@@ -0,0 +1,17 @@
+import pathlib
+
+SALTEXT_DIR = pathlib.Path(__file__).resolve().parent
+
+
+def get_engines_dirs():
+    """
+    Return a list of directories for Salt to look for engine extensions.
+    """
+    return [str(SALTEXT_DIR / "engines")]
+
+
+def get_log_handlers_dirs():
+    """
+    Return a list of directories for Salt to look for log handlers extensions.
+    """
+    return [str(SALTEXT_DIR / "log_handlers")]
diff --git a/src/saltfactories/utils/saltext/engines/__init__.py b/src/saltfactories/utils/saltext/engines/__init__.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Use old-style Salt entrypoints for improved backwards compatibility.