salt/tests/unit/config/test_config.py

1315 lines
54 KiB
Python
Raw Normal View History

# -*- coding: utf-8 -*-
'''
:codeauthor: Pedro Algarvio (pedro@algarvio.me)
tests.unit.config_test
~~~~~~~~~~~~~~~~~~~~~~
'''
# Import python libs
from __future__ import absolute_import, print_function, unicode_literals
import logging
import os
import textwrap
# Import Salt Testing libs
from tests.support.helpers import with_tempdir, with_tempfile
2017-04-04 12:05:23 +00:00
from tests.support.mixins import AdaptedConfigurationTestCaseMixin
from tests.support.paths import TMP
from tests.support.unit import skipIf, TestCase
from tests.support.mock import NO_MOCK, NO_MOCK_REASON, Mock, MagicMock, patch
# Import Salt libs
import salt.minion
import salt.utils.files
import salt.utils.network
import salt.utils.platform
import salt.utils.yaml
2018-02-27 15:31:41 +00:00
from salt.ext import six
from salt.syspaths import CONFIG_DIR
2014-07-16 12:41:28 +00:00
from salt import config as sconfig
from salt.exceptions import (
CommandExecutionError,
SaltConfigurationError,
SaltCloudConfigError
)
log = logging.getLogger(__name__)
2014-05-03 02:24:13 +00:00
# mock hostname should be more complex than the systems FQDN
MOCK_HOSTNAME = 'very.long.complex.fqdn.that.is.crazy.extra.long.example.com'
MOCK_ETC_HOSTS = (
'##\n'
'# Host Database\n'
'#\n'
'# localhost is used to configure the loopback interface\n'
'# when the system is booting. Do not change this entry.\n'
'##\n'
'\n' # This empty line MUST STAY HERE, it factors into the tests
2014-05-03 02:24:13 +00:00
'127.0.0.1 localhost ' + MOCK_HOSTNAME + '\n'
'10.0.0.100 ' + MOCK_HOSTNAME + '\n'
'200.200.200.2 other.host.alias.com\n'
'::1 ip6-localhost ip6-loopback\n'
'fe00::0 ip6-localnet\n'
'ff00::0 ip6-mcastprefix\n'
)
2014-05-03 02:24:13 +00:00
MOCK_ETC_HOSTNAME = '{0}\n'.format(MOCK_HOSTNAME)
PATH = 'path/to/some/cloud/conf/file'
DEFAULT = {'default_include': PATH}
2014-06-18 23:47:05 +00:00
2014-02-25 08:27:35 +00:00
def _unhandled_mock_read(filename):
'''
Raise an error because we should not be calling salt.utils.files.fopen()
2014-02-25 08:27:35 +00:00
'''
raise CommandExecutionError('Unhandled mock read for {0}'.format(filename))
def _salt_configuration_error(filename):
'''
Raise an error to indicate error in the Salt configuration file
'''
raise SaltConfigurationError('Configuration error in {0}'.format(filename))
2017-04-04 12:05:23 +00:00
class ConfigTestCase(TestCase, AdaptedConfigurationTestCaseMixin):
2016-08-10 14:12:08 +00:00
@with_tempfile()
def test_sha256_is_default_for_master(self, fpath):
with salt.utils.files.fopen(fpath, 'w') as wfh:
wfh.write(
"root_dir: /\n"
"key_logfile: key\n"
)
config = sconfig.master_config(fpath)
self.assertEqual(config['hash_type'], 'sha256')
@with_tempfile()
def test_sha256_is_default_for_minion(self, fpath):
with salt.utils.files.fopen(fpath, 'w') as wfh:
wfh.write(
"root_dir: /\n"
"key_logfile: key\n"
)
config = sconfig.minion_config(fpath)
self.assertEqual(config['hash_type'], 'sha256')
2016-08-10 14:12:08 +00:00
@with_tempfile()
def test_proper_path_joining(self, fpath):
2017-06-27 23:31:23 +00:00
temp_config = 'root_dir: /\n'\
'key_logfile: key\n'
Use explicit unicode strings + break up salt.utils This PR is part of what will be an ongoing effort to use explicit unicode strings in Salt. Because Python 3 does not suport Python 2's raw unicode string syntax (i.e. `ur'\d+'`), we must use `salt.utils.locales.sdecode()` to ensure that the raw string is unicode. However, because of how `salt/utils/__init__.py` has evolved into the hulking monstrosity it is today, this means importing a large module in places where it is not needed, which could negatively impact performance. For this reason, this PR also breaks out some of the functions from `salt/utils/__init__.py` into new/existing modules under `salt/utils/`. The long term goal will be that the modules within this directory do not depend on importing `salt.utils`. A summary of the changes in this PR is as follows: * Moves the following functions from `salt.utils` to new locations (including a deprecation warning if invoked from `salt.utils`): `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`, `dequote`, `is_hex`, `is_bin_str`, `rand_string`, `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`, `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`, `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`, `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`, `is_openbsd`, `is_aix` * Moves the functions already deprecated by @rallytime to the bottom of `salt/utils/__init__.py` for better organization, so we can keep the deprecated ones separate from the ones yet to be deprecated as we continue to break up `salt.utils` * Updates `salt/*.py` and all files under `salt/client/` to use explicit unicode string literals. * Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils import foo` becomes `import salt.utils.foo as foo`). * Renames the `test.rand_str` function to `test.random_hash` to more accurately reflect what it does * Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`) such that it returns a string matching the passed size. Previously this function would get `size` bytes from `os.urandom()`, base64-encode it, and return the result, which would in most cases not be equal to the passed size.
2017-07-25 01:47:15 +00:00
if salt.utils.platform.is_windows():
2017-06-27 23:31:23 +00:00
temp_config = 'root_dir: c:\\\n'\
'key_logfile: key\n'
with salt.utils.files.fopen(fpath, 'w') as fp_:
fp_.write(temp_config)
config = sconfig.master_config(fpath)
expect_path_join = os.path.join('/', 'key')
expect_sep_join = '//key'
if salt.utils.platform.is_windows():
expect_path_join = os.path.join('c:\\', 'key')
expect_sep_join = 'c:\\\\key'
# os.path.join behavior
self.assertEqual(config['key_logfile'], expect_path_join)
# os.sep.join behavior
self.assertNotEqual(config['key_logfile'], expect_sep_join)
@with_tempdir()
def test_common_prefix_stripping(self, tempdir):
root_dir = os.path.join(tempdir, 'foo', 'bar')
os.makedirs(root_dir)
fpath = os.path.join(root_dir, 'config')
with salt.utils.files.fopen(fpath, 'w') as fp_:
fp_.write(
'root_dir: {0}\n'
'log_file: {1}\n'.format(root_dir, fpath)
)
config = sconfig.master_config(fpath)
self.assertEqual(config['log_file'], fpath)
@with_tempdir()
def test_default_root_dir_included_in_config_root_dir(self, tempdir):
root_dir = os.path.join(tempdir, 'foo', 'bar')
os.makedirs(root_dir)
fpath = os.path.join(root_dir, 'config')
with salt.utils.files.fopen(fpath, 'w') as fp_:
fp_.write(
'root_dir: {0}\n'
'log_file: {1}\n'.format(root_dir, fpath)
)
with patch('salt.syspaths.ROOT_DIR', TMP):
config = sconfig.master_config(fpath)
self.assertEqual(config['log_file'], fpath)
2017-06-27 23:31:23 +00:00
@skipIf(
Use explicit unicode strings + break up salt.utils This PR is part of what will be an ongoing effort to use explicit unicode strings in Salt. Because Python 3 does not suport Python 2's raw unicode string syntax (i.e. `ur'\d+'`), we must use `salt.utils.locales.sdecode()` to ensure that the raw string is unicode. However, because of how `salt/utils/__init__.py` has evolved into the hulking monstrosity it is today, this means importing a large module in places where it is not needed, which could negatively impact performance. For this reason, this PR also breaks out some of the functions from `salt/utils/__init__.py` into new/existing modules under `salt/utils/`. The long term goal will be that the modules within this directory do not depend on importing `salt.utils`. A summary of the changes in this PR is as follows: * Moves the following functions from `salt.utils` to new locations (including a deprecation warning if invoked from `salt.utils`): `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`, `dequote`, `is_hex`, `is_bin_str`, `rand_string`, `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`, `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`, `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`, `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`, `is_openbsd`, `is_aix` * Moves the functions already deprecated by @rallytime to the bottom of `salt/utils/__init__.py` for better organization, so we can keep the deprecated ones separate from the ones yet to be deprecated as we continue to break up `salt.utils` * Updates `salt/*.py` and all files under `salt/client/` to use explicit unicode string literals. * Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils import foo` becomes `import salt.utils.foo as foo`). * Renames the `test.rand_str` function to `test.random_hash` to more accurately reflect what it does * Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`) such that it returns a string matching the passed size. Previously this function would get `size` bytes from `os.urandom()`, base64-encode it, and return the result, which would in most cases not be equal to the passed size.
2017-07-25 01:47:15 +00:00
salt.utils.platform.is_windows(),
2017-06-27 23:31:23 +00:00
'You can\'t set an environment dynamically in Windows')
@with_tempdir()
def test_load_master_config_from_environ_var(self, tempdir):
original_environ = os.environ.copy()
env_root_dir = os.path.join(tempdir, 'foo', 'env')
os.makedirs(env_root_dir)
env_fpath = os.path.join(env_root_dir, 'config-env')
with salt.utils.files.fopen(env_fpath, 'w') as fp_:
fp_.write(
'root_dir: {0}\n'
'log_file: {1}\n'.format(env_root_dir, env_fpath)
)
os.environ['SALT_MASTER_CONFIG'] = env_fpath
# Should load from env variable, not the default configuration file.
config = sconfig.master_config('{0}/master'.format(CONFIG_DIR))
self.assertEqual(config['log_file'], env_fpath)
os.environ.clear()
os.environ.update(original_environ)
root_dir = os.path.join(tempdir, 'foo', 'bar')
os.makedirs(root_dir)
fpath = os.path.join(root_dir, 'config')
with salt.utils.files.fopen(fpath, 'w') as fp_:
fp_.write(
'root_dir: {0}\n'
'log_file: {1}\n'.format(root_dir, fpath)
)
# Let's set the environment variable, yet, since the configuration
# file path is not the default one, i.e., the user has passed an
# alternative configuration file form the CLI parser, the
# environment variable will be ignored.
os.environ['SALT_MASTER_CONFIG'] = env_fpath
config = sconfig.master_config(fpath)
self.assertEqual(config['log_file'], fpath)
os.environ.clear()
os.environ.update(original_environ)
2017-06-27 23:31:23 +00:00
@skipIf(
Use explicit unicode strings + break up salt.utils This PR is part of what will be an ongoing effort to use explicit unicode strings in Salt. Because Python 3 does not suport Python 2's raw unicode string syntax (i.e. `ur'\d+'`), we must use `salt.utils.locales.sdecode()` to ensure that the raw string is unicode. However, because of how `salt/utils/__init__.py` has evolved into the hulking monstrosity it is today, this means importing a large module in places where it is not needed, which could negatively impact performance. For this reason, this PR also breaks out some of the functions from `salt/utils/__init__.py` into new/existing modules under `salt/utils/`. The long term goal will be that the modules within this directory do not depend on importing `salt.utils`. A summary of the changes in this PR is as follows: * Moves the following functions from `salt.utils` to new locations (including a deprecation warning if invoked from `salt.utils`): `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`, `dequote`, `is_hex`, `is_bin_str`, `rand_string`, `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`, `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`, `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`, `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`, `is_openbsd`, `is_aix` * Moves the functions already deprecated by @rallytime to the bottom of `salt/utils/__init__.py` for better organization, so we can keep the deprecated ones separate from the ones yet to be deprecated as we continue to break up `salt.utils` * Updates `salt/*.py` and all files under `salt/client/` to use explicit unicode string literals. * Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils import foo` becomes `import salt.utils.foo as foo`). * Renames the `test.rand_str` function to `test.random_hash` to more accurately reflect what it does * Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`) such that it returns a string matching the passed size. Previously this function would get `size` bytes from `os.urandom()`, base64-encode it, and return the result, which would in most cases not be equal to the passed size.
2017-07-25 01:47:15 +00:00
salt.utils.platform.is_windows(),
2017-06-27 23:31:23 +00:00
'You can\'t set an environment dynamically in Windows')
@with_tempdir()
def test_load_minion_config_from_environ_var(self, tempdir):
original_environ = os.environ.copy()
env_root_dir = os.path.join(tempdir, 'foo', 'env')
os.makedirs(env_root_dir)
env_fpath = os.path.join(env_root_dir, 'config-env')
with salt.utils.files.fopen(env_fpath, 'w') as fp_:
fp_.write(
'root_dir: {0}\n'
'log_file: {1}\n'.format(env_root_dir, env_fpath)
)
os.environ['SALT_MINION_CONFIG'] = env_fpath
# Should load from env variable, not the default configuration file
config = sconfig.minion_config('{0}/minion'.format(CONFIG_DIR))
self.assertEqual(config['log_file'], env_fpath)
os.environ.clear()
os.environ.update(original_environ)
root_dir = os.path.join(tempdir, 'foo', 'bar')
os.makedirs(root_dir)
fpath = os.path.join(root_dir, 'config')
with salt.utils.files.fopen(fpath, 'w') as fp_:
fp_.write(
'root_dir: {0}\n'
'log_file: {1}\n'.format(root_dir, fpath)
)
# Let's set the environment variable, yet, since the configuration
# file path is not the default one, i.e., the user has passed an
# alternative configuration file form the CLI parser, the
# environment variable will be ignored.
os.environ['SALT_MINION_CONFIG'] = env_fpath
config = sconfig.minion_config(fpath)
self.assertEqual(config['log_file'], fpath)
os.environ.clear()
os.environ.update(original_environ)
@with_tempdir()
def test_load_client_config_from_environ_var(self, tempdir):
original_environ = os.environ.copy()
env_root_dir = os.path.join(tempdir, 'foo', 'env')
os.makedirs(env_root_dir)
# Let's populate a master configuration file which should not get
# picked up since the client configuration tries to load the master
# configuration settings using the provided client configuration
# file
master_config = os.path.join(env_root_dir, 'master')
with salt.utils.files.fopen(master_config, 'w') as fp_:
fp_.write(
'blah: true\n'
'root_dir: {0}\n'
'log_file: {1}\n'.format(env_root_dir, master_config)
)
os.environ['SALT_MASTER_CONFIG'] = master_config
# Now the client configuration file
env_fpath = os.path.join(env_root_dir, 'config-env')
with salt.utils.files.fopen(env_fpath, 'w') as fp_:
fp_.write(
'root_dir: {0}\n'
'log_file: {1}\n'.format(env_root_dir, env_fpath)
)
os.environ['SALT_CLIENT_CONFIG'] = env_fpath
# Should load from env variable, not the default configuration file
config = sconfig.client_config(os.path.expanduser('~/.salt'))
self.assertEqual(config['log_file'], env_fpath)
self.assertTrue('blah' not in config)
os.environ.clear()
os.environ.update(original_environ)
root_dir = os.path.join(tempdir, 'foo', 'bar')
os.makedirs(root_dir)
fpath = os.path.join(root_dir, 'config')
with salt.utils.files.fopen(fpath, 'w') as fp_:
fp_.write(
'root_dir: {0}\n'
'log_file: {1}\n'.format(root_dir, fpath)
)
# Let's set the environment variable, yet, since the configuration
# file path is not the default one, i.e., the user has passed an
# alternative configuration file form the CLI parser, the
# environment variable will be ignored.
os.environ['SALT_MASTER_CONFIG'] = env_fpath
config = sconfig.master_config(fpath)
self.assertEqual(config['log_file'], fpath)
os.environ.clear()
os.environ.update(original_environ)
@with_tempdir()
def test_issue_5970_minion_confd_inclusion(self, tempdir):
minion_config = os.path.join(tempdir, 'minion')
minion_confd = os.path.join(tempdir, 'minion.d')
os.makedirs(minion_confd)
# Let's populate a minion configuration file with some basic
# settings
with salt.utils.files.fopen(minion_config, 'w') as fp_:
fp_.write(
'blah: false\n'
'root_dir: {0}\n'
'log_file: {1}\n'.format(tempdir, minion_config)
)
# Now, let's populate an extra configuration file under minion.d
# Notice that above we've set blah as False and below as True.
# Since the minion.d files are loaded after the main configuration
# file so overrides can happen, the final value of blah should be
# True.
extra_config = os.path.join(minion_confd, 'extra.conf')
with salt.utils.files.fopen(extra_config, 'w') as fp_:
fp_.write('blah: true\n')
# Let's load the configuration
config = sconfig.minion_config(minion_config)
self.assertEqual(config['log_file'], minion_config)
# As proven by the assertion below, blah is True
self.assertTrue(config['blah'])
@with_tempdir()
def test_master_confd_inclusion(self, tempdir):
master_config = os.path.join(tempdir, 'master')
master_confd = os.path.join(tempdir, 'master.d')
os.makedirs(master_confd)
# Let's populate a master configuration file with some basic
# settings
with salt.utils.files.fopen(master_config, 'w') as fp_:
fp_.write(
'blah: false\n'
'root_dir: {0}\n'
'log_file: {1}\n'.format(tempdir, master_config)
)
2017-04-04 12:11:54 +00:00
# Now, let's populate an extra configuration file under master.d
# Notice that above we've set blah as False and below as True.
# Since the master.d files are loaded after the main configuration
# file so overrides can happen, the final value of blah should be
# True.
extra_config = os.path.join(master_confd, 'extra.conf')
with salt.utils.files.fopen(extra_config, 'w') as fp_:
fp_.write('blah: true\n')
# Let's load the configuration
config = sconfig.master_config(master_config)
self.assertEqual(config['log_file'], master_config)
# As proven by the assertion below, blah is True
self.assertTrue(config['blah'])
@with_tempfile()
@with_tempdir()
def test_master_file_roots_glob(self, tempdir, fpath):
# Create some files
for f in 'abc':
fpath = os.path.join(tempdir, f)
with salt.utils.files.fopen(fpath, 'w') as wfh:
wfh.write(f)
2017-04-04 12:11:54 +00:00
with salt.utils.files.fopen(fpath, 'w') as wfh:
wfh.write(
'file_roots:\n'
' base:\n'
' - {0}'.format(os.path.join(tempdir, '*'))
)
config = sconfig.master_config(fpath)
base = config['file_roots']['base']
self.assertEqual(set(base), set([
os.path.join(tempdir, 'a'),
os.path.join(tempdir, 'b'),
os.path.join(tempdir, 'c')
]))
@with_tempfile()
@with_tempdir()
def test_master_pillar_roots_glob(self, tempdir, fpath):
# Create some files.
for f in 'abc':
fpath = os.path.join(tempdir, f)
with salt.utils.files.fopen(fpath, 'w') as wfh:
wfh.write(f)
with salt.utils.files.fopen(fpath, 'w') as wfh:
wfh.write(
'pillar_roots:\n'
' base:\n'
' - {0}'.format(os.path.join(tempdir, '*'))
)
config = sconfig.master_config(fpath)
base = config['pillar_roots']['base']
self.assertEqual(set(base), set([
os.path.join(tempdir, 'a'),
os.path.join(tempdir, 'b'),
os.path.join(tempdir, 'c')
]))
@with_tempdir()
def test_master_id_function(self, tempdir):
master_config = os.path.join(tempdir, 'master')
with salt.utils.files.fopen(master_config, 'w') as fp_:
fp_.write(
'id_function:\n'
' test.echo:\n'
' text: hello_world\n'
'root_dir: {0}\n'
'log_file: {1}\n'.format(tempdir, master_config)
)
# Let's load the configuration
config = sconfig.master_config(master_config)
self.assertEqual(config['log_file'], master_config)
# 'master_config' appends '_master' to the ID
self.assertEqual(config['id'], 'hello_world_master')
2017-04-04 12:11:54 +00:00
@with_tempfile()
@with_tempdir()
def test_minion_file_roots_glob(self, tempdir, fpath):
# Create some files.
for f in 'abc':
fpath = os.path.join(tempdir, f)
with salt.utils.files.fopen(fpath, 'w') as wfh:
wfh.write(f)
2017-04-04 12:11:54 +00:00
with salt.utils.files.fopen(fpath, 'w') as wfh:
wfh.write(
'file_roots:\n'
' base:\n'
' - {0}'.format(os.path.join(tempdir, '*'))
)
config = sconfig.minion_config(fpath)
base = config['file_roots']['base']
self.assertEqual(set(base), set([
os.path.join(tempdir, 'a'),
os.path.join(tempdir, 'b'),
os.path.join(tempdir, 'c')
]))
@with_tempfile()
@with_tempdir()
def test_minion_pillar_roots_glob(self, tempdir, fpath):
# Create some files.
for f in 'abc':
fpath = os.path.join(tempdir, f)
with salt.utils.files.fopen(fpath, 'w') as wfh:
wfh.write(f)
with salt.utils.files.fopen(fpath, 'w') as wfh:
wfh.write(
'pillar_roots:\n'
' base:\n'
' - {0}'.format(os.path.join(tempdir, '*'))
)
config = sconfig.minion_config(fpath)
base = config['pillar_roots']['base']
self.assertEqual(set(base), set([
os.path.join(tempdir, 'a'),
os.path.join(tempdir, 'b'),
os.path.join(tempdir, 'c')
]))
@with_tempdir()
def test_minion_id_function(self, tempdir):
minion_config = os.path.join(tempdir, 'minion')
with salt.utils.files.fopen(minion_config, 'w') as fp_:
fp_.write(
'id_function:\n'
' test.echo:\n'
' text: hello_world\n'
'root_dir: {0}\n'
'log_file: {1}\n'.format(tempdir, minion_config)
)
# Let's load the configuration
config = sconfig.minion_config(minion_config)
self.assertEqual(config['log_file'], minion_config)
self.assertEqual(config['id'], 'hello_world')
@with_tempdir()
def test_backend_rename(self, tempdir):
'''
This tests that we successfully rename git, hg, svn, and minion to
gitfs, hgfs, svnfs, and minionfs in the master and minion opts.
'''
fpath = salt.utils.files.mkstemp(dir=tempdir)
with salt.utils.files.fopen(fpath, 'w') as fp_:
fp_.write(textwrap.dedent('''\
fileserver_backend:
- roots
- git
- hg
- svn
- minion
'''))
master_config = sconfig.master_config(fpath)
minion_config = sconfig.minion_config(fpath)
expected = ['roots', 'gitfs', 'hgfs', 'svnfs', 'minionfs']
self.assertEqual(master_config['fileserver_backend'], expected)
self.assertEqual(minion_config['fileserver_backend'], expected)
def test_syndic_config(self):
2014-06-02 00:12:46 +00:00
syndic_conf_path = self.get_config_file_path('syndic')
minion_conf_path = self.get_config_file_path('minion')
syndic_opts = sconfig.syndic_config(
2014-06-02 00:12:46 +00:00
syndic_conf_path, minion_conf_path
)
syndic_opts.update(salt.minion.resolve_dns(syndic_opts))
2014-06-02 00:12:46 +00:00
root_dir = syndic_opts['root_dir']
# id & pki dir are shared & so configured on the minion side
self.assertEqual(syndic_opts['id'], 'minion')
2014-06-02 00:12:46 +00:00
self.assertEqual(syndic_opts['pki_dir'], os.path.join(root_dir, 'pki'))
# the rest is configured master side
self.assertEqual(syndic_opts['master_uri'], 'tcp://127.0.0.1:54506')
self.assertEqual(syndic_opts['master_port'], 54506)
self.assertEqual(syndic_opts['master_ip'], '127.0.0.1')
self.assertEqual(syndic_opts['master'], 'localhost')
2014-06-02 00:12:46 +00:00
self.assertEqual(syndic_opts['sock_dir'], os.path.join(root_dir, 'minion_sock'))
self.assertEqual(syndic_opts['cachedir'], os.path.join(root_dir, 'cache'))
2016-07-20 15:44:23 +00:00
self.assertEqual(syndic_opts['log_file'], os.path.join(root_dir, 'syndic.log'))
self.assertEqual(syndic_opts['pidfile'], os.path.join(root_dir, 'syndic.pid'))
# Show that the options of localclient that repub to local master
# are not merged with syndic ones
2014-06-02 00:12:46 +00:00
self.assertEqual(syndic_opts['_master_conf_file'], minion_conf_path)
self.assertEqual(syndic_opts['_minion_conf_file'], syndic_conf_path)
@with_tempfile()
def _get_tally(self, fpath, conf_func):
2018-02-27 15:31:41 +00:00
'''
This ensures that any strings which are loaded are unicode strings
'''
2018-03-01 19:12:34 +00:00
tally = {}
def _count_strings(config):
2018-02-27 15:31:41 +00:00
if isinstance(config, dict):
for key, val in six.iteritems(config):
log.debug('counting strings in dict key: %s', key)
log.debug('counting strings in dict val: %s', val)
2018-03-01 19:12:34 +00:00
_count_strings(key)
_count_strings(val)
2018-02-27 15:31:41 +00:00
elif isinstance(config, list):
log.debug('counting strings in list: %s', config)
for item in config:
2018-03-01 19:12:34 +00:00
_count_strings(item)
2018-02-27 15:31:41 +00:00
else:
if isinstance(config, six.string_types):
if isinstance(config, six.text_type):
tally['unicode'] = tally.get('unicode', 0) + 1
else:
# We will never reach this on PY3
2018-03-01 19:12:34 +00:00
tally.setdefault('non_unicode', []).append(config)
2018-02-27 15:31:41 +00:00
with salt.utils.files.fopen(fpath, 'w') as wfh:
wfh.write(textwrap.dedent('''
foo: bar
mylist:
- somestring
- 9
- 123.456
- True
- nested:
- key: val
- nestedlist:
- foo
- bar
- baz
mydict:
- somestring: 9
- 123.456: 789
- True: False
- nested:
- key: val
- nestedlist:
- foo
- bar
- baz'''))
if conf_func is sconfig.master_config:
wfh.write('\n\n')
2018-02-27 15:31:41 +00:00
wfh.write(textwrap.dedent('''
rest_cherrypy:
port: 8000
disable_ssl: True
app_path: /beacon_demo
app: /srv/web/html/index.html
static: /srv/web/static'''))
config = conf_func(fpath)
_count_strings(config)
return tally
2018-02-27 15:31:41 +00:00
2018-03-01 19:12:34 +00:00
def test_conf_file_strings_are_unicode_for_master(self):
'''
This ensures that any strings which are loaded are unicode strings
'''
tally = self._get_tally(sconfig.master_config) # pylint: disable=no-value-for-parameter
2018-03-01 19:12:34 +00:00
non_unicode = tally.get('non_unicode', [])
self.assertEqual(len(non_unicode), 8 if six.PY2 else 0, non_unicode)
2018-03-01 19:12:34 +00:00
self.assertTrue(tally['unicode'] > 0)
def test_conf_file_strings_are_unicode_for_minion(self):
'''
This ensures that any strings which are loaded are unicode strings
'''
tally = self._get_tally(sconfig.minion_config) # pylint: disable=no-value-for-parameter
2018-03-01 19:12:34 +00:00
non_unicode = tally.get('non_unicode', [])
self.assertEqual(len(non_unicode), 0, non_unicode)
self.assertTrue(tally['unicode'] > 0)
# <---- Salt Cloud Configuration Tests ---------------------------------------------
# cloud_config tests
2017-02-19 16:05:58 +00:00
@skipIf(NO_MOCK, NO_MOCK_REASON)
def test_cloud_config_double_master_path(self):
'''
Tests passing in master_config_path and master_config kwargs.
'''
2017-04-10 13:00:57 +00:00
with patch('salt.config.load_config', MagicMock(return_value={})):
self.assertRaises(SaltCloudConfigError, sconfig.cloud_config, PATH,
master_config_path='foo', master_config='bar')
2017-02-19 16:05:58 +00:00
@skipIf(NO_MOCK, NO_MOCK_REASON)
def test_cloud_config_double_providers_path(self):
'''
Tests passing in providers_config_path and providers_config kwargs.
'''
2017-04-10 13:00:57 +00:00
with patch('salt.config.load_config', MagicMock(return_value={})):
self.assertRaises(SaltCloudConfigError, sconfig.cloud_config, PATH,
providers_config_path='foo', providers_config='bar')
2017-02-19 16:05:58 +00:00
@skipIf(NO_MOCK, NO_MOCK_REASON)
def test_cloud_config_double_profiles_path(self):
'''
Tests passing in profiles_config_path and profiles_config kwargs.
'''
2017-04-10 13:00:57 +00:00
with patch('salt.config.load_config', MagicMock(return_value={})):
self.assertRaises(SaltCloudConfigError, sconfig.cloud_config, PATH,
profiles_config_path='foo', profiles_config='bar')
2017-02-19 16:05:58 +00:00
@skipIf(NO_MOCK, NO_MOCK_REASON)
def test_cloud_config_providers_in_opts(self):
'''
Tests mixing old cloud providers with pre-configured providers configurations
using the providers_config kwarg
'''
2017-04-10 13:00:57 +00:00
with patch('salt.config.load_config', MagicMock(return_value={})):
with patch('salt.config.apply_cloud_config',
MagicMock(return_value={'providers': 'foo'})):
self.assertRaises(SaltCloudConfigError, sconfig.cloud_config, PATH,
providers_config='bar')
2017-02-19 16:05:58 +00:00
@skipIf(NO_MOCK, NO_MOCK_REASON)
def test_cloud_config_providers_in_opts_path(self):
'''
Tests mixing old cloud providers with pre-configured providers configurations
using the providers_config_path kwarg
'''
2017-04-10 13:00:57 +00:00
with patch('salt.config.load_config', MagicMock(return_value={})):
with patch('salt.config.apply_cloud_config',
MagicMock(return_value={'providers': 'foo'})):
with patch('os.path.isfile', MagicMock(return_value=True)):
self.assertRaises(SaltCloudConfigError, sconfig.cloud_config, PATH,
providers_config_path='bar')
2017-02-19 16:05:58 +00:00
@skipIf(NO_MOCK, NO_MOCK_REASON)
def test_cloud_config_deploy_scripts_search_path(self):
'''
Tests the contents of the 'deploy_scripts_search_path' tuple to ensure that
the correct deploy search paths are present.
There should be two search paths reported in the tuple: ``/etc/salt/cloud.deploy.d``
and ``<path-to-salt-install>/salt/cloud/deploy``. The first element is usually
``/etc/salt/cloud.deploy.d``, but sometimes is can be something like
``/etc/local/salt/cloud.deploy.d``, so we'll only test against the last part of
the path.
'''
2017-04-10 13:00:57 +00:00
with patch('os.path.isdir', MagicMock(return_value=True)):
search_paths = sconfig.cloud_config('/etc/salt/cloud').get('deploy_scripts_search_path')
etc_deploy_path = '/salt/cloud.deploy.d'
deploy_path = '/salt/cloud/deploy'
Use explicit unicode strings + break up salt.utils This PR is part of what will be an ongoing effort to use explicit unicode strings in Salt. Because Python 3 does not suport Python 2's raw unicode string syntax (i.e. `ur'\d+'`), we must use `salt.utils.locales.sdecode()` to ensure that the raw string is unicode. However, because of how `salt/utils/__init__.py` has evolved into the hulking monstrosity it is today, this means importing a large module in places where it is not needed, which could negatively impact performance. For this reason, this PR also breaks out some of the functions from `salt/utils/__init__.py` into new/existing modules under `salt/utils/`. The long term goal will be that the modules within this directory do not depend on importing `salt.utils`. A summary of the changes in this PR is as follows: * Moves the following functions from `salt.utils` to new locations (including a deprecation warning if invoked from `salt.utils`): `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`, `dequote`, `is_hex`, `is_bin_str`, `rand_string`, `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`, `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`, `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`, `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`, `is_openbsd`, `is_aix` * Moves the functions already deprecated by @rallytime to the bottom of `salt/utils/__init__.py` for better organization, so we can keep the deprecated ones separate from the ones yet to be deprecated as we continue to break up `salt.utils` * Updates `salt/*.py` and all files under `salt/client/` to use explicit unicode string literals. * Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils import foo` becomes `import salt.utils.foo as foo`). * Renames the `test.rand_str` function to `test.random_hash` to more accurately reflect what it does * Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`) such that it returns a string matching the passed size. Previously this function would get `size` bytes from `os.urandom()`, base64-encode it, and return the result, which would in most cases not be equal to the passed size.
2017-07-25 01:47:15 +00:00
if salt.utils.platform.is_windows():
2017-06-27 23:31:23 +00:00
etc_deploy_path = '/salt\\cloud.deploy.d'
deploy_path = '\\salt\\cloud\\deploy'
2017-04-10 13:00:57 +00:00
# Check cloud.deploy.d path is the first element in the search_paths tuple
self.assertTrue(search_paths[0].endswith(etc_deploy_path))
2017-04-10 13:00:57 +00:00
# Check the second element in the search_paths tuple
self.assertTrue(search_paths[1].endswith(deploy_path))
2014-06-24 16:59:46 +00:00
# apply_cloud_config tests
def test_apply_cloud_config_no_provider_detail_list(self):
'''
Tests when the provider is not contained in a list of details
'''
overrides = {'providers': {'foo': [{'bar': 'baz'}]}}
self.assertRaises(SaltCloudConfigError, sconfig.apply_cloud_config,
overrides, defaults=DEFAULT)
def test_apply_cloud_config_no_provider_detail_dict(self):
'''
Tests when the provider is not contained in the details dictionary
'''
overrides = {'providers': {'foo': {'bar': 'baz'}}}
self.assertRaises(SaltCloudConfigError, sconfig.apply_cloud_config,
overrides, defaults=DEFAULT)
2017-02-19 16:05:58 +00:00
@skipIf(NO_MOCK, NO_MOCK_REASON)
2014-06-24 16:59:46 +00:00
def test_apply_cloud_config_success_list(self):
'''
Tests success when valid data is passed into the function as a list
'''
2017-04-10 13:00:57 +00:00
with patch('salt.config.old_to_new',
MagicMock(return_value={'default_include': 'path/to/some/cloud/conf/file',
'providers': {
'foo': {
'bar': {
'driver': 'foo:bar'}}}})):
overrides = {'providers': {'foo': [{'driver': 'bar'}]}}
ret = {'default_include': 'path/to/some/cloud/conf/file',
'providers': {'foo': {'bar': {'driver': 'foo:bar'}}}}
self.assertEqual(sconfig.apply_cloud_config(overrides, defaults=DEFAULT), ret)
2014-06-24 16:59:46 +00:00
2017-02-19 16:05:58 +00:00
@skipIf(NO_MOCK, NO_MOCK_REASON)
2014-06-24 16:59:46 +00:00
def test_apply_cloud_config_success_dict(self):
'''
Tests success when valid data is passed into function as a dictionary
'''
2017-04-10 13:00:57 +00:00
with patch('salt.config.old_to_new',
MagicMock(return_value={'default_include': 'path/to/some/cloud/conf/file',
'providers': {
'foo': {
'bar': {
'driver': 'foo:bar'}}}})):
overrides = {'providers': {'foo': {'driver': 'bar'}}}
ret = {'default_include': 'path/to/some/cloud/conf/file',
'providers': {'foo': {'bar': {'driver': 'foo:bar'}}}}
self.assertEqual(sconfig.apply_cloud_config(overrides, defaults=DEFAULT), ret)
2014-06-24 16:59:46 +00:00
2014-06-23 18:17:26 +00:00
# apply_vm_profiles_config tests
def test_apply_vm_profiles_config_bad_profile_format(self):
'''
Tests passing in a bad profile format in overrides
'''
overrides = {'foo': 'bar', 'conf_file': PATH}
self.assertRaises(SaltCloudConfigError, sconfig.apply_vm_profiles_config,
PATH, overrides, defaults=DEFAULT)
2014-06-23 21:19:11 +00:00
def test_apply_vm_profiles_config_success(self):
'''
Tests passing in valid provider and profile config files successfully
'''
providers = {'test-provider':
{'digitalocean':
{'driver': 'digitalocean', 'profiles': {}}}}
2014-06-23 21:19:11 +00:00
overrides = {'test-profile':
{'provider': 'test-provider',
'image': 'Ubuntu 12.10 x64',
'size': '512MB'},
'conf_file': PATH}
ret = {'test-profile':
{'profile': 'test-profile',
'provider': 'test-provider:digitalocean',
2014-06-23 21:19:11 +00:00
'image': 'Ubuntu 12.10 x64',
'size': '512MB'}}
self.assertEqual(sconfig.apply_vm_profiles_config(providers,
overrides,
defaults=DEFAULT), ret)
def test_apply_vm_profiles_config_extend_success(self):
'''
Tests profile extends functionality with valid provider and profile configs
'''
providers = {'test-config': {'ec2': {'profiles': {}, 'driver': 'ec2'}}}
2014-06-23 21:19:11 +00:00
overrides = {'Amazon': {'image': 'test-image-1',
'extends': 'dev-instances'},
'Fedora': {'image': 'test-image-2',
'extends': 'dev-instances'},
'conf_file': PATH,
'dev-instances': {'ssh_username': 'test_user',
'provider': 'test-config'}}
ret = {'Amazon': {'profile': 'Amazon',
'ssh_username': 'test_user',
'image': 'test-image-1',
'provider': 'test-config:ec2'},
'Fedora': {'profile': 'Fedora',
'ssh_username': 'test_user',
'image': 'test-image-2',
'provider': 'test-config:ec2'},
'dev-instances': {'profile': 'dev-instances',
'ssh_username': 'test_user',
'provider': 'test-config:ec2'}}
self.assertEqual(sconfig.apply_vm_profiles_config(providers,
overrides,
defaults=DEFAULT), ret)
def test_apply_vm_profiles_config_extend_override_success(self):
'''
Tests profile extends and recursively merges data elements
'''
self.maxDiff = None
providers = {'test-config': {'ec2': {'profiles': {}, 'driver': 'ec2'}}}
overrides = {'Fedora': {'image': 'test-image-2',
'extends': 'dev-instances',
'minion': {'grains': {'stage': 'experimental'}}},
'conf_file': PATH,
'dev-instances': {'ssh_username': 'test_user',
'provider': 'test-config',
'minion': {'grains': {'role': 'webserver'}}}}
ret = {'Fedora': {'profile': 'Fedora',
'ssh_username': 'test_user',
'image': 'test-image-2',
'minion': {'grains': {'role': 'webserver',
'stage': 'experimental'}},
'provider': 'test-config:ec2'},
'dev-instances': {'profile': 'dev-instances',
'ssh_username': 'test_user',
'minion': {'grains': {'role': 'webserver'}},
'provider': 'test-config:ec2'}}
self.assertEqual(sconfig.apply_vm_profiles_config(providers,
overrides,
defaults=DEFAULT), ret)
# apply_cloud_providers_config tests
def test_apply_cloud_providers_config_same_providers(self):
'''
Tests when two providers are given with the same provider name
'''
overrides = {'my-dev-envs':
[{'id': 'ABCDEFGHIJKLMNOP',
'key': 'supersecretkeysupersecretkey',
'driver': 'ec2'},
{'apikey': 'abcdefghijklmnopqrstuvwxyz',
'password': 'supersecret',
'driver': 'ec2'}],
'conf_file': PATH}
self.assertRaises(SaltCloudConfigError,
sconfig.apply_cloud_providers_config,
overrides,
DEFAULT)
def test_apply_cloud_providers_config_extend(self):
'''
Tests the successful extension of a cloud provider
'''
overrides = {'my-production-envs':
[{'extends': 'my-dev-envs:ec2',
'location': 'us-east-1',
'user': 'ec2-user@mycorp.com'
}],
'my-dev-envs':
[{'id': 'ABCDEFGHIJKLMNOP',
'user': 'user@mycorp.com',
'location': 'ap-southeast-1',
'key': 'supersecretkeysupersecretkey',
'driver': 'ec2'
},
{'apikey': 'abcdefghijklmnopqrstuvwxyz',
'password': 'supersecret',
'driver': 'linode'
}],
'conf_file': PATH}
ret = {'my-production-envs':
{'ec2':
{'profiles': {},
'location': 'us-east-1',
'key': 'supersecretkeysupersecretkey',
'driver': 'ec2',
'id': 'ABCDEFGHIJKLMNOP',
'user': 'ec2-user@mycorp.com'}},
'my-dev-envs':
{'linode':
{'apikey': 'abcdefghijklmnopqrstuvwxyz',
'password': 'supersecret',
'profiles': {},
'driver': 'linode'},
'ec2':
{'profiles': {},
'location': 'ap-southeast-1',
'key': 'supersecretkeysupersecretkey',
'driver': 'ec2',
'id': 'ABCDEFGHIJKLMNOP',
'user': 'user@mycorp.com'}}}
self.assertEqual(ret,
sconfig.apply_cloud_providers_config(
overrides,
defaults=DEFAULT))
def test_apply_cloud_providers_config_extend_multiple(self):
'''
Tests the successful extension of two cloud providers
'''
overrides = {'my-production-envs':
[{'extends': 'my-dev-envs:ec2',
'location': 'us-east-1',
'user': 'ec2-user@mycorp.com'},
{'password': 'new-password',
'extends': 'my-dev-envs:linode',
'location': 'Salt Lake City'
}],
'my-dev-envs':
[{'id': 'ABCDEFGHIJKLMNOP',
'user': 'user@mycorp.com',
'location': 'ap-southeast-1',
'key': 'supersecretkeysupersecretkey',
'driver': 'ec2'},
{'apikey': 'abcdefghijklmnopqrstuvwxyz',
'password': 'supersecret',
'driver': 'linode'}],
'conf_file': PATH}
ret = {'my-production-envs':
{'linode':
{'apikey': 'abcdefghijklmnopqrstuvwxyz',
'profiles': {},
'location': 'Salt Lake City',
'driver': 'linode',
'password': 'new-password'},
'ec2':
{'user': 'ec2-user@mycorp.com',
'key': 'supersecretkeysupersecretkey',
'driver': 'ec2',
'id': 'ABCDEFGHIJKLMNOP',
'profiles': {},
'location': 'us-east-1'}},
'my-dev-envs':
{'linode':
{'apikey': 'abcdefghijklmnopqrstuvwxyz',
'password': 'supersecret',
'profiles': {},
'driver': 'linode'},
'ec2':
{'profiles': {},
'user': 'user@mycorp.com',
'key': 'supersecretkeysupersecretkey',
'driver': 'ec2',
'id': 'ABCDEFGHIJKLMNOP',
'location': 'ap-southeast-1'}}}
self.assertEqual(ret, sconfig.apply_cloud_providers_config(
overrides,
defaults=DEFAULT))
def test_apply_cloud_providers_config_extends_bad_alias(self):
'''
Tests when the extension contains an alias not found in providers list
'''
overrides = {'my-production-envs':
[{'extends': 'test-alias:ec2',
'location': 'us-east-1',
'user': 'ec2-user@mycorp.com'}],
'my-dev-envs':
[{'id': 'ABCDEFGHIJKLMNOP',
'user': 'user@mycorp.com',
'location': 'ap-southeast-1',
'key': 'supersecretkeysupersecretkey',
'driver': 'ec2'}],
'conf_file': PATH}
self.assertRaises(SaltCloudConfigError,
sconfig.apply_cloud_providers_config,
overrides,
DEFAULT)
def test_apply_cloud_providers_config_extends_bad_provider(self):
'''
Tests when the extension contains a provider not found in providers list
'''
overrides = {'my-production-envs':
[{'extends': 'my-dev-envs:linode',
'location': 'us-east-1',
'user': 'ec2-user@mycorp.com'}],
'my-dev-envs':
[{'id': 'ABCDEFGHIJKLMNOP',
'user': 'user@mycorp.com',
'location': 'ap-southeast-1',
'key': 'supersecretkeysupersecretkey',
'driver': 'ec2'}],
'conf_file': PATH}
self.assertRaises(SaltCloudConfigError,
sconfig.apply_cloud_providers_config,
overrides,
DEFAULT)
def test_apply_cloud_providers_config_extends_no_provider(self):
'''
Tests when no provider is supplied in the extends statement
'''
overrides = {'my-production-envs':
[{'extends': 'my-dev-envs',
'location': 'us-east-1',
'user': 'ec2-user@mycorp.com'}],
'my-dev-envs':
[{'id': 'ABCDEFGHIJKLMNOP',
'user': 'user@mycorp.com',
'location': 'ap-southeast-1',
'key': 'supersecretkeysupersecretkey',
'driver': 'linode'}],
'conf_file': PATH}
self.assertRaises(SaltCloudConfigError,
sconfig.apply_cloud_providers_config,
overrides,
DEFAULT)
def test_apply_cloud_providers_extends_not_in_providers(self):
'''
Tests when extends is not in the list of providers
'''
overrides = {'my-production-envs':
[{'extends': 'my-dev-envs ec2',
'location': 'us-east-1',
'user': 'ec2-user@mycorp.com'}],
'my-dev-envs':
[{'id': 'ABCDEFGHIJKLMNOP',
'user': 'user@mycorp.com',
'location': 'ap-southeast-1',
'key': 'supersecretkeysupersecretkey',
'driver': 'linode'}],
'conf_file': PATH}
self.assertRaises(SaltCloudConfigError,
sconfig.apply_cloud_providers_config,
overrides,
DEFAULT)
# is_provider_configured tests
def test_is_provider_configured_no_alias(self):
'''
Tests when provider alias is not in opts
'''
opts = {'providers': 'test'}
provider = 'foo:bar'
self.assertFalse(sconfig.is_provider_configured(opts, provider))
def test_is_provider_configured_no_driver(self):
'''
Tests when provider driver is not in opts
'''
opts = {'providers': {'foo': 'baz'}}
provider = 'foo:bar'
self.assertFalse(sconfig.is_provider_configured(opts, provider))
def test_is_provider_configured_key_is_none(self):
'''
Tests when a required configuration key is not set
'''
opts = {'providers': {'foo': {'bar': {'api_key': None}}}}
provider = 'foo:bar'
self.assertFalse(
sconfig.is_provider_configured(opts,
provider,
required_keys=('api_key',)))
def test_is_provider_configured_success(self):
'''
Tests successful cloud provider configuration
'''
opts = {'providers': {'foo': {'bar': {'api_key': 'baz'}}}}
provider = 'foo:bar'
ret = {'api_key': 'baz'}
self.assertEqual(
sconfig.is_provider_configured(opts,
provider,
required_keys=('api_key',)), ret)
def test_is_provider_configured_multiple_driver_not_provider(self):
'''
Tests when the drive is not the same as the provider when
searching through multiple providers
'''
opts = {'providers': {'foo': {'bar': {'api_key': 'baz'}}}}
provider = 'foo'
self.assertFalse(sconfig.is_provider_configured(opts, provider))
def test_is_provider_configured_multiple_key_is_none(self):
'''
Tests when a required configuration key is not set when
searching through multiple providers
'''
opts = {'providers': {'foo': {'bar': {'api_key': None}}}}
provider = 'bar'
self.assertFalse(
sconfig.is_provider_configured(opts,
provider,
required_keys=('api_key',)))
def test_is_provider_configured_multiple_success(self):
'''
Tests successful cloud provider configuration when searching
through multiple providers
'''
opts = {'providers': {'foo': {'bar': {'api_key': 'baz'}}}}
provider = 'bar'
ret = {'api_key': 'baz'}
self.assertEqual(
sconfig.is_provider_configured(opts,
provider,
required_keys=('api_key',)), ret)
# other cloud configuration tests
2017-06-27 23:31:23 +00:00
@skipIf(
Use explicit unicode strings + break up salt.utils This PR is part of what will be an ongoing effort to use explicit unicode strings in Salt. Because Python 3 does not suport Python 2's raw unicode string syntax (i.e. `ur'\d+'`), we must use `salt.utils.locales.sdecode()` to ensure that the raw string is unicode. However, because of how `salt/utils/__init__.py` has evolved into the hulking monstrosity it is today, this means importing a large module in places where it is not needed, which could negatively impact performance. For this reason, this PR also breaks out some of the functions from `salt/utils/__init__.py` into new/existing modules under `salt/utils/`. The long term goal will be that the modules within this directory do not depend on importing `salt.utils`. A summary of the changes in this PR is as follows: * Moves the following functions from `salt.utils` to new locations (including a deprecation warning if invoked from `salt.utils`): `to_bytes`, `to_str`, `to_unicode`, `str_to_num`, `is_quoted`, `dequote`, `is_hex`, `is_bin_str`, `rand_string`, `contains_whitespace`, `clean_kwargs`, `invalid_kwargs`, `which`, `which_bin`, `path_join`, `shlex_split`, `rand_str`, `is_windows`, `is_proxy`, `is_linux`, `is_darwin`, `is_sunos`, `is_smartos`, `is_smartos_globalzone`, `is_smartos_zone`, `is_freebsd`, `is_netbsd`, `is_openbsd`, `is_aix` * Moves the functions already deprecated by @rallytime to the bottom of `salt/utils/__init__.py` for better organization, so we can keep the deprecated ones separate from the ones yet to be deprecated as we continue to break up `salt.utils` * Updates `salt/*.py` and all files under `salt/client/` to use explicit unicode string literals. * Gets rid of implicit imports of `salt.utils` (e.g. `from salt.utils import foo` becomes `import salt.utils.foo as foo`). * Renames the `test.rand_str` function to `test.random_hash` to more accurately reflect what it does * Modifies `salt.utils.stringutils.random()` (née `salt.utils.rand_string()`) such that it returns a string matching the passed size. Previously this function would get `size` bytes from `os.urandom()`, base64-encode it, and return the result, which would in most cases not be equal to the passed size.
2017-07-25 01:47:15 +00:00
salt.utils.platform.is_windows(),
2017-06-27 23:31:23 +00:00
'You can\'t set an environment dynamically in Windows')
@with_tempdir()
def test_load_cloud_config_from_environ_var(self, tempdir):
original_environ = os.environ.copy()
try:
env_root_dir = os.path.join(tempdir, 'foo', 'env')
os.makedirs(env_root_dir)
env_fpath = os.path.join(env_root_dir, 'config-env')
with salt.utils.files.fopen(env_fpath, 'w') as fp_:
Clean up open filehandles (#35359) * salt/crypt.py: clean up open filehandles * salt/fileclient.py: clean up open filehandles * salt/grains/core.py: clean up open filehandles * salt/modules/cp.py: clean up open filehandles * salt/modules/data.py: clean up open filehandles * salt/modules/dnsutil.py: clean up open filehandles * salt/modules/dockerng.py: clean up open filehandles * salt/modules/inspectlib/collector.py: clean up open filehandles * salt/modules/file.py: clean up open filehandles * salt/modules/hosts.py: clean up open filehandles * salt/modules/incron.py: clean up open filehandles * salt/modules/dpkg.py: clean up open filehandles * salt/modules/linux_sysctl.py: clean up open filehandles * salt/modules/netbsd_sysctl.py: clean up open filehandles * salt/modules/network.py: clean up open filehandles * salt/modules/nftables.py: clean up open filehandles * salt/modules/openbsd_sysctl.py: clean up open filehandles * salt/modules/rh_ip.py: clean up open filehandles * salt/modules/portage_config.py: clean up open filehandles * salt/modules/status.py: clean up open filehandles * salt/modules/tls.py: clean up open filehandles * salt/modules/xapi.py: clean up open filehandles * salt/modules/x509.py: clean up open filehandles * salt/modules/virt.py: clean up open filehandles * salt/modules/zcbuildout.py: clean up open filehandles * salt/returners/local_cache.py: clean up open filehandles * salt/utils/cloud.py: clean up open filehandles * salt/states/pkgrepo.py: clean up open filehandles * salt/states/x509.py: clean up open filehandles * salt/transport/mixins/auth.py: clean up open filehandles * salt/utils/__init__.py: clean up open filehandles * salt/states/pkg.py: clean up open filehandles * salt/utils/minion.py: clean up open filehandles * salt/utils/openstack/nova.py: clean up open filehandles * salt/utils/openstack/swift.py: clean up open filehandles * salt/utils/process.py: clean up open filehandles * salt/utils/templates.py: clean up open filehandles * salt/utils/virt.py: clean up open filehandles * tests/integration/__init__.py: clean up open filehandles * tests/integration/cli/grains.py: clean up open filehandles * tests/integration/client/standard.py: clean up open filehandles * tests/integration/modules/hosts.py: clean up open filehandles * tests/unit/utils/vt_test.py: clean up open filehandles * tests/integration/shell/enabled.py: clean up open filehandles * tests/integration/states/cmd.py: clean up open filehandles * tests/integration/states/file.py: clean up open filehandles * tests/integration/states/match.py: clean up open filehandles * tests/unit/config_test.py: clean up open filehandles * tests/unit/templates/jinja_test.py: clean up open filehandles * tests/unit/utils/find_test.py: clean up open filehandles * tests/integration/modules/state.py: clean up open filehandles * Update dnsutil_test to reflect changes in fopen usage
2016-08-11 16:45:24 +00:00
fp_.write(
'root_dir: {0}\n'
'log_file: {1}\n'.format(env_root_dir, env_fpath)
)
os.environ['SALT_CLOUD_CONFIG'] = env_fpath
# Should load from env variable, not the default configuration file
config = sconfig.cloud_config('/etc/salt/cloud')
self.assertEqual(config['log_file'], env_fpath)
os.environ.clear()
os.environ.update(original_environ)
root_dir = os.path.join(tempdir, 'foo', 'bar')
os.makedirs(root_dir)
fpath = os.path.join(root_dir, 'config')
with salt.utils.files.fopen(fpath, 'w') as fp_:
Clean up open filehandles (#35359) * salt/crypt.py: clean up open filehandles * salt/fileclient.py: clean up open filehandles * salt/grains/core.py: clean up open filehandles * salt/modules/cp.py: clean up open filehandles * salt/modules/data.py: clean up open filehandles * salt/modules/dnsutil.py: clean up open filehandles * salt/modules/dockerng.py: clean up open filehandles * salt/modules/inspectlib/collector.py: clean up open filehandles * salt/modules/file.py: clean up open filehandles * salt/modules/hosts.py: clean up open filehandles * salt/modules/incron.py: clean up open filehandles * salt/modules/dpkg.py: clean up open filehandles * salt/modules/linux_sysctl.py: clean up open filehandles * salt/modules/netbsd_sysctl.py: clean up open filehandles * salt/modules/network.py: clean up open filehandles * salt/modules/nftables.py: clean up open filehandles * salt/modules/openbsd_sysctl.py: clean up open filehandles * salt/modules/rh_ip.py: clean up open filehandles * salt/modules/portage_config.py: clean up open filehandles * salt/modules/status.py: clean up open filehandles * salt/modules/tls.py: clean up open filehandles * salt/modules/xapi.py: clean up open filehandles * salt/modules/x509.py: clean up open filehandles * salt/modules/virt.py: clean up open filehandles * salt/modules/zcbuildout.py: clean up open filehandles * salt/returners/local_cache.py: clean up open filehandles * salt/utils/cloud.py: clean up open filehandles * salt/states/pkgrepo.py: clean up open filehandles * salt/states/x509.py: clean up open filehandles * salt/transport/mixins/auth.py: clean up open filehandles * salt/utils/__init__.py: clean up open filehandles * salt/states/pkg.py: clean up open filehandles * salt/utils/minion.py: clean up open filehandles * salt/utils/openstack/nova.py: clean up open filehandles * salt/utils/openstack/swift.py: clean up open filehandles * salt/utils/process.py: clean up open filehandles * salt/utils/templates.py: clean up open filehandles * salt/utils/virt.py: clean up open filehandles * tests/integration/__init__.py: clean up open filehandles * tests/integration/cli/grains.py: clean up open filehandles * tests/integration/client/standard.py: clean up open filehandles * tests/integration/modules/hosts.py: clean up open filehandles * tests/unit/utils/vt_test.py: clean up open filehandles * tests/integration/shell/enabled.py: clean up open filehandles * tests/integration/states/cmd.py: clean up open filehandles * tests/integration/states/file.py: clean up open filehandles * tests/integration/states/match.py: clean up open filehandles * tests/unit/config_test.py: clean up open filehandles * tests/unit/templates/jinja_test.py: clean up open filehandles * tests/unit/utils/find_test.py: clean up open filehandles * tests/integration/modules/state.py: clean up open filehandles * Update dnsutil_test to reflect changes in fopen usage
2016-08-11 16:45:24 +00:00
fp_.write(
'root_dir: {0}\n'
'log_file: {1}\n'.format(root_dir, fpath)
)
# Let's set the environment variable, yet, since the configuration
2014-11-05 21:57:47 +00:00
# file path is not the default one, i.e., the user has passed an
# alternative configuration file form the CLI parser, the
# environment variable will be ignored.
os.environ['SALT_CLOUD_CONFIG'] = env_fpath
config = sconfig.cloud_config(fpath)
self.assertEqual(config['log_file'], fpath)
finally:
# Reset the environ
os.environ.clear()
os.environ.update(original_environ)
@with_tempdir()
def test_deploy_search_path_as_string(self, temp_conf_dir):
config_file_path = os.path.join(temp_conf_dir, 'cloud')
deploy_dir_path = os.path.join(temp_conf_dir, 'test-deploy.d')
for directory in (temp_conf_dir, deploy_dir_path):
if not os.path.isdir(directory):
os.makedirs(directory)
default_config = sconfig.cloud_config(config_file_path)
default_config['deploy_scripts_search_path'] = deploy_dir_path
with salt.utils.files.fopen(config_file_path, 'w') as cfd:
salt.utils.yaml.safe_dump(default_config, cfd, default_flow_style=False)
default_config = sconfig.cloud_config(config_file_path)
# Our custom deploy scripts path was correctly added to the list
self.assertIn(
deploy_dir_path,
default_config['deploy_scripts_search_path']
)
# And it's even the first occurrence as it should
self.assertEqual(
deploy_dir_path,
default_config['deploy_scripts_search_path'][0]
)
def test_includes_load(self):
'''
Tests that cloud.{providers,profiles}.d directories are loaded, even if not
directly passed in through path
'''
config = sconfig.cloud_config(self.get_config_file_path('cloud'))
self.assertIn('ec2-config', config['providers'])
self.assertIn('ec2-test', config['profiles'])
# <---- Salt Cloud Configuration Tests ---------------------------------------------
2017-02-19 16:05:58 +00:00
@skipIf(NO_MOCK, NO_MOCK_REASON)
def test_include_config_without_errors(self):
'''
Tests that include_config function returns valid configuration
'''
include_file = 'minion.d/my.conf'
config_path = '/etc/salt/minion'
config_opts = {'id': 'myminion.example.com'}
with patch('glob.glob', MagicMock(return_value=include_file)):
with patch('salt.config._read_conf_file', MagicMock(return_value=config_opts)):
configuration = sconfig.include_config(include_file, config_path, verbose=False)
self.assertEqual(config_opts, configuration)
2017-02-19 16:05:58 +00:00
@skipIf(NO_MOCK, NO_MOCK_REASON)
def test_include_config_with_errors(self):
'''
Tests that include_config function returns valid configuration even on errors
'''
include_file = 'minion.d/my.conf'
config_path = '/etc/salt/minion'
config_opts = {}
with patch('glob.glob', MagicMock(return_value=include_file)):
with patch('salt.config._read_conf_file', _salt_configuration_error):
configuration = sconfig.include_config(include_file, config_path, verbose=False)
self.assertEqual(config_opts, configuration)
2017-02-19 16:05:58 +00:00
@skipIf(NO_MOCK, NO_MOCK_REASON)
def test_include_config_with_errors_exit(self):
'''
Tests that include_config exits on errors
'''
include_file = 'minion.d/my.conf'
config_path = '/etc/salt/minion'
with patch('glob.glob', MagicMock(return_value=include_file)):
with patch('salt.config._read_conf_file', _salt_configuration_error):
with self.assertRaises(SystemExit):
sconfig.include_config(include_file,
config_path,
verbose=False,
exit_on_config_errors=True)
@staticmethod
def _get_defaults(**kwargs):
ret = {
'saltenv': kwargs.pop('saltenv', None),
'id': 'test',
'cachedir': '/A',
'sock_dir': '/B',
'root_dir': '/C',
'fileserver_backend': 'roots',
'open_mode': False,
'auto_accept': False,
'file_roots': {},
'pillar_roots': {},
'file_ignore_glob': [],
'file_ignore_regex': [],
'worker_threads': 5,
'hash_type': 'sha256',
'log_file': 'foo.log',
}
ret.update(kwargs)
return ret
@skipIf(NO_MOCK, NO_MOCK_REASON)
def test_apply_config(self):
'''
Ensure that the environment and saltenv options work properly
'''
with patch.object(sconfig, '_adjust_log_file_override', Mock()), \
patch.object(sconfig, '_update_ssl_config', Mock()), \
patch.object(sconfig, '_update_discovery_config', Mock()):
# MASTER CONFIG
# Ensure that environment overrides saltenv when saltenv not
# explicitly passed.
defaults = self._get_defaults(environment='foo')
ret = sconfig.apply_master_config(defaults=defaults)
self.assertEqual(ret['environment'], 'foo')
self.assertEqual(ret['saltenv'], 'foo')
# Ensure that environment overrides saltenv when saltenv not
# explicitly passed.
defaults = self._get_defaults(environment='foo', saltenv='bar')
ret = sconfig.apply_master_config(defaults=defaults)
self.assertEqual(ret['environment'], 'bar')
self.assertEqual(ret['saltenv'], 'bar')
# If environment was not explicitly set, it should not be in the
# opts at all.
defaults = self._get_defaults()
ret = sconfig.apply_master_config(defaults=defaults)
self.assertNotIn('environment', ret)
self.assertEqual(ret['saltenv'], None)
# Same test as above but with saltenv explicitly set
defaults = self._get_defaults(saltenv='foo')
ret = sconfig.apply_master_config(defaults=defaults)
self.assertNotIn('environment', ret)
self.assertEqual(ret['saltenv'], 'foo')
# MINION CONFIG
# Ensure that environment overrides saltenv when saltenv not
# explicitly passed.
defaults = self._get_defaults(environment='foo')
ret = sconfig.apply_minion_config(defaults=defaults)
self.assertEqual(ret['environment'], 'foo')
self.assertEqual(ret['saltenv'], 'foo')
# Ensure that environment overrides saltenv when saltenv not
# explicitly passed.
defaults = self._get_defaults(environment='foo', saltenv='bar')
ret = sconfig.apply_minion_config(defaults=defaults)
self.assertEqual(ret['environment'], 'bar')
self.assertEqual(ret['saltenv'], 'bar')
# If environment was not explicitly set, it should not be in the
# opts at all.
defaults = self._get_defaults()
ret = sconfig.apply_minion_config(defaults=defaults)
self.assertNotIn('environment', ret)
self.assertEqual(ret['saltenv'], None)
# Same test as above but with saltenv explicitly set
defaults = self._get_defaults(saltenv='foo')
ret = sconfig.apply_minion_config(defaults=defaults)
self.assertNotIn('environment', ret)
self.assertEqual(ret['saltenv'], 'foo')