Skip to content
This repository has been archived by the owner on Dec 8, 2020. It is now read-only.

Fix for bug where pagination was not happening #28

Merged
merged 1 commit into from
May 14, 2019
Merged

Fix for bug where pagination was not happening #28

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
43 changes: 33 additions & 10 deletions bitbucket/resource_default_reviewers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ type Reviewer struct {

type PaginatedReviewers struct {
Values []Reviewer `json:"values,omitempty"`
Page int `json:"page,omitempty"`
Size int `json:"size,omitempty"`
Next string `json:"next,omitempty"`
}

func resourceDefaultReviewers() *schema.Resource {
Expand Down Expand Up @@ -70,32 +73,52 @@ func resourceDefaultReviewersCreate(d *schema.ResourceData, m interface{}) error
d.SetId(fmt.Sprintf("%s/%s/reviewers", d.Get("owner").(string), d.Get("repository").(string)))
return resourceDefaultReviewersRead(d, m)
}

func resourceDefaultReviewersRead(d *schema.ResourceData, m interface{}) error {
client := m.(*BitbucketClient)

reviewersResponse, err := client.Get(fmt.Sprintf("2.0/repositories/%s/%s/default-reviewers",
resourceURL := fmt.Sprintf("2.0/repositories/%s/%s/default-reviewers",
d.Get("owner").(string),
d.Get("repository").(string),
))
)

var reviewers PaginatedReviewers
var terraformReviewers []string

decoder := json.NewDecoder(reviewersResponse.Body)
err = decoder.Decode(&reviewers)
if err != nil {
return err
}
for {
reviewersResponse, err := client.Get(resourceURL)
if err != nil {
return err
}

terraformReviewers := make([]string, 0, len(reviewers.Values))
decoder := json.NewDecoder(reviewersResponse.Body)
Copy link
Contributor

@cwood cwood May 14, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: could just do err := json.NewDecoder(reviersResponse.Body).Decode(&reviewers)

err = decoder.Decode(&reviewers)
if err != nil {
return err
}

for _, reviewer := range reviewers.Values {
terraformReviewers = append(terraformReviewers, reviewer.Username)
}

for _, reviewer := range reviewers.Values {
terraformReviewers = append(terraformReviewers, reviewer.Username)
if reviewers.Next != "" {
nextPage := reviewers.Page + 1
resourceURL = fmt.Sprintf("2.0/repositories/%s/%s/default-reviewers?page=%d",
d.Get("owner").(string),
d.Get("repository").(string),
nextPage,
)
reviewers = PaginatedReviewers{}
} else {
break
}
}

d.Set("reviewers", terraformReviewers)

return nil
}

func resourceDefaultReviewersDelete(d *schema.ResourceData, m interface{}) error {
client := m.(*BitbucketClient)

Expand Down