File 0057-Allows-using-downloadonly-in-a-pkg.install... of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File 0057-Allows-using-downloadonly-in-a-pkg.installed-state.patch of Package salt (Revision 9988236fb5b8cf6933790d6a8dfae4b4)

Currently displaying revision 9988236fb5b8cf6933790d6a8dfae4b4 , Show latest

From 37a0518dedbb2cce5f943ef703dc150463d9a687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
 <psuarezhernandez@suse.com>
Date: Fri, 17 Mar 2017 15:45:28 +0000
Subject: [PATCH 57/57] Allows using 'downloadonly' in a 'pkg.installed' state

Adds a new 'pkg.downloaded' state function

Adds support for patches in pkg.installed state

Adding support for installing patches in yum/dnf execution module

Adding support for installing patches in Zypper module

Adding documentation notes

Pylint fixes

Handling 'downloadonly' and 'patches' as kwargs in pkg.installed

Fixes documentation
---
 salt/modules/pkg_resource.py | 12 +++++--
 salt/modules/yumpkg.py       |  7 ++--
 salt/modules/zypper.py       |  7 +++-
 salt/states/pkg.py           | 77 ++++++++++++++++++++++++++++++++++++++------
 4 files changed, 89 insertions(+), 14 deletions(-)

diff --git a/salt/modules/pkg_resource.py b/salt/modules/pkg_resource.py
index 3a4452a..fcc621f 100644
--- a/salt/modules/pkg_resource.py
+++ b/salt/modules/pkg_resource.py
@@ -89,6 +89,7 @@ def pack_sources(sources, normalize=True):
 def parse_targets(name=None,
                   pkgs=None,
                   sources=None,
+                  patches=None,
                   saltenv='base',
                   normalize=True,
                   **kwargs):
