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

Jump to bottom

use AWS SDK paginator funcs for pagination loops #15

Merged
merged 1 commit into from
Nov 16, 2023
Merged

use AWS SDK paginator funcs for pagination loops #15

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
28 changes: 15 additions & 13 deletions pkg/connector/account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
)

const (
accountMemeberEntitlement = "member"
accountMemberEntitlement = "member"
)

type accountResourceType struct {
Expand Down Expand Up @@ -115,7 +115,7 @@ func (o *accountResourceType) Entitlements(ctx context.Context, resource *v2.Res
annos.Update(&v2.V1Identifier{
Id: b.String(),
})
member := sdk.NewAssignmentEntitlement(resource, accountMemeberEntitlement, resourceTypeAccount)
member := sdk.NewAssignmentEntitlement(resource, accountMemberEntitlement, resourceTypeAccount)
member.Description = awsSdk.ToString(ps.Description)
member.Annotations = annos
member.Id = b.String()
Expand All @@ -132,8 +132,9 @@ func (o *accountResourceType) Grants(ctx context.Context, resource *v2.Resource,
InstanceArn: o.identityInstance.InstanceArn,
}

psBindingPaginator := awsSsoAdmin.NewListPermissionSetsProvisionedToAccountPaginator(o.ssoAdminClient, psBindingInput)
for {
psBindingsResp, err := o.ssoAdminClient.ListPermissionSetsProvisionedToAccount(ctx, psBindingInput)
psBindingsResp, err := psBindingPaginator.NextPage(ctx)
if err != nil {
return nil, "", nil, fmt.Errorf("aws-connector: ssoadmin.ListPermissionSetsProvisionedToAccount failed: %w", err)
}
Expand Down Expand Up @@ -168,8 +169,9 @@ func (o *accountResourceType) Grants(ctx context.Context, resource *v2.Resource,
PermissionSetArn: ps.PermissionSetArn,
}

assignmentsPaginator := awsSsoAdmin.NewListAccountAssignmentsPaginator(o.ssoAdminClient, assignmentsInput)
for {
assignmentsResp, err := o.ssoAdminClient.ListAccountAssignments(ctx, assignmentsInput)
assignmentsResp, err := assignmentsPaginator.NextPage(ctx)
if err != nil {
return nil, "", nil, fmt.Errorf("aws-connector: ssoadmin.ListAccountAssignments failed: %w", err)
}
Expand Down Expand Up @@ -227,13 +229,13 @@ func (o *accountResourceType) Grants(ctx context.Context, resource *v2.Resource,
}
}
assignmentsInput.NextToken = assignmentsResp.NextToken
if assignmentsResp.NextToken == nil {
if !assignmentsPaginator.HasMorePages() {
break
}
} // end pagination loop for assignments
} // end range ange psBindingsResp.PermissionSets
psBindingInput.NextToken = psBindingsResp.NextToken
if psBindingsResp.NextToken == nil {

if !psBindingPaginator.HasMorePages() {
break
}
} // end pagination loop for permission set to account binding
Expand Down Expand Up @@ -300,8 +302,9 @@ func (o *accountResourceType) getGroupMembers(ctx context.Context, groupId strin
GroupId: awsSdk.String(groupId),
}
userIds := make([]string, 0, 16)
paginator := awsIdentityStore.NewListGroupMembershipsPaginator(o.identityClient, input)
for {
resp, err := o.identityClient.ListGroupMemberships(ctx, input)
resp, err := paginator.NextPage(ctx)
if err != nil {
return nil, err
}
Expand All @@ -312,10 +315,9 @@ func (o *accountResourceType) getGroupMembers(ctx context.Context, groupId strin
}
userIds = append(userIds, member.Value)
}
if resp.NextToken == nil {
if !paginator.HasMorePages() {
break
}
input.NextToken = resp.NextToken
}
o._groupMembersCache.Store(groupId, userIds)
return userIds, nil
Expand All @@ -332,16 +334,16 @@ func (o *accountResourceType) getPermissionSets(ctx context.Context) ([]*awsSsoA
input := &awsSsoAdmin.ListPermissionSetsInput{
InstanceArn: o.identityInstance.InstanceArn,
}
paginator := awsSsoAdmin.NewListPermissionSetsPaginator(o.ssoAdminClient, input)
for {
resp, err := o.ssoAdminClient.ListPermissionSets(ctx, input)
resp, err := paginator.NextPage(ctx)
if err != nil {
return nil, err
}
permissionSetIDs = append(permissionSetIDs, resp.PermissionSets...)
if resp.NextToken == nil {
if !paginator.HasMorePages() {
break
}
input.NextToken = resp.NextToken
}
for _, psId := range permissionSetIDs {
ps, err := o.getPermissionSet(ctx, psId)
Expand Down
9 changes: 3 additions & 6 deletions pkg/connector/connector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,11 +361,9 @@ func (c *AWS) getIdentityInstance(ctx context.Context) (*awsSsoAdminTypes.Instan
return nil, err
}

nextToken := awsSdk.String("")
paginator := awsSsoAdmin.NewListInstancesPaginator(ssoClient, &awsSsoAdmin.ListInstancesInput{})
for {
resp, err := ssoClient.ListInstances(ctx, &awsSsoAdmin.ListInstancesInput{
NextToken: nextToken,
})
resp, err := paginator.NextPage(ctx)
if err != nil {
c._identityInstancesCacheErr = err
return nil, err
Expand All @@ -375,8 +373,7 @@ func (c *AWS) getIdentityInstance(ctx context.Context) (*awsSsoAdminTypes.Instan
func(i awsSsoAdminTypes.InstanceMetadata) *awsSsoAdminTypes.InstanceMetadata { return &i },
)...,
)
nextToken = resp.NextToken
if nextToken == nil {
if !paginator.HasMorePages() {
break
}
}
Expand Down
Loading