mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
fc7d0a9296
* fixes saltstack/salt#62372 unable to use random shuffle and sample functions as Jinja filters * move random_shuffle and random_sample logic to utils * static seed in tests seems to have shifted * static seed in tests require hash module * Change Tiamat to onedir in release notes * Reinstate known issues * Update release notes with onedir package support policy * need to check the version of Netmiko python library and then import the exceptions from different locations depending on the result. * Adding changelog. * swap out if...else for double try...except. * Remove extra fix we don't need anymore * [Docs] include onedir system python note * Update all platforms to use pycparser 2.21 or greater for Py 3.9 or higher, fixes fips fault with openssl v3.x * Remove the PyObjC dependency Signed-off-by: Pedro Algarvio <palgarvio@vmware.com> * Add "<tiamat> python" subcommand to allow execution or arbitrary scripts via bundled Python runtime * Document usage of bundled Python runtime for Client API * Use explicit locals for custom script execution, handle exception in similar fashion as Python * Remove old __file__ replacement * Apply suggestions from code review Co-authored-by: Pedro Algarvio <pedro@algarvio.me> Co-authored-by: nicholasmhughes <nicholasmhughes@gmail.com> Co-authored-by: Alyssa Rock <alyssa.rock@gmail.com> Co-authored-by: Gareth J. Greenaway <gareth@saltstack.com> Co-authored-by: Twangboy <leesh@vmware.com> Co-authored-by: David Murphy < dmurphy@saltstack.com> Co-authored-by: Pedro Algarvio <palgarvio@vmware.com> Co-authored-by: Lukas Raska <lukas@raska.me> Co-authored-by: Pedro Algarvio <pedro@algarvio.me>
117 lines
2.9 KiB
Python
Executable file
117 lines
2.9 KiB
Python
Executable file
#!/usr/bin/env python3
|
|
# see issue: https://gitlab.com/saltstack/open/salt-pkg/-/issues/19
|
|
import contextlib
|
|
import multiprocessing
|
|
import os
|
|
import pathlib
|
|
import sys
|
|
|
|
import _pyio
|
|
import tiamatpip.cli
|
|
import tiamatpip.configure
|
|
import tiamatpip.utils
|
|
|
|
import salt.scripts
|
|
import salt.utils.platform
|
|
|
|
AVAIL = (
|
|
"minion",
|
|
"master",
|
|
"call",
|
|
"api",
|
|
"cloud",
|
|
"cp",
|
|
"extend",
|
|
"key",
|
|
"proxy",
|
|
"pip",
|
|
"run",
|
|
"shell",
|
|
"spm",
|
|
"ssh",
|
|
"support",
|
|
"syndic",
|
|
"python",
|
|
)
|
|
|
|
|
|
if "TIAMAT_PIP_PYPATH" in os.environ:
|
|
PIP_PATH = pathlib.Path(os.environ["TIAMAT_PIP_PYPATH"]).resolve()
|
|
elif not sys.platform.startswith("win"):
|
|
PIP_PATH = pathlib.Path(f"{os.sep}opt", "saltstack", "salt", "pypath")
|
|
else:
|
|
PIP_PATH = pathlib.Path(os.getenv("LocalAppData"), "salt", "pypath")
|
|
with contextlib.suppress(PermissionError):
|
|
PIP_PATH.mkdir(mode=0o755, parents=True, exist_ok=True)
|
|
tiamatpip.configure.set_user_base_path(PIP_PATH)
|
|
|
|
|
|
def py_shell():
|
|
if not sys.platform.startswith("win"):
|
|
# optional, will allow Up/Down/History in the console
|
|
import readline
|
|
import code
|
|
|
|
variables = globals().copy()
|
|
variables.update(locals())
|
|
shell = code.InteractiveConsole(variables)
|
|
shell.interact()
|
|
|
|
|
|
def python_runtime():
|
|
# extract the absolute script path to alter sys.path and specific dunder variables
|
|
script = pathlib.Path(sys.argv[2]).expanduser().resolve()
|
|
sys.path.insert(0, str(script.parent))
|
|
|
|
# update passed args so they don't start with "<binary> python"
|
|
sys.argv[:] = sys.argv[2:]
|
|
exec_locals = {"__name__": "__main__", "__file__": str(script), "__doc__": None}
|
|
with open(script, encoding="utf-8") as rfh:
|
|
try:
|
|
exec(rfh.read(), exec_locals)
|
|
except Exception:
|
|
traceback.print_exc()
|
|
sys.exit(1)
|
|
|
|
|
|
def redirect(argv):
|
|
"""
|
|
Change the args and redirect to another salt script
|
|
"""
|
|
if len(argv) < 2:
|
|
msg = "Must pass in a salt command, available commands are:"
|
|
for cmd in AVAIL:
|
|
msg += f"\n{cmd}"
|
|
print(msg, file=sys.stderr, flush=True)
|
|
sys.exit(1)
|
|
cmd = sys.argv[1]
|
|
if cmd == "shell":
|
|
py_shell()
|
|
return
|
|
if cmd == "python":
|
|
if len(argv) < 3:
|
|
msg = "Must pass script location to this command"
|
|
print(msg, file=sys.stderr, flush=True)
|
|
sys.exit(1)
|
|
|
|
python_runtime()
|
|
return
|
|
if tiamatpip.cli.should_redirect_argv(argv):
|
|
tiamatpip.cli.process_pip_argv(argv)
|
|
return
|
|
if cmd not in AVAIL:
|
|
# Fall back to the salt command
|
|
args = ["salt"]
|
|
s_fun = salt.scripts.salt_main
|
|
else:
|
|
args = [f"salt-{cmd}"]
|
|
sys.argv.pop(1)
|
|
s_fun = getattr(salt.scripts, f"salt_{cmd}")
|
|
args.extend(argv[1:])
|
|
with tiamatpip.utils.patched_sys_argv(args):
|
|
s_fun()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
multiprocessing.freeze_support()
|
|
redirect(sys.argv)
|