@@ -116,8 +117,8 @@ def parse_targets(name=None,
     if __grains__['os'] == 'MacOS' and sources:
         log.warning('Parameter "sources" ignored on MacOS hosts.')
 
-    if pkgs and sources:
-        log.error('Only one of "pkgs" and "sources" can be used.')
+    if len([True for x in [pkgs, sources, patches] if x]) > 1:
+        log.error('Only one of "pkgs", "sources" or "patches" can be used.')
         return None, None
 
     elif pkgs:
@@ -127,6 +128,13 @@ def parse_targets(name=None,
         else:
             return pkgs, 'repository'
 
+    elif patches:
+        patches = _repack_pkgs(patches, normalize=normalize)
+        if not patches:
+            return None, None
+        else:
+            return patches, 'repository'
+
     elif sources and __grains__['os'] != 'MacOS':
         sources = pack_sources(sources, normalize=normalize)
         if not sources:
diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py
index a0cdb30..bdef1ce 100644
--- a/salt/modules/yumpkg.py
+++ b/salt/modules/yumpkg.py
@@ -1102,6 +1102,7 @@ def install(name=None,
             downloadonly=False,
             reinstall=False,
             normalize=True,
+            patches=None,
             **kwargs):
     '''
     .. versionchanged:: 2015.8.12,2016.3.3,Carbon
@@ -1240,7 +1241,7 @@ def install(name=None,
 
     try:
         pkg_params, pkg_type = __salt__['pkg_resource.parse_targets'](
-            name, pkgs, sources, normalize=normalize, **kwargs
+            name, pkgs, sources, patches, normalize=normalize, **kwargs
         )
     except MinionError as exc:
         raise CommandExecutionError(exc)
@@ -1394,6 +1395,8 @@ def install(name=None,
             cmd.append('--downloadonly')
 
     if targets:
+        if patches:
+           targets = ["--advisory={0}".format(t) for t in targets]
         cmd = []
         if salt.utils.systemd.has_scope(__context__) \
                 and __salt__['config.get']('systemd.scope', True):
@@ -1402,7 +1405,7 @@ def install(name=None,
         if _yum() == 'dnf':
             cmd.extend(['--best', '--allowerasing'])
         _add_common_args(cmd)
-        cmd.append('install')
+        cmd.append('install' if not patches else 'update')
         cmd.extend(targets)
         __salt__['cmd.run_all'](
             cmd,
diff --git a/salt/modules/zypper.py b/salt/modules/zypper.py
index c914229..c728162 100644
--- a/salt/modules/zypper.py
+++ b/salt/modules/zypper.py
@@ -884,6 +884,7 @@ def install(name=None,
             fromrepo=None,
             pkgs=None,
             sources=None,
+            patches=None,
             downloadonly=None,
             version=None,
             ignore_repo_failure=False,
@@ -978,7 +979,7 @@ def install(name=None,
         refresh_db()
 
     try:
-        pkg_params, pkg_type = __salt__['pkg_resource.parse_targets'](name, pkgs, sources, **kwargs)
+        pkg_params, pkg_type = __salt__['pkg_resource.parse_targets'](name, pkgs, sources, patches, **kwargs)
     except MinionError as exc:
         raise CommandExecutionError(exc)
 
@@ -1027,6 +1028,10 @@ def install(name=None,
         cmd_install.append('--download-only')
     if fromrepo:
         cmd_install.extend(fromrepoopt)
+
+    if patches:
+        targets = ["patch:{0}".format(t) for t in targets]
+
     # Split the targets into batches of 500 packages each, so that
     # the maximal length of the command line is not broken
     systemd_scope = _systemd_scope()
diff --git a/salt/states/pkg.py b/salt/states/pkg.py
index 3b02329..1ee8aec 100644
--- a/salt/states/pkg.py
+++ b/salt/states/pkg.py
@@ -277,6 +277,7 @@ def _find_install_targets(name=None,
                           version=None,
                           pkgs=None,
                           sources=None,
+                          patches=None,
                           skip_suggestions=False,
                           pkg_verify=False,
                           normalize=True,
@@ -286,11 +287,11 @@ def _find_install_targets(name=None,
     Inspect the arguments to pkg.installed and discover what packages need to
     be installed. Return a dict of desired packages
     '''
-    if all((pkgs, sources)):
+    if len([True for x in [pkgs, sources, patches] if x]) > 1:
         return {'name': name,
                 'changes': {},
                 'result': False,
-                'comment': 'Only one of "pkgs" and "sources" is permitted.'}
+                'comment': 'Only one of "pkgs", "sources" or "patches" is permitted.'}
 
     # dict for packages that fail pkg.verify and their altered files
     altered_files = {}
@@ -317,7 +318,7 @@ def _find_install_targets(name=None,
                 'result': False,
                 'comment': exc.strerror}
 
-    if any((pkgs, sources)):
+    if any((pkgs, sources, patches)):
         if pkgs:
             desired = _repack_pkgs(pkgs)
         elif sources:
@@ -325,6 +326,8 @@ def _find_install_targets(name=None,
                 sources,
                 normalize=normalize,
             )
+        elif patches:
+            desired = _repack_pkgs(patches)
 
         if not desired:
             # Badly-formatted SLS
@@ -383,7 +386,7 @@ def _find_install_targets(name=None,
                                    'installed'.format(name)}
 
     version_spec = False
-    if not sources:
+    if not sources and not patches:
         # Check for alternate package names if strict processing is not
         # enforced. Takes extra time. Disable for improved performance
         if not skip_suggestions:
@@ -614,6 +617,7 @@ def installed(
         pkg_verify=False,
         normalize=True,
         ignore_epoch=False,
+        downloadonly=False,
         **kwargs):
     '''
     Ensure that the package is installed, and that it is the correct version
@@ -1024,6 +1028,33 @@ def installed(
             If this parameter is set to True and the package is not already
             installed, the state will fail.
 
+    :param bool downloadonly:
+        Ensures package is only downloaded without actually installing it.
+
+        Example:
+
+        .. code-block:: yaml
+
+            vim-enhanced:
+              pkg.installed:
+                - fromrepo: mycustomrepo
+                - skip_verify: True
+                - refresh: True
+                - downloadonly: True
+
+    :param list patches:
+        A list of patches/erratas to install.
+        CLI commands.
+
+        .. code-block:: yaml
+
+            my-suse-patches:
+              pkg.installed:
+                - patches:
+                  - SUSE-SLE-SERVER-12-SP1-2016-942
+                  - SUSE-SLE-SERVER-12-SP1-2016-1048
+                  - SUSE-SLE-SERVER-12-SP1-2016-1853
+
     :return:
         A dictionary containing the state of the software installation
     :rtype dict:
@@ -1099,6 +1130,8 @@ def installed(
                         'comment': exc.strerror}
 
     kwargs['allow_updates'] = allow_updates
+    patches = kwargs.get('patches', None)
+    downloadonly = kwargs.get('downloadonly', False)
 
     # if windows and a refresh
     # is required, we will have to do a refresh when _find_install_targets
@@ -1204,8 +1237,10 @@ def installed(
             else:
                 summary = ', '.join([_get_desired_pkg(x, targets)
                                      for x in targets])
-            comment.append('The following packages are set to be '
-                           'installed/updated: {0}'.format(summary))
+            comment.append('The following {0} would be {1}: {2}'.format(
+                           'patches' if patches else 'packages',
+                           'downloaded' if downloadonly else 'installed/updated',
+                           summary))
         if to_unpurge:
             comment.append(
                 'The following packages will have their selection status '
@@ -1250,6 +1285,8 @@ def installed(
                                               pkgs=pkgs,
                                               sources=sources,
                                               reinstall=reinstall,
+                                              patches=patches,
+                                              downloadonly=downloadonly,
                                               normalize=normalize,
                                               **kwargs)
         except CommandExecutionError as exc:
@@ -1394,7 +1431,7 @@ def installed(
 
     result = True
 
-    if failed:
+    if failed and not downloadonly and not patches:
         if sources:
             summary = ', '.join(failed)
         else:
@@ -1404,7 +1441,7 @@ def installed(
                           'install/update: {0}'.format(summary))
         result = False
 
-    if failed_hold:
+    if failed_hold and not downloadonly:
         for i in failed_hold:
             comment.append(i['comment'])
         result = False
@@ -1446,7 +1483,7 @@ def installed(
             )
             comment.append(_nested_output(altered_files[modified_pkg]))
 
-    if failed:
+    if failed and not downloadonly:
         # Add a comment for each package in failed with its pkg.verify output
         for failed_pkg in failed:
             if sources:
@@ -1469,6 +1506,28 @@ def installed(
     return ret
 
 
+def downloaded(**kwargs):
+    '''
+    Ensure that the package is downloaded.
+
+    Functionally identical to :mod:`installed <salt.states.pkg.installed>` but
+    forcing `downloadonly=True`.
+
+    CLI Example:
+
+    .. code-block:: yaml
+
+        zsh:
+          pkg.downloaded:
+            - fromrepo: "myrepository"
+    '''
+    # It doesn't make sense here to received 'downloadonly' as kwargs
+    # as we're explicitely using 'downloadonly=True'
+    if 'downloadonly' in kwargs:
+        del kwargs['downloadonly']
+    return installed(downloadonly=True, **kwargs)
+
+
 def latest(
         name,
         refresh=None,
-- 
2.10.1

Places

File 0057-Allows-using-downloadonly-in-a-pkg.installed-state.patch of Package salt (Revision 9988236fb5b8cf6933790d6a8dfae4b4)

Places