hubclient: minor bug fixes (#118)

- update org client to use common pagination helper
- when a request fails, don't print the full
  request body. just the first 100 chars.
  otherwise it's a bit overwhelming.
- add an acceptance test for an org that
  requires pagination

this was useful when i was investigating
#117

Signed-off-by: Nick Santos <nick.santos@docker.com>

Author: nicks

internal/hubclient/client.go

@@ -96,6 +96,12 @@ func (c *Client) sendRequest(ctx context.Context, method string, url string, bod
 		if readErr != nil {
 			return readErr
 		}
+
+		// Limit the size of the error message body to avoid excessive logs
+		if len(bodyBytes) > 500 {
+			bodyBytes = bodyBytes[:500]
+		}
+
 		return fmt.Errorf("server response %s: %s", path, string(bodyBytes))
 	}
 

internal/hubclient/client_organization.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"strings"
 )
 
 type Org struct {
@@ -185,21 +184,19 @@ func (c *Client) GetOrg(ctx context.Context, orgName string) (Org, error) {
 }
 
 func (c *Client) ListOrgMembers(ctx context.Context, orgName string) ([]OrgMember, error) {
-	org := OrgMemberListResponse{}
-	err := c.sendRequest(ctx, "GET", fmt.Sprintf("/orgs/%s/members", orgName), nil, &org)
-	if err != nil {
-		return nil, err
-	}
-	members := org.Results
-	for org.Next != "" {
-		nextOrg := OrgMemberListResponse{}
-		nextURL := strings.TrimPrefix(org.Next, c.BaseURL)
-		err := c.sendRequest(ctx, "GET", nextURL, nil, &nextOrg)
-		if err != nil {
+	var members []OrgMember
+	initialURL := fmt.Sprintf("/orgs/%s/members", orgName)
+	err := c.paginate(ctx, initialURL, func(url string) (interface{}, error) {
+		var page OrgMemberListResponse
+		if err := c.sendRequest(ctx, "GET", url, nil, &page); err != nil {
 			return nil, err
 		}
-		members = append(members, nextOrg.Results...)
-		org = nextOrg
+
+		members = append(members, page.Results...)
+		return page.Next, nil
+	})
+	if err != nil {
+		return nil, err
 	}
 	return members, nil
 }
@@ -258,27 +255,22 @@ func (c *Client) AddOrgTeamMember(ctx context.Context, orgName string, teamName
 	return c.sendRequest(ctx, "POST", fmt.Sprintf("/orgs/%s/groups/%s/members/", orgName, teamName), memberRequestJSON, nil)
 }
 
-func (c *Client) ListOrgTeamMembers(ctx context.Context, orgName string, teamName string) (OrgTeamMembersResponse, error) {
-	membersResponse := OrgTeamMembersResponse{}
-	err := c.sendRequest(ctx, "GET", fmt.Sprintf("/orgs/%s/groups/%s/members/", orgName, teamName), nil, &membersResponse)
-	if err != nil {
-		return membersResponse, err
-	}
-
-	members := membersResponse.Results
-	for membersResponse.Next != "" {
-		nextResponse := OrgTeamMembersResponse{}
-		nextURL := strings.TrimPrefix(membersResponse.Next, c.BaseURL)
-		err := c.sendRequest(ctx, "GET", nextURL, nil, &nextResponse)
-		if err != nil {
-			return membersResponse, err
+func (c *Client) ListOrgTeamMembers(ctx context.Context, orgName string, teamName string) ([]OrgTeamMember, error) {
+	var members []OrgTeamMember
+	initialURL := fmt.Sprintf("/orgs/%s/groups/%s/members/", orgName, teamName)
+	err := c.paginate(ctx, initialURL, func(url string) (interface{}, error) {
+		var page OrgTeamMembersResponse
+		if err := c.sendRequest(ctx, "GET", url, nil, &page); err != nil {
+			return nil, err
 		}
-		members = append(members, nextResponse.Results...)
-		membersResponse = nextResponse
-	}
 
-	membersResponse.Results = members
-	return membersResponse, nil
+		members = append(members, page.Results...)
+		return page.Next, nil
+	})
+	if err != nil {
+		return nil, err
+	}
+	return members, nil
 }
 
 func (c *Client) GetOrgSettingImageAccessManagement(ctx context.Context, orgName string) (OrgSettingImageAccessManagement, error) {

internal/provider/data_source_org_members_test.go

@@ -53,3 +53,19 @@ output "self" {
 }
 `, orgName, username)
 }
+
+func TestAccOrgMembersDataSourceLargeOrg(t *testing.T) {
+	username := os.Getenv("DOCKER_USERNAME")
+	resource.Test(t, resource.TestCase{
+		PreCheck:                 func() { testAccPreCheck(t) },
+		ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccOrgMembersDataSourceConfig("docker", username),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckOutput("self", username),
+				),
+			},
+		},
+	})
+}

internal/provider/data_source_org_team_member.go

@@ -204,7 +204,7 @@ func (d *OrgTeamMemberDataSource) Read(ctx context.Context, req datasource.ReadR
 	}
 
 	var memberList []Member
-	for _, member := range members.Results {
+	for _, member := range members {
 		memberGroups := make([]attr.Value, len(member.Groups))
 		for i, group := range member.Groups {
 			memberGroups[i] = types.StringValue(group)

internal/provider/resource_org_team_member.go

@@ -158,15 +158,15 @@ func (r *OrgTeamMemberResource) Read(ctx context.Context, req resource.ReadReque
 	}
 
 	// Call the new API to list members of the team
-	membersResponse, err := r.client.ListOrgTeamMembers(ctx, data.OrgName.ValueString(), data.TeamName.ValueString())
+	members, err := r.client.ListOrgTeamMembers(ctx, data.OrgName.ValueString(), data.TeamName.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError("Unable to read org_team_member resource", fmt.Sprintf("Error retrieving team members: %v", err))
 		return
 	}
 
 	// Check if the specified user is in the team
 	found := false
-	for _, member := range membersResponse.Results {
+	for _, member := range members {
 		if member.Username == data.UserName.ValueString() {
 			found = true
 			break