valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #36394 from oba11/module-fixes

Browse Source 
fix accound_id in boto_iam and get_region in boto_sns
This commit is contained in:
Mike Place 2016-09-20 22:11:28 +09:00 committed by GitHub
commit 6e16ca46ed
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/modules/boto_iam.py
View File

@ -1200,6 +1200,7 @@ def get_account_id(region=None, key=None, keyid=None, profile=None):
# The get_user call returns an user ARN:
# arn:aws:iam::027050522557:user/salt-test
arn = ret['get_user_response']['get_user_result']['user']['arn']
account_id = arn.split(':')[4]
except boto.exception.BotoServerError:
# If call failed, then let's try to get the ARN from the metadata
timeout = boto.config.getfloat(
@ -1208,15 +1209,15 @@ def get_account_id(region=None, key=None, keyid=None, profile=None):
attempts = boto.config.getint(
'Boto', 'metadata_service_num_attempts', 1
)
metadata = boto.utils.get_instance_metadata(
identity = boto.utils.get_instance_identity(
timeout=timeout, num_retries=attempts
)
try:
arn = metadata['iam']['info']['InstanceProfileArn']
account_id = identity['document']['accountId']
except KeyError:
log.error('Failed to get user or metadata ARN information in'
log.error('Failed to get account id from instance_identity in'
' boto_iam.get_account_id.')
__context__[cache_key] = arn.split(':')[4]
__context__[cache_key] = account_id
return __context__[cache_key]

3
salt/modules/boto_sns.py
View File

@ -199,6 +199,9 @@ def get_arn(name, region=None, key=None, keyid=None, profile=None):
def _get_region(region=None, profile=None):
if profile and 'region' in profile:
return profile['region']
if not region and __salt__['config.option'](profile):
_profile = __salt__['config.option'](profile)
region = _profile.get('region', None)
if not region and __salt__['config.option']('sns.region'):
region = __salt__['config.option']('sns.region')
if not region: