Merge pull request #69200 from lkubb/fix-ssh-synced-extmods

Salt-SSH: Fix internal modules being synced as external ones

Author: dwoz

changelog/69199.fixed.md

@@ -0,0 +1 @@
+Fixed Salt-SSH syncing internal modules as extmods

salt/client/ssh/__init__.py

@@ -1757,6 +1757,10 @@ def mod_data(fsclient):
                 if not os.path.isdir(mod_dir):
                     continue
 
+                # Skip internal salt modules - they should be in the thin/relenv tarball
+                if mod_dir.startswith(str(salt.loader.SALT_BASE_PATH)):
+                    continue
+
                 for fn_ in os.listdir(mod_dir):
                     if fn_.endswith((".py", ".so", ".pyx")) and not fn_.startswith(
                         "__"

tests/pytests/unit/client/ssh/test_extmods.py

@@ -0,0 +1,17 @@
+import re
+
+import salt.client.ssh
+import salt.fileclient
+from tests.support.mock import MagicMock, patch
+
+
+def test_internal_modules_are_not_synced_as_extmods(master_opts):
+    fsclient = salt.fileclient.FSClient(master_opts)
+    tar = MagicMock()
+    with patch("tarfile.open", return_value=tar):
+        salt.client.ssh.mod_data(fsclient)
+    ptrn = re.compile(
+        r".*/salt/(modules|states|grains|renderers|returners|utils)/\w+\.py$"
+    )
+    for call in tar.add.call_args_list:
+        assert not ptrn.match(call[0][0])