a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix DO_API_KEY environment variable check (#33512) 

`os.environ['DO_API_TOKEN']` raised a `KeyError` preventing the check
for `os.environ['DO_API_KEY]` from being executed. Fix this by failing
only if the api token isn't set.
pull/4420/head
Gurchet Rai 2017-12-13 21:07:45 -08:00 committed by ansibot
parent be5d68f3ad
commit 490dc40203
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ansible/modules/cloud/digital_ocean/digital_ocean.py
View File

@ -201,7 +201,7 @@ try:
except ImportError: except ImportError:
pass pass
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule, env_fallback
class TimeoutError(Exception): class TimeoutError(Exception):
@ -346,11 +346,7 @@ def core(module):
module.fail_json(msg='Unable to load %s' % k) module.fail_json(msg='Unable to load %s' % k)
return v return v
try: api_token = module.params['api_token']
api_token = module.params['api_token'] or os.environ['DO_API_TOKEN'] or os.environ['DO_API_KEY']
except KeyError as e:
module.fail_json(msg='Unable to load %s' % e.message)
changed = True changed = True
command = module.params['command'] command = module.params['command']
state = module.params['state'] state = module.params['state']
@ -432,7 +428,11 @@ def main():
argument_spec=dict( argument_spec=dict(
command=dict(choices=['droplet', 'ssh'], default='droplet'), command=dict(choices=['droplet', 'ssh'], default='droplet'),
state=dict(choices=['active', 'present', 'absent', 'deleted'], default='present'), state=dict(choices=['active', 'present', 'absent', 'deleted'], default='present'),
api_token=dict(aliases=['API_TOKEN'], no_log=True), api_token=dict(
aliases=['API_TOKEN'],
no_log=True,
fallback=(env_fallback, ['DO_API_TOKEN', 'DO_API_KEY'])
),
name=dict(type='str'), name=dict(type='str'),
size_id=dict(), size_id=dict(),
image_id=dict(), image_id=dict(),