openstack
/
monasca-agent
Code Issues Proposed changes

Merge "Fix slash handling in KubernetesConnector's get_request"

This commit is contained in:
Jenkins 2017-08-11 06:42:41 +00:00 committed by Gerrit Code Review
parent ec31373621 5f849db6a3
commit 033ff30a4b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
monasca_agent/collector/checks/utils.py
View File

@ -149,7 +149,14 @@ class KubernetesConnector(object):
"""Sends request to Kubernetes API with given endpoint.
Will retry the request once, with updated token/cert, if unauthorized.
"""
request_url = "{}/{}".format(self.api_url, request_endpoint)
api_url = self.api_url
if api_url[-1] == '/':
api_url = api_url[:-1]
if request_endpoint[0] == '/':
request_endpoint = request_endpoint[1:]
request_url = "{}/{}".format(api_url, request_endpoint)
result = requests.get(request_url,
timeout=self.connection_timeout,
headers=self.api_request_header,