Skip to content

fix: members: use new *All objects for *AllManager managers #1827

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

Merged
merged 1 commit into from
Jan 13, 2022
Merged

fix: members: use new *All objects for *AllManager managers #1827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 16 additions & 6 deletions gitlab/v4/objects/members.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@
"GroupBillableMemberMembership",
"GroupBillableMemberMembershipManager",
"GroupMember",
"GroupMemberAll",
"GroupMemberManager",
"GroupMemberAllManager",
"ProjectMember",
"ProjectMemberAll",
"ProjectMemberManager",
"ProjectMemberAllManager",
]
Expand Down Expand Up @@ -70,15 +72,19 @@ class GroupBillableMemberMembershipManager(ListMixin, RESTManager):
_from_parent_attrs = {"group_id": "group_id", "user_id": "id"}


class GroupMemberAll(RESTObject):
_short_print_attr = "username"


class GroupMemberAllManager(RetrieveMixin, RESTManager):
_path = "/groups/{group_id}/members/all"
_obj_cls = GroupMember
_obj_cls = GroupMemberAll
_from_parent_attrs = {"group_id": "id"}

def get(
self, id: Union[str, int], lazy: bool = False, **kwargs: Any
) -> GroupMember:
return cast(GroupMember, super().get(id=id, lazy=lazy, **kwargs))
) -> GroupMemberAll:
return cast(GroupMemberAll, super().get(id=id, lazy=lazy, **kwargs))


class ProjectMember(SaveMixin, ObjectDeleteMixin, RESTObject):
Expand All @@ -103,12 +109,16 @@ def get(
return cast(ProjectMember, super().get(id=id, lazy=lazy, **kwargs))


class ProjectMemberAll(RESTObject):
_short_print_attr = "username"


class ProjectMemberAllManager(RetrieveMixin, RESTManager):
_path = "/projects/{project_id}/members/all"
_obj_cls = ProjectMember
_obj_cls = ProjectMemberAll
_from_parent_attrs = {"project_id": "id"}

def get(
self, id: Union[str, int], lazy: bool = False, **kwargs: Any
) -> ProjectMember:
return cast(ProjectMember, super().get(id=id, lazy=lazy, **kwargs))
) -> ProjectMemberAll:
return cast(ProjectMemberAll, super().get(id=id, lazy=lazy, **kwargs))
28 changes: 28 additions & 0 deletions tests/functional/cli/test_cli_v4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,6 +701,31 @@ def test_delete_group_deploy_token(gitlab_cli, group_deploy_token):
# TODO assert not in list


def test_project_member_all(gitlab_cli, project):
cmd = [
"project-member-all",
"list",
"--project-id",
project.id,
]
ret = gitlab_cli(cmd)

assert ret.success


def test_group_member_all(gitlab_cli, group):
cmd = [
"group-member-all",
"list",
"--group-id",
group.id,
]
ret = gitlab_cli(cmd)

assert ret.success


# Deleting the project and group. Add your tests above here.
def test_delete_project(gitlab_cli, project):
cmd = ["project", "delete", "--id", project.id]
ret = gitlab_cli(cmd)
Expand All @@ -713,3 +738,6 @@ def test_delete_group(gitlab_cli, group):
ret = gitlab_cli(cmd)

assert ret.success


# Don't add tests below here as the group and project have been deleted