From 239c47964c5976c6c3744ad1f3b9a20e353991e8 Mon Sep 17 00:00:00 2001 From: dettlaff Date: Mon, 11 Nov 2024 20:36:16 +0400 Subject: [PATCH] fix: add endpoint debug --- .../repositories/users/kanidm_user_repository.py | 6 +++--- selfprivacy_api/utils/monitoring.py | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/selfprivacy_api/repositories/users/kanidm_user_repository.py b/selfprivacy_api/repositories/users/kanidm_user_repository.py index c851d1b..baefb54 100644 --- a/selfprivacy_api/repositories/users/kanidm_user_repository.py +++ b/selfprivacy_api/repositories/users/kanidm_user_repository.py @@ -20,10 +20,11 @@ class KanidmUserRepository(AbstractUserRepository): @staticmethod def _send_query(endpoint: str, method: str = "GET", data=None): request_method = getattr(requests, method.lower(), None) + full_endpoint = f"{KANIDM_URL}/v1/{endpoint}" try: response = request_method( - f"{KANIDM_URL}/v1/{endpoint}", + full_endpoint, json=data, headers={ "Authorization": f"Bearer {TEST_TOKEN}", @@ -33,9 +34,8 @@ class KanidmUserRepository(AbstractUserRepository): ) if response.status_code != 200: - error_text = getattr(response, "text", "No response error was found...") raise KanidmQueryError( - f"Kanidm returned {response.status_code} unexpected HTTP status code. Error: {error_text}." + f"Kanidm returned {response.status_code} unexpected HTTP status code. Endpoint: {full_endpoint}. Error: {response.text}." ) json = response.json() return json["data"] diff --git a/selfprivacy_api/utils/monitoring.py b/selfprivacy_api/utils/monitoring.py index 168d595..adf6758 100644 --- a/selfprivacy_api/utils/monitoring.py +++ b/selfprivacy_api/utils/monitoring.py @@ -70,9 +70,8 @@ class MonitoringQueries: timeout=0.8, ) if response.status_code != 200: - error_text = getattr(response, "text", "No response error was found...") return MonitoringQueryError( - error=f"Prometheus returned unexpected HTTP status code. Error: {error_text}. The query was {query}" + error=f"Prometheus returned unexpected HTTP status code. Error: {response.text}. The query was {query}" ) json = response.json() if result_type and json["data"]["resultType"] != result_type: