Merge pull request #44 from stat-kwon/master

Add metadata in init method

Author: stat-kwon

src/cloudforet/cost_analysis/connector/google_storage_collector.py

@@ -59,8 +59,8 @@ def get_cost_data(self, bucket_name: str):
 
     @staticmethod
     def _check_options(options: dict) -> None:
-        if "base_url" not in options or "bucket_name" not in options:
-            raise ERROR_REQUIRED_PARAMETER(key="options.base_url")
+        if "bucket_name" not in options:
+            raise ERROR_REQUIRED_PARAMETER(key="options.bucket_name")
 
     @staticmethod
     def _get_csv(csv_file: str) -> List[dict]:

src/cloudforet/cost_analysis/connector/http_file_connector.py

@@ -50,7 +50,7 @@ def get_cost_data(self, base_url):
 
     @staticmethod
     def _check_options(options: dict) -> None:
-        if "base_url" not in options or "bucket_name" not in options:
+        if "base_url" not in options:
             raise ERROR_REQUIRED_PARAMETER(key="options.base_url")
 
     def _get_csv(self, base_url: str) -> List[dict]:

src/cloudforet/cost_analysis/manager/cost_manager.py

@@ -27,7 +27,7 @@ def get_data(self, options, secret_data, schema, task_options):
         if "field_mapper" in options:
             self.field_mapper = options["field_mapper"]
 
-        if not secret_data:
+        if "base_url" in task_options:
             base_url = task_options["base_url"]
             http_file_connector = self.locator.get_connector(HTTPFileConnector)
             http_file_connector.create_session(options, secret_data, schema)

src/cloudforet/cost_analysis/manager/data_source_manager.py

@@ -1,6 +1,10 @@
 import logging
 
 from spaceone.core.manager import BaseManager
+
+from cloudforet.cost_analysis.connector.google_storage_collector import (
+    GoogleStorageConnector,
+)
 from cloudforet.cost_analysis.model.data_source_model import PluginMetadata
 from cloudforet.cost_analysis.connector.http_file_connector import HTTPFileConnector
 
@@ -13,10 +17,33 @@ def init_response(options):
         plugin_metadata = PluginMetadata()
         plugin_metadata.validate()
 
+        if "bucket_name" in options:
+            return {
+                "metadata": {
+                    "data_source_rules": [
+                        {
+                            "name": "match_service_account",
+                            "conditions_policy": "ALWAYS",
+                            "actions": {
+                                "match_service_account": {
+                                    "source": "additional_info.Project ID",
+                                    "target": "data.project_id",
+                                }
+                            },
+                            "options": {"stop_processing": True},
+                        }
+                    ],
+                    "currency": "KRW",
+                }
+            }
+
         return {"metadata": plugin_metadata.to_primitive()}
 
     def verify_plugin(self, options, secret_data, schema):
-        http_file_connector: HTTPFileConnector = self.locator.get_connector(
-            HTTPFileConnector
-        )
-        http_file_connector.create_session(options, secret_data, schema)
+        if "base_url" in options:
+            http_file_connector: HTTPFileConnector = self.locator.get_connector(
+                HTTPFileConnector
+            )
+            http_file_connector.create_session(options, secret_data, schema)
+        elif "bucket_name" in options:
+            self.locator.get_connector(GoogleStorageConnector, secret_data=secret_data)