From 2793d27b12bd4bf13aee6145558e9bf59bb4e076 Mon Sep 17 00:00:00 2001
From: Matthieu Huin <mhuin@redhat.com>
Date: Thu, 14 May 2020 14:08:26 +0200
Subject: [PATCH] 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
---
 zuul/cmd/client.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/zuul/cmd/client.py b/zuul/cmd/client.py
index 49d6ea9a9b..db535b888b 100755
--- a/zuul/cmd/client.py
+++ b/zuul/cmd/client.py
@@ -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: