Fixes #16 - Pagination issue

aws-samples · Jun 21, 2023 · f50c29a · f50c29a
1 parent 137ce81
commit f50c29a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/amplify/backend/function/teamListGroups/src/index.py b/amplify/backend/function/teamListGroups/src/index.py
@@ -26,8 +26,10 @@ def list_idc_group_membership(groupId):
         paginator = p.paginate(IdentityStoreId=sso_instance,
         GroupId=groupId,
         )
+        all_groups=[]
         for page in paginator:
-            return page["GroupMemberships"]
+            all_groups.extend(page["GroupMemberships"])
+        return all_groups
     except ClientError as e:
         print(e.response['Error']['Message'])
 

diff --git a/amplify/backend/function/teamRouter/src/index.py b/amplify/backend/function/teamRouter/src/index.py
@@ -94,8 +94,10 @@ def list_idc_group_membership(userId):
             MemberId={
                 'UserId': userId
             })
+        all_idc_groups = []
         for page in paginator:
-            return page["GroupMemberships"]
+            all_idc_groups.extend(page["GroupMemberships"])
+        return all_idc_groups
     except ClientError as e:
         print(e.response['Error']['Message'])
         return []
@@ -389,8 +391,10 @@ def list_group_membership(groupId):
         paginator = p.paginate(IdentityStoreId=sso_instance['IdentityStoreId'],
         GroupId=groupId,
         )
+        all_groups = []
         for page in paginator:
-            return page["GroupMemberships"]
+            all_groups.extend(page["GroupMemberships"])
+        return all_groups
     except ClientError as e:
         print(e.response['Error']['Message'])
 

diff --git a/amplify/backend/function/teamgetGroups/src/index.py b/amplify/backend/function/teamgetGroups/src/index.py
@@ -91,8 +91,10 @@ def list_idc_group_membership(userId):
             MemberId={
                 'UserId': userId
             })
+        all_groups = []
         for page in paginator:
-            return page["GroupMemberships"]
+            all_groups.extend(page["GroupMemberships"])
+        return all_groups
     except ClientError as e:
         print(e.response['Error']['Message'])
 

diff --git a/amplify/backend/function/teamgetMgmtAccountDetails/src/index.py b/amplify/backend/function/teamgetMgmtAccountDetails/src/index.py
@@ -35,8 +35,10 @@ def get_mgmt_ps():
         paginator = p.paginate(
             InstanceArn=sso_instance['InstanceArn'],
             AccountId=mgmt_account_id,)
+        all_permissions = []
         for page in paginator:
-            return page["PermissionSets"]
+            all_permissions.extend(page["PermissionSets"])
+        return all_permissions
     except ClientError as e:
         print(e.response['Error']['Message'])
 

diff --git a/amplify/backend/function/teamgetPermissions/src/index.py b/amplify/backend/function/teamgetPermissions/src/index.py
@@ -39,8 +39,10 @@ def get_mgmt_ps():
         paginator = p.paginate(
             InstanceArn=sso_instance['InstanceArn'],
             AccountId=mgmt_account_id,)
+        all_permissions = []
         for page in paginator:
-            return page["PermissionSets"]
+            all_permissions.extend(page["PermissionSets"])
+        return all_permissions
     except ClientError as e:
         print(e.response['Error']['Message'])
         return []

diff --git a/amplify/backend/function/teamgetUsers/src/index.py b/amplify/backend/function/teamgetUsers/src/index.py
@@ -21,8 +21,10 @@ def list_idc_users(IdentityStoreId):
         client = boto3.client('identitystore')
         p = client.get_paginator('list_users')
         paginator = p.paginate(IdentityStoreId=IdentityStoreId)
+        all_users = []
         for page in paginator:
-            return page["Users"]
+            all_users.extend(page["Users"])
+        return all_users
     except ClientError as e:
         print(e.response['Error']['Message'])