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

fixes issue in which s3.role_arn was defaulting to ''

Browse source 
fixes #30899
This commit is contained in:
Tim Harper 2016-02-06 12:36:56 -07:00
parent ef02779391
commit b4fe9aaa11
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/s3.py
View file

@ -256,7 +256,7 @@ def _get_key(key, keyid, service_url, verify_ssl, location, role_arn):
if location is None and __salt__['config.option']('s3.location') is not None:
location = __salt__['config.option']('s3.location')
if role_arn is None and __salt__['config.option']('s3.role_arn') is not None:
if role_arn is None and __salt__['config.option']('s3.role_arn'):
role_arn = __salt__['config.option']('s3.role_arn')
return key, keyid, service_url, verify_ssl, location, role_arn

13
tests/unit/modules/s3_test.py
View file

@ -8,6 +8,7 @@ from __future__ import absolute_import
# Import Salt Testing Libs
from salttesting import skipIf, TestCase
from salttesting.mock import (
MagicMock,
NO_MOCK,
NO_MOCK_REASON,
patch
@ -21,9 +22,21 @@ ensure_in_syspath('../../')
import salt.utils.s3
from salt.modules import s3
s3.__salt__ = {}
@skipIf(NO_MOCK, NO_MOCK_REASON)
class S3TestCase(TestCase):
def test__get_key_defaults(self):
mock = MagicMock(return_value='')
with patch.dict(s3.__salt__, {'config.option': mock}):
key, keyid, service_url, verify_ssl, location, role_arn = (
s3._get_key(None, None, None, None, None, None))
self.assertEqual(None, role_arn)
self.assertEqual(None, key)
self.assertEqual(None, keyid)
self.assertEqual('s3.amazonaws.com', service_url)
self.assertEqual('', verify_ssl)
self.assertEqual('', location)
'''
Test cases for salt.modules.s3
'''