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

Remove helper functions for pagination #58

Merged
merged 2 commits into from
Oct 7, 2024
Merged

Remove helper functions for pagination #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc90c5f
Remove helper functions for pagination
shackra Oct 7, 2024
9a4066f
Remove page size
shackra Oct 7, 2024
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
10 changes: 9 additions & 1 deletion pkg/connector/account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,15 @@ func (o *accountResourceType) List(ctx context.Context, _ *v2.ResourceId, pt *pa
rv = append(rv, userResource)
}

return paginate(rv, bag, resp.NextToken)
if resp.NextToken != nil {
token, err := bag.NextToken(*resp.NextToken)
if err != nil {
return rv, "", nil, err
}
return rv, token, nil, nil
}

return rv, "", nil, nil
}

func (o *accountResourceType) Entitlements(ctx context.Context, resource *v2.Resource, _ *pagination.Token) ([]*v2.Entitlement, string, annotations.Annotations, error) {
Expand Down
28 changes: 26 additions & 2 deletions pkg/connector/iam_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,19 @@ func (o *iamGroupResourceType) List(ctx context.Context, _ *v2.ResourceId, pt *p
rv = append(rv, groupResource)
}

return paginateTruncation(rv, bag, resp.Marker, resp.IsTruncated)
if !resp.IsTruncated {
return rv, "", nil, nil
}

if resp.Marker != nil {
token, err := bag.NextToken(*resp.Marker)
if err != nil {
return rv, "", nil, err
}
return rv, token, nil, nil
}

return rv, "", nil, nil
}

func (o *iamGroupResourceType) Entitlements(ctx context.Context, resource *v2.Resource, _ *pagination.Token) ([]*v2.Entitlement, string, annotations.Annotations, error) {
Expand Down Expand Up @@ -123,7 +135,19 @@ func (o *iamGroupResourceType) Grants(ctx context.Context, resource *v2.Resource
rv = append(rv, grant)
}

return paginateTruncation(rv, bag, resp.Marker, resp.IsTruncated)
if !resp.IsTruncated {
return rv, "", nil, nil
}

if resp.Marker != nil {
token, err := bag.NextToken(*resp.Marker)
if err != nil {
return rv, "", nil, err
}
return rv, token, nil, nil
}

return rv, "", nil, nil
}

func iamGroupBuilder(iamClient *iam.Client) *iamGroupResourceType {
Expand Down
14 changes: 13 additions & 1 deletion pkg/connector/iam_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,19 @@ func (o *iamUserResourceType) List(ctx context.Context, _ *v2.ResourceId, pt *pa
rv = append(rv, userResource)
}

return paginateTruncation(rv, bag, resp.Marker, resp.IsTruncated)
if !resp.IsTruncated {
return rv, "", nil, nil
}

if resp.Marker != nil {
token, err := bag.NextToken(*resp.Marker)
if err != nil {
return rv, "", nil, err
}
return rv, token, nil, nil
}

return rv, "", nil, nil
}

func (o *iamUserResourceType) Entitlements(_ context.Context, _ *v2.Resource, _ *pagination.Token) ([]*v2.Entitlement, string, annotations.Annotations, error) {
Expand Down
27 changes: 0 additions & 27 deletions pkg/connector/pagination.go
View file
Open in desktop

This file was deleted.

14 changes: 13 additions & 1 deletion pkg/connector/role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,19 @@ func (o *roleResourceType) List(ctx context.Context, _ *v2.ResourceId, pt *pagin
rv = append(rv, roleResource)
}

return paginateTruncation(rv, bag, resp.Marker, resp.IsTruncated)
if !resp.IsTruncated {
return rv, "", nil, nil
}

if resp.Marker != nil {
token, err := bag.NextToken(*resp.Marker)
if err != nil {
return rv, "", nil, err
}
return rv, token, nil, nil
}

return rv, "", nil, nil
}

func (o *roleResourceType) Entitlements(_ context.Context, resource *v2.Resource, _ *pagination.Token) ([]*v2.Entitlement, string, annotations.Annotations, error) {
Expand Down
23 changes: 18 additions & 5 deletions pkg/connector/sso_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,15 @@ func (o *ssoGroupResourceType) List(ctx context.Context, _ *v2.ResourceId, pt *p
rv = append(rv, groupResource)
}

return paginate(rv, bag, resp.NextToken)
if resp.NextToken != nil {
token, err := bag.NextToken(*resp.NextToken)
if err != nil {
return rv, "", nil, err
}
return rv, token, nil, nil
}

return rv, "", nil, nil
}

func (o *ssoGroupResourceType) Entitlements(_ context.Context, resource *v2.Resource, _ *pagination.Token) ([]*v2.Entitlement, string, annotations.Annotations, error) {
Expand Down Expand Up @@ -175,11 +183,15 @@ func (o *ssoGroupResourceType) Grants(ctx context.Context, resource *v2.Resource
rv = append(rv, grant)
}

rv, nextPage, anno, err := paginate(rv, bag, resp.NextToken)
if err != nil {
return nil, "", nil, fmt.Errorf("aws-connector: failed to marshal pagination bag [%s]: %w", awsSdk.ToString(input.GroupId), err)
if resp.NextToken != nil {
token, err := bag.NextToken(*resp.NextToken)
if err != nil {
return nil, "", nil, fmt.Errorf("aws-connector: failed to marshal pagination bag [%s]: %w", awsSdk.ToString(input.GroupId), err)
}
return rv, token, nil, nil
}
return rv, nextPage, anno, nil

return rv, "", nil, nil
}

func ssoGroupBuilder(
Expand Down Expand Up @@ -349,6 +361,7 @@ func (g *ssoGroupResourceType) Grant(

return outputGrants, annos, nil
}

func (g *ssoGroupResourceType) Revoke(ctx context.Context, grant *v2.Grant) (annotations.Annotations, error) {
if grant.Principal.Id.ResourceType != resourceTypeSSOUser.Id {
return nil, errors.New("baton-aws: only sso users can be removed from sso groups")
Expand Down
10 changes: 9 additions & 1 deletion pkg/connector/sso_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,15 @@ func (o *ssoUserResourceType) List(ctx context.Context, _ *v2.ResourceId, pt *pa
rv = append(rv, userResource)
}

return paginate(rv, bag, resp.NextToken)
if resp.NextToken != nil {
token, err := bag.NextToken(*resp.NextToken)
if err != nil {
return rv, "", nil, err
}
return rv, token, nil, nil
}

return rv, "", nil, nil
}

func (o *ssoUserResourceType) Entitlements(_ context.Context, _ *v2.Resource, _ *pagination.Token) ([]*v2.Entitlement, string, annotations.Annotations, error) {
Expand Down
Loading