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

utils.aws.query calls for any other product than ec2 do not seem to work

Browse Source
This commit is contained in:
Alexandre Létourneau 2016-01-08 16:01:16 -05:00
parent cf927a7382
commit 950db49ea8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/utils/aws.py
View File

@ -225,7 +225,7 @@ def sig4(method, endpoint, params, prov_dict,
location = DEFAULT_LOCATION
params_with_headers = params.copy()
if product != 's3':
if product not in ('s3', 'ssm'):
params_with_headers['Version'] = aws_api_version
keys = sorted(params_with_headers.keys())
values = list(map(params_with_headers.get, keys))
@ -428,6 +428,11 @@ def query(params=None, setname=None, requesturl=None, location=None,
)
)
# Fallback to ec2's id & key if none is found, for this component
if not prov_dict.get('id', None):
prov_dict['id'] = providers.get(provider, {}).get('ec2', {}).get('id', {})
prov_dict['key'] = providers.get(provider, {}).get('ec2', {}).get('key', {})
if sigver == '4':
headers, requesturl = sig4(
method, endpoint, params, prov_dict, aws_api_version, location, product, requesturl=requesturl