[3006.x] Provide execution module a regular file client durring pillar rendering

changelog/66124.fixed.md

@@ -0,0 +1 @@
+Execution modules have access to regular fileclient durring pillar rendering.

salt/beacons/__init__.py

@@ -7,7 +7,6 @@
 import re
 import sys
 
-import salt.loader
 import salt.utils.event
 import salt.utils.minion
 
@@ -20,6 +19,8 @@ class Beacon:
     """
 
     def __init__(self, opts, functions):
+        import salt.loader
+
         self.opts = opts
         self.functions = functions
         self.beacons = salt.loader.beacons(opts, functions)

salt/pillar/__init__.py

@@ -561,6 +561,7 @@ def __init__(
         self.opts = self.__gen_opts(opts, grains, saltenv=saltenv, pillarenv=pillarenv)
         self.saltenv = saltenv
         self.client = salt.fileclient.get_file_client(self.opts, True)
+        self.fileclient = salt.fileclient.get_file_client(self.opts, False)
         self.avail = self.__gather_avail()
 
         if opts.get("file_client", "") == "local" and not opts.get(
@@ -573,11 +574,15 @@ def __init__(
             utils = salt.loader.utils(opts, file_client=self.client)
             if opts.get("file_client", "") == "local":
                 self.functions = salt.loader.minion_mods(
-                    opts, utils=utils, file_client=self.client
+                    opts,
+                    utils=utils,
+                    file_client=salt.fileclient.ContextlessFileClient(self.fileclient),
                 )
             else:
                 self.functions = salt.loader.minion_mods(
-                    self.opts, utils=utils, file_client=self.client
+                    self.opts,
+                    utils=utils,
+                    file_client=salt.fileclient.ContextlessFileClient(self.fileclient),
                 )
         else:
             self.functions = functions
@@ -1370,6 +1375,11 @@ def destroy(self):
                 self.client.destroy()
             except AttributeError:
                 pass
+        if self.fileclient:
+            try:
+                self.fileclient.destroy()
+            except AttributeError:
+                pass
 
     # pylint: disable=W1701
     def __del__(self):

tests/pytests/integration/pillar/test_fileclient.py

@@ -0,0 +1,24 @@
+def test_pillar_using_cp_module(salt_master, salt_minion, salt_cli, tmp_path):
+    pillar_top = """
+    base:
+      "*":
+        - my_pillar
+    """
+    my_pillar = """
+    {{% set file_content = salt.cp.get_file_str("{}") %}}
+    """.format(
+        str(tmp_path / "myfile.txt")
+    )
+    my_file = """
+    foobar
+    """
+    (tmp_path / "myfile.txt").write_text(my_file)
+    with salt_master.pillar_tree.base.temp_file("top.sls", pillar_top):
+        with salt_master.pillar_tree.base.temp_file("my_pillar.sls", my_pillar):
+            with salt_master.pillar_tree.base.temp_file("my_pillar.sls", my_pillar):
+                ret = salt_cli.run("state.apply", minion_tgt=salt_minion.id)
+                assert ret.returncode == 1
+                assert (
+                    ret.json["no_|-states_|-states_|-None"]["comment"]
+                    == "No states found for this minion"
+                )

tests/pytests/unit/pillar/test_pillar.py

@@ -65,6 +65,8 @@ def test_dynamic_pillarenv():
         },
         "file_roots": {"base": ["/srv/salt/base"], "__env__": ["/srv/salt/__env__"]},
         "extension_modules": "",
+        "fileserver_backend": "roots",
+        "cachedir": "",
     }
     pillar = salt.pillar.Pillar(opts, {}, "mocked-minion", "base", pillarenv="dev")
     assert pillar.opts["pillar_roots"] == {
@@ -87,6 +89,8 @@ def test_ignored_dynamic_pillarenv():
         },
         "file_roots": {"base": ["/srv/salt/base"], "dev": ["/svr/salt/dev"]},
         "extension_modules": "",
+        "fileserver_backend": "roots",
+        "cachedir": "",
     }
     pillar = salt.pillar.Pillar(opts, {}, "mocked-minion", "base", pillarenv="base")
     assert pillar.opts["pillar_roots"] == {"base": ["/srv/pillar/base"]}