fix: delete state field & fix schedule logic from DataSource

cloudforet-io · Feb 10, 2025 · 459bf06 · 459bf06
1 parent 2141906
commit 459bf06
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/src/spaceone/cost_analysis/info/data_source_info.py b/src/spaceone/cost_analysis/info/data_source_info.py
@@ -37,16 +37,28 @@ def PluginInfo(vo):
         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,
-        "state": data_source_vo.state,
         "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:

diff --git a/src/spaceone/cost_analysis/model/data_source/request.py b/src/spaceone/cost_analysis/model/data_source/request.py
@@ -26,7 +26,7 @@ class Plugin(BaseModel):
 
 
 class Schedule(BaseModel):
-    state: State
+    state: str
     hour: Union[int, None] = None
 
 

diff --git a/src/spaceone/cost_analysis/model/data_source_model.py b/src/spaceone/cost_analysis/model/data_source_model.py
@@ -77,6 +77,7 @@ class DataSource(MongoModel):
             "plugin_info",
             "secret_filter",
             "template",
+            "schedule",
             "tags",
             "updated_at",
             "last_synchronized_at",
@@ -93,6 +94,7 @@ class DataSource(MongoModel):
             "data_source_type",
             "secret_type",
             "provider",
+            "schedule",
         ],
         "ordering": ["name"],
         "indexes": [

diff --git a/src/spaceone/cost_analysis/service/data_source_service.py b/src/spaceone/cost_analysis/service/data_source_service.py
@@ -585,7 +585,6 @@ def get(self, params: DataSourceGetRequest) -> Union[DataSourceResponse, dict]:
         [
             "data_source_id",
             "name",
-            "state",
             "data_source_type",
             "provider",
             "workspace_id",
@@ -605,7 +604,6 @@ def list(
                 'query': 'dict (spaceone.api.core.v1.Query)'
                 'data_source_id': 'str',
                 'name': 'str',
-                'state': 'str',
                 'data_source_type': 'str',
                 'provider': 'str',
                 'connected_workspace_id': str,