Feature refactoring

.github/workflows/dispatch_daily_build.yaml

@@ -63,7 +63,7 @@ jobs:
 
   scan:
     needs: docker
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Run Trivy vulnerability scanner
         id: trivy-scan
@@ -89,7 +89,7 @@ jobs:
           echo "$count"
 
       - name: slack
-        if:  ${{ steps.vulnerabilities.outputs.result_count != 0 }}
+        if: ${{ steps.vulnerabilities.outputs.result_count != 0 }}
         uses: 8398a7/action-slack@v3
         with:
           status: custom

deploy/helm/Chart.yaml

@@ -4,6 +4,6 @@ description: SpaceONE Cost Analysis Helm chart for Kubernetes
 
 type: application
 
-version: 1.4.1
+version: 1.4.2
 appVersion: 1.x.y
 

deploy/helm/values.yaml

@@ -78,6 +78,18 @@ application_scheduler:
       queue: cost_analysis_q
       interval: 1
       minute: ':00'
+    cost_report_run_scheduler:
+      backend: spaceone.cost_analysis.interface.task.v1.cost_report_run_scheduler.CostReportRunScheduler
+      queue: cost_analysis_q
+      interval: 1
+      minute: ':00'
+    budget_update_scheduler:
+      backend: spaceone.cost_analysis.interface.task.v1.budget_update_scheduler.BudgetUpdateScheduler
+      queue: cost_analysis_q
+      interval: 1
+      minute: ':00'
+
+
 
 # Overwrite worker config
 application_worker:

src/spaceone/cost_analysis/conf/global_conf.py

@@ -13,6 +13,10 @@
     }
 }
 
+# Budget Settings
+BUDGET_UPDATE_DAY = 1  # Every 1st day of month
+BUDGET_UPDATE_HOUR = 0
+
 # Cost Report Config Settings
 COST_REPORT_CONFIG_DEFAULT_ISSUE_DAY = 10
 COST_REPORT_DEFAULT_CURRENCY = "KRW"  # KRW | USD | JPY
@@ -98,12 +102,6 @@
 UNIFIED_COST_RUN_HOUR = 0  # Hour (UTC)
 UNIFIED_COST_AGGREGATION_DAY = 15  # Day
 
