Merge pull request saltstack#36372 from rallytime/merge-carbon

[carbon] Merge forward from 2016.3 to carbon

CONDUCT.md

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

doc/topics/releases/2016.3.0.rst

@@ -37,6 +37,8 @@ Backwards-incompatible Changes
   fileserver under ``salt://_runners``, ``salt://_output``, etc. and sync them
   using the functions in the new :mod:`saltutil runner
   <salt.runners.saltutil>`.
+- The :py:func:`pkg.check_db <salt.modules.yumpkg.check_db>` function has been
+  removed for yum/dnf.
 
 
 Core Changes

salt/modules/aptpkg.py

@@ -404,9 +404,9 @@ def refresh_db(cache_valid_time=0):
             # Strip filesize from end of line
             ident = re.sub(r' \[.+B\]$', '', ident)
             ret[ident] = True
-        elif cols[0] == 'Ign':
+        elif 'Ign' in cols[0]:
             ret[ident] = False
-        elif cols[0] == 'Hit':
+        elif 'Hit' in cols[0]:
             ret[ident] = None
     return ret
 

salt/modules/daemontools.py

@@ -31,6 +31,8 @@
 
 log = logging.getLogger(__name__)
 
+__virtualname__ = 'service'
+
 VALID_SERVICE_DIRS = [
     '/service',
     '/var/service',
@@ -46,7 +48,7 @@
 def __virtual__():
     # Ensure that daemontools is installed properly.
     BINS = frozenset(('svc', 'supervise', 'svok'))
-    return all(salt.utils.which(b) for b in BINS)
+    return __virtualname__ if all(salt.utils.which(b) for b in BINS) else False
 
 
 def _service_path(name):

salt/modules/glance.py

@@ -162,7 +162,6 @@ def get(key, default=None):
         log.debug('Calling keystoneclient.v2_0.client.Client(' +
             '{0}, **{1})'.format(ks_endpoint, kwargs))
         keystone = kstone.Client(**kwargs)
-        log.debug(help(keystone.get_token))
         kwargs['token'] = keystone.get_token(keystone.session)
         # This doesn't realy prevent the password to show up
         # in the minion log as keystoneclient.session is

salt/modules/postgres.py

@@ -2900,22 +2900,22 @@ def privileges_grant(name,
     _grants = ','.join(_privs)
 
     if object_type in ['table', 'sequence']:
-        on_part = '{0}.{1}'.format(prepend, object_name)
+        on_part = '{0}."{1}"'.format(prepend, object_name)
     else:
-        on_part = object_name
+        on_part = '"{0}"'.format(object_name)
 
     if grant_option:
         if object_type == 'group':
-            query = 'GRANT {0} TO {1} WITH ADMIN OPTION'.format(
+            query = 'GRANT {0} TO "{1}" WITH ADMIN OPTION'.format(
                 object_name, name)
         else:
-            query = 'GRANT {0} ON {1} {2} TO {3} WITH GRANT OPTION'.format(
+            query = 'GRANT {0} ON {1} {2} TO "{3}" WITH GRANT OPTION'.format(
                 _grants, object_type.upper(), on_part, name)
     else:
         if object_type == 'group':
-            query = 'GRANT {0} TO {1}'.format(object_name, name)
+            query = 'GRANT {0} TO "{1}"'.format(object_name, name)
         else:
-            query = 'GRANT {0} ON {1} {2} TO {3}'.format(
+            query = 'GRANT {0} ON {1} {2} TO "{3}"'.format(
                 _grants, object_type.upper(), on_part, name)
 
     ret = _psql_prepare_and_run(['-c', query],

salt/states/infoblox.py

@@ -138,9 +138,9 @@ def present(name,
                                                  value,
                                                  record_type,
                                                  dns_view,
-                                                 infoblox_server=None,
-                                                 infoblox_user=None,
-                                                 infoblox_password=None,
+                                                 infoblox_server=infoblox_server,
+                                                 infoblox_user=infoblox_user,
+                                                 infoblox_password=infoblox_password,
                                                  infoblox_api_version='v1.4.2',
                                                  sslVerify=sslVerify)
         if retval:

salt/states/postgres_extension.py

@@ -51,13 +51,13 @@ def present(name,
         The name of the extension to manage
 
     if_not_exists
-        Add a if_not_exists switch to the ddl statement
+        Add an `IF NOT EXISTS` parameter to the DDL statement
 
     schema
         Schema to install the extension into
 
     ext_version
-        version to install
+        Version to install
 
     from_version
         Old extension version if already installed
@@ -69,10 +69,10 @@ def present(name,
         Database to act on
 
     db_user
-        database username if different from config or default
+        Database username if different from config or default
 
     db_password
-        user password if any password for a specified user
+        User password if any password for a specified user
 
     db_host
         Database host if different from config or default
@@ -87,10 +87,10 @@ def present(name,
     db_args = {
         'maintenance_db': maintenance_db,
         'runas': user,
-        'host': db_host,
         'user': db_user,
-        'port': db_port,
         'password': db_password,
+        'host': db_host,
+        'port': db_port,
     }
     # check if extension exists
     mode = 'create'
@@ -134,11 +134,11 @@ def present(name,
         else:
             suffix = 'ed'
         ret['comment'] = 'The extension {0} has been {1}{2}'.format(name, mode, suffix)
+        ret['changes'][name] = '{0}{1}'.format(mode.capitalize(), suffix)
     elif cret is not None:
         ret['comment'] = 'Failed to {1} extension {0}'.format(name, mode)
         ret['result'] = False
-    else:
-        ret['result'] = True
+
     return ret
 
 

salt/utils/gitfs.py

@@ -965,6 +965,9 @@ def find_file(self, path, tgt_env):
                     path = salt.utils.path_join(os.path.dirname(path), link_tgt)
                 else:
                     blob = file_blob
+                    if isinstance(blob, git.Tree):
+                        # Path is a directory, not a file.
+                        blob = None
                     break
             except KeyError:
                 # File not found or repo_path points to a directory
@@ -1509,6 +1512,9 @@ def find_file(self, path, tgt_env):
                     path = salt.utils.path_join(os.path.dirname(path), link_tgt)
                 else:
                     blob = self.repo[entry.oid]
+                    if isinstance(blob, pygit2.Tree):
+                        # Path is a directory, not a file.
+                        blob = None
                     break
             except KeyError:
                 blob = None
@@ -1884,6 +1890,9 @@ def find_file(self, path, tgt_env):
                     path = salt.utils.path_join(os.path.dirname(path), link_tgt)
                 else:
                     blob = self.repo.get_object(oid)
+                    if isinstance(blob, dulwich.objects.Tree):
+                        # Path is a directory, not a file.
+                        blob = None
                     break
             except KeyError:
                 blob = None

tests/unit/modules/disk_test.py

@@ -7,7 +7,7 @@
 from __future__ import absolute_import
 
 # Import Salt Testing libs
-from salttesting import TestCase, skipIf
+from salttesting import skipIf, TestCase
 from salttesting.helpers import ensure_in_syspath
 from salttesting.mock import MagicMock, patch
 ensure_in_syspath('../../')
@@ -16,8 +16,6 @@
 from salt.modules import disk
 import salt.utils
 
-#usage_size = {'filesystem': None,'1K-blocks':10000,'used':10000,'available':10000,'capacity':10000}
-
 STUB_DISK_USAGE = {
                    '/': {'filesystem': None, '1K-blocks': 10000, 'used': 10000, 'available': 10000, 'capacity': 10000},
                    '/dev': {'filesystem': None, '1K-blocks': 10000, 'used': 10000, 'available': 10000, 'capacity': 10000},
@@ -154,6 +152,17 @@ def test_fstype(self):
         with patch.dict(disk.__salt__, {'cmd.run': mock}):
             self.assertEqual(disk.fstype(device), fs_type)
 
+    @skipIf(not salt.utils.which('resize2fs'), 'resize2fs not found')
+    def test_resize2fs(self):
+        '''
+        unit tests for disk.resize2fs
+        '''
+        device = '/dev/sdX1'
+        mock = MagicMock()
+        with patch.dict(disk.__salt__, {'cmd.run_all': mock}):
+            disk.resize2fs(device)
+            mock.assert_called_once_with('resize2fs {0}'.format(device), python_shell=False)
+
 
 if __name__ == '__main__':
     from integration import run_tests

tests/unit/modules/postgres_test.py

@@ -1264,7 +1264,7 @@ def test_privileges_grant_table(self):
                    password='testpassword'
                 )
 
-                query = 'GRANT ALL ON TABLE public.awl TO baruwa WITH GRANT OPTION'
+                query = 'GRANT ALL ON TABLE public."awl" TO "baruwa" WITH GRANT OPTION'
 
                 postgres._run_psql.assert_called_once_with(
                     ['/usr/bin/pgsql', '--no-align', '--no-readline',
@@ -1291,7 +1291,7 @@ def test_privileges_grant_table(self):
                    password='testpassword'
                 )
 
-                query = 'GRANT ALL ON TABLE public.awl TO baruwa'
+                query = 'GRANT ALL ON TABLE public."awl" TO "baruwa"'
 
                 postgres._run_psql.assert_called_once_with(
                     ['/usr/bin/pgsql', '--no-align', '--no-readline',
@@ -1322,7 +1322,7 @@ def test_privileges_grant_group(self):
                    password='testpassword'
                 )
 
-                query = 'GRANT admins TO baruwa WITH ADMIN OPTION'
+                query = 'GRANT admins TO "baruwa" WITH ADMIN OPTION'
 
                 postgres._run_psql.assert_called_once_with(
                     ['/usr/bin/pgsql', '--no-align', '--no-readline',
@@ -1348,7 +1348,7 @@ def test_privileges_grant_group(self):
                    password='testpassword'
                 )
 
-                query = 'GRANT admins TO baruwa'
+                query = 'GRANT admins TO "baruwa"'
 
                 postgres._run_psql.assert_called_once_with(
                     ['/usr/bin/pgsql', '--no-align', '--no-readline',

tests/unit/states/postgres_test.py

@@ -370,7 +370,7 @@ def test_present(self):
         self.assertEqual(
             ret,
             {'comment': 'The extension foo has been installed',
-             'changes': {}, 'name': 'foo', 'result': True}
+             'changes': {'foo': 'Installed'}, 'name': 'foo', 'result': True}
         )
         ret = postgres_extension.present('foo')
         self.assertEqual(
@@ -382,7 +382,7 @@ def test_present(self):
         self.assertEqual(
             ret,
             {'comment': 'The extension foo has been upgraded',
-             'changes': {}, 'name': 'foo', 'result': True}
+             'changes': {'foo': 'Upgraded'}, 'name': 'foo', 'result': True}
         )
 
     @patch.dict(OPTS, {'test': True})

tests/unit/utils/schema_test.py

@@ -11,6 +11,8 @@
 
 from distutils.version import LooseVersion
 
+from distutils.version import LooseVersion
+
 # Import Salt Testing Libs
 from salttesting import TestCase, skipIf
 from salttesting.helpers import ensure_in_syspath