openstack/deb-python-requestbuilder
Code Issues Proposed changes

Move AWS_ACCESS_KEY fetching to a saner function

Browse Source
This commit is contained in:
Garrett Holmstrom
2013-05-31 16:36:50 -07:00
parent e3c2324e6e
commit 85d3fbd98d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
requestbuilder/auth.py
View File

@@ -85,6 +85,11 @@ class HmacKeyAuth(BaseAuth):
# If the current user/region was explicitly set (e.g. with --region),
# use that first
self.configure_from_configfile(only_if_explicit=True)
# Try the environment next
if 'AWS_ACCESS_KEY' in os.environ and not self.args.get('key_id'):
self.args['key_id'] = os.getenv('AWS_ACCESS_KEY')
if 'AWS_SECRET_KEY' in os.environ and not self.args.get('secret_key'):
self.args['secret_key'] = os.getenv('AWS_SECRET_KEY')
# See if an AWS credential file was given in the environment
self.configure_from_aws_credential_file()
# Try the requestbuilder config file next
@@ -96,10 +101,6 @@ class HmacKeyAuth(BaseAuth):
raise AuthError('missing secret key; please supply one with -S')
def configure_from_aws_credential_file(self):
if 'AWS_ACCESS_KEY' in os.environ and not self.args.get('key_id'):
self.args['key_id'] = os.getenv('AWS_ACCESS_KEY')
if 'AWS_SECRET_KEY' in os.environ and not self.args.get('secret_key'):
self.args['secret_key'] = os.getenv('AWS_SECRET_KEY')
if 'AWS_CREDENTIAL_FILE' in os.environ:
path = os.getenv('AWS_CREDENTIAL_FILE')
path = os.path.expandvars(path)