From 8aeffa3872d608b7bff17b252ee23a521cf0957b Mon Sep 17 00:00:00 2001 From: Paul Czarkowski Date: Tue, 22 Feb 2022 12:28:51 -0600 Subject: [PATCH] fix ocp auth adding / to oauth discovery url (#140) * fix ocp auth adding / to oauth discovery url * fix space after comma * add changelog fragment * Convert line endings Co-authored-by: Mike Graves --- changelogs/fragments/auth-against-api-with-trailing-slash.yaml | 2 ++ plugins/modules/openshift_auth.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/auth-against-api-with-trailing-slash.yaml diff --git a/changelogs/fragments/auth-against-api-with-trailing-slash.yaml b/changelogs/fragments/auth-against-api-with-trailing-slash.yaml new file mode 100644 index 0000000..f8bfcf9 --- /dev/null +++ b/changelogs/fragments/auth-against-api-with-trailing-slash.yaml @@ -0,0 +1,2 @@ +bugfixes: + - fix ocp auth failing against cluster api url with trailing slash (https://github.com/openshift/community.okd/issues/139) diff --git a/plugins/modules/openshift_auth.py b/plugins/modules/openshift_auth.py index c897bda..8140806 100644 --- a/plugins/modules/openshift_auth.py +++ b/plugins/modules/openshift_auth.py @@ -171,6 +171,7 @@ import traceback from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six.moves.urllib_parse import urlparse, parse_qs, urlencode +from urllib.parse import urljoin # 3rd party imports try: @@ -266,7 +267,7 @@ class OpenShiftAuthModule(AnsibleModule): self.exit_json(changed=False, openshift_auth=result, k8s_auth=result) def openshift_discover(self): - url = '{0}/.well-known/oauth-authorization-server'.format(self.con_host) + url = urljoin(self.con_host, '.well-known/oauth-authorization-server') ret = requests.get(url, verify=self.con_verify_ca) if ret.status_code != 200: