Added APIListObject to Option types to allow setting offset and

addon.go

@@ -2,10 +2,11 @@ package pagerduty
 
 import (
 	"fmt"
-	log "github.com/Sirupsen/logrus"
-	"github.com/google/go-querystring/query"
 	"io/ioutil"
 	"net/http"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/google/go-querystring/query"
 )
 
 type Addon struct {
@@ -16,6 +17,7 @@ type Addon struct {
 }
 
 type ListAddonOptions struct {
+	APIListObject
 	Includes   []string `url:"include,omitempty,brackets"`
 	ServiceIDs []string `url:"service_ids,omitempty,brackets"`
 	Filter     string   `url:"filter,omitempty"`

client.go

@@ -4,9 +4,10 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
 	"io"
 	"net/http"
+
+	log "github.com/Sirupsen/logrus"
 )
 
 // APIObject represents generic api json response that is shared by most
@@ -20,8 +21,8 @@ type APIObject struct {
 }
 
 type APIListObject struct {
-	Limit  uint
-	Offset uint
+	Limit  uint `url:"limit,omitempty"`
+	Offset uint `url:"offset,omitempty"`
 	More   bool
 	Total  uint
 }

esacalation_policy.go → escalation_policy.go

@@ -2,6 +2,7 @@ package pagerduty
 
 import (
 	"fmt"
+
 	"github.com/google/go-querystring/query"
 )
 
@@ -27,6 +28,7 @@ type ListEscalationPolicyResponse struct {
 }
 
 type ListEscalationPoliciesOptions struct {
+	APIListObject
 	Query    string   `url:"query,omitempty"`
 	UserIDs  []string `url:"user_ids,omitempty,brackets"`
 	TeamIDs  []string `url:"team_ids,omitempty,brackets"`

incident.go

@@ -2,6 +2,7 @@ package pagerduty
 
 import (
 	"fmt"
+
 	"github.com/google/go-querystring/query"
 )
 
@@ -43,6 +44,7 @@ type ListIncidentsResponse struct {
 }
 
 type ListIncidentsOptions struct {
+	APIListObject
 	Since       string   `url:"since,omitempty"`
 	Until       string   `url:"until,omitempty"`
 	DateRange   string   `url:"date_range,omitempty"`

log_entry.go

@@ -2,6 +2,7 @@ package pagerduty
 
 import (
 	"fmt"
+
 	"github.com/google/go-querystring/query"
 )
 
@@ -27,6 +28,7 @@ type ListLogEntryResponse struct {
 }
 
 type ListLogEntriesOptions struct {
+	APIListObject
 	TimeZone   string   `url:"time_zone"`
 	Since      string   `url:"omitempty"`
 	Until      string   `url:"omitempty"`

maintenance_window.go

@@ -2,6 +2,7 @@ package pagerduty
 
 import (
 	"fmt"
+
 	"github.com/google/go-querystring/query"
 )
 
@@ -22,6 +23,7 @@ type ListMaintenanceWindowsResponse struct {
 }
 
 type ListMaintenanceWindowsOptions struct {
+	APIListObject
 	Query      string   `url:"query,omitempty"`
 	Includes   []string `url:"include,omitempty,brackets"`
 	TeamIDs    []string `url:"team_ids,omitempty,brackets"`

notification.go

@@ -13,6 +13,7 @@ type Notification struct {
 }
 
 type ListNotificationOptions struct {
+	APIListObject
 	TimeZone string   `url:"time_zone,omitempty"`
 	Since    string   `url:"since,omitempty"`
 	Until    string   `url:"until,omitempty"`

on_call.go

@@ -18,6 +18,7 @@ type ListOnCallsResponse struct {
 }
 
 type ListOnCallOptions struct {
+	APIListObject
 	TimeZone            string   `url:"time_zone,omitempty"`
 	Includes            []string `url:"include,omitempty,brackets"`
 	UserIDs             []string `url:"user_ids,omitempty,brackets"`

schedule.go

@@ -2,6 +2,7 @@ package pagerduty
 
 import (
 	"fmt"
+
 	"github.com/google/go-querystring/query"
 )
 
@@ -43,6 +44,7 @@ type Schedule struct {
 }
 
 type ListSchedulesOptions struct {
+	APIListObject
 	Query string `url:"query,omitempty"`
 }
 
@@ -72,6 +74,7 @@ func (c *Client) CreateSchedule(s Schedule) error {
 }
 
 type PreviewScheduleOptions struct {
+	APIListObject
 	Since    string `url:"since,omitempty"`
 	Until    string `url:"until,omitempty"`
 	Overflow bool   `url:"overflow,omitempty"`
@@ -94,6 +97,7 @@ func (c *Client) DeleteSchedule(id string) error {
 }
 
 type GetScheduleOptions struct {
+	APIListObject
 	TimeZone string `url:"time_zone,omitempty"`
 	Since    string `url:"since,omitempty"`
 	Until    string `url:"until,omitempty"`
@@ -131,6 +135,7 @@ func (c *Client) UpdateSchedule(id string, s Schedule) error {
 }
 
 type ListOverridesOptions struct {
+	APIListObject
 	Since    string `url:"since,omitempty"`
 	Until    string `url:"until,omitempty"`
 	Editable bool   `url:"editable,omitempty"`
@@ -175,6 +180,7 @@ func (c *Client) DeleteOverride(scheduleID, overrideID string) error {
 }
 
 type ListOnCallUsersOptions struct {
+	APIListObject
 	Since string `url:"since,omitempty"`
 	Until string `url:"until,omitempty"`
 }

service.go

@@ -2,10 +2,11 @@ package pagerduty
 
 import (
 	"fmt"
-	log "github.com/Sirupsen/logrus"
-	"github.com/google/go-querystring/query"
 	"io/ioutil"
 	"net/http"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/google/go-querystring/query"
 )
 
 type EmailFilter struct {
@@ -77,6 +78,7 @@ type Service struct {
 }
 
 type ListServiceOptions struct {
+	APIListObject
 	TeamIDs  []string `url:"team_ids,omitempty,brackets"`
 	TimeZone string   `url:"time_zone,omitempty"`
 	SortBy   string   `url:"sort_by,omitempty"`

team.go

@@ -2,6 +2,7 @@ package pagerduty
 
 import (
 	"fmt"
+
 	"github.com/google/go-querystring/query"
 )
 
@@ -17,6 +18,7 @@ type ListTeamResponse struct {
 }
 
 type ListTeamOptions struct {
+	APIListObject
 	Query string `url:"query,omitempty"`
 }
 

user.go

@@ -2,6 +2,7 @@ package pagerduty
 
 import (
 	"fmt"
+
 	"github.com/google/go-querystring/query"
 )
 
@@ -44,6 +45,7 @@ type ListUsersResponse struct {
 }
 
 type ListUserOptions struct {
+	APIListObject
 	Query    string   `url:"query,omitempty"`
 	Includes []string `url:"include,omitempty,brackets"`
 }