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

Bring #52191 into 2019.2 branch

Browse source
This commit is contained in:
twangboy 2019-04-12 14:47:22 -06:00
parent 6eb2bce9be
commit b394ad566d
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 79 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

169
salt/modules/chocolatey.py
View file

@ -9,9 +9,10 @@ from __future__ import absolute_import, print_function, unicode_literals
# Import python libs
import logging
import os.path
import os
import re
import tempfile
from requests.structures import CaseInsensitiveDict
# Import salt libs
import salt.utils.data
@ -48,65 +49,72 @@ def __virtual__():
return 'chocolatey'
def _clear_context(context):
def _clear_context():
'''
Clear variables stored in __context__. Run this function when a new version
of chocolatey is installed.
'''
for var in (x for x in __context__ if x.startswith('chocolatey.')):
context.pop(var)
__context__.pop(var)
def _yes(context):
def _yes():
'''
Returns ['--yes'] if on v0.9.9.0 or later, otherwise returns an empty list
'''
if 'chocolatey._yes' in __context__:
return context['chocolatey._yes']
return __context__['chocolatey._yes']
if _LooseVersion(chocolatey_version()) >= _LooseVersion('0.9.9'):
answer = ['--yes']
else:
answer = []
context['chocolatey._yes'] = answer
return answer
__context__['chocolatey._yes'] = answer
return __context__['chocolatey._yes']
def _no_progress(context):
def _no_progress():
'''
Returns ['--no-progress'] if on v0.10.4 or later, otherwise returns an
empty list
'''
if 'chocolatey._no_progress' in __context__:
return context['chocolatey._no_progress']
return __context__['chocolatey._no_progress']
if _LooseVersion(chocolatey_version()) >= _LooseVersion('0.10.4'):
answer = ['--no-progress']
else:
log.warning('--no-progress unsupported in choco < 0.10.4')
answer = []
context['chocolatey._no_progress'] = answer
return answer
__context__['chocolatey._no_progress'] = answer
return __context__['chocolatey._no_progress']
def _find_chocolatey(context, salt):
def _find_chocolatey():
'''
Returns the full path to chocolatey.bat on the host.
'''
if 'chocolatey._path' in context:
return context['chocolatey._path']
choc_defaults = ['C:\\Chocolatey\\bin\\chocolatey.bat',
'C:\\ProgramData\\Chocolatey\\bin\\chocolatey.exe', ]
# Check context
if 'chocolatey._path' in __context__:
return __context__['chocolatey._path']
choc_path = salt['cmd.which']('chocolatey.exe')
if not choc_path:
for choc_dir in choc_defaults:
if salt['cmd.has_exec'](choc_dir):
choc_path = choc_dir
if not choc_path:
err = ('Chocolatey not installed. Use chocolatey.bootstrap to '
'install the Chocolatey package manager.')
raise CommandExecutionError(err)
context['chocolatey._path'] = choc_path
return choc_path
# Check the path
choc_path = __salt__['cmd.which']('chocolatey.exe')
if choc_path:
__context__['chocolatey._path'] = choc_path
return __context__['chocolatey._path']
# Check in common locations
choc_defaults = [
os.path.join(os.environ.get('ProgramData'), 'Chocolatey', 'bin', 'chocolatey.exe'),
os.path.join(os.environ.get('SystemDrive'), 'Chocolatey', 'bin', 'chocolatey.bat')]
for choc_exe in choc_defaults:
if os.path.isfile(choc_exe):
__context__['chocolatey._path'] = choc_exe
return __context__['chocolatey._path']
# Not installed, raise an error
err = ('Chocolatey not installed. Use chocolatey.bootstrap to '
'install the Chocolatey package manager.')
raise CommandExecutionError(err)
def chocolatey_version():
@ -122,7 +130,7 @@ def chocolatey_version():
if 'chocolatey._version' in __context__:
return __context__['chocolatey._version']
cmd = [_find_chocolatey(__context__, __salt__)]
cmd = [_find_chocolatey()]
cmd.append('-v')
out = __salt__['cmd.run'](cmd, python_shell=False)
__context__['chocolatey._version'] = out
@ -155,7 +163,7 @@ def bootstrap(force=False):
'''
# Check if Chocolatey is already present in the path
try:
choc_path = _find_chocolatey(__context__, __salt__)
choc_path = _find_chocolatey()
except CommandExecutionError:
choc_path = None
if choc_path and not force:
@ -219,9 +227,8 @@ def bootstrap(force=False):
result = __salt__['cmd.run_all'](cmd, python_shell=True)
if result['retcode'] != 0:
raise CommandExecutionError(
'Bootstrapping Chocolatey failed: {0}'.format(result['stderr'])
)
err = 'Bootstrapping Chocolatey failed: {0}'.format(result['stderr'])
raise CommandExecutionError(err)
return result['stdout']
@ -271,7 +278,7 @@ def list_(narrow=None,
salt '*' chocolatey.list <narrow>
salt '*' chocolatey.list <narrow> all_versions=True
'''
choc_path = _find_chocolatey(__context__, __salt__)
choc_path = _find_chocolatey()
cmd = [choc_path, 'list']
if narrow:
cmd.append(narrow)
@ -292,11 +299,10 @@ def list_(narrow=None,
result = __salt__['cmd.run_all'](cmd, python_shell=False)
if result['retcode'] != 0:
raise CommandExecutionError(
'Running chocolatey failed: {0}'.format(result['stdout'])
)
err = 'Running chocolatey failed: {0}'.format(result['stdout'])
raise CommandExecutionError(err)
ret = {}
ret = CaseInsensitiveDict({})
pkg_re = re.compile(r'(\S+)\|(\S+)')
for line in result['stdout'].split('\n'):
if line.startswith("No packages"):
@ -325,14 +331,13 @@ def list_webpi():
salt '*' chocolatey.list_webpi
'''
choc_path = _find_chocolatey(__context__, __salt__)
choc_path = _find_chocolatey()
cmd = [choc_path, 'list', '--source', 'webpi']
result = __salt__['cmd.run_all'](cmd, python_shell=False)
if result['retcode'] != 0:
raise CommandExecutionError(
'Running chocolatey failed: {0}'.format(result['stdout'])
)
err = 'Running chocolatey failed: {0}'.format(result['stdout'])
raise CommandExecutionError(err)
return result['stdout']
@ -351,14 +356,13 @@ def list_windowsfeatures():
salt '*' chocolatey.list_windowsfeatures
'''
choc_path = _find_chocolatey(__context__, __salt__)
choc_path = _find_chocolatey()
cmd = [choc_path, 'list', '--source', 'windowsfeatures']
result = __salt__['cmd.run_all'](cmd, python_shell=False)
if result['retcode'] != 0:
raise CommandExecutionError(
'Running chocolatey failed: {0}'.format(result['stdout'])
)
err = 'Running chocolatey failed: {0}'.format(result['stdout'])
raise CommandExecutionError(err)
return result['stdout']
@ -449,7 +453,7 @@ def install(name,
raise SaltInvocationError(
'Cannot use \'force\' in conjunction with \'allow_multiple\'')
choc_path = _find_chocolatey(__context__, __salt__)
choc_path = _find_chocolatey()
# chocolatey helpfully only supports a single package argument
# CORRECTION: it also supports multiple package names separated by spaces
# but any additional arguments apply to ALL packages specified
@ -476,18 +480,17 @@ def install(name,
cmd.extend(['--execution-timeout', execution_timeout])
# Salt doesn't need to see the progress
cmd.extend(_no_progress(__context__))
cmd.extend(_yes(__context__))
cmd.extend(_no_progress())
cmd.extend(_yes())
result = __salt__['cmd.run_all'](cmd, python_shell=False)
if result['retcode'] not in [0, 1641, 3010]:
raise CommandExecutionError(
'Running chocolatey failed: {0}'.format(result['stdout'])
)
err = 'Running chocolatey failed: {0}'.format(result['stdout'])
raise CommandExecutionError(err)
if name == 'chocolatey':
_clear_context(__context__)
_clear_context()
return result['stdout']
@ -587,25 +590,23 @@ def install_missing(name, version=None, source=None):
salt '*' chocolatey.install_missing <package name>
salt '*' chocolatey.install_missing <package name> version=<package version>
'''
choc_path = _find_chocolatey(__context__, __salt__)
if _LooseVersion(chocolatey_version()) >= _LooseVersion('0.9.8.24'):
log.warning('installmissing is deprecated, using install')
return install(name, version=version)
# chocolatey helpfully only supports a single package argument
cmd = [choc_path, 'installmissing', name]
cmd = [_find_chocolatey(), 'installmissing', name]
if version:
cmd.extend(['--version', version])
if source:
cmd.extend(['--source', source])
# Shouldn't need this as this code should never run on v0.9.9 and newer
cmd.extend(_yes(__context__))
cmd.extend(_yes())
result = __salt__['cmd.run_all'](cmd, python_shell=False)
if result['retcode'] != 0:
raise CommandExecutionError(
'Running chocolatey failed: {0}'.format(result['stdout'])
)
err = 'Running chocolatey failed: {0}'.format(result['stdout'])
raise CommandExecutionError(err)
return result['stdout']
@ -723,22 +724,20 @@ def uninstall(name, version=None, uninstall_args=None, override_args=False):
salt '*' chocolatey.uninstall <package name> version=<package version>
salt '*' chocolatey.uninstall <package name> version=<package version> uninstall_args=<args> override_args=True
'''
choc_path = _find_chocolatey(__context__, __salt__)
# chocolatey helpfully only supports a single package argument
cmd = [choc_path, 'uninstall', name]
cmd = [_find_chocolatey(), 'uninstall', name]
if version:
cmd.extend(['--version', version])
if uninstall_args:
cmd.extend(['--uninstallarguments', uninstall_args])
if override_args:
cmd.extend(['--overridearguments'])
cmd.extend(_yes(__context__))
cmd.extend(_yes())
result = __salt__['cmd.run_all'](cmd, python_shell=False)
if result['retcode'] not in [0, 1605, 1614, 1641]:
raise CommandExecutionError(
'Running chocolatey failed: {0}'.format(result['stdout'])
)
err = 'Running chocolatey failed: {0}'.format(result['stdout'])
raise CommandExecutionError(err)
return result['stdout']
@ -805,8 +804,7 @@ def upgrade(name,
salt "*" chocolatey.upgrade <package name> pre_versions=True
'''
# chocolatey helpfully only supports a single package argument
choc_path = _find_chocolatey(__context__, __salt__)
cmd = [choc_path, 'upgrade', name]
cmd = [_find_chocolatey(), 'upgrade', name]
if version:
cmd.extend(['--version', version])
if source:
@ -825,15 +823,14 @@ def upgrade(name,
cmd.extend(['--packageparameters', package_args])
# Salt doesn't need to see the progress
cmd.extend(_no_progress(__context__))
cmd.extend(_yes(__context__))
cmd.extend(_no_progress())
cmd.extend(_yes())
result = __salt__['cmd.run_all'](cmd, python_shell=False)
if result['retcode'] not in [0, 1641, 3010]:
raise CommandExecutionError(
'Running chocolatey failed: {0}'.format(result['stdout'])
)
err = 'Running chocolatey failed: {0}'.format(result['stdout'])
raise CommandExecutionError(err)
return result['stdout']
@ -861,27 +858,25 @@ def update(name, source=None, pre_versions=False):
salt "*" chocolatey.update <package name> pre_versions=True
'''
# chocolatey helpfully only supports a single package argument
choc_path = _find_chocolatey(__context__, __salt__)
if _LooseVersion(chocolatey_version()) >= _LooseVersion('0.9.8.24'):
log.warning('update is deprecated, using upgrade')
return upgrade(name, source=source, pre_versions=pre_versions)
cmd = [choc_path, 'update', name]
cmd = [_find_chocolatey(), 'update', name]
if source:
cmd.extend(['--source', source])
if salt.utils.data.is_true(pre_versions):
cmd.append('--prerelease')
# Salt doesn't need to see the progress
cmd.extend(_no_progress(__context__))
cmd.extend(_yes(__context__))
cmd.extend(_no_progress())
cmd.extend(_yes())
result = __salt__['cmd.run_all'](cmd, python_shell=False)
if result['retcode'] not in [0, 1641, 3010]:
raise CommandExecutionError(
'Running chocolatey failed: {0}'.format(result['stdout'])
)
err = 'Running chocolatey failed: {0}'.format(result['stdout'])
raise CommandExecutionError(err)
return result['stdout']
@ -919,7 +914,6 @@ def version(name, check_remote=False, source=None, pre_versions=False):
salt "*" chocolatey.version <package name> check_remote=True
'''
installed = list_(narrow=name, local_only=True)
installed = {k.lower(): v for k, v in installed.items()}
packages = {}
lower_name = name.lower()
@ -929,7 +923,6 @@ def version(name, check_remote=False, source=None, pre_versions=False):
if check_remote:
available = list_(narrow=name, pre_versions=pre_versions, source=source)
available = {k.lower(): v for k, v in available.items()}
for pkg in packages:
packages[pkg] = {'installed': installed[pkg],
@ -964,8 +957,7 @@ def add_source(name, source_location, username=None, password=None):
salt '*' chocolatey.add_source <source name> <source_location> user=<user> password=<password>
'''
choc_path = _find_chocolatey(__context__, __salt__)
cmd = [choc_path, 'sources', 'add', '--name', name, '--source', source_location]
cmd = [_find_chocolatey(), 'sources', 'add', '--name', name, '--source', source_location]
if username:
cmd.extend(['--user', username])
if password:
@ -973,9 +965,8 @@ def add_source(name, source_location, username=None, password=None):
result = __salt__['cmd.run_all'](cmd, python_shell=False)
if result['retcode'] != 0:
raise CommandExecutionError(
'Running chocolatey failed: {0}'.format(result['stdout'])
)
err = 'Running chocolatey failed: {0}'.format(result['stdout'])
raise CommandExecutionError(err)
return result['stdout']
@ -991,14 +982,12 @@ def _change_source_state(name, state):
State in which you want the chocolatey repository.
'''
choc_path = _find_chocolatey(__context__, __salt__)
cmd = [choc_path, 'source', state, '--name', name]
cmd = [_find_chocolatey(), 'source', state, '--name', name]
result = __salt__['cmd.run_all'](cmd, python_shell=False)
if result['retcode'] != 0:
raise CommandExecutionError(
'Running chocolatey failed: {0}'.format(result['stdout'])
)
err = 'Running chocolatey failed: {0}'.format(result['stdout'])
raise CommandExecutionError(err)
return result['stdout']