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.

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

Parse paginated replies for listing all users/groups #1448

Merged
merged 3 commits into from
Feb 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 14 additions & 8 deletions plugins/modules/azure_rm_adgroup_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,21 +311,27 @@ async def get_group(self, group_id):
return await self._client.groups.by_group_id(group_id).get()

async def get_group_list(self, filter=None):
kwargs = {}
if filter:
request_configuration = GroupsRequestBuilder.GroupsRequestBuilderGetRequestConfiguration(
query_parameters=GroupsRequestBuilder.GroupsRequestBuilderGetQueryParameters(
count=True,
filter=filter,
),
)
groups = await self._client.groups.get(request_configuration=request_configuration)
else:
groups = await self._client.groups.get()

if groups and groups.value:
return groups.value

return []
kwargs["request_configuration"] = request_configuration

groups = []
# paginated response can be quite large
response = await self._client.groups.get(**kwargs)
if response:
groups += response.value
while response is not None and response.odata_next_link is not None:
response = await self._client.groups.with_url(response.odata_next_link).get(**kwargs)
if response:
groups += response.value

return groups

async def get_group_owners(self, group_id):
request_configuration = GroupsRequestBuilder.GroupsRequestBuilderGetRequestConfiguration(
Expand Down
16 changes: 13 additions & 3 deletions plugins/modules/azure_rm_aduser_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ def exec_module(self, **kwargs):
users = asyncio.get_event_loop().run_until_complete(self.get_users_by_filter(self.odata_filter))
ad_users = list(users.value)
elif self.all:
users = asyncio.get_event_loop().run_until_complete(self.get_users())
ad_users = list(users.value)
# this returns as a list, since we parse multiple pages
ad_users = asyncio.get_event_loop().run_until_complete(self.get_users())

self.results['ad_users'] = [self.to_dict(user) for user in ad_users]

Expand Down Expand Up @@ -251,7 +251,17 @@ async def get_users(self):
select=["accountEnabled", "displayName", "mail", "mailNickname", "id", "userPrincipalName", "userType"]
),
)
return await self._client.users.get(request_configuration=request_configuration)
users = []
# paginated response can be quite large
response = await self._client.users.get(request_configuration=request_configuration)
if response:
users += response.value
while response is not None and response.odata_next_link is not None:
response = await self._client.users.with_url(response.odata_next_link).get(request_configuration=request_configuration)
if response:
users += response.value

return users

async def get_users_by_filter(self, filter):
return await self._client.users.get(
Expand Down