github-mirrors/terraform-provider-bitbucketserver
1
0
Fork 0
mirror of https://github.com/ysoftdevs/terraform-provider-bitbucketserver.git synced 2026-04-10 03:03:34 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix data_group_users in the face of pagination (#45)

Browse Source 
* Without this change, past the first page of results, the
  pagination logic within data_group_users was incorrectly switching
  to the data_project_permissions_groups API, as well as not actually
  updating the API URL, resulting in breakage for groups with >25 users.
This commit is contained in:
Robin Breathe
2022-06-16 19:25:01 +02:00
committed by GitHub
parent 5311e3ab9e
commit 2e2fc4e78f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bitbucket/data_group_users.go
View File

@@ -3,8 +3,9 @@ package bitbucket
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/hashicorp/terraform/helper/schema"
"net/url" "net/url"
"github.com/hashicorp/terraform/helper/schema"
) )
type PaginatedGroupUsersValue struct { type PaginatedGroupUsersValue struct {
@@ -96,7 +97,7 @@ func dataSourceGroupUsersRead(d *schema.ResourceData, m interface{}) error {
func readGroupUsers(m interface{}, group string, filter string) ([]GroupUser, error) { func readGroupUsers(m interface{}, group string, filter string) ([]GroupUser, error) {
client := m.(*BitbucketServerProvider).BitbucketClient client := m.(*BitbucketServerProvider).BitbucketClient
resourceURL := fmt.Sprintf("/rest/api/1.0/admin/groups/more-members?context=%s", resourceURL := fmt.Sprintf("/rest/api/1.0/admin/groups/more-members?context=%s&limit=100",
url.QueryEscape(group), url.QueryEscape(group),
) )
@@ -130,7 +131,7 @@ func readGroupUsers(m interface{}, group string, filter string) ([]GroupUser, er
} }
if groupUsers.IsLastPage == false { if groupUsers.IsLastPage == false {
resourceURL = fmt.Sprintf("/rest/api/1.0/projects/%s/permissions/users?start=%d", resourceURL = fmt.Sprintf("/rest/api/1.0/admin/groups/more-members?context=%s&limit=100&start=%d",
group, group,
groupUsers.NextPageStart, groupUsers.NextPageStart,
) )