From 1f54e539aafc1e1cc187c11f37aabde3eb774649 Mon Sep 17 00:00:00 2001 From: Sooyoung98 Date: Wed, 17 Jan 2024 18:12:37 +0900 Subject: [PATCH] fix: fixed alert bugs related to project id and domain id showing up instead of project and domain names --- .../monitoring/manager/identity_manager.py | 14 ++++---------- src/spaceone/monitoring/service/job_service.py | 6 +++++- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/spaceone/monitoring/manager/identity_manager.py b/src/spaceone/monitoring/manager/identity_manager.py index 7088488..c724efe 100644 --- a/src/spaceone/monitoring/manager/identity_manager.py +++ b/src/spaceone/monitoring/manager/identity_manager.py @@ -18,16 +18,10 @@ def __init__(self, *args, **kwargs): ) def get_domain(self, domain_id: str) -> dict: - if self.token_type == "SYSTEM_TOKEN": - return self.identity_connector.dispatch( - "Domain.get", - {"domain_id": domain_id}, - x_domain_id=domain_id, - ) - else: - return self.identity_connector.dispatch( - "Domain.get", {"domain_id": domain_id} - ) + token = config.get_global("TOKEN") + return self.identity_connector.dispatch( + "Domain.get", {"domain_id": domain_id}, x_domain_id=domain_id, token=token + ) def get_user(self, user_id: str, domain_id) -> dict: if self.token_type == "SYSTEM_TOKEN": diff --git a/src/spaceone/monitoring/service/job_service.py b/src/spaceone/monitoring/service/job_service.py index 20416bb..b9b83ef 100644 --- a/src/spaceone/monitoring/service/job_service.py +++ b/src/spaceone/monitoring/service/job_service.py @@ -516,7 +516,9 @@ def _create_message( if alert_vo.description and alert_vo.description != "": message["description"] = alert_vo.description - alert_link = self._make_alert_link(alert_vo.alert_id, alert_vo.workspace_id, alert_vo.domain_id) + alert_link = self._make_alert_link( + alert_vo.alert_id, alert_vo.workspace_id, alert_vo.domain_id + ) if alert_link: message["link"] = alert_link @@ -551,6 +553,8 @@ def _get_project_name(self, project_id: str, domain_id: str) -> str: ) return f'{project_group_info["name"]} > {project_info["name"]}' + else: + return project_info["name"] except Exception as e: _LOGGER.error( f"[_get_project_name] Failed to get project: {e}", exc_info=True