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

better os detection for relenv tarball

Browse source
This commit is contained in:
Tyler Levy Conde 2024-09-10 12:28:35 -06:00 • committed by Daniel Wozniak
parent 5263353262
commit b997d8d733
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
salt/client/ssh/__init__.py
View file

@ -1144,7 +1144,7 @@ class Single:
def detect_os_arch(self):
"""
Detect the OS and architecture of the target machine.
Detect the OS and architecture of the target machine for the purpose of identifying the right relenv tarball.
Returns a tuple of (kernel, architecture) or raises an error if detection fails.
"""
os_arch_cmd = 'echo "$OSTYPE|$MACHTYPE|$env:PROCESSOR_ARCHITECTURE"'
@ -1164,10 +1164,10 @@ class Single:
raise ValueError("Failed to parse OS and architecture data")
# Set architecture
if "64" in winarch or "64" in arch:
os_arch = "amd64"
if "arm" in arch:
os_arch = "arm64"
else:
os_arch = "i386"
os_arch = "x86_64"
# Set kernel based on OS type
if "linux" in kernel:
@ -1176,8 +1176,12 @@ class Single:
kernel = "macos"
elif "processor_architecture" not in winarch:
kernel = "windows"
if "64" in arch:
os_arch = "amd64"
else:
os_arch = "x86"
else:
log.error(f"Could not determine OS from kernel: {kernel}, arch: {arch}, winarch: {winarch}")
raise ValueError(f"Could not determine OS from kernel: {kernel}, arch: {arch}, winarch: {winarch}")
log.info(f'Detected kernel "{kernel}" and architecture "{os_arch}" on target')
@ -1203,8 +1207,14 @@ class Single:
log.error(f"Failed to retrieve tarball listing: {e}")
raise ValueError("Unable to fetch tarball list from repository")
# Determine the correct file extension based on the OS
if kernel == "windows":
file_extension = "zip"
else:
file_extension = "tar.xz"
# Search for tarball filenames that match the kernel and arch
pattern = re.compile(rf'href="(salt-.*-onedir-{kernel}-{arch}\.tar\.xz)"')
pattern = re.compile(rf'href="(salt-.*-onedir-{kernel}-{arch}\.{file_extension})"')
# Find all matches in the HTML content
matches = pattern.findall(response.text)