From 23ba530ada77e4169f740e416bc5b41f2255c27b Mon Sep 17 00:00:00 2001 From: Kirill Zhukov Date: Thu, 19 Jan 2023 22:13:04 +0100 Subject: [PATCH] Post-review fixes --- albs_oval_errata_diff/albs.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/albs_oval_errata_diff/albs.py b/albs_oval_errata_diff/albs.py index da2b718..6f758b3 100644 --- a/albs_oval_errata_diff/albs.py +++ b/albs_oval_errata_diff/albs.py @@ -1,6 +1,7 @@ """ albs.py contains ALBS class """ +from urllib.parse import urljoin from typing import Union, Dict import requests @@ -12,8 +13,6 @@ class ALBS: """ def __init__(self, url: str, token: str, timeout: int): - if url.endswith('/'): - url = url[:-1] self.url = url self.token = token self.timeout = timeout @@ -27,13 +26,12 @@ class ALBS: endpoint = '/api/v1/platforms/' headers = {'accept': 'application/json', 'Authorization': f'Bearer {self.token}'} - response = requests.get(url=self.url+endpoint, + response = requests.get(url=urljoin(self.url, endpoint), headers=headers, timeout=self.timeout) response.raise_for_status() - res = {} - for platform in response.json(): - res[platform['name']] = platform['id'] + res = {platform['name']: platform['id'] + for platform in response.json()} return res def get_errata_status(self, errata_id: str, platform_name: str) -> Union[str, None]: @@ -60,7 +58,7 @@ class ALBS: params = {'id': errata_id, 'platformId': platform_id} headers = {'accept': 'application/json', 'Authorization': f'Bearer {self.token}'} - response = requests.get(url=self.url+endpoint, + response = requests.get(url=urljoin(self.url, endpoint), params=params, headers=headers, timeout=self.timeout) response.raise_for_status() @@ -68,5 +66,5 @@ class ALBS: # errata_id was not found if response_json['total_records'] == 0: - return None + return return response_json['records'][0]['release_status']