Merge pull request #380 from yjinjo/master

Delete workspace role binding when workspace group is added
cloudforet-io · Sep 30, 2024 · 84a033a · 84a033a
2 parents 86878cb + 063e0f3
commit 84a033a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/spaceone/identity/service/workspace_service.py b/src/spaceone/identity/service/workspace_service.py
@@ -417,7 +417,7 @@ def _add_workspace_to_group(
         if old_workspace_group_id:
             if old_workspace_group_id != workspace_group_id:
                 self._delete_role_bindings(
-                    workspace_id, old_workspace_group_id, domain_id
+                    workspace_id, domain_id, old_workspace_group_id
                 )
 
                 self._create_role_bindings(
@@ -459,6 +459,7 @@ def _add_workspace_to_group(
             else:
                 is_updatable = False
         else:
+            self._delete_role_bindings(workspace_id, domain_id)
             self._create_role_bindings(
                 workspace_group_vo.users,
                 workspace_id,
@@ -478,7 +479,7 @@ def _remove_workspace_from_group_with_workspace_vo(
         self, workspace_vo: Workspace, old_workspace_group_id: str, domain_id: str
     ) -> None:
         workspace_id = workspace_vo.workspace_id
-        self._delete_role_bindings(workspace_id, old_workspace_group_id, domain_id)
+        self._delete_role_bindings(workspace_id, domain_id, old_workspace_group_id)
 
         workspace_vo.changed_at = datetime.utcnow()
         workspace_vo.workspace_group_id = None
@@ -504,12 +505,12 @@ def _remove_workspace_from_group_with_workspace_vo(
         )
 
     def _delete_role_bindings(
-        self, workspace_id: str, existing_workspace_group_id: str, domain_id: str
+        self, workspace_id: str, domain_id: str, existing_workspace_group_id: str = None
     ):
         rb_vos = self.rb_mgr.filter_role_bindings(
             workspace_id=workspace_id,
-            workspace_group_id=existing_workspace_group_id,
             domain_id=domain_id,
+            workspace_group_id=existing_workspace_group_id,
         )
         for rb_vo in rb_vos:
             self.rb_mgr.delete_role_binding_by_vo(rb_vo)