Merge pull request #131 from ImMin5/master

Add workspace_id to secret manager when Domain admin register datasource

src/spaceone/cost_analysis/conf/global_conf.py

@@ -31,6 +31,17 @@
     # "event": []
 }
 
+# Log Settings
+LOG = {
+    "filters": {
+        "masking": {
+            "rules": {
+                "DataSource.register": ["secret_data"],
+            }
+        }
+    }
+}
+
 CONNECTORS = {
     "SpaceConnector": {
         "backend": "spaceone.core.connector.space_connector:SpaceConnector",

src/spaceone/cost_analysis/manager/secret_manager.py

@@ -19,10 +19,11 @@ def __init__(self, *args, **kwargs):
         )
 
     def create_secret(
-            self,
-            secret_data: dict,
-            resource_group: str,
-            schema_id: str,
+        self,
+        secret_data: dict,
+        resource_group: str,
+        schema_id: str,
+        workspace_id: str,
     ):
         def _rollback(secret_id: str):
             _LOGGER.info(f"[create_secret._rollback] Delete secret : {secret_id}")
@@ -33,6 +34,7 @@ def _rollback(secret_id: str):
             "resource_group": resource_group,
             "data": secret_data,
             "schema_id": schema_id,
+            "workspace_id": workspace_id,
         }
 
         response = self.secret_connector.dispatch("Secret.create", params)

src/spaceone/cost_analysis/service/data_source_service.py

@@ -112,6 +112,7 @@ def register(self, params):
                     secret_data,
                     resource_group,
                     plugin_info.get("schema_id"),
+                    params["workspace_id"],
                 )
 
                 params["plugin_info"]["secret_id"] = secret_id