From 922ae905826e2056d546f2147e5340bd7aa772de Mon Sep 17 00:00:00 2001 From: seolmin Date: Tue, 25 Feb 2025 11:51:01 +0900 Subject: [PATCH] feat: update ConfigManager to include domain_id in get_domain_config method and add new clone and index files Signed-off-by: seolmin --- src/spaceone/dashboard/manager/config_manager.py | 11 +++++++++-- .../manager/data_table_manager/data_source_manager.py | 4 +++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/spaceone/dashboard/manager/config_manager.py b/src/spaceone/dashboard/manager/config_manager.py index ae69917..8c8c12f 100644 --- a/src/spaceone/dashboard/manager/config_manager.py +++ b/src/spaceone/dashboard/manager/config_manager.py @@ -1,3 +1,4 @@ +from spaceone.core import config from spaceone.core.manager import BaseManager from spaceone.core.connector.space_connector import SpaceConnector @@ -9,5 +10,11 @@ def __init__(self, *args, **kwargs): "SpaceConnector", service="config" ) - def get_domain_config(self, params: dict) -> dict: - return self.domain_config_conn.dispatch("DomainConfig.get", params) + def get_domain_config(self, params: dict, domain_id: str) -> dict: + system_token = config.get_global("TOKEN") + return self.domain_config_conn.dispatch( + "DomainConfig.get", + params, + x_domain_id=domain_id, + token=system_token, + ) diff --git a/src/spaceone/dashboard/manager/data_table_manager/data_source_manager.py b/src/spaceone/dashboard/manager/data_table_manager/data_source_manager.py index 60301fa..537fe60 100644 --- a/src/spaceone/dashboard/manager/data_table_manager/data_source_manager.py +++ b/src/spaceone/dashboard/manager/data_table_manager/data_source_manager.py @@ -483,6 +483,8 @@ def _apply_left_join_tags_from_service_account(self, service_account_keys) -> No def _get_currency_from_domain_config(self): request_params = {"name": "settings"} - domain_config = self.config_mgr.get_domain_config(request_params) + domain_config = self.config_mgr.get_domain_config( + request_params, self.domain_id + ) unified_cost_config = domain_config["data"].get("unified_cost_config") return unified_cost_config.get("currency")