mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 01:18:58 +00:00
20ed2c6bcf
* salt/cloud/__init__.py: remove repr formatting * salt/cloud/clouds/azurearm.py: remove repr formatting * salt/cloud/clouds/ec2.py: remove repr formatting * salt/cloud/clouds/profitbricks.py: remove repr formatting * salt/loader.py: remove repr formatting * salt/modules/win_file.py: remove repr formatting * salt/modules/zypper.py: remove repr formatting * salt/pillar/consul_pillar.py: remove repr formatting * salt/renderers/pyobjects.py: remove repr formatting * salt/returners/sentry_return.py: remove repr formatting * salt/states/bower.py: remove repr formatting * salt/states/cabal.py: remove repr formatting * salt/states/cmd.py: remove repr formatting * salt/states/composer.py: remove repr formatting * salt/states/win_network.py: remove repr formatting * salt/states/eselect.py: remove repr formatting * salt/states/file.py: remove repr formatting * salt/states/htpasswd.py: remove repr formatting * salt/states/memcached.py: remove repr formatting * salt/states/npm.py: remove repr formatting * salt/states/pip_state.py: remove repr formatting * salt/states/pkg.py: remove repr formatting * salt/states/pkgrepo.py: remove repr formatting * salt/states/supervisord.py: remove repr formatting * salt/states/timezone.py: remove repr formatting * salt/states/virtualenv_mod.py: remove repr formatting * salt/states/dockerio.py: remove repr formatting * salt/states/win_system.py: remove repr formatting * salt/utils/nb_popen.py: remove repr formatting * salt/utils/cloud.py: remove repr formatting * Add pylint disable due to legit usage of repr flag See https://github.com/saltstack/salt-pylint/pull/6 * Fix composer tests These tests needed to be updated because quoting was changed in the state module in 9dc9146. There was an unnecessary !r used for the exception class there, which means that instead of the exception class being passed through the formatter and coming out with the equivalent value of err.__str__(), we get a repr'ed instance of the exception class (i.e. SaltException('',)) in the state output. The unit test was asserting that we have that repr'ed instance of SaltException in the output, a case of writing the test to confirm the badly-conceived output in the state. This has also been corrected. * salt/cloud/clouds/azurearm.py: lint fixes * salt/modules/boto_s3_bucket.py: lint fixes * salt/modules/minion.py: lint fixes * salt/modules/reg.py: lint fixes * salt/modules/testinframod.py: lint fixes * salt/modules/win_iis.py: lint fixes * salt/pillar/csvpillar.py: lint fixes * salt/utils/win_functions.py: lint fixes * salt/states/nxos.py: lint fixes * salt/returners/mongo_future_return.py: lint fixes * tests/integration/__init__.py: lint fixes * tests/unit/context_test.py: lint fixes * tests/integration/states/file.py: lint fixes * tests/integration/utils/test_reactor.py: lint fixes * tests/integration/utils/testprogram.py: lint fixes * tests/unit/__init__.py: lint fixes * tests/integration/shell/minion.py: lint fixes * tests/unit/modules/boto_apigateway_test.py: lint fixes * tests/unit/modules/boto_cognitoidentity_test.py: lint fixes * tests/unit/modules/boto_elasticsearch_domain_test.py: lint fixes * tests/unit/modules/k8s_test.py: lint fixes * tests/unit/modules/reg_win_test.py: lint fixes * tests/unit/states/boto_apigateway_test.py: lint fixes * tests/unit/states/boto_cognitoidentity_test.py: lint fixes * tests/unit/states/boto_elasticsearch_domain_test.py: lint fixes
318 lines
13 KiB
Python
318 lines
13 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Import Python libs
|
|
from __future__ import absolute_import
|
|
from distutils.version import LooseVersion # pylint: disable=import-error,no-name-in-module
|
|
import copy
|
|
import logging
|
|
import random
|
|
import string
|
|
|
|
# Import Salt Testing libs
|
|
from salttesting.unit import skipIf, TestCase
|
|
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, patch
|
|
from salttesting.helpers import ensure_in_syspath
|
|
|
|
ensure_in_syspath('../../')
|
|
|
|
# Import Salt libs
|
|
import salt.config
|
|
import salt.loader
|
|
from salt.modules import boto_elasticsearch_domain
|
|
|
|
# Import Mock libraries
|
|
from salttesting.mock import NO_MOCK, NO_MOCK_REASON, MagicMock, patch
|
|
|
|
# Import 3rd-party libs
|
|
|
|
# pylint: disable=import-error,no-name-in-module
|
|
try:
|
|
import boto3
|
|
from botocore.exceptions import ClientError
|
|
HAS_BOTO = True
|
|
except ImportError:
|
|
HAS_BOTO = False
|
|
|
|
from salt.ext.six.moves import range
|
|
|
|
# pylint: enable=import-error,no-name-in-module
|
|
|
|
# the boto_elasticsearch_domain module relies on the connect_to_region() method
|
|
# which was added in boto 2.8.0
|
|
# https://github.com/boto/boto/commit/33ac26b416fbb48a60602542b4ce15dcc7029f12
|
|
required_boto3_version = '1.2.1'
|
|
|
|
|
|
def _has_required_boto():
|
|
'''
|
|
Returns True/False boolean depending on if Boto is installed and correct
|
|
version.
|
|
'''
|
|
if not HAS_BOTO:
|
|
return False
|
|
elif LooseVersion(boto3.__version__) < LooseVersion(required_boto3_version):
|
|
return False
|
|
else:
|
|
return True
|
|
|
|
|
|
if _has_required_boto():
|
|
region = 'us-east-1'
|
|
access_key = 'GKTADJGHEIQSXMKKRBJ08H'
|
|
secret_key = 'askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs'
|
|
conn_parameters = {'region': region, 'key': access_key, 'keyid': secret_key, 'profile': {}}
|
|
error_message = 'An error occurred (101) when calling the {0} operation: Test-defined error'
|
|
error_content = {
|
|
'Error': {
|
|
'Code': 101,
|
|
'Message': "Test-defined error"
|
|
}
|
|
}
|
|
not_found_error = ClientError({
|
|
'Error': {
|
|
'Code': 'ResourceNotFoundException',
|
|
'Message': "Test-defined error"
|
|
}
|
|
}, 'msg')
|
|
domain_ret = dict(DomainName='testdomain',
|
|
ElasticsearchClusterConfig={},
|
|
EBSOptions={},
|
|
AccessPolicies={},
|
|
SnapshotOptions={},
|
|
AdvancedOptions={})
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
opts = salt.config.DEFAULT_MINION_OPTS
|
|
context = {}
|
|
utils = salt.loader.utils(opts, whitelist=['boto3'], context=context)
|
|
|
|
boto_elasticsearch_domain.__utils__ = utils
|
|
boto_elasticsearch_domain.__init__(opts)
|
|
boto_elasticsearch_domain.__salt__ = {}
|
|
|
|
|
|
class BotoElasticsearchDomainTestCaseBase(TestCase):
|
|
conn = None
|
|
|
|
# Set up MagicMock to replace the boto3 session
|
|
def setUp(self):
|
|
boto_elasticsearch_domain.__context__ = {}
|
|
context.clear()
|
|
# connections keep getting cached from prior tests, can't find the
|
|
# correct context object to clear it. So randomize the cache key, to prevent any
|
|
# cache hits
|
|
conn_parameters['key'] = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(50))
|
|
|
|
self.patcher = patch('boto3.session.Session')
|
|
self.addCleanup(self.patcher.stop)
|
|
mock_session = self.patcher.start()
|
|
|
|
session_instance = mock_session.return_value
|
|
self.conn = MagicMock()
|
|
session_instance.client.return_value = self.conn
|
|
|
|
|
|
class BotoElasticsearchDomainTestCaseMixin(object):
|
|
pass
|
|
|
|
|
|
@skipIf(True, 'Skip these tests while investigating failures')
|
|
@skipIf(HAS_BOTO is False, 'The boto module must be installed.')
|
|
@skipIf(_has_required_boto() is False, 'The boto3 module must be greater than'
|
|
' or equal to version {0}'
|
|
.format(required_boto3_version))
|
|
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
|
class BotoElasticsearchDomainTestCase(BotoElasticsearchDomainTestCaseBase, BotoElasticsearchDomainTestCaseMixin):
|
|
'''
|
|
TestCase for salt.modules.boto_elasticsearch_domain module
|
|
'''
|
|
|
|
def test_that_when_checking_if_a_domain_exists_and_a_domain_exists_the_domain_exists_method_returns_true(self):
|
|
'''
|
|
Tests checking domain existence when the domain already exists
|
|
'''
|
|
result = boto_elasticsearch_domain.exists(DomainName='testdomain', **conn_parameters)
|
|
|
|
self.assertTrue(result['exists'])
|
|
|
|
def test_that_when_checking_if_a_domain_exists_and_a_domain_does_not_exist_the_domain_exists_method_returns_false(self):
|
|
'''
|
|
Tests checking domain existence when the domain does not exist
|
|
'''
|
|
self.conn.describe_elasticsearch_domain.side_effect = not_found_error
|
|
result = boto_elasticsearch_domain.exists(DomainName='mydomain', **conn_parameters)
|
|
|
|
self.assertFalse(result['exists'])
|
|
|
|
def test_that_when_checking_if_a_domain_exists_and_boto3_returns_an_error_the_domain_exists_method_returns_error(self):
|
|
'''
|
|
Tests checking domain existence when boto returns an error
|
|
'''
|
|
self.conn.describe_elasticsearch_domain.side_effect = ClientError(error_content, 'list_domains')
|
|
result = boto_elasticsearch_domain.exists(DomainName='mydomain', **conn_parameters)
|
|
|
|
self.assertEqual(result.get('error', {}).get('message'), error_message.format('list_domains'))
|
|
|
|
def test_that_when_checking_domain_status_and_a_domain_exists_the_domain_status_method_returns_info(self):
|
|
'''
|
|
Tests checking domain existence when the domain already exists
|
|
'''
|
|
self.conn.describe_elasticsearch_domain.return_value = {'DomainStatus': domain_ret}
|
|
result = boto_elasticsearch_domain.status(DomainName='testdomain', **conn_parameters)
|
|
|
|
self.assertTrue(result['domain'])
|
|
|
|
def test_that_when_checking_domain_status_and_boto3_returns_an_error_the_domain_status_method_returns_error(self):
|
|
'''
|
|
Tests checking domain existence when boto returns an error
|
|
'''
|
|
self.conn.describe_elasticsearch_domain.side_effect = ClientError(error_content, 'list_domains')
|
|
result = boto_elasticsearch_domain.status(DomainName='mydomain', **conn_parameters)
|
|
|
|
self.assertEqual(result.get('error', {}).get('message'), error_message.format('list_domains'))
|
|
|
|
def test_that_when_describing_domain_it_returns_the_dict_of_properties_returns_true(self):
|
|
'''
|
|
Tests describing parameters if domain exists
|
|
'''
|
|
domainconfig = {}
|
|
for k, v in domain_ret.iteritems():
|
|
if k == 'DomainName':
|
|
continue
|
|
domainconfig[k] = {'Options': v}
|
|
self.conn.describe_elasticsearch_domain_config.return_value = {'DomainConfig': domainconfig}
|
|
|
|
result = boto_elasticsearch_domain.describe(DomainName=domain_ret['DomainName'], **conn_parameters)
|
|
|
|
log.warn(result)
|
|
desired_ret = copy.copy(domain_ret)
|
|
desired_ret.pop('DomainName')
|
|
self.assertEqual(result, {'domain': desired_ret})
|
|
|
|
def test_that_when_describing_domain_on_client_error_it_returns_error(self):
|
|
'''
|
|
Tests describing parameters failure
|
|
'''
|
|
self.conn.describe_elasticsearch_domain_config.side_effect = ClientError(error_content, 'list_domains')
|
|
result = boto_elasticsearch_domain.describe(DomainName='testdomain', **conn_parameters)
|
|
self.assertTrue('error' in result)
|
|
|
|
def test_that_when_creating_a_domain_succeeds_the_create_domain_method_returns_true(self):
|
|
'''
|
|
tests True domain created.
|
|
'''
|
|
self.conn.create_elasticsearch_domain.return_value = {'DomainStatus': domain_ret}
|
|
args = copy.copy(domain_ret)
|
|
args.update(conn_parameters)
|
|
result = boto_elasticsearch_domain.create(**args)
|
|
|
|
self.assertTrue(result['created'])
|
|
|
|
def test_that_when_creating_a_domain_fails_the_create_domain_method_returns_error(self):
|
|
'''
|
|
tests False domain not created.
|
|
'''
|
|
self.conn.create_elasticsearch_domain.side_effect = ClientError(error_content, 'create_domain')
|
|
args = copy.copy(domain_ret)
|
|
args.update(conn_parameters)
|
|
result = boto_elasticsearch_domain.create(**args)
|
|
self.assertEqual(result.get('error', {}).get('message'), error_message.format('create_domain'))
|
|
|
|
def test_that_when_deleting_a_domain_succeeds_the_delete_domain_method_returns_true(self):
|
|
'''
|
|
tests True domain deleted.
|
|
'''
|
|
result = boto_elasticsearch_domain.delete(DomainName='testdomain',
|
|
**conn_parameters)
|
|
self.assertTrue(result['deleted'])
|
|
|
|
def test_that_when_deleting_a_domain_fails_the_delete_domain_method_returns_false(self):
|
|
'''
|
|
tests False domain not deleted.
|
|
'''
|
|
self.conn.delete_elasticsearch_domain.side_effect = ClientError(error_content, 'delete_domain')
|
|
result = boto_elasticsearch_domain.delete(DomainName='testdomain',
|
|
**conn_parameters)
|
|
self.assertFalse(result['deleted'])
|
|
|
|
def test_that_when_updating_a_domain_succeeds_the_update_domain_method_returns_true(self):
|
|
'''
|
|
tests True domain updated.
|
|
'''
|
|
self.conn.update_elasticsearch_domain_config.return_value = {'DomainConfig': domain_ret}
|
|
args = copy.copy(domain_ret)
|
|
args.update(conn_parameters)
|
|
result = boto_elasticsearch_domain.update(**args)
|
|
|
|
self.assertTrue(result['updated'])
|
|
|
|
def test_that_when_updating_a_domain_fails_the_update_domain_method_returns_error(self):
|
|
'''
|
|
tests False domain not updated.
|
|
'''
|
|
self.conn.update_elasticsearch_domain_config.side_effect = ClientError(error_content, 'update_domain')
|
|
args = copy.copy(domain_ret)
|
|
args.update(conn_parameters)
|
|
result = boto_elasticsearch_domain.update(**args)
|
|
self.assertEqual(result.get('error', {}).get('message'), error_message.format('update_domain'))
|
|
|
|
def test_that_when_adding_tags_succeeds_the_add_tags_method_returns_true(self):
|
|
'''
|
|
tests True tags added.
|
|
'''
|
|
self.conn.describe_elasticsearch_domain.return_value = {'DomainStatus': domain_ret}
|
|
result = boto_elasticsearch_domain.add_tags(DomainName='testdomain', a='b', **conn_parameters)
|
|
|
|
self.assertTrue(result['tagged'])
|
|
|
|
def test_that_when_adding_tags_fails_the_add_tags_method_returns_false(self):
|
|
'''
|
|
tests False tags not added.
|
|
'''
|
|
self.conn.add_tags.side_effect = ClientError(error_content, 'add_tags')
|
|
self.conn.describe_elasticsearch_domain.return_value = {'DomainStatus': domain_ret}
|
|
result = boto_elasticsearch_domain.add_tags(DomainName=domain_ret['DomainName'], a='b', **conn_parameters)
|
|
self.assertFalse(result['tagged'])
|
|
|
|
def test_that_when_removing_tags_succeeds_the_remove_tags_method_returns_true(self):
|
|
'''
|
|
tests True tags removed.
|
|
'''
|
|
self.conn.describe_elasticsearch_domain.return_value = {'DomainStatus': domain_ret}
|
|
result = boto_elasticsearch_domain.remove_tags(DomainName=domain_ret['DomainName'], TagKeys=['a'], **conn_parameters)
|
|
|
|
self.assertTrue(result['tagged'])
|
|
|
|
def test_that_when_removing_tags_fails_the_remove_tags_method_returns_false(self):
|
|
'''
|
|
tests False tags not removed.
|
|
'''
|
|
self.conn.remove_tags.side_effect = ClientError(error_content, 'remove_tags')
|
|
self.conn.describe_elasticsearch_domain.return_value = {'DomainStatus': domain_ret}
|
|
result = boto_elasticsearch_domain.remove_tags(DomainName=domain_ret['DomainName'], TagKeys=['b'], **conn_parameters)
|
|
self.assertFalse(result['tagged'])
|
|
|
|
def test_that_when_listing_tags_succeeds_the_list_tags_method_returns_true(self):
|
|
'''
|
|
tests True tags listed.
|
|
'''
|
|
self.conn.describe_elasticsearch_domain.return_value = {'DomainStatus': domain_ret}
|
|
result = boto_elasticsearch_domain.list_tags(DomainName=domain_ret['DomainName'], **conn_parameters)
|
|
|
|
self.assertEqual(result['tags'], {})
|
|
|
|
def test_that_when_listing_tags_fails_the_list_tags_method_returns_false(self):
|
|
'''
|
|
tests False tags not listed.
|
|
'''
|
|
self.conn.list_tags.side_effect = ClientError(error_content, 'list_tags')
|
|
self.conn.describe_elasticsearch_domain.return_value = {'DomainStatus': domain_ret}
|
|
result = boto_elasticsearch_domain.list_tags(DomainName=domain_ret['DomainName'], **conn_parameters)
|
|
self.assertTrue(result['error'])
|
|
|
|
|
|
if __name__ == '__main__':
|
|
from integration import run_tests # pylint: disable=import-error
|
|
run_tests(BotoElasticsearchDomainTestCase, needs_daemon=False)
|