Merge pull request #225 from ImMin5/feature-cost-router

Fix data source rule permission
cloudforet-io · May 13, 2024 · 203e3c4 · 203e3c4
2 parents c79b72d + 366160a
commit 203e3c4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/spaceone/cost_analysis/manager/data_source_rule_manager.py b/src/spaceone/cost_analysis/manager/data_source_rule_manager.py
@@ -196,7 +196,7 @@ def _get_service_account(
                 {"k": target_key, "v": target_value, "o": "eq"},
                 {"k": "domain_id", "v": domain_id, "o": "eq"},
             ],
-            "only": ["service_account_id", "project_id", "workspace_id"],
+            "only": ["service_account_id", "project_id", "workspace_id", "tags"],
         }
 
         if workspace_id:

diff --git a/src/spaceone/cost_analysis/service/data_source_rule_service.py b/src/spaceone/cost_analysis/service/data_source_rule_service.py
@@ -41,7 +41,7 @@ def __init__(self, *args, **kwargs):
 
     @transaction(
         permission="cost-analysis:DataSourceRule.write",
-        role_types=["DOMAIN_OWNER", "WORKSPACE_OWNER"],
+        role_types=["DOMAIN_ADMIN", "WORKSPACE_OWNER"],
     )
     def create(self, params):
         """Create data source rule
@@ -114,7 +114,7 @@ def create_data_source_rule(self, params):
 
     @transaction(
         permission="cost-analysis:DataSourceRule.write",
-        role_types=["DOMAIN_OWNER", "WORKSPACE_OWNER"],
+        role_types=["DOMAIN_ADMIN", "WORKSPACE_OWNER"],
     )
     @check_required(["data_source_rule_id", "domain_id"])
     @change_date_value(["end"])
@@ -169,7 +169,7 @@ def update(self, params):
 
     @transaction(
         permission="cost-analysis:DataSourceRule.write",
-        role_types=["DOMAIN_OWNER", "WORKSPACE_OWNER"],
+        role_types=["DOMAIN_ADMIN", "WORKSPACE_OWNER"],
     )
     @check_required(["data_source_rule_id", "order", "domain_id"])
     def change_order(self, params):
@@ -242,7 +242,7 @@ def change_order(self, params):
 
     @transaction(
         permission="cost-analysis:DataSourceRule.write",
-        role_types=["DOMAIN_OWNER", "WORKSPACE_OWNER"],
+        role_types=["DOMAIN_ADMIN", "WORKSPACE_OWNER"],
     )
     @check_required(["data_source_rule_id", "domain_id"])
     def delete(self, params):
@@ -288,7 +288,7 @@ def delete(self, params):
 
     @transaction(
         permission="cost-analysis:DataSourceRule.read",
-        role_types=["DOMAIN_OWNER", "WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
+        role_types=["DOMAIN_ADMIN", "WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
     )
     @change_value_by_rule("APPEND", "workspace_id", "*")
     @check_required(["data_source_rule_id", "domain_id"])
@@ -316,7 +316,7 @@ def get(self, params):
 
     @transaction(
         permission="cost-analysis:DataSourceRule.read",
-        role_types=["DOMAIN_OWNER", "WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
+        role_types=["DOMAIN_ADMIN", "WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
     )
     @change_value_by_rule("APPEND", "workspace_id", "*")
     @check_required(["domain_id"])
@@ -347,7 +347,7 @@ def list(self, params):
 
     @transaction(
         permission="cost-analysis:DataSourceRule.read",
-        role_types=["DOMAIN_OWNER", "WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
+        role_types=["DOMAIN_ADMIN", "WORKSPACE_OWNER", "WORKSPACE_MEMBER"],
     )
     @change_value_by_rule("APPEND", "workspace_id", "*")
     @check_required(["query", "domain_id"])