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

handle pagination in cloud identity datasources #2387

Merged
merged 1 commit into from
Aug 14, 2020
Merged

handle pagination in cloud identity datasources #2387

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
3 changes: 3 additions & 0 deletions .changelog/3871.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
cloudidentity: fixed cloud identity datasources to handle pagination
```
27 changes: 15 additions & 12 deletions google-beta/data_source_cloud_identity_group_memberships.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,22 @@ func dataSourceGoogleCloudIdentityGroupMemberships() *schema.Resource {
func dataSourceGoogleCloudIdentityGroupMembershipsRead(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)

resp, err := config.clientCloudIdentity.Groups.Memberships.List(d.Get("group").(string)).View("FULL").Do()
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("CloudIdentityGroups %q", d.Id()))
}

result := []map[string]interface{}{}
for _, member := range resp.Memberships {
result = append(result, map[string]interface{}{
"name": member.Name,
"roles": flattenCloudIdentityGroupMembershipsRoles(member.Roles),
"member_key": flattenCloudIdentityGroupsEntityKey(member.MemberKey),
"preferred_member_key": flattenCloudIdentityGroupsEntityKey(member.PreferredMemberKey),
})
err := config.clientCloudIdentity.Groups.Memberships.List(d.Get("group").(string)).View("FULL").Pages(config.context, func(resp *cloudidentity.ListMembershipsResponse) error {

for _, member := range resp.Memberships {
result = append(result, map[string]interface{}{
"name": member.Name,
"roles": flattenCloudIdentityGroupMembershipsRoles(member.Roles),
"member_key": flattenCloudIdentityGroupsEntityKey(member.MemberKey),
"preferred_member_key": flattenCloudIdentityGroupsEntityKey(member.PreferredMemberKey),
})
}

return nil
})
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("CloudIdentityGroupMemberships %q", d.Id()))
}

d.Set("memberships", result)
Expand Down
26 changes: 14 additions & 12 deletions google-beta/data_source_cloud_identity_groups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,24 @@ groups or customers/{customer_id} for Google Groups.`,
func dataSourceGoogleCloudIdentityGroupsRead(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)

resp, err := config.clientCloudIdentity.Groups.List().Parent(d.Get("parent").(string)).View("FULL").Do()
result := []map[string]interface{}{}
err := config.clientCloudIdentity.Groups.List().Parent(d.Get("parent").(string)).View("FULL").Pages(config.context, func(resp *cloudidentity.ListGroupsResponse) error {
for _, group := range resp.Groups {
result = append(result, map[string]interface{}{
"name": group.Name,
"display_name": group.DisplayName,
"labels": group.Labels,
"description": group.Description,
"group_key": flattenCloudIdentityGroupsEntityKey(group.GroupKey),
})
}

return nil
})
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("CloudIdentityGroups %q", d.Id()))
}

result := []map[string]interface{}{}
for _, group := range resp.Groups {
result = append(result, map[string]interface{}{
"name": group.Name,
"display_name": group.DisplayName,
"labels": group.Labels,
"description": group.Description,
"group_key": flattenCloudIdentityGroupsEntityKey(group.GroupKey),
})
}

d.Set("groups", result)
d.SetId(time.Now().UTC().String())
return nil
Expand Down