Skip to content

Fix pagination for pagerduty_service data source #524

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

Open
josiahp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix pagination for pagerduty_service data source #524

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
39 changes: 25 additions & 14 deletions pagerduty/data_source_pagerduty_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,28 +39,39 @@ func dataSourcePagerDutyServiceRead(d *schema.ResourceData, meta interface{}) er

o := &pagerduty.ListServicesOptions{
Query: searchName,
Limit: 100,
}

return resource.Retry(5*time.Minute, func() *resource.RetryError {
resp, _, err := client.Services.List(o)
if err != nil {
if isErrCode(err, 429) {
// Delaying retry by 30s as recommended by PagerDuty
// https://developer.pagerduty.com/docs/rest-api-v2/rate-limiting/#what-are-possible-workarounds-to-the-events-api-rate-limit
time.Sleep(30 * time.Second)
return resource.RetryableError(err)
}
var found *pagerduty.Service

return resource.NonRetryableError(err)
}
for {
resp, _, err := client.Services.List(o)
if err != nil {
if isErrCode(err, 429) {
// Delaying retry by 30s as recommended by PagerDuty
// https://developer.pagerduty.com/docs/rest-api-v2/rate-limiting/#what-are-possible-workarounds-to-the-events-api-rate-limit
time.Sleep(30 * time.Second)
return resource.RetryableError(err)
}

var found *pagerduty.Service
return resource.NonRetryableError(err)
}

for _, service := range resp.Services {
if service.Name == searchName {
found = service
for _, service := range resp.Services {
if service.Name == searchName {
found = service
break
}
}

if found != nil {
break
}
if !resp.More {
break
}
o.Offset += 100
}

if found == nil {
Expand Down