refactor: remove debug print statements and update token handling in cost report management

Author: jinyoungmoonDEV

src/spaceone/cost_analysis/interface/task/v1/cost_report_run_scheduler.py

@@ -1,7 +1,6 @@
 import logging
 from datetime import datetime, timezone
 
-from spaceone.core.auth.jwt.jwt_util import JWTUtil
 from spaceone.core.error import ERROR_CONFIGURATION
 from spaceone.core import config
 from spaceone.core import utils
@@ -47,8 +46,6 @@ def _create_cost_report_run_task(self):
                     }
                 ],
             }
-            print("scheduler token exists:", self._token is not None)
-            print("scheduler token type:", JWTUtil.get_value_from_token(self._token, "typ"))
             print(
                 f"{utils.datetime_to_iso8601(datetime.now(timezone.utc))} [INFO] [create_task] create_cost_report_by_cost_report_config => START"
             )

src/spaceone/cost_analysis/manager/cost_report_manager.py

@@ -1,9 +1,7 @@
 import logging
-from multiprocessing.pool import worker
 from typing import Tuple
 from mongoengine import QuerySet
 
-from spaceone.core.auth.jwt.jwt_util import JWTUtil
 from spaceone.core import queue, utils
 from spaceone.core.manager import BaseManager
 from spaceone.cost_analysis.model.cost_report.database import CostReport
@@ -82,8 +80,6 @@ def stat_cost_reports(self, query: dict) -> dict:
 
     def push_creating_cost_report_job(self, params: dict) -> None:
         token = self.transaction.meta.get("token")
-        print("worker token exists :", token is not None)
-        print("worker token type :", JWTUtil.get_value_from_token(token, "typ"))
         task = {
             "name": "create_cost_report_job",
             "version": "v1",

src/spaceone/cost_analysis/manager/identity_manager.py

@@ -1,6 +1,4 @@
 import logging
-from time import sleep
-from typing import Union
 
 from spaceone.core import cache
 from spaceone.core import config
@@ -114,19 +112,17 @@ def get_workspace(self, workspace_id: str, domain_id: str) -> str:
             return workspace_id
 
     def list_workspaces(self, params: dict, domain_id: str, token: str = None) -> dict:
-        print("request token type:", self.token_type)
         if self.token_type == "SYSTEM_TOKEN" or token:
             return self.identity_conn.dispatch(
                 "Workspace.list", params, x_domain_id=domain_id, token=token
             )
         else:
-            print("else in")
             return self.identity_conn.dispatch("Workspace.list", params)
 
-    def list_workspace_users(self, params: dict, domain_id: str) -> dict:
-        if self.token_type == "SYSTEM_TOKEN":
+    def list_workspace_users(self, params: dict, domain_id: str, token: str = None) -> dict:
+        if self.token_type == "SYSTEM_TOKEN" or token:
             return self.identity_conn.dispatch(
-                "WorkspaceUser.list", params, x_domain_id=domain_id
+                "WorkspaceUser.list", params, x_domain_id=domain_id, token=token
             )
         else:
             return self.identity_conn.dispatch("WorkspaceUser.list", params)

src/spaceone/cost_analysis/service/cost_report_serivce.py

@@ -440,6 +440,7 @@ def get_email_verified_workspace_owner_users(
             return []
 
         # list users in workspace
+        system_token = config.get_global("TOKEN")
         users_info = self.identity_mgr.list_workspace_users(
             params={
                 "workspace_id": workspace_id,
@@ -452,6 +453,7 @@ def get_email_verified_workspace_owner_users(
                 },
             },
             domain_id=domain_id,
+            token=system_token,
         ).get("results", [])
 
         return users_info
@@ -469,9 +471,11 @@ def get_start_cost_report_number(
     def _get_workspace_name_map(self, domain_id: str) -> list:
         workspace_ids = []
 
+        system_token = config.get_global("TOKEN")
         workspaces = self.identity_mgr.list_workspaces(
             {"query": {"filter": [{"k": "state", "v": "ENABLED", "o": "eq"}]}},
             domain_id,
+            token=system_token,
         )
 
         for workspace in workspaces.get("results", []):