Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete role bindings when the workspace group is deleted #328

Merged
merged 2 commits into from
Aug 29, 2024
Merged

Delete role bindings when the workspace group is deleted #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c70ad80
feat: delete the role binding when delete a workspace group
yjinjo Aug 29, 2024
58102f4
feat: delete role bindings when role bindings exist
yjinjo Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions src/spaceone/identity/manager/workspace_group_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from mongoengine import QuerySet
from spaceone.core.manager import BaseManager

from spaceone.identity.manager.role_binding_manager import RoleBindingManager
from spaceone.identity.model.workspace_group.database import WorkspaceGroup

_LOGGER = logging.getLogger(__name__)
Expand All @@ -13,6 +14,7 @@ class WorkspaceGroupManager(BaseManager):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.workspace_group_model = WorkspaceGroup
self.rb_mgr = RoleBindingManager()

def create_workspace_group(self, params: dict) -> WorkspaceGroup:
def _rollback(vo: WorkspaceGroup):
Expand All @@ -39,8 +41,20 @@ def _rollback(old_data):

return workspace_group_vo.update(params)

@staticmethod
def delete_workspace_group_by_vo(workspace_group_vo: WorkspaceGroup) -> None:
def delete_workspace_group_by_vo(self, workspace_group_vo: WorkspaceGroup) -> None:
user_ids = [user["user_id"] for user in workspace_group_vo.users]
rb_vos = self.rb_mgr.filter_role_bindings(
user_id=user_ids,
workspace_group_id=workspace_group_vo.workspace_group_id,
domain_id=workspace_group_vo.domain_id,
)

if rb_vos.count() > 0:
_LOGGER.debug(
f"[delete_workspace_group_by_vo] Delete role bindings count with {workspace_group_vo.workspaces}: {rb_vos.count()}"
)
rb_vos.delete()

workspace_group_vo.delete()

# TODO: When add_users and remove_users, are user_id and role_type required?
Expand Down
13 changes: 7 additions & 6 deletions src/spaceone/identity/service/workspace_group_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from typing import Union

from spaceone.core.error import (
ERROR_EXIST_RESOURCE,
ERROR_INVALID_PARAMETER,
ERROR_NOT_FOUND,
ERROR_PERMISSION_DENIED,
Expand Down Expand Up @@ -147,9 +146,6 @@ def delete(self, params: WorkspaceGroupDeleteRequest) -> None:
params.workspace_group_id, params.domain_id
)

if workspace_group_vo.users:
_LOGGER.error("Workspace Group has users. Please remove users first.")
raise ERROR_EXIST_RESOURCE(child="users", parent="workspace_group")
self.workspace_group_mgr.delete_workspace_group_by_vo(workspace_group_vo)

@transaction(
Expand Down Expand Up @@ -454,12 +450,17 @@ def remove_users(
raise ERROR_NOT_FOUND(key="params_user_id", value=params_user_id)

workspace_group_users = [users for users in workspace_group_vo["users"]]
role_binding_vos = self.rb_mgr.filter_role_bindings(
rb_vos = self.rb_mgr.filter_role_bindings(
user_id=params_user_ids,
workspace_group_id=params.workspace_group_id,
domain_id=params.domain_id,
)
role_binding_vos.delete()

if rb_vos.count() > 0:
_LOGGER.debug(
f"[remove_users] Delete role bindings count with {workspace_group_vo.workspaces}: {rb_vos.count()}"
)
rb_vos.delete()

params.users = []
for user in workspace_group_users:
Expand Down
Loading