zuul
/
zuul
Code Issues Proposed changes

CLI: Fix errors with the REST client 

* Fix error in instantiating Session object: attributes "verify",
  "headers" must be passed on after creating the session
* Fix error in computing the API URL from the server's base URL

Change-Id: Id80956e7026db5ed7192fbc4c2dff3afbbd3c9a8
This commit is contained in:
Matthieu Huin 2020-05-14 14:08:26 +02:00
parent 9c463fc185
commit 2793d27b12
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zuul/cmd/client.py
View File

@ -36,12 +36,15 @@ class ZuulRESTClient(object):
"""Basic client for Zuul's REST API"""
def __init__(self, url, verify=False, auth_token=None):
self.url = url
if not self.url.endswith('/'):
self.url += '/'
self.auth_token = auth_token
self.base_url = urllib.parse.urljoin(self.url, '/api/')
self.verify = verify
self.session = requests.Session(
verify=self.verify,
headers={'Authorization': 'Bearer %s' % self.auth_token})
self.base_url = urllib.parse.urljoin(self.url, 'api/')
self.session = requests.Session()
self.session.verify = self.verify
self.session.headers = dict(
Authorization='Bearer %s' % self.auth_token)
def _check_status(self, req):
try: