From 8f09872f92c97dc6b997a8d8a51af5a1a4c3ce20 Mon Sep 17 00:00:00 2001 From: Jongmin Kim Date: Tue, 23 Jul 2024 00:31:44 +0900 Subject: [PATCH] fix: fix permission issue Signed-off-by: Jongmin Kim --- .../monitoring/manager/identity_manager.py | 17 ++++++++--------- src/spaceone/monitoring/service/job_service.py | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/spaceone/monitoring/manager/identity_manager.py b/src/spaceone/monitoring/manager/identity_manager.py index 61865dc..4ae199c 100644 --- a/src/spaceone/monitoring/manager/identity_manager.py +++ b/src/spaceone/monitoring/manager/identity_manager.py @@ -23,15 +23,14 @@ def get_domain_from_system(self, domain_id: str) -> dict: "Domain.get", {"domain_id": domain_id}, token=system_token ) - def get_user(self, user_id: str, domain_id) -> dict: - if self.token_type == "SYSTEM_TOKEN": - return self.identity_connector.dispatch( - "User.get", - {"user_id": user_id}, - x_domain_id=domain_id, - ) - else: - return self.identity_connector.dispatch("User.get", {"user_id": user_id}) + def get_user_from_system(self, user_id: str, domain_id: str) -> dict: + system_token = config.get_global("TOKEN") + return self.identity_connector.dispatch( + "User.get", + {"user_id": user_id}, + x_domain_id=domain_id, + token=system_token, + ) def get_workspace_user(self, user_id: str): return self.identity_connector.dispatch( diff --git a/src/spaceone/monitoring/service/job_service.py b/src/spaceone/monitoring/service/job_service.py index dc6168f..7cc93e8 100644 --- a/src/spaceone/monitoring/service/job_service.py +++ b/src/spaceone/monitoring/service/job_service.py @@ -593,7 +593,7 @@ def _get_triggered_by_name(self, triggered_by, domain_id): def _get_user_name(self, user_id: str, domain_id: str) -> str: try: identity_mgr: IdentityManager = self.locator.get_manager("IdentityManager") - user_info = identity_mgr.get_user(user_id, domain_id) + user_info = identity_mgr.get_user_from_system(user_id, domain_id) if len(user_info.get("name", "").strip()) == 0: return user_info["user_id"]