External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

change except to get response instead of raise error

Browse Source
This commit is contained in:
Joe Garcia
2023-01-20 11:40:51 -05:00
parent 4470b80059
commit d8e7c59fe8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/credential_plugins/conjur.py
View File

@@ -73,7 +73,7 @@ def conjur_backend(**kwargs):
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError:
resp = requests.post(urljoin(url, '/'.join(['api', 'authn', account, username, 'authenticate'])), **auth_kwargs) resp = requests.post(urljoin(url, '/'.join(['api', 'authn', account, username, 'authenticate'])), **auth_kwargs)
except: except:
raise resp = requests.post(urljoin(url, '/'.join(['api', 'authn', account, username, 'authenticate'])), **auth_kwargs)
raise_for_status(resp) raise_for_status(resp)
token = resp.content.decode('utf-8') token = resp.content.decode('utf-8')
@@ -97,7 +97,7 @@ def conjur_backend(**kwargs):
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError:
resp = requests.get(path_conjurcloud, timeout=30, **lookup_kwargs) resp = requests.get(path_conjurcloud, timeout=30, **lookup_kwargs)
except: except:
raise resp = requests.get(path_conjurcloud, timeout=30, **lookup_kwargs)
raise_for_status(resp) raise_for_status(resp)
return resp.text return resp.text