External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 13:41:28 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11875 from shanemcd/url-prefixing-collection

Browse Source 
Make our collection work with prefixed API endpoints
This commit is contained in:
Shane McDonald 2022-03-21 08:09:08 -04:00 committed by GitHub
commit 07d0eedb0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
awx_collection/plugins/module_utils/controller_api.py
View File

@ -133,6 +133,8 @@ class ControllerModule(AnsibleModule):
# Try to parse the hostname as a url
try:
self.url = urlparse(self.host)
# Store URL prefix for later use in build_url
self.url_prefix = self.url.path
except Exception as e:
self.fail_json(msg="Unable to parse controller_host as a URL ({1}): {0}".format(self.host, e))
@ -147,8 +149,9 @@ class ControllerModule(AnsibleModule):
# Make sure we start with /api/vX
if not endpoint.startswith("/"):
endpoint = "/{0}".format(endpoint)
if not endpoint.startswith("/api/"):
endpoint = "/api/v2{0}".format(endpoint)
prefix = self.url_prefix.rstrip("/")
if not endpoint.startswith(prefix + "/api/"):
endpoint = prefix + "/api/v2{0}".format(endpoint)
if not endpoint.endswith('/') and '?' not in endpoint:
endpoint = "{0}/".format(endpoint)
@ -589,8 +592,10 @@ class ControllerAPIModule(ControllerModule):
"application": None,
"scope": "write",
}
# Preserve URL prefix
endpoint = self.url_prefix.rstrip('/') + '/api/v2/tokens/'
# Post to the tokens endpoint with baisc auth to try and get a token
api_token_url = (self.url._replace(path='/api/v2/tokens/')).geturl()
api_token_url = (self.url._replace(path=endpoint)).geturl()
try:
response = self.session.open(
@ -954,9 +959,10 @@ class ControllerAPIModule(ControllerModule):
if self.authenticated and self.oauth_token_id:
# Attempt to delete our current token from /api/v2/tokens/
# Post to the tokens endpoint with baisc auth to try and get a token
endpoint = self.url_prefix.rstrip('/') + '/api/v2/tokens/{0}/'.format(self.oauth_token_id)
api_token_url = (
self.url._replace(
path='/api/v2/tokens/{0}/'.format(self.oauth_token_id), query=None # in error cases, fail_json exists before exception handling
path=endpoint, query=None # in error cases, fail_json exists before exception handling
)
).geturl()