-DEFAULT_EXCHANGE_RATE = {
-    # 'KRW': 1178.7,
-    # 'JPY': 114,
-    # 'CNY': 6.3
-}
-
 INSTALLED_DATA_SOURCE_PLUGINS = [
     # {
     #     'name': '',

src/spaceone/cost_analysis/connector/currency_connector.py

@@ -1,3 +1,4 @@
+import FinanceDataReader as fdr
 import logging
 import pandas as pd
 import requests

src/spaceone/cost_analysis/connector/datasource_plugin_connector.py

@@ -2,6 +2,7 @@
 
 from spaceone.core.connector import BaseConnector
 from spaceone.core.auth.jwt.jwt_util import JWTUtil
+from spaceone.core.connector.space_connector import SpaceConnector
 
 __all__ = ["DataSourcePluginConnector"]
 
@@ -24,9 +25,7 @@ def initialize(self, endpoint):
         if static_endpoint:
             endpoint = static_endpoint
 
-        self.client = self.locator.get_connector(
-            "SpaceConnector", endpoint=endpoint, token="NO_TOKEN"
-        )
+        self.client = SpaceConnector(endpoint=endpoint, token="NO_TOKEN")
 
         self.secret_data = self.config.get("secret_data")
         self.options = self.config.get("options")

src/spaceone/cost_analysis/error/budget.py

@@ -30,32 +30,38 @@ class ERROR_DATE_IS_WRONG(ERROR_INVALID_ARGUMENT):
 
 
 class ERROR_UNIT_IS_REQUIRED(ERROR_INVALID_ARGUMENT):
-    _message = (
-        "Unit is required for notifications (key = notifications, value = {value})"
-    )
+    _message = "Unit is required for notification (key = notification, value = {value})"
 
 
 class ERROR_NOTIFICATION_TYPE_IS_REQUIRED(ERROR_INVALID_ARGUMENT):
-    _message = "Notification type is required for notifications (key = notifications, value = {value})"
+    _message = "Notification type is required for notification (key = notification, value = {value})"
 
 
 class ERROR_THRESHOLD_IS_WRONG(ERROR_INVALID_ARGUMENT):
     _message = (
-        "Threshold must be greater than zero. (key = notifications, value = {value})"
+        "Threshold must be greater than zero. (key = notification, value = {value})"
     )
 
 
 class ERROR_THRESHOLD_IS_WRONG_IN_PERCENT_TYPE(ERROR_INVALID_ARGUMENT):
-    _message = "In percentage type, the threshold must be less than 100. (key = notifications, value = {value})"
+    _message = "In percentage type, the threshold must be less than 100. (key = notification, value = {value})"
 
 
 class ERROR_PROVIDER_FILTER_IS_EMPTY(ERROR_INVALID_ARGUMENT):
     _message = "Provider filter is empty. (key = provider_filter.providers, value = [])"
 
 
 class ERROR_BUDGET_ALREADY_EXIST(ERROR_INVALID_ARGUMENT):
-    _message = "Budget already exist. (service_account_id = {service_account_id}, workspace_id= {workspace_id}, target = {target})"
+    _message = "Budget already exist. (start = {start} end = {end}, target = {target}, workspace_id = {workspace_id})"
 
 
 class ERROR_NOTIFICATION_IS_NOT_SUPPORTED_IN_PROJECT(ERROR_INVALID_ARGUMENT):
     _message = "Notification is not supported in project. (target = {target})"
+
+
+class ERROR_BUDGET_MANAGER_IS_NOT_VERIFIED(ERROR_INVALID_ARGUMENT):
+    _message = "To assign as a budget manager to a user, email verification is required. (user_id = {user_id})"
+
+
+class ERROR_DUPLICATED_THRESHOLD(ERROR_INVALID_ARGUMENT):
+    _message = "Duplicate threshold in notification. (threshold = {threshold})"

src/spaceone/cost_analysis/info/__init__.py

@@ -1,7 +0,0 @@
-from spaceone.cost_analysis.info.common_info import *
-from spaceone.cost_analysis.info.data_source_info import *
-from spaceone.cost_analysis.info.data_source_rule_info import *
-from spaceone.cost_analysis.info.cost_info import *
-from spaceone.cost_analysis.info.cost_query_set_info import *
-from spaceone.cost_analysis.info.job_info import *
-from spaceone.cost_analysis.info.job_task_info import *

src/spaceone/cost_analysis/info/data_source_info.py

@@ -1,92 +0,0 @@
-import functools
-from spaceone.api.cost_analysis.v1 import data_source_pb2
-from spaceone.core.pygrpc.message_type import *
-from spaceone.core import utils
-from spaceone.cost_analysis.model.data_source_model import DataSource
-
-__all__ = ["DataSourceInfo", "DataSourcesInfo"]
-
-
-def SecretFilterInfo(secret_filter_vo):
-    if secret_filter_vo:
-        info = {
-            "state": secret_filter_vo.state,
-            "secrets": secret_filter_vo.secrets,
-            "service_accounts": secret_filter_vo.service_accounts,
-            "schemas": secret_filter_vo.schemas,
-        }
-        return data_source_pb2.SecretFilter(**info)
-    else:
-        return None
-
-
-def PluginInfo(vo):
-    if vo:
-        info = {
-            "plugin_id": vo.plugin_id,
-            "version": vo.version,
-            "options": change_struct_type(vo.options),
-            "metadata": change_struct_type(vo.metadata),
-            "secret_id": vo.secret_id,
-            "schema_id": vo.schema_id,
-            "upgrade_mode": vo.upgrade_mode,
-        }
-
-        return data_source_pb2.PluginInfo(**info)
-    else:
-        return None
-
-
-def ScheduleInfo(vo):
-    if vo:
-        info = {
-            "state": vo.state,
-            "hour": vo.hour,
-        }
-
-        return data_source_pb2.Schedule(**info)
-    else:
-        return None
-
-
-def DataSourceInfo(data_source_vo: DataSource, minimal=False):
-    info = {
-        "data_source_id": data_source_vo.data_source_id,
-        "workspace_id": data_source_vo.workspace_id,
-        "name": data_source_vo.name,
-        "data_source_type": data_source_vo.data_source_type,
-        "secret_type": data_source_vo.secret_type,
-        "provider": data_source_vo.provider,
-        "resource_group": data_source_vo.resource_group,
-        "schedule": ScheduleInfo(data_source_vo.schedule),
-    }
-
-    if not minimal:
-        info.update(
-            {
-                "plugin_info": PluginInfo(data_source_vo.plugin_info),
-                "secret_filter": SecretFilterInfo(data_source_vo.secret_filter),
-                "template": change_struct_type(data_source_vo.template),
-                "permissions": change_struct_type(data_source_vo.permissions),
-                "tags": change_struct_type(data_source_vo.tags),
-                "cost_tag_keys": data_source_vo.cost_tag_keys,
-                "cost_additional_info_keys": data_source_vo.cost_additional_info_keys,
-                "cost_data_keys": data_source_vo.cost_data_keys,
-                "data_source_account_count": data_source_vo.data_source_account_count,
-                "connected_workspace_count": data_source_vo.connected_workspace_count,
-                "domain_id": data_source_vo.domain_id,
-                "created_at": utils.datetime_to_iso8601(data_source_vo.created_at),
-                "last_synchronized_at": utils.datetime_to_iso8601(
-                    data_source_vo.last_synchronized_at
-                ),
-            }
-        )
-
-    return data_source_pb2.DataSourceInfo(**info)
-
-
-def DataSourcesInfo(data_source_vos, total_count, **kwargs):
-    return data_source_pb2.DataSourcesInfo(
-        results=list(map(functools.partial(DataSourceInfo, **kwargs), data_source_vos)),
-        total_count=total_count,
-    )