From 1015e47481f94f13db3a14d75262dd4e5a6846e2 Mon Sep 17 00:00:00 2001 From: Steven Moy Date: Wed, 8 Nov 2023 21:05:42 -0800 Subject: [PATCH] Fix pagination handling on apps, groups, and users --- iambic/plugins/v0_1_0/okta/app/utils.py | 3 ++- iambic/plugins/v0_1_0/okta/group/utils.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/iambic/plugins/v0_1_0/okta/app/utils.py b/iambic/plugins/v0_1_0/okta/app/utils.py index ce419b3db..88738f0c1 100644 --- a/iambic/plugins/v0_1_0/okta/app/utils.py +++ b/iambic/plugins/v0_1_0/okta/app/utils.py @@ -150,6 +150,7 @@ async def list_all_apps(okta_organization: OktaOrganization) -> List[App]: log.error("Error encountered when listing apps", error=str(err)) raise Exception("Error encountered when listing apps") while resp.has_next(): + # pagination handling async with GlobalRetryController( fn_identifier="okta.list_applications" ) as retry_controller: @@ -157,7 +158,7 @@ async def list_all_apps(okta_organization: OktaOrganization) -> List[App]: if err: log.error("Error encountered when listing apps", error=str(err)) raise Exception("Error encountered when listing apps") - raw_apps.append(next_apps) + raw_apps.extend(next_apps) if not raw_apps: return [] diff --git a/iambic/plugins/v0_1_0/okta/group/utils.py b/iambic/plugins/v0_1_0/okta/group/utils.py index 7f44b0a4d..7fc7ee92f 100644 --- a/iambic/plugins/v0_1_0/okta/group/utils.py +++ b/iambic/plugins/v0_1_0/okta/group/utils.py @@ -51,6 +51,7 @@ async def list_all_users(okta_organization: OktaOrganization) -> List[User]: raise Exception(f"Error listing users: {str(err)}") while resp.has_next(): + # pagination handling async with GlobalRetryController( fn_identifier="okta.list_users" ) as retry_controller: @@ -58,7 +59,7 @@ async def list_all_users(okta_organization: OktaOrganization) -> List[User]: if err: log.error("Error encountered when listing users", error=str(err)) raise Exception(f"Error listing users: {str(err)}") - users.append(next_users) + users.extend(next_users) if not users: return [] @@ -158,6 +159,7 @@ async def list_all_groups(okta_organization: OktaOrganization) -> List[Group]: raise Exception(f"Error listing groups: {str(err)}") while resp.has_next(): + # pagination handling async with GlobalRetryController( fn_identifier="okta.list_groups" ) as retry_controller: @@ -165,7 +167,7 @@ async def list_all_groups(okta_organization: OktaOrganization) -> List[Group]: if err: log.error("Error encountered when listing groups", error=str(err)) raise Exception(f"Error listing groups: {str(err)}") - groups.append(next_groups) + groups.extend(next_groups) if not groups: log.info(