wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix digital_ocean module_util api_token bug (#28924)

Browse source 
* Fix digital_ocean module_util api_token bug

* Included environment variables also

* Removed try/catch and added a check on self.oauth_token

Modules using the DigitalOceanHelper would expect the module to handle any api key resolution.
This commit is contained in:
ABond 2017-09-06 10:14:10 -04:00 committed by Toshio Kuratomi
parent 0ddbcf8841
commit 082f54eaf4
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/module_utils/digital_ocean.py
View file

@ -92,11 +92,10 @@ class DigitalOceanHelper:
return self.send('DELETE', path, data) return self.send('DELETE', path, data)
def get_do_oauth_token(self): def get_do_oauth_token(self):
try: self.oauth_token = self.module.params.get('oauth_token') or \
self.oauth_token = self.module.params['oauth_token'] or \ self.module.params.get('api_token') or \
self.module.params['api_token'] or \ os.environ.get('DO_API_TOKEN') or \
os.environ['DO_API_TOKEN'] or \ os.environ.get('DO_API_KEY') or \
os.environ['DO_API_KEY'] or \ os.environ.get('OAUTH_TOKEN')
os.environ['OAUTH_TOKEN'] if self.oauth_token is None:
except KeyError as e: self.module.fail_json(msg='Unable to load api key: oauth_token')
self.module.fail_json(msg='Unable to load %s' % e.message)