External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-24 22:46:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Adding more through testing of tower_oauthtoken including failure messages

Browse Source
This commit is contained in:
John Westcott IV
2020-06-01 13:35:28 -04:00
parent 7c88a51992
commit 30346618f1
2 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx_collection/plugins/module_utils/tower_api.py
View File

@@ -3,7 +3,7 @@ __metaclass__ = type
from ansible.module_utils.basic import AnsibleModule, env_fallback
from ansible.module_utils.urls import Request, SSLValidationError, ConnectionError
from ansible.module_utils.six import PY2
from ansible.module_utils.six import PY2, string_types
from ansible.module_utils.six.moves import StringIO
from ansible.module_utils.six.moves.urllib.parse import urlparse, urlencode
from ansible.module_utils.six.moves.urllib.error import HTTPError
@@ -98,10 +98,16 @@ class TowerModule(AnsibleModule):
# Perform magic depending on whether tower_oauthtoken is a string or a dict
if self.params.get('tower_oauthtoken'):
if type(self.params.get('tower_oauthtoken')) is dict:
setattr(self, 'oauth_token', self.params.get('tower_oauthtoken')['token'])
elif 'token' in self.params.get('tower_oauthtoken'):
setattr(self, 'oauth_token', self.params.get('tower_oauthtoken'))
token_param = self.params.get('tower_oauthtoken')
if type(token_param) is dict:
if 'token' in token_param:
self.oauth_token = self.params.get('tower_oauthtoken')['token']
else:
self.fail_json(msg="The provided dict in tower_oauthtoken did not properly contain the token entry")
elif isinstance(token_param, string_types):
self.oauth_token = self.params.get('tower_oauthtoken')
else:
self.fail_json(msg="The provided tower_oauthtoken type was not valid ({0}), please refer to ansible-doc for valid options".format(type(token_param).__name__))
# Perform some basic validation
if not re.match('^https{0,1}://', self.host):