diff --git a/Makefile b/Makefile index 7bb17cce61d..23f962978bf 100644 --- a/Makefile +++ b/Makefile @@ -9,9 +9,9 @@ generate-test: generate-protocol-test generate: go generate ./aws - make service + make services -service: +services: go generate ./service integration: deps diff --git a/aws/request.go b/aws/request.go index 95e944d76f7..62d31451c61 100644 --- a/aws/request.go +++ b/aws/request.go @@ -9,6 +9,8 @@ import ( "reflect" "strings" "time" + + "github.com/awslabs/aws-sdk-go/aws/awsutil" ) // A Request is the service request to be made. @@ -39,6 +41,14 @@ type Operation struct { Name string HTTPMethod string HTTPPath string + *Paginator +} + +type Paginator struct { + InputTokens []string + OutputTokens []string + LimitToken string + TruncationToken string } // NewRequest returns a new Request pointer for the service API @@ -217,3 +227,99 @@ func (r *Request) Send() error { return nil } + +func (r *Request) HasNextPage() bool { + return r.nextPageTokens() != nil +} + +func (r *Request) nextPageTokens() []interface{} { + if r.Operation.Paginator == nil { + return nil + } + + if r.Operation.TruncationToken != "" { + tr := awsutil.ValuesAtAnyPath(r.Data, r.Operation.TruncationToken) + if tr == nil || len(tr) == 0 { + return nil + } + switch v := tr[0].(type) { + case bool: + if v == false { + return nil + } + } + } + + found := false + tokens := make([]interface{}, len(r.Operation.OutputTokens)) + + for i, outtok := range r.Operation.OutputTokens { + v := awsutil.ValuesAtAnyPath(r.Data, outtok) + if v != nil && len(v) > 0 { + found = true + tokens[i] = v[0] + } + } + + if found { + return tokens + } + return nil +} + +func (r *Request) NextPage() *Request { + tokens := r.nextPageTokens() + if tokens == nil { + return nil + } + + data := reflect.New(reflect.TypeOf(r.Data).Elem()).Interface() + nr := NewRequest(r.Service, r.Operation, awsutil.CopyOf(r.Params), data) + for i, intok := range nr.Operation.InputTokens { + awsutil.SetValueAtAnyPath(nr.Params, intok, tokens[i]) + } + return nr +} + +// This nil value is needed to work around passing nil into reflect.Value#Call() +// See https://groups.google.com/forum/#!topic/golang-nuts/apNcACpl_fI +var nilval interface{} +var rnil = reflect.ValueOf(&nilval).Elem() + +func (r *Request) EachPage(fn interface{}) error { + valfn := reflect.ValueOf(fn) + if valfn.Kind() != reflect.Func { + panic("expected function for EachPage()") + } + if valfn.Type().NumOut() > 0 && valfn.Type().Out(0).Kind() != reflect.Bool { + panic("EachPage(fn) function must return bool if it returns a value") + } + + for page := r; page != nil; page = page.NextPage() { + page.Send() + + shouldContinue := true + args := []reflect.Value{ + reflect.ValueOf(page.Data), + reflect.ValueOf(!page.HasNextPage()), + } + + // Use rnil (see above) when page.Data is nil to work around + // reflect.Value#Call() on nil values. + if page.Data == nil { + args[0] = rnil + } + + out := valfn.Call(args) + + if len(out) > 0 { + shouldContinue = out[0].Bool() + } + + if page.Error != nil || !shouldContinue { + return page.Error + } + } + + return nil +} diff --git a/aws/request_pagination_test.go b/aws/request_pagination_test.go new file mode 100644 index 00000000000..dbb16d5dde7 --- /dev/null +++ b/aws/request_pagination_test.go @@ -0,0 +1,368 @@ +package aws_test + +import ( + "testing" + + "github.com/awslabs/aws-sdk-go/aws" + "github.com/awslabs/aws-sdk-go/internal/test/unit" + "github.com/awslabs/aws-sdk-go/service/dynamodb" + "github.com/awslabs/aws-sdk-go/service/s3" + "github.com/stretchr/testify/assert" +) + +var _ = unit.Imported + +// Use DynamoDB methods for simplicity +func TestPagination(t *testing.T) { + db := dynamodb.New(nil) + tokens, pages, numPages, gotToEnd := []string{}, []string{}, 0, false + + reqNum := 0 + resps := []*dynamodb.ListTablesOutput{ + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("Table1"), aws.String("Table2")}, LastEvaluatedTableName: aws.String("Table2")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("Table3"), aws.String("Table4")}, LastEvaluatedTableName: aws.String("Table4")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("Table5")}}, + } + + db.Handlers.Send.Clear() // mock sending + db.Handlers.Unmarshal.Clear() + db.Handlers.UnmarshalMeta.Clear() + db.Handlers.ValidateResponse.Clear() + db.Handlers.Build.PushBack(func(r *aws.Request) { + in := r.Params.(*dynamodb.ListTablesInput) + if in == nil { + tokens = append(tokens, "") + } else if in.ExclusiveStartTableName != nil { + tokens = append(tokens, *in.ExclusiveStartTableName) + } + }) + db.Handlers.Unmarshal.PushBack(func(r *aws.Request) { + r.Data = resps[reqNum] + reqNum++ + }) + + params := &dynamodb.ListTablesInput{Limit: aws.Long(2)} + err := db.ListTablesPages(params, func(p *dynamodb.ListTablesOutput, last bool) bool { + numPages++ + for _, t := range p.TableNames { + pages = append(pages, *t) + } + if last { + if gotToEnd { + assert.Fail(t, "last=true happened twice") + } + gotToEnd = true + } + return true + }) + + assert.Equal(t, []string{"Table2", "Table4"}, tokens) + assert.Equal(t, []string{"Table1", "Table2", "Table3", "Table4", "Table5"}, pages) + assert.Equal(t, 3, numPages) + assert.True(t, gotToEnd) + assert.Nil(t, err) + assert.Nil(t, params.ExclusiveStartTableName) +} + +// Use DynamoDB methods for simplicity +func TestPaginationEachPage(t *testing.T) { + db := dynamodb.New(nil) + tokens, pages, numPages, gotToEnd := []string{}, []string{}, 0, false + + reqNum := 0 + resps := []*dynamodb.ListTablesOutput{ + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("Table1"), aws.String("Table2")}, LastEvaluatedTableName: aws.String("Table2")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("Table3"), aws.String("Table4")}, LastEvaluatedTableName: aws.String("Table4")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("Table5")}}, + } + + db.Handlers.Send.Clear() // mock sending + db.Handlers.Unmarshal.Clear() + db.Handlers.UnmarshalMeta.Clear() + db.Handlers.ValidateResponse.Clear() + db.Handlers.Build.PushBack(func(r *aws.Request) { + in := r.Params.(*dynamodb.ListTablesInput) + if in == nil { + tokens = append(tokens, "") + } else if in.ExclusiveStartTableName != nil { + tokens = append(tokens, *in.ExclusiveStartTableName) + } + }) + db.Handlers.Unmarshal.PushBack(func(r *aws.Request) { + r.Data = resps[reqNum] + reqNum++ + }) + + params := &dynamodb.ListTablesInput{Limit: aws.Long(2)} + req, _ := db.ListTablesRequest(params) + err := req.EachPage(func(p *dynamodb.ListTablesOutput, last bool) bool { + numPages++ + for _, t := range p.TableNames { + pages = append(pages, *t) + } + if last { + if gotToEnd { + assert.Fail(t, "last=true happened twice") + } + gotToEnd = true + } + + return true + }) + + assert.Equal(t, []string{"Table2", "Table4"}, tokens) + assert.Equal(t, []string{"Table1", "Table2", "Table3", "Table4", "Table5"}, pages) + assert.Equal(t, 3, numPages) + assert.True(t, gotToEnd) + assert.Nil(t, err) +} + +// Use DynamoDB methods for simplicity +func TestPaginationEachPageNoReturn(t *testing.T) { + db := dynamodb.New(nil) + tokens, pages, numPages, gotToEnd := []string{}, []string{}, 0, false + + reqNum := 0 + resps := []*dynamodb.ListTablesOutput{ + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("Table1"), aws.String("Table2")}, LastEvaluatedTableName: aws.String("Table2")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("Table3"), aws.String("Table4")}, LastEvaluatedTableName: aws.String("Table4")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("Table5")}}, + } + + db.Handlers.Send.Clear() // mock sending + db.Handlers.Unmarshal.Clear() + db.Handlers.UnmarshalMeta.Clear() + db.Handlers.ValidateResponse.Clear() + db.Handlers.Build.PushBack(func(r *aws.Request) { + in := r.Params.(*dynamodb.ListTablesInput) + if in == nil { + tokens = append(tokens, "") + } else if in.ExclusiveStartTableName != nil { + tokens = append(tokens, *in.ExclusiveStartTableName) + } + }) + db.Handlers.Unmarshal.PushBack(func(r *aws.Request) { + r.Data = resps[reqNum] + reqNum++ + }) + + params := &dynamodb.ListTablesInput{Limit: aws.Long(2)} + req, _ := db.ListTablesRequest(params) + err := req.EachPage(func(p *dynamodb.ListTablesOutput, last bool) { + numPages++ + for _, t := range p.TableNames { + pages = append(pages, *t) + } + if last { + if gotToEnd { + assert.Fail(t, "last=true happened twice") + } + gotToEnd = true + } + }) + + assert.Equal(t, []string{"Table2", "Table4"}, tokens) + assert.Equal(t, []string{"Table1", "Table2", "Table3", "Table4", "Table5"}, pages) + assert.Equal(t, 3, numPages) + assert.True(t, gotToEnd) + assert.Nil(t, err) +} + +// Use DynamoDB methods for simplicity +func TestPaginationEarlyExit(t *testing.T) { + db := dynamodb.New(nil) + numPages, gotToEnd := 0, false + + reqNum := 0 + resps := []*dynamodb.ListTablesOutput{ + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("Table1"), aws.String("Table2")}, LastEvaluatedTableName: aws.String("Table2")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("Table3"), aws.String("Table4")}, LastEvaluatedTableName: aws.String("Table4")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("Table5")}}, + } + + db.Handlers.Send.Clear() // mock sending + db.Handlers.Unmarshal.Clear() + db.Handlers.UnmarshalMeta.Clear() + db.Handlers.ValidateResponse.Clear() + db.Handlers.Unmarshal.PushBack(func(r *aws.Request) { + r.Data = resps[reqNum] + reqNum++ + }) + + params := &dynamodb.ListTablesInput{Limit: aws.Long(2)} + err := db.ListTablesPages(params, func(p *dynamodb.ListTablesOutput, last bool) bool { + numPages++ + if numPages == 2 { + return false + } + if last { + if gotToEnd { + assert.Fail(t, "last=true happened twice") + } + gotToEnd = true + } + return true + }) + + assert.Equal(t, 2, numPages) + assert.False(t, gotToEnd) + assert.Nil(t, err) +} + +func TestEachPagePanics(t *testing.T) { + db := dynamodb.New(nil) + db.Handlers.Send.Clear() // mock sending + req, _ := db.ListTablesRequest(nil) + + assert.Panics(t, func() { req.EachPage(0) }) // must be a function + assert.Panics(t, func() { // must return bool + req.EachPage(func(p *dynamodb.ListTablesOutput, last bool) string { + return "" + }) + }) +} + +func TestSkipPagination(t *testing.T) { + client := s3.New(nil) + client.Handlers.Send.Clear() // mock sending + client.Handlers.Unmarshal.Clear() + client.Handlers.UnmarshalMeta.Clear() + client.Handlers.ValidateResponse.Clear() + client.Handlers.Unmarshal.PushBack(func(r *aws.Request) { + r.Data = &s3.HeadBucketOutput{} + }) + + req, _ := client.HeadBucketRequest(&s3.HeadBucketInput{Bucket: aws.String("bucket")}) + + numPages, gotToEnd := 0, false + req.EachPage(func(p *s3.HeadBucketOutput, last bool) { + numPages++ + if last { + gotToEnd = true + } + }) + assert.Equal(t, 1, numPages) + assert.True(t, gotToEnd) +} + +// Use S3 for simplicity +func TestPaginationTruncation(t *testing.T) { + count := 0 + client := s3.New(nil) + + reqNum := &count + resps := []*s3.ListObjectsOutput{ + &s3.ListObjectsOutput{IsTruncated: aws.Boolean(true), Contents: []*s3.Object{&s3.Object{Key: aws.String("Key1")}}}, + &s3.ListObjectsOutput{IsTruncated: aws.Boolean(true), Contents: []*s3.Object{&s3.Object{Key: aws.String("Key2")}}}, + &s3.ListObjectsOutput{IsTruncated: aws.Boolean(false), Contents: []*s3.Object{&s3.Object{Key: aws.String("Key3")}}}, + &s3.ListObjectsOutput{IsTruncated: aws.Boolean(true), Contents: []*s3.Object{&s3.Object{Key: aws.String("Key4")}}}, + } + + client.Handlers.Send.Clear() // mock sending + client.Handlers.Unmarshal.Clear() + client.Handlers.UnmarshalMeta.Clear() + client.Handlers.ValidateResponse.Clear() + client.Handlers.Unmarshal.PushBack(func(r *aws.Request) { + r.Data = resps[*reqNum] + *reqNum++ + }) + + params := &s3.ListObjectsInput{Bucket: aws.String("bucket")} + + results := []string{} + err := client.ListObjectsPages(params, func(p *s3.ListObjectsOutput, last bool) bool { + results = append(results, *p.Contents[0].Key) + return true + }) + + assert.Equal(t, []string{"Key1", "Key2", "Key3"}, results) + assert.Nil(t, err) + + // Try again without truncation token at all + count = 0 + resps[1].IsTruncated = nil + resps[2].IsTruncated = aws.Boolean(true) + results = []string{} + err = client.ListObjectsPages(params, func(p *s3.ListObjectsOutput, last bool) bool { + results = append(results, *p.Contents[0].Key) + return true + }) + + assert.Equal(t, []string{"Key1", "Key2"}, results) + assert.Nil(t, err) + +} + +// Benchmarks +var benchResps = []*dynamodb.ListTablesOutput{ + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("TABLE"), aws.String("NXT")}, LastEvaluatedTableName: aws.String("NXT")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("TABLE"), aws.String("NXT")}, LastEvaluatedTableName: aws.String("NXT")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("TABLE"), aws.String("NXT")}, LastEvaluatedTableName: aws.String("NXT")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("TABLE"), aws.String("NXT")}, LastEvaluatedTableName: aws.String("NXT")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("TABLE"), aws.String("NXT")}, LastEvaluatedTableName: aws.String("NXT")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("TABLE"), aws.String("NXT")}, LastEvaluatedTableName: aws.String("NXT")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("TABLE"), aws.String("NXT")}, LastEvaluatedTableName: aws.String("NXT")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("TABLE"), aws.String("NXT")}, LastEvaluatedTableName: aws.String("NXT")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("TABLE"), aws.String("NXT")}, LastEvaluatedTableName: aws.String("NXT")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("TABLE"), aws.String("NXT")}, LastEvaluatedTableName: aws.String("NXT")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("TABLE"), aws.String("NXT")}, LastEvaluatedTableName: aws.String("NXT")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("TABLE"), aws.String("NXT")}, LastEvaluatedTableName: aws.String("NXT")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("TABLE"), aws.String("NXT")}, LastEvaluatedTableName: aws.String("NXT")}, + &dynamodb.ListTablesOutput{TableNames: []*string{aws.String("TABLE")}}, +} + +var benchDb = func() *dynamodb.DynamoDB { + db := dynamodb.New(nil) + db.Handlers.Send.Clear() // mock sending + db.Handlers.Unmarshal.Clear() + db.Handlers.UnmarshalMeta.Clear() + db.Handlers.ValidateResponse.Clear() + return db +} + +func BenchmarkCodegenIterator(b *testing.B) { + reqNum := 0 + db := benchDb() + db.Handlers.Unmarshal.PushBack(func(r *aws.Request) { + r.Data = benchResps[reqNum] + reqNum++ + }) + + input := &dynamodb.ListTablesInput{Limit: aws.Long(2)} + iter := func(fn func(*dynamodb.ListTablesOutput, bool) bool) error { + page, _ := db.ListTablesRequest(input) + for ; page != nil; page = page.NextPage() { + page.Send() + out := page.Data.(*dynamodb.ListTablesOutput) + if result := fn(out, !page.HasNextPage()); page.Error != nil || !result { + return page.Error + } + } + return nil + } + + for i := 0; i < b.N; i++ { + reqNum = 0 + iter(func(p *dynamodb.ListTablesOutput, last bool) bool { + return true + }) + } +} + +func BenchmarkEachPageIterator(b *testing.B) { + reqNum := 0 + db := benchDb() + db.Handlers.Unmarshal.PushBack(func(r *aws.Request) { + r.Data = benchResps[reqNum] + reqNum++ + }) + + input := &dynamodb.ListTablesInput{Limit: aws.Long(2)} + for i := 0; i < b.N; i++ { + reqNum = 0 + req, _ := db.ListTablesRequest(input) + req.EachPage(func(p *dynamodb.ListTablesOutput, last bool) bool { + return true + }) + } +} diff --git a/internal/model/api/load.go b/internal/model/api/load.go index bb09b13d77d..69b267fe8b9 100644 --- a/internal/model/api/load.go +++ b/internal/model/api/load.go @@ -24,6 +24,7 @@ func Load(api, docs, paginators, waiters string) *API { // Will proceed to setup the API if not already done so. func (a *API) Attach(filename string) { f, err := os.Open(filename) + defer f.Close() if err != nil { panic(err) } diff --git a/internal/model/api/operation.go b/internal/model/api/operation.go index 4b05015d704..b69b471af17 100644 --- a/internal/model/api/operation.go +++ b/internal/model/api/operation.go @@ -20,6 +20,7 @@ type Operation struct { HTTP HTTPInfo InputRef ShapeRef `json:"input"` OutputRef ShapeRef `json:"output"` + Paginator *Paginator } // A HTTPInfo defines the method of HTTP request for the Operation. @@ -60,6 +61,12 @@ func (c *{{ .API.StructName }}) {{ .ExportedName }}Request(` + Name: "{{ .Name }}", {{ if ne .HTTP.Method "" }}HTTPMethod: "{{ .HTTP.Method }}", {{ end }}{{ if ne .HTTP.RequestURI "" }}HTTPPath: "{{ .HTTP.RequestURI }}", + {{ end }}{{ if .Paginator }}Paginator: &aws.Paginator{ + InputTokens: {{ .Paginator.InputTokensString }}, + OutputTokens: {{ .Paginator.OutputTokensString }}, + LimitToken: "{{ .Paginator.LimitKey }}", + TruncationToken: "{{ .Paginator.MoreResults }}", + }, {{ end }} } } @@ -81,6 +88,14 @@ func (c *{{ .API.StructName }}) {{ .ExportedName }}Request(` + return out, err } +{{ if .Paginator }} +func (c *{{ .API.StructName }}) {{ .ExportedName }}Pages(` + + `input {{ .InputRef.GoType }}, fn func(p {{ .OutputRef.GoType }}, lastPage bool) (shouldContinue bool)) error { + page, _ := c.{{ .ExportedName }}Request(input) + return page.EachPage(fn) +} +{{ end }} + var op{{ .ExportedName }} *aws.Operation `)) diff --git a/internal/model/api/pagination.go b/internal/model/api/pagination.go new file mode 100644 index 00000000000..0cad00a8bd8 --- /dev/null +++ b/internal/model/api/pagination.go @@ -0,0 +1,87 @@ +package api + +import ( + "encoding/json" + "fmt" + "os" +) + +type Paginator struct { + InputTokens interface{} `json:"input_token"` + OutputTokens interface{} `json:"output_token"` + LimitKey string `json:"limit_key"` + MoreResults string `json:"more_results"` +} + +// InputTokensString returns output tokens formatted as a list +func (p *Paginator) InputTokensString() string { + str := p.InputTokens.([]string) + return fmt.Sprintf("%#v", str) +} + +// OutputTokensString returns output tokens formatted as a list +func (p *Paginator) OutputTokensString() string { + str := p.OutputTokens.([]string) + return fmt.Sprintf("%#v", str) +} + +// used for unmarshaling from the paginators JSON file +type paginationDefinitions struct { + *API + Pagination map[string]Paginator +} + +func (a *API) AttachPaginators(filename string) { + p := paginationDefinitions{API: a} + + f, err := os.Open(filename) + defer f.Close() + if err != nil { + panic(err) + } + err = json.NewDecoder(f).Decode(&p) + if err != nil { + panic(err) + } + + p.setup() +} + +func (p *paginationDefinitions) setup() { + for n, e := range p.Pagination { + if e.InputTokens == nil || e.OutputTokens == nil { + continue + } + paginator := e + + switch t := paginator.InputTokens.(type) { + case string: + paginator.InputTokens = []string{t} + case []interface{}: + toks := []string{} + for _, e := range t { + s := e.(string) + toks = append(toks, s) + } + paginator.InputTokens = toks + } + switch t := paginator.OutputTokens.(type) { + case string: + paginator.OutputTokens = []string{t} + case []interface{}: + toks := []string{} + for _, e := range t { + s := e.(string) + toks = append(toks, s) + } + paginator.OutputTokens = toks + } + + n = p.ExportableName(n) + if o, ok := p.Operations[n]; ok { + o.Paginator = &paginator + } else { + panic("unknown operation for paginator " + n) + } + } +} diff --git a/internal/model/cli/gen-api/main.go b/internal/model/cli/gen-api/main.go index 0b90ff17a32..e234a7c456b 100644 --- a/internal/model/cli/gen-api/main.go +++ b/internal/model/cli/gen-api/main.go @@ -30,6 +30,11 @@ func newGenerateInfo(modelFile, svcPath string) *generateInfo { g := &generateInfo{API: &api.API{}} g.API.Attach(modelFile) + paginatorsFile := strings.Replace(modelFile, ".normal.json", ".paginators.json", -1) + if _, err := os.Stat(paginatorsFile); err == nil { + g.API.AttachPaginators(paginatorsFile) + } + if svc := os.Getenv("SERVICES"); svc != "" { svcs := strings.Split(svc, ",") for _, s := range svcs { diff --git a/service/autoscaling/api.go b/service/autoscaling/api.go index e294f6e22d9..984a2ffb8f7 100644 --- a/service/autoscaling/api.go +++ b/service/autoscaling/api.go @@ -518,6 +518,12 @@ func (c *AutoScaling) DescribeAutoScalingGroupsRequest(input *DescribeAutoScalin Name: "DescribeAutoScalingGroups", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -543,6 +549,11 @@ func (c *AutoScaling) DescribeAutoScalingGroups(input *DescribeAutoScalingGroups return out, err } +func (c *AutoScaling) DescribeAutoScalingGroupsPages(input *DescribeAutoScalingGroupsInput, fn func(p *DescribeAutoScalingGroupsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeAutoScalingGroupsRequest(input) + return page.EachPage(fn) +} + var opDescribeAutoScalingGroups *aws.Operation // DescribeAutoScalingInstancesRequest generates a request for the DescribeAutoScalingInstances operation. @@ -555,6 +566,12 @@ func (c *AutoScaling) DescribeAutoScalingInstancesRequest(input *DescribeAutoSca Name: "DescribeAutoScalingInstances", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -581,6 +598,11 @@ func (c *AutoScaling) DescribeAutoScalingInstances(input *DescribeAutoScalingIns return out, err } +func (c *AutoScaling) DescribeAutoScalingInstancesPages(input *DescribeAutoScalingInstancesInput, fn func(p *DescribeAutoScalingInstancesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeAutoScalingInstancesRequest(input) + return page.EachPage(fn) +} + var opDescribeAutoScalingInstances *aws.Operation // DescribeAutoScalingNotificationTypesRequest generates a request for the DescribeAutoScalingNotificationTypes operation. @@ -625,6 +647,12 @@ func (c *AutoScaling) DescribeLaunchConfigurationsRequest(input *DescribeLaunchC Name: "DescribeLaunchConfigurations", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -650,6 +678,11 @@ func (c *AutoScaling) DescribeLaunchConfigurations(input *DescribeLaunchConfigur return out, err } +func (c *AutoScaling) DescribeLaunchConfigurationsPages(input *DescribeLaunchConfigurationsInput, fn func(p *DescribeLaunchConfigurationsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeLaunchConfigurationsRequest(input) + return page.EachPage(fn) +} + var opDescribeLaunchConfigurations *aws.Operation // DescribeLifecycleHookTypesRequest generates a request for the DescribeLifecycleHookTypes operation. @@ -762,6 +795,12 @@ func (c *AutoScaling) DescribeNotificationConfigurationsRequest(input *DescribeN Name: "DescribeNotificationConfigurations", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -783,6 +822,11 @@ func (c *AutoScaling) DescribeNotificationConfigurations(input *DescribeNotifica return out, err } +func (c *AutoScaling) DescribeNotificationConfigurationsPages(input *DescribeNotificationConfigurationsInput, fn func(p *DescribeNotificationConfigurationsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeNotificationConfigurationsRequest(input) + return page.EachPage(fn) +} + var opDescribeNotificationConfigurations *aws.Operation // DescribePoliciesRequest generates a request for the DescribePolicies operation. @@ -795,6 +839,12 @@ func (c *AutoScaling) DescribePoliciesRequest(input *DescribePoliciesInput) (req Name: "DescribePolicies", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -819,6 +869,11 @@ func (c *AutoScaling) DescribePolicies(input *DescribePoliciesInput) (*DescribeP return out, err } +func (c *AutoScaling) DescribePoliciesPages(input *DescribePoliciesInput, fn func(p *DescribePoliciesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribePoliciesRequest(input) + return page.EachPage(fn) +} + var opDescribePolicies *aws.Operation // DescribeScalingActivitiesRequest generates a request for the DescribeScalingActivities operation. @@ -831,6 +886,12 @@ func (c *AutoScaling) DescribeScalingActivitiesRequest(input *DescribeScalingAct Name: "DescribeScalingActivities", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -858,6 +919,11 @@ func (c *AutoScaling) DescribeScalingActivities(input *DescribeScalingActivities return out, err } +func (c *AutoScaling) DescribeScalingActivitiesPages(input *DescribeScalingActivitiesInput, fn func(p *DescribeScalingActivitiesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeScalingActivitiesRequest(input) + return page.EachPage(fn) +} + var opDescribeScalingActivities *aws.Operation // DescribeScalingProcessTypesRequest generates a request for the DescribeScalingProcessTypes operation. @@ -903,6 +969,12 @@ func (c *AutoScaling) DescribeScheduledActionsRequest(input *DescribeScheduledAc Name: "DescribeScheduledActions", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -924,6 +996,11 @@ func (c *AutoScaling) DescribeScheduledActions(input *DescribeScheduledActionsIn return out, err } +func (c *AutoScaling) DescribeScheduledActionsPages(input *DescribeScheduledActionsInput, fn func(p *DescribeScheduledActionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeScheduledActionsRequest(input) + return page.EachPage(fn) +} + var opDescribeScheduledActions *aws.Operation // DescribeTagsRequest generates a request for the DescribeTags operation. @@ -936,6 +1013,12 @@ func (c *AutoScaling) DescribeTagsRequest(input *DescribeTagsInput) (req *aws.Re Name: "DescribeTags", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -965,6 +1048,11 @@ func (c *AutoScaling) DescribeTags(input *DescribeTagsInput) (*DescribeTagsOutpu return out, err } +func (c *AutoScaling) DescribeTagsPages(input *DescribeTagsInput, fn func(p *DescribeTagsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeTagsRequest(input) + return page.EachPage(fn) +} + var opDescribeTags *aws.Operation // DescribeTerminationPolicyTypesRequest generates a request for the DescribeTerminationPolicyTypes operation. diff --git a/service/cloudformation/api.go b/service/cloudformation/api.go index bd0a940e836..00a5434715f 100644 --- a/service/cloudformation/api.go +++ b/service/cloudformation/api.go @@ -125,6 +125,12 @@ func (c *CloudFormation) DescribeStackEventsRequest(input *DescribeStackEventsIn Name: "DescribeStackEvents", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -150,6 +156,11 @@ func (c *CloudFormation) DescribeStackEvents(input *DescribeStackEventsInput) (* return out, err } +func (c *CloudFormation) DescribeStackEventsPages(input *DescribeStackEventsInput, fn func(p *DescribeStackEventsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeStackEventsRequest(input) + return page.EachPage(fn) +} + var opDescribeStackEvents *aws.Operation // DescribeStackResourceRequest generates a request for the DescribeStackResource operation. @@ -245,6 +256,12 @@ func (c *CloudFormation) DescribeStacksRequest(input *DescribeStacksInput) (req Name: "DescribeStacks", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -266,6 +283,11 @@ func (c *CloudFormation) DescribeStacks(input *DescribeStacksInput) (*DescribeSt return out, err } +func (c *CloudFormation) DescribeStacksPages(input *DescribeStacksInput, fn func(p *DescribeStacksOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeStacksRequest(input) + return page.EachPage(fn) +} + var opDescribeStacks *aws.Operation // EstimateTemplateCostRequest generates a request for the EstimateTemplateCost operation. @@ -424,6 +446,12 @@ func (c *CloudFormation) ListStackResourcesRequest(input *ListStackResourcesInpu Name: "ListStackResources", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -447,6 +475,11 @@ func (c *CloudFormation) ListStackResources(input *ListStackResourcesInput) (*Li return out, err } +func (c *CloudFormation) ListStackResourcesPages(input *ListStackResourcesInput, fn func(p *ListStackResourcesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListStackResourcesRequest(input) + return page.EachPage(fn) +} + var opListStackResources *aws.Operation // ListStacksRequest generates a request for the ListStacks operation. @@ -459,6 +492,12 @@ func (c *CloudFormation) ListStacksRequest(input *ListStacksInput) (req *aws.Req Name: "ListStacks", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -483,6 +522,11 @@ func (c *CloudFormation) ListStacks(input *ListStacksInput) (*ListStacksOutput, return out, err } +func (c *CloudFormation) ListStacksPages(input *ListStacksInput, fn func(p *ListStacksOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListStacksRequest(input) + return page.EachPage(fn) +} + var opListStacks *aws.Operation // SetStackPolicyRequest generates a request for the SetStackPolicy operation. diff --git a/service/cloudfront/api.go b/service/cloudfront/api.go index 4ca1e4dc90a..d4d07d0dbfa 100644 --- a/service/cloudfront/api.go +++ b/service/cloudfront/api.go @@ -470,6 +470,12 @@ func (c *CloudFront) ListCloudFrontOriginAccessIdentitiesRequest(input *ListClou Name: "ListCloudFrontOriginAccessIdentities2014_11_06", HTTPMethod: "GET", HTTPPath: "/2014-11-06/origin-access-identity/cloudfront", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"CloudFrontOriginAccessIdentityList.NextMarker"}, + LimitToken: "MaxItems", + TruncationToken: "CloudFrontOriginAccessIdentityList.IsTruncated", + }, } } @@ -490,6 +496,11 @@ func (c *CloudFront) ListCloudFrontOriginAccessIdentities(input *ListCloudFrontO return out, err } +func (c *CloudFront) ListCloudFrontOriginAccessIdentitiesPages(input *ListCloudFrontOriginAccessIdentitiesInput, fn func(p *ListCloudFrontOriginAccessIdentitiesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListCloudFrontOriginAccessIdentitiesRequest(input) + return page.EachPage(fn) +} + var opListCloudFrontOriginAccessIdentities *aws.Operation // ListDistributionsRequest generates a request for the ListDistributions operation. @@ -502,6 +513,12 @@ func (c *CloudFront) ListDistributionsRequest(input *ListDistributionsInput) (re Name: "ListDistributions2014_11_06", HTTPMethod: "GET", HTTPPath: "/2014-11-06/distribution", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"DistributionList.NextMarker"}, + LimitToken: "MaxItems", + TruncationToken: "DistributionList.IsTruncated", + }, } } @@ -522,6 +539,11 @@ func (c *CloudFront) ListDistributions(input *ListDistributionsInput) (*ListDist return out, err } +func (c *CloudFront) ListDistributionsPages(input *ListDistributionsInput, fn func(p *ListDistributionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListDistributionsRequest(input) + return page.EachPage(fn) +} + var opListDistributions *aws.Operation // ListInvalidationsRequest generates a request for the ListInvalidations operation. @@ -534,6 +556,12 @@ func (c *CloudFront) ListInvalidationsRequest(input *ListInvalidationsInput) (re Name: "ListInvalidations2014_11_06", HTTPMethod: "GET", HTTPPath: "/2014-11-06/distribution/{DistributionId}/invalidation", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"InvalidationList.NextMarker"}, + LimitToken: "MaxItems", + TruncationToken: "InvalidationList.IsTruncated", + }, } } @@ -554,6 +582,11 @@ func (c *CloudFront) ListInvalidations(input *ListInvalidationsInput) (*ListInva return out, err } +func (c *CloudFront) ListInvalidationsPages(input *ListInvalidationsInput, fn func(p *ListInvalidationsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListInvalidationsRequest(input) + return page.EachPage(fn) +} + var opListInvalidations *aws.Operation // ListStreamingDistributionsRequest generates a request for the ListStreamingDistributions operation. @@ -566,6 +599,12 @@ func (c *CloudFront) ListStreamingDistributionsRequest(input *ListStreamingDistr Name: "ListStreamingDistributions2014_11_06", HTTPMethod: "GET", HTTPPath: "/2014-11-06/streaming-distribution", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"StreamingDistributionList.NextMarker"}, + LimitToken: "MaxItems", + TruncationToken: "StreamingDistributionList.IsTruncated", + }, } } @@ -586,6 +625,11 @@ func (c *CloudFront) ListStreamingDistributions(input *ListStreamingDistribution return out, err } +func (c *CloudFront) ListStreamingDistributionsPages(input *ListStreamingDistributionsInput, fn func(p *ListStreamingDistributionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListStreamingDistributionsRequest(input) + return page.EachPage(fn) +} + var opListStreamingDistributions *aws.Operation // UpdateCloudFrontOriginAccessIdentityRequest generates a request for the UpdateCloudFrontOriginAccessIdentity operation. diff --git a/service/cloudwatch/api.go b/service/cloudwatch/api.go index f037f574f11..1592b4ac56f 100644 --- a/service/cloudwatch/api.go +++ b/service/cloudwatch/api.go @@ -54,6 +54,12 @@ func (c *CloudWatch) DescribeAlarmHistoryRequest(input *DescribeAlarmHistoryInpu Name: "DescribeAlarmHistory", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -76,6 +82,11 @@ func (c *CloudWatch) DescribeAlarmHistory(input *DescribeAlarmHistoryInput) (*De return out, err } +func (c *CloudWatch) DescribeAlarmHistoryPages(input *DescribeAlarmHistoryInput, fn func(p *DescribeAlarmHistoryOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeAlarmHistoryRequest(input) + return page.EachPage(fn) +} + var opDescribeAlarmHistory *aws.Operation // DescribeAlarmsRequest generates a request for the DescribeAlarms operation. @@ -88,6 +99,12 @@ func (c *CloudWatch) DescribeAlarmsRequest(input *DescribeAlarmsInput) (req *aws Name: "DescribeAlarms", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -110,6 +127,11 @@ func (c *CloudWatch) DescribeAlarms(input *DescribeAlarmsInput) (*DescribeAlarms return out, err } +func (c *CloudWatch) DescribeAlarmsPages(input *DescribeAlarmsInput, fn func(p *DescribeAlarmsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeAlarmsRequest(input) + return page.EachPage(fn) +} + var opDescribeAlarms *aws.Operation // DescribeAlarmsForMetricRequest generates a request for the DescribeAlarmsForMetric operation. @@ -277,6 +299,12 @@ func (c *CloudWatch) ListMetricsRequest(input *ListMetricsInput) (req *aws.Reque Name: "ListMetrics", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -299,6 +327,11 @@ func (c *CloudWatch) ListMetrics(input *ListMetricsInput) (*ListMetricsOutput, e return out, err } +func (c *CloudWatch) ListMetricsPages(input *ListMetricsInput, fn func(p *ListMetricsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListMetricsRequest(input) + return page.EachPage(fn) +} + var opListMetrics *aws.Operation // PutMetricAlarmRequest generates a request for the PutMetricAlarm operation. diff --git a/service/datapipeline/api.go b/service/datapipeline/api.go index 6df290e8180..21521d01117 100644 --- a/service/datapipeline/api.go +++ b/service/datapipeline/api.go @@ -163,6 +163,12 @@ func (c *DataPipeline) DescribeObjectsRequest(input *DescribeObjectsInput) (req Name: "DescribeObjects", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"marker"}, + OutputTokens: []string{"marker"}, + LimitToken: "", + TruncationToken: "hasMoreResults", + }, } } @@ -185,6 +191,11 @@ func (c *DataPipeline) DescribeObjects(input *DescribeObjectsInput) (*DescribeOb return out, err } +func (c *DataPipeline) DescribeObjectsPages(input *DescribeObjectsInput, fn func(p *DescribeObjectsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeObjectsRequest(input) + return page.EachPage(fn) +} + var opDescribeObjects *aws.Operation // DescribePipelinesRequest generates a request for the DescribePipelines operation. @@ -303,6 +314,12 @@ func (c *DataPipeline) ListPipelinesRequest(input *ListPipelinesInput) (req *aws Name: "ListPipelines", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"marker"}, + OutputTokens: []string{"marker"}, + LimitToken: "", + TruncationToken: "hasMoreResults", + }, } } @@ -324,6 +341,11 @@ func (c *DataPipeline) ListPipelines(input *ListPipelinesInput) (*ListPipelinesO return out, err } +func (c *DataPipeline) ListPipelinesPages(input *ListPipelinesInput, fn func(p *ListPipelinesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListPipelinesRequest(input) + return page.EachPage(fn) +} + var opListPipelines *aws.Operation // PollForTaskRequest generates a request for the PollForTask operation. @@ -424,6 +446,12 @@ func (c *DataPipeline) QueryObjectsRequest(input *QueryObjectsInput) (req *aws.R Name: "QueryObjects", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"marker"}, + OutputTokens: []string{"marker"}, + LimitToken: "limit", + TruncationToken: "hasMoreResults", + }, } } @@ -451,6 +479,11 @@ func (c *DataPipeline) QueryObjects(input *QueryObjectsInput) (*QueryObjectsOutp return out, err } +func (c *DataPipeline) QueryObjectsPages(input *QueryObjectsInput, fn func(p *QueryObjectsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.QueryObjectsRequest(input) + return page.EachPage(fn) +} + var opQueryObjects *aws.Operation // RemoveTagsRequest generates a request for the RemoveTags operation. diff --git a/service/dynamodb/api.go b/service/dynamodb/api.go index e14e8b0cb9a..32e8d7a8b76 100644 --- a/service/dynamodb/api.go +++ b/service/dynamodb/api.go @@ -414,6 +414,12 @@ func (c *DynamoDB) ListTablesRequest(input *ListTablesInput) (req *aws.Request, Name: "ListTables", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"ExclusiveStartTableName"}, + OutputTokens: []string{"LastEvaluatedTableName"}, + LimitToken: "Limit", + TruncationToken: "", + }, } } @@ -436,6 +442,11 @@ func (c *DynamoDB) ListTables(input *ListTablesInput) (*ListTablesOutput, error) return out, err } +func (c *DynamoDB) ListTablesPages(input *ListTablesInput, fn func(p *ListTablesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListTablesRequest(input) + return page.EachPage(fn) +} + var opListTables *aws.Operation // PutItemRequest generates a request for the PutItem operation. @@ -504,6 +515,12 @@ func (c *DynamoDB) QueryRequest(input *QueryInput) (req *aws.Request, output *Qu Name: "Query", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"ExclusiveStartKey"}, + OutputTokens: []string{"LastEvaluatedKey"}, + LimitToken: "Limit", + TruncationToken: "", + }, } } @@ -548,6 +565,11 @@ func (c *DynamoDB) Query(input *QueryInput) (*QueryOutput, error) { return out, err } +func (c *DynamoDB) QueryPages(input *QueryInput, fn func(p *QueryOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.QueryRequest(input) + return page.EachPage(fn) +} + var opQuery *aws.Operation // ScanRequest generates a request for the Scan operation. @@ -560,6 +582,12 @@ func (c *DynamoDB) ScanRequest(input *ScanInput) (req *aws.Request, output *Scan Name: "Scan", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"ExclusiveStartKey"}, + OutputTokens: []string{"LastEvaluatedKey"}, + LimitToken: "Limit", + TruncationToken: "", + }, } } @@ -596,6 +624,11 @@ func (c *DynamoDB) Scan(input *ScanInput) (*ScanOutput, error) { return out, err } +func (c *DynamoDB) ScanPages(input *ScanInput, fn func(p *ScanOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ScanRequest(input) + return page.EachPage(fn) +} + var opScan *aws.Operation // UpdateItemRequest generates a request for the UpdateItem operation. diff --git a/service/ec2/api.go b/service/ec2/api.go index 96b73fb4518..d042b65e0d1 100644 --- a/service/ec2/api.go +++ b/service/ec2/api.go @@ -3291,6 +3291,12 @@ func (c *EC2) DescribeInstanceStatusRequest(input *DescribeInstanceStatusInput) Name: "DescribeInstanceStatus", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, } } @@ -3369,6 +3375,11 @@ func (c *EC2) DescribeInstanceStatus(input *DescribeInstanceStatusInput) (*Descr return out, err } +func (c *EC2) DescribeInstanceStatusPages(input *DescribeInstanceStatusInput, fn func(p *DescribeInstanceStatusOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeInstanceStatusRequest(input) + return page.EachPage(fn) +} + var opDescribeInstanceStatus *aws.Operation // DescribeInstancesRequest generates a request for the DescribeInstances operation. @@ -3381,6 +3392,12 @@ func (c *EC2) DescribeInstancesRequest(input *DescribeInstancesInput) (req *aws. Name: "DescribeInstances", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, } } @@ -3410,6 +3427,11 @@ func (c *EC2) DescribeInstances(input *DescribeInstancesInput) (*DescribeInstanc return out, err } +func (c *EC2) DescribeInstancesPages(input *DescribeInstancesInput, fn func(p *DescribeInstancesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeInstancesRequest(input) + return page.EachPage(fn) +} + var opDescribeInstances *aws.Operation // DescribeInternetGatewaysRequest generates a request for the DescribeInternetGateways operation. @@ -3746,6 +3768,12 @@ func (c *EC2) DescribeReservedInstancesModificationsRequest(input *DescribeReser Name: "DescribeReservedInstancesModifications", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -3772,6 +3800,11 @@ func (c *EC2) DescribeReservedInstancesModifications(input *DescribeReservedInst return out, err } +func (c *EC2) DescribeReservedInstancesModificationsPages(input *DescribeReservedInstancesModificationsInput, fn func(p *DescribeReservedInstancesModificationsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeReservedInstancesModificationsRequest(input) + return page.EachPage(fn) +} + var opDescribeReservedInstancesModifications *aws.Operation // DescribeReservedInstancesOfferingsRequest generates a request for the DescribeReservedInstancesOfferings operation. @@ -3784,6 +3817,12 @@ func (c *EC2) DescribeReservedInstancesOfferingsRequest(input *DescribeReservedI Name: "DescribeReservedInstancesOfferings", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, } } @@ -3811,6 +3850,11 @@ func (c *EC2) DescribeReservedInstancesOfferings(input *DescribeReservedInstance return out, err } +func (c *EC2) DescribeReservedInstancesOfferingsPages(input *DescribeReservedInstancesOfferingsInput, fn func(p *DescribeReservedInstancesOfferingsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeReservedInstancesOfferingsRequest(input) + return page.EachPage(fn) +} + var opDescribeReservedInstancesOfferings *aws.Operation // DescribeRouteTablesRequest generates a request for the DescribeRouteTables operation. @@ -3933,6 +3977,12 @@ func (c *EC2) DescribeSnapshotsRequest(input *DescribeSnapshotsInput) (req *aws. Name: "DescribeSnapshots", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -3992,6 +4042,11 @@ func (c *EC2) DescribeSnapshots(input *DescribeSnapshotsInput) (*DescribeSnapsho return out, err } +func (c *EC2) DescribeSnapshotsPages(input *DescribeSnapshotsInput, fn func(p *DescribeSnapshotsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeSnapshotsRequest(input) + return page.EachPage(fn) +} + var opDescribeSnapshots *aws.Operation // DescribeSpotDatafeedSubscriptionRequest generates a request for the DescribeSpotDatafeedSubscription operation. @@ -4081,6 +4136,12 @@ func (c *EC2) DescribeSpotPriceHistoryRequest(input *DescribeSpotPriceHistoryInp Name: "DescribeSpotPriceHistory", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, } } @@ -4109,6 +4170,11 @@ func (c *EC2) DescribeSpotPriceHistory(input *DescribeSpotPriceHistoryInput) (*D return out, err } +func (c *EC2) DescribeSpotPriceHistoryPages(input *DescribeSpotPriceHistoryInput, fn func(p *DescribeSpotPriceHistoryOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeSpotPriceHistoryRequest(input) + return page.EachPage(fn) +} + var opDescribeSpotPriceHistory *aws.Operation // DescribeSubnetsRequest generates a request for the DescribeSubnets operation. @@ -4428,6 +4494,12 @@ func (c *EC2) DescribeVolumeStatusRequest(input *DescribeVolumeStatusInput) (req Name: "DescribeVolumeStatus", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, } } @@ -4482,6 +4554,11 @@ func (c *EC2) DescribeVolumeStatus(input *DescribeVolumeStatusInput) (*DescribeV return out, err } +func (c *EC2) DescribeVolumeStatusPages(input *DescribeVolumeStatusInput, fn func(p *DescribeVolumeStatusOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeVolumeStatusRequest(input) + return page.EachPage(fn) +} + var opDescribeVolumeStatus *aws.Operation // DescribeVolumesRequest generates a request for the DescribeVolumes operation. @@ -4494,6 +4571,12 @@ func (c *EC2) DescribeVolumesRequest(input *DescribeVolumesInput) (req *aws.Requ Name: "DescribeVolumes", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, } } @@ -4524,6 +4607,11 @@ func (c *EC2) DescribeVolumes(input *DescribeVolumesInput) (*DescribeVolumesOutp return out, err } +func (c *EC2) DescribeVolumesPages(input *DescribeVolumesInput, fn func(p *DescribeVolumesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeVolumesRequest(input) + return page.EachPage(fn) +} + var opDescribeVolumes *aws.Operation // DetachClassicLinkVPCRequest generates a request for the DetachClassicLinkVPC operation. diff --git a/service/elasticache/api.go b/service/elasticache/api.go index c946efdc5b2..6a766e2ded5 100644 --- a/service/elasticache/api.go +++ b/service/elasticache/api.go @@ -565,6 +565,12 @@ func (c *ElastiCache) DescribeCacheClustersRequest(input *DescribeCacheClustersI Name: "DescribeCacheClusters", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -606,6 +612,11 @@ func (c *ElastiCache) DescribeCacheClusters(input *DescribeCacheClustersInput) ( return out, err } +func (c *ElastiCache) DescribeCacheClustersPages(input *DescribeCacheClustersInput, fn func(p *DescribeCacheClustersOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeCacheClustersRequest(input) + return page.EachPage(fn) +} + var opDescribeCacheClusters *aws.Operation // DescribeCacheEngineVersionsRequest generates a request for the DescribeCacheEngineVersions operation. @@ -618,6 +629,12 @@ func (c *ElastiCache) DescribeCacheEngineVersionsRequest(input *DescribeCacheEng Name: "DescribeCacheEngineVersions", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -639,6 +656,11 @@ func (c *ElastiCache) DescribeCacheEngineVersions(input *DescribeCacheEngineVers return out, err } +func (c *ElastiCache) DescribeCacheEngineVersionsPages(input *DescribeCacheEngineVersionsInput, fn func(p *DescribeCacheEngineVersionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeCacheEngineVersionsRequest(input) + return page.EachPage(fn) +} + var opDescribeCacheEngineVersions *aws.Operation // DescribeCacheParameterGroupsRequest generates a request for the DescribeCacheParameterGroups operation. @@ -651,6 +673,12 @@ func (c *ElastiCache) DescribeCacheParameterGroupsRequest(input *DescribeCachePa Name: "DescribeCacheParameterGroups", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -673,6 +701,11 @@ func (c *ElastiCache) DescribeCacheParameterGroups(input *DescribeCacheParameter return out, err } +func (c *ElastiCache) DescribeCacheParameterGroupsPages(input *DescribeCacheParameterGroupsInput, fn func(p *DescribeCacheParameterGroupsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeCacheParameterGroupsRequest(input) + return page.EachPage(fn) +} + var opDescribeCacheParameterGroups *aws.Operation // DescribeCacheParametersRequest generates a request for the DescribeCacheParameters operation. @@ -685,6 +718,12 @@ func (c *ElastiCache) DescribeCacheParametersRequest(input *DescribeCacheParamet Name: "DescribeCacheParameters", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -706,6 +745,11 @@ func (c *ElastiCache) DescribeCacheParameters(input *DescribeCacheParametersInpu return out, err } +func (c *ElastiCache) DescribeCacheParametersPages(input *DescribeCacheParametersInput, fn func(p *DescribeCacheParametersOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeCacheParametersRequest(input) + return page.EachPage(fn) +} + var opDescribeCacheParameters *aws.Operation // DescribeCacheSecurityGroupsRequest generates a request for the DescribeCacheSecurityGroups operation. @@ -718,6 +762,12 @@ func (c *ElastiCache) DescribeCacheSecurityGroupsRequest(input *DescribeCacheSec Name: "DescribeCacheSecurityGroups", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -740,6 +790,11 @@ func (c *ElastiCache) DescribeCacheSecurityGroups(input *DescribeCacheSecurityGr return out, err } +func (c *ElastiCache) DescribeCacheSecurityGroupsPages(input *DescribeCacheSecurityGroupsInput, fn func(p *DescribeCacheSecurityGroupsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeCacheSecurityGroupsRequest(input) + return page.EachPage(fn) +} + var opDescribeCacheSecurityGroups *aws.Operation // DescribeCacheSubnetGroupsRequest generates a request for the DescribeCacheSubnetGroups operation. @@ -752,6 +807,12 @@ func (c *ElastiCache) DescribeCacheSubnetGroupsRequest(input *DescribeCacheSubne Name: "DescribeCacheSubnetGroups", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -774,6 +835,11 @@ func (c *ElastiCache) DescribeCacheSubnetGroups(input *DescribeCacheSubnetGroups return out, err } +func (c *ElastiCache) DescribeCacheSubnetGroupsPages(input *DescribeCacheSubnetGroupsInput, fn func(p *DescribeCacheSubnetGroupsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeCacheSubnetGroupsRequest(input) + return page.EachPage(fn) +} + var opDescribeCacheSubnetGroups *aws.Operation // DescribeEngineDefaultParametersRequest generates a request for the DescribeEngineDefaultParameters operation. @@ -786,6 +852,12 @@ func (c *ElastiCache) DescribeEngineDefaultParametersRequest(input *DescribeEngi Name: "DescribeEngineDefaultParameters", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"EngineDefaults.Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -807,6 +879,11 @@ func (c *ElastiCache) DescribeEngineDefaultParameters(input *DescribeEngineDefau return out, err } +func (c *ElastiCache) DescribeEngineDefaultParametersPages(input *DescribeEngineDefaultParametersInput, fn func(p *DescribeEngineDefaultParametersOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeEngineDefaultParametersRequest(input) + return page.EachPage(fn) +} + var opDescribeEngineDefaultParameters *aws.Operation // DescribeEventsRequest generates a request for the DescribeEvents operation. @@ -819,6 +896,12 @@ func (c *ElastiCache) DescribeEventsRequest(input *DescribeEventsInput) (req *aw Name: "DescribeEvents", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -845,6 +928,11 @@ func (c *ElastiCache) DescribeEvents(input *DescribeEventsInput) (*DescribeEvent return out, err } +func (c *ElastiCache) DescribeEventsPages(input *DescribeEventsInput, fn func(p *DescribeEventsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeEventsRequest(input) + return page.EachPage(fn) +} + var opDescribeEvents *aws.Operation // DescribeReplicationGroupsRequest generates a request for the DescribeReplicationGroups operation. @@ -857,6 +945,12 @@ func (c *ElastiCache) DescribeReplicationGroupsRequest(input *DescribeReplicatio Name: "DescribeReplicationGroups", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -879,6 +973,11 @@ func (c *ElastiCache) DescribeReplicationGroups(input *DescribeReplicationGroups return out, err } +func (c *ElastiCache) DescribeReplicationGroupsPages(input *DescribeReplicationGroupsInput, fn func(p *DescribeReplicationGroupsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeReplicationGroupsRequest(input) + return page.EachPage(fn) +} + var opDescribeReplicationGroups *aws.Operation // DescribeReservedCacheNodesRequest generates a request for the DescribeReservedCacheNodes operation. @@ -891,6 +990,12 @@ func (c *ElastiCache) DescribeReservedCacheNodesRequest(input *DescribeReservedC Name: "DescribeReservedCacheNodes", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -912,6 +1017,11 @@ func (c *ElastiCache) DescribeReservedCacheNodes(input *DescribeReservedCacheNod return out, err } +func (c *ElastiCache) DescribeReservedCacheNodesPages(input *DescribeReservedCacheNodesInput, fn func(p *DescribeReservedCacheNodesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeReservedCacheNodesRequest(input) + return page.EachPage(fn) +} + var opDescribeReservedCacheNodes *aws.Operation // DescribeReservedCacheNodesOfferingsRequest generates a request for the DescribeReservedCacheNodesOfferings operation. @@ -924,6 +1034,12 @@ func (c *ElastiCache) DescribeReservedCacheNodesOfferingsRequest(input *Describe Name: "DescribeReservedCacheNodesOfferings", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -945,6 +1061,11 @@ func (c *ElastiCache) DescribeReservedCacheNodesOfferings(input *DescribeReserve return out, err } +func (c *ElastiCache) DescribeReservedCacheNodesOfferingsPages(input *DescribeReservedCacheNodesOfferingsInput, fn func(p *DescribeReservedCacheNodesOfferingsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeReservedCacheNodesOfferingsRequest(input) + return page.EachPage(fn) +} + var opDescribeReservedCacheNodesOfferings *aws.Operation // DescribeSnapshotsRequest generates a request for the DescribeSnapshots operation. @@ -957,6 +1078,12 @@ func (c *ElastiCache) DescribeSnapshotsRequest(input *DescribeSnapshotsInput) (r Name: "DescribeSnapshots", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -980,6 +1107,11 @@ func (c *ElastiCache) DescribeSnapshots(input *DescribeSnapshotsInput) (*Describ return out, err } +func (c *ElastiCache) DescribeSnapshotsPages(input *DescribeSnapshotsInput, fn func(p *DescribeSnapshotsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeSnapshotsRequest(input) + return page.EachPage(fn) +} + var opDescribeSnapshots *aws.Operation // ListTagsForResourceRequest generates a request for the ListTagsForResource operation. diff --git a/service/elasticbeanstalk/api.go b/service/elasticbeanstalk/api.go index 6206dc5a063..f50ab320d54 100644 --- a/service/elasticbeanstalk/api.go +++ b/service/elasticbeanstalk/api.go @@ -569,6 +569,12 @@ func (c *ElasticBeanstalk) DescribeEventsRequest(input *DescribeEventsInput) (re Name: "DescribeEvents", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -589,6 +595,11 @@ func (c *ElasticBeanstalk) DescribeEvents(input *DescribeEventsInput) (*Describe return out, err } +func (c *ElasticBeanstalk) DescribeEventsPages(input *DescribeEventsInput, fn func(p *DescribeEventsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeEventsRequest(input) + return page.EachPage(fn) +} + var opDescribeEvents *aws.Operation // ListAvailableSolutionStacksRequest generates a request for the ListAvailableSolutionStacks operation. diff --git a/service/elastictranscoder/api.go b/service/elastictranscoder/api.go index 0ea217d01a7..cb81503ddde 100644 --- a/service/elastictranscoder/api.go +++ b/service/elastictranscoder/api.go @@ -243,6 +243,12 @@ func (c *ElasticTranscoder) ListJobsByPipelineRequest(input *ListJobsByPipelineI Name: "ListJobsByPipeline", HTTPMethod: "GET", HTTPPath: "/2012-09-25/jobsByPipeline/{PipelineId}", + Paginator: &aws.Paginator{ + InputTokens: []string{"PageToken"}, + OutputTokens: []string{"NextPageToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -267,6 +273,11 @@ func (c *ElasticTranscoder) ListJobsByPipeline(input *ListJobsByPipelineInput) ( return out, err } +func (c *ElasticTranscoder) ListJobsByPipelinePages(input *ListJobsByPipelineInput, fn func(p *ListJobsByPipelineOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListJobsByPipelineRequest(input) + return page.EachPage(fn) +} + var opListJobsByPipeline *aws.Operation // ListJobsByStatusRequest generates a request for the ListJobsByStatus operation. @@ -279,6 +290,12 @@ func (c *ElasticTranscoder) ListJobsByStatusRequest(input *ListJobsByStatusInput Name: "ListJobsByStatus", HTTPMethod: "GET", HTTPPath: "/2012-09-25/jobsByStatus/{Status}", + Paginator: &aws.Paginator{ + InputTokens: []string{"PageToken"}, + OutputTokens: []string{"NextPageToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -301,6 +318,11 @@ func (c *ElasticTranscoder) ListJobsByStatus(input *ListJobsByStatusInput) (*Lis return out, err } +func (c *ElasticTranscoder) ListJobsByStatusPages(input *ListJobsByStatusInput, fn func(p *ListJobsByStatusOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListJobsByStatusRequest(input) + return page.EachPage(fn) +} + var opListJobsByStatus *aws.Operation // ListPipelinesRequest generates a request for the ListPipelines operation. @@ -313,6 +335,12 @@ func (c *ElasticTranscoder) ListPipelinesRequest(input *ListPipelinesInput) (req Name: "ListPipelines", HTTPMethod: "GET", HTTPPath: "/2012-09-25/pipelines", + Paginator: &aws.Paginator{ + InputTokens: []string{"PageToken"}, + OutputTokens: []string{"NextPageToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -334,6 +362,11 @@ func (c *ElasticTranscoder) ListPipelines(input *ListPipelinesInput) (*ListPipel return out, err } +func (c *ElasticTranscoder) ListPipelinesPages(input *ListPipelinesInput, fn func(p *ListPipelinesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListPipelinesRequest(input) + return page.EachPage(fn) +} + var opListPipelines *aws.Operation // ListPresetsRequest generates a request for the ListPresets operation. @@ -346,6 +379,12 @@ func (c *ElasticTranscoder) ListPresetsRequest(input *ListPresetsInput) (req *aw Name: "ListPresets", HTTPMethod: "GET", HTTPPath: "/2012-09-25/presets", + Paginator: &aws.Paginator{ + InputTokens: []string{"PageToken"}, + OutputTokens: []string{"NextPageToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -367,6 +406,11 @@ func (c *ElasticTranscoder) ListPresets(input *ListPresetsInput) (*ListPresetsOu return out, err } +func (c *ElasticTranscoder) ListPresetsPages(input *ListPresetsInput, fn func(p *ListPresetsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListPresetsRequest(input) + return page.EachPage(fn) +} + var opListPresets *aws.Operation // ReadJobRequest generates a request for the ReadJob operation. diff --git a/service/elb/api.go b/service/elb/api.go index ef6c911579b..ddb63cd1a11 100644 --- a/service/elb/api.go +++ b/service/elb/api.go @@ -679,6 +679,12 @@ func (c *ELB) DescribeLoadBalancersRequest(input *DescribeLoadBalancersInput) (r Name: "DescribeLoadBalancers", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"NextMarker"}, + LimitToken: "PageSize", + TruncationToken: "", + }, } } @@ -700,6 +706,11 @@ func (c *ELB) DescribeLoadBalancers(input *DescribeLoadBalancersInput) (*Describ return out, err } +func (c *ELB) DescribeLoadBalancersPages(input *DescribeLoadBalancersInput, fn func(p *DescribeLoadBalancersOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeLoadBalancersRequest(input) + return page.EachPage(fn) +} + var opDescribeLoadBalancers *aws.Operation // DescribeTagsRequest generates a request for the DescribeTags operation. diff --git a/service/emr/api.go b/service/emr/api.go index 2b01171d8b4..b916f343589 100644 --- a/service/emr/api.go +++ b/service/emr/api.go @@ -258,6 +258,12 @@ func (c *EMR) ListBootstrapActionsRequest(input *ListBootstrapActionsInput) (req Name: "ListBootstrapActions", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -278,6 +284,11 @@ func (c *EMR) ListBootstrapActions(input *ListBootstrapActionsInput) (*ListBoots return out, err } +func (c *EMR) ListBootstrapActionsPages(input *ListBootstrapActionsInput, fn func(p *ListBootstrapActionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListBootstrapActionsRequest(input) + return page.EachPage(fn) +} + var opListBootstrapActions *aws.Operation // ListClustersRequest generates a request for the ListClusters operation. @@ -290,6 +301,12 @@ func (c *EMR) ListClustersRequest(input *ListClustersInput) (req *aws.Request, o Name: "ListClusters", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -314,6 +331,11 @@ func (c *EMR) ListClusters(input *ListClustersInput) (*ListClustersOutput, error return out, err } +func (c *EMR) ListClustersPages(input *ListClustersInput, fn func(p *ListClustersOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListClustersRequest(input) + return page.EachPage(fn) +} + var opListClusters *aws.Operation // ListInstanceGroupsRequest generates a request for the ListInstanceGroups operation. @@ -326,6 +348,12 @@ func (c *EMR) ListInstanceGroupsRequest(input *ListInstanceGroupsInput) (req *aw Name: "ListInstanceGroups", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -346,6 +374,11 @@ func (c *EMR) ListInstanceGroups(input *ListInstanceGroupsInput) (*ListInstanceG return out, err } +func (c *EMR) ListInstanceGroupsPages(input *ListInstanceGroupsInput, fn func(p *ListInstanceGroupsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListInstanceGroupsRequest(input) + return page.EachPage(fn) +} + var opListInstanceGroups *aws.Operation // ListInstancesRequest generates a request for the ListInstances operation. @@ -358,6 +391,12 @@ func (c *EMR) ListInstancesRequest(input *ListInstancesInput) (req *aws.Request, Name: "ListInstances", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -382,6 +421,11 @@ func (c *EMR) ListInstances(input *ListInstancesInput) (*ListInstancesOutput, er return out, err } +func (c *EMR) ListInstancesPages(input *ListInstancesInput, fn func(p *ListInstancesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListInstancesRequest(input) + return page.EachPage(fn) +} + var opListInstances *aws.Operation // ListStepsRequest generates a request for the ListSteps operation. @@ -394,6 +438,12 @@ func (c *EMR) ListStepsRequest(input *ListStepsInput) (req *aws.Request, output Name: "ListSteps", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -414,6 +464,11 @@ func (c *EMR) ListSteps(input *ListStepsInput) (*ListStepsOutput, error) { return out, err } +func (c *EMR) ListStepsPages(input *ListStepsInput, fn func(p *ListStepsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListStepsRequest(input) + return page.EachPage(fn) +} + var opListSteps *aws.Operation // ModifyInstanceGroupsRequest generates a request for the ModifyInstanceGroups operation. diff --git a/service/iam/api.go b/service/iam/api.go index d8365fc91cb..c07791ec28b 100644 --- a/service/iam/api.go +++ b/service/iam/api.go @@ -1703,6 +1703,12 @@ func (c *IAM) GetAccountAuthorizationDetailsRequest(input *GetAccountAuthorizati Name: "GetAccountAuthorizationDetails", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -1729,6 +1735,11 @@ func (c *IAM) GetAccountAuthorizationDetails(input *GetAccountAuthorizationDetai return out, err } +func (c *IAM) GetAccountAuthorizationDetailsPages(input *GetAccountAuthorizationDetailsInput, fn func(p *GetAccountAuthorizationDetailsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.GetAccountAuthorizationDetailsRequest(input) + return page.EachPage(fn) +} + var opGetAccountAuthorizationDetails *aws.Operation // GetAccountPasswordPolicyRequest generates a request for the GetAccountPasswordPolicy operation. @@ -1844,6 +1855,12 @@ func (c *IAM) GetGroupRequest(input *GetGroupInput) (req *aws.Request, output *G Name: "GetGroup", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -1865,6 +1882,11 @@ func (c *IAM) GetGroup(input *GetGroupInput) (*GetGroupOutput, error) { return out, err } +func (c *IAM) GetGroupPages(input *GetGroupInput, fn func(p *GetGroupOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.GetGroupRequest(input) + return page.EachPage(fn) +} + var opGetGroup *aws.Operation // GetGroupPolicyRequest generates a request for the GetGroupPolicy operation. @@ -2336,6 +2358,12 @@ func (c *IAM) ListAccessKeysRequest(input *ListAccessKeysInput) (req *aws.Reques Name: "ListAccessKeys", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -2368,6 +2396,11 @@ func (c *IAM) ListAccessKeys(input *ListAccessKeysInput) (*ListAccessKeysOutput, return out, err } +func (c *IAM) ListAccessKeysPages(input *ListAccessKeysInput, fn func(p *ListAccessKeysOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListAccessKeysRequest(input) + return page.EachPage(fn) +} + var opListAccessKeys *aws.Operation // ListAccountAliasesRequest generates a request for the ListAccountAliases operation. @@ -2380,6 +2413,12 @@ func (c *IAM) ListAccountAliasesRequest(input *ListAccountAliasesInput) (req *aw Name: "ListAccountAliases", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -2404,6 +2443,11 @@ func (c *IAM) ListAccountAliases(input *ListAccountAliasesInput) (*ListAccountAl return out, err } +func (c *IAM) ListAccountAliasesPages(input *ListAccountAliasesInput, fn func(p *ListAccountAliasesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListAccountAliasesRequest(input) + return page.EachPage(fn) +} + var opListAccountAliases *aws.Operation // ListAttachedGroupPoliciesRequest generates a request for the ListAttachedGroupPolicies operation. @@ -2585,6 +2629,12 @@ func (c *IAM) ListGroupPoliciesRequest(input *ListGroupPoliciesInput) (req *aws. Name: "ListGroupPolicies", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -2616,6 +2666,11 @@ func (c *IAM) ListGroupPolicies(input *ListGroupPoliciesInput) (*ListGroupPolici return out, err } +func (c *IAM) ListGroupPoliciesPages(input *ListGroupPoliciesInput, fn func(p *ListGroupPoliciesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListGroupPoliciesRequest(input) + return page.EachPage(fn) +} + var opListGroupPolicies *aws.Operation // ListGroupsRequest generates a request for the ListGroups operation. @@ -2628,6 +2683,12 @@ func (c *IAM) ListGroupsRequest(input *ListGroupsInput) (req *aws.Request, outpu Name: "ListGroups", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -2650,6 +2711,11 @@ func (c *IAM) ListGroups(input *ListGroupsInput) (*ListGroupsOutput, error) { return out, err } +func (c *IAM) ListGroupsPages(input *ListGroupsInput, fn func(p *ListGroupsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListGroupsRequest(input) + return page.EachPage(fn) +} + var opListGroups *aws.Operation // ListGroupsForUserRequest generates a request for the ListGroupsForUser operation. @@ -2662,6 +2728,12 @@ func (c *IAM) ListGroupsForUserRequest(input *ListGroupsForUserInput) (req *aws. Name: "ListGroupsForUser", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -2684,6 +2756,11 @@ func (c *IAM) ListGroupsForUser(input *ListGroupsForUserInput) (*ListGroupsForUs return out, err } +func (c *IAM) ListGroupsForUserPages(input *ListGroupsForUserInput, fn func(p *ListGroupsForUserOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListGroupsForUserRequest(input) + return page.EachPage(fn) +} + var opListGroupsForUser *aws.Operation // ListInstanceProfilesRequest generates a request for the ListInstanceProfiles operation. @@ -2696,6 +2773,12 @@ func (c *IAM) ListInstanceProfilesRequest(input *ListInstanceProfilesInput) (req Name: "ListInstanceProfiles", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -2720,6 +2803,11 @@ func (c *IAM) ListInstanceProfiles(input *ListInstanceProfilesInput) (*ListInsta return out, err } +func (c *IAM) ListInstanceProfilesPages(input *ListInstanceProfilesInput, fn func(p *ListInstanceProfilesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListInstanceProfilesRequest(input) + return page.EachPage(fn) +} + var opListInstanceProfiles *aws.Operation // ListInstanceProfilesForRoleRequest generates a request for the ListInstanceProfilesForRole operation. @@ -2732,6 +2820,12 @@ func (c *IAM) ListInstanceProfilesForRoleRequest(input *ListInstanceProfilesForR Name: "ListInstanceProfilesForRole", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -2756,6 +2850,11 @@ func (c *IAM) ListInstanceProfilesForRole(input *ListInstanceProfilesForRoleInpu return out, err } +func (c *IAM) ListInstanceProfilesForRolePages(input *ListInstanceProfilesForRoleInput, fn func(p *ListInstanceProfilesForRoleOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListInstanceProfilesForRoleRequest(input) + return page.EachPage(fn) +} + var opListInstanceProfilesForRole *aws.Operation // ListMFADevicesRequest generates a request for the ListMFADevices operation. @@ -2768,6 +2867,12 @@ func (c *IAM) ListMFADevicesRequest(input *ListMFADevicesInput) (req *aws.Reques Name: "ListMFADevices", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -2793,6 +2898,11 @@ func (c *IAM) ListMFADevices(input *ListMFADevicesInput) (*ListMFADevicesOutput, return out, err } +func (c *IAM) ListMFADevicesPages(input *ListMFADevicesInput, fn func(p *ListMFADevicesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListMFADevicesRequest(input) + return page.EachPage(fn) +} + var opListMFADevices *aws.Operation // ListOpenIDConnectProvidersRequest generates a request for the ListOpenIDConnectProviders operation. @@ -2918,6 +3028,12 @@ func (c *IAM) ListRolePoliciesRequest(input *ListRolePoliciesInput) (req *aws.Re Name: "ListRolePolicies", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -2949,6 +3065,11 @@ func (c *IAM) ListRolePolicies(input *ListRolePoliciesInput) (*ListRolePoliciesO return out, err } +func (c *IAM) ListRolePoliciesPages(input *ListRolePoliciesInput, fn func(p *ListRolePoliciesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListRolePoliciesRequest(input) + return page.EachPage(fn) +} + var opListRolePolicies *aws.Operation // ListRolesRequest generates a request for the ListRoles operation. @@ -2961,6 +3082,12 @@ func (c *IAM) ListRolesRequest(input *ListRolesInput) (req *aws.Request, output Name: "ListRoles", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -2988,6 +3115,11 @@ func (c *IAM) ListRoles(input *ListRolesInput) (*ListRolesOutput, error) { return out, err } +func (c *IAM) ListRolesPages(input *ListRolesInput, fn func(p *ListRolesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListRolesRequest(input) + return page.EachPage(fn) +} + var opListRoles *aws.Operation // ListSAMLProvidersRequest generates a request for the ListSAMLProviders operation. @@ -3034,6 +3166,12 @@ func (c *IAM) ListServerCertificatesRequest(input *ListServerCertificatesInput) Name: "ListServerCertificates", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -3057,6 +3195,11 @@ func (c *IAM) ListServerCertificates(input *ListServerCertificatesInput) (*ListS return out, err } +func (c *IAM) ListServerCertificatesPages(input *ListServerCertificatesInput, fn func(p *ListServerCertificatesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListServerCertificatesRequest(input) + return page.EachPage(fn) +} + var opListServerCertificates *aws.Operation // ListSigningCertificatesRequest generates a request for the ListSigningCertificates operation. @@ -3069,6 +3212,12 @@ func (c *IAM) ListSigningCertificatesRequest(input *ListSigningCertificatesInput Name: "ListSigningCertificates", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -3098,6 +3247,11 @@ func (c *IAM) ListSigningCertificates(input *ListSigningCertificatesInput) (*Lis return out, err } +func (c *IAM) ListSigningCertificatesPages(input *ListSigningCertificatesInput, fn func(p *ListSigningCertificatesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListSigningCertificatesRequest(input) + return page.EachPage(fn) +} + var opListSigningCertificates *aws.Operation // ListUserPoliciesRequest generates a request for the ListUserPolicies operation. @@ -3110,6 +3264,12 @@ func (c *IAM) ListUserPoliciesRequest(input *ListUserPoliciesInput) (req *aws.Re Name: "ListUserPolicies", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -3140,6 +3300,11 @@ func (c *IAM) ListUserPolicies(input *ListUserPoliciesInput) (*ListUserPoliciesO return out, err } +func (c *IAM) ListUserPoliciesPages(input *ListUserPoliciesInput, fn func(p *ListUserPoliciesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListUserPoliciesRequest(input) + return page.EachPage(fn) +} + var opListUserPolicies *aws.Operation // ListUsersRequest generates a request for the ListUsers operation. @@ -3152,6 +3317,12 @@ func (c *IAM) ListUsersRequest(input *ListUsersInput) (req *aws.Request, output Name: "ListUsers", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -3176,6 +3347,11 @@ func (c *IAM) ListUsers(input *ListUsersInput) (*ListUsersOutput, error) { return out, err } +func (c *IAM) ListUsersPages(input *ListUsersInput, fn func(p *ListUsersOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListUsersRequest(input) + return page.EachPage(fn) +} + var opListUsers *aws.Operation // ListVirtualMFADevicesRequest generates a request for the ListVirtualMFADevices operation. @@ -3188,6 +3364,12 @@ func (c *IAM) ListVirtualMFADevicesRequest(input *ListVirtualMFADevicesInput) (r Name: "ListVirtualMFADevices", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -3213,6 +3395,11 @@ func (c *IAM) ListVirtualMFADevices(input *ListVirtualMFADevicesInput) (*ListVir return out, err } +func (c *IAM) ListVirtualMFADevicesPages(input *ListVirtualMFADevicesInput, fn func(p *ListVirtualMFADevicesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListVirtualMFADevicesRequest(input) + return page.EachPage(fn) +} + var opListVirtualMFADevices *aws.Operation // PutGroupPolicyRequest generates a request for the PutGroupPolicy operation. diff --git a/service/kinesis/api.go b/service/kinesis/api.go index 4405c0ca77b..cd468efa40f 100644 --- a/service/kinesis/api.go +++ b/service/kinesis/api.go @@ -175,6 +175,12 @@ func (c *Kinesis) DescribeStreamRequest(input *DescribeStreamInput) (req *aws.Re Name: "DescribeStream", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"ExclusiveStartShardId"}, + OutputTokens: []string{"StreamDescription.Shards[-1].ShardId"}, + LimitToken: "Limit", + TruncationToken: "StreamDescription.HasMoreShards", + }, } } @@ -216,6 +222,11 @@ func (c *Kinesis) DescribeStream(input *DescribeStreamInput) (*DescribeStreamOut return out, err } +func (c *Kinesis) DescribeStreamPages(input *DescribeStreamInput, fn func(p *DescribeStreamOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeStreamRequest(input) + return page.EachPage(fn) +} + var opDescribeStream *aws.Operation // GetRecordsRequest generates a request for the GetRecords operation. @@ -372,6 +383,12 @@ func (c *Kinesis) ListStreamsRequest(input *ListStreamsInput) (req *aws.Request, Name: "ListStreams", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"ExclusiveStartStreamName"}, + OutputTokens: []string{"StreamNames[-1]"}, + LimitToken: "Limit", + TruncationToken: "HasMoreStreams", + }, } } @@ -407,6 +424,11 @@ func (c *Kinesis) ListStreams(input *ListStreamsInput) (*ListStreamsOutput, erro return out, err } +func (c *Kinesis) ListStreamsPages(input *ListStreamsInput, fn func(p *ListStreamsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListStreamsRequest(input) + return page.EachPage(fn) +} + var opListStreams *aws.Operation // ListTagsForStreamRequest generates a request for the ListTagsForStream operation. diff --git a/service/lambda/api.go b/service/lambda/api.go index 13aec1633b4..37cbb16babe 100644 --- a/service/lambda/api.go +++ b/service/lambda/api.go @@ -441,6 +441,12 @@ func (c *Lambda) ListEventSourceMappingsRequest(input *ListEventSourceMappingsIn Name: "ListEventSourceMappings", HTTPMethod: "GET", HTTPPath: "/2015-03-31/event-source-mappings/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"NextMarker"}, + LimitToken: "MaxItems", + TruncationToken: "", + }, } } @@ -469,6 +475,11 @@ func (c *Lambda) ListEventSourceMappings(input *ListEventSourceMappingsInput) (* return out, err } +func (c *Lambda) ListEventSourceMappingsPages(input *ListEventSourceMappingsInput, fn func(p *ListEventSourceMappingsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListEventSourceMappingsRequest(input) + return page.EachPage(fn) +} + var opListEventSourceMappings *aws.Operation // ListFunctionsRequest generates a request for the ListFunctions operation. @@ -481,6 +492,12 @@ func (c *Lambda) ListFunctionsRequest(input *ListFunctionsInput) (req *aws.Reque Name: "ListFunctions", HTTPMethod: "GET", HTTPPath: "/2015-03-31/functions/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"NextMarker"}, + LimitToken: "MaxItems", + TruncationToken: "", + }, } } @@ -505,6 +522,11 @@ func (c *Lambda) ListFunctions(input *ListFunctionsInput) (*ListFunctionsOutput, return out, err } +func (c *Lambda) ListFunctionsPages(input *ListFunctionsInput, fn func(p *ListFunctionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListFunctionsRequest(input) + return page.EachPage(fn) +} + var opListFunctions *aws.Operation // RemovePermissionRequest generates a request for the RemovePermission operation. diff --git a/service/rds/api.go b/service/rds/api.go index 921cd13ccb5..b085940aec3 100644 --- a/service/rds/api.go +++ b/service/rds/api.go @@ -809,6 +809,12 @@ func (c *RDS) DescribeDBEngineVersionsRequest(input *DescribeDBEngineVersionsInp Name: "DescribeDBEngineVersions", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -829,6 +835,11 @@ func (c *RDS) DescribeDBEngineVersions(input *DescribeDBEngineVersionsInput) (*D return out, err } +func (c *RDS) DescribeDBEngineVersionsPages(input *DescribeDBEngineVersionsInput, fn func(p *DescribeDBEngineVersionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeDBEngineVersionsRequest(input) + return page.EachPage(fn) +} + var opDescribeDBEngineVersions *aws.Operation // DescribeDBInstancesRequest generates a request for the DescribeDBInstances operation. @@ -841,6 +852,12 @@ func (c *RDS) DescribeDBInstancesRequest(input *DescribeDBInstancesInput) (req * Name: "DescribeDBInstances", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -861,6 +878,11 @@ func (c *RDS) DescribeDBInstances(input *DescribeDBInstancesInput) (*DescribeDBI return out, err } +func (c *RDS) DescribeDBInstancesPages(input *DescribeDBInstancesInput, fn func(p *DescribeDBInstancesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeDBInstancesRequest(input) + return page.EachPage(fn) +} + var opDescribeDBInstances *aws.Operation // DescribeDBLogFilesRequest generates a request for the DescribeDBLogFiles operation. @@ -873,6 +895,12 @@ func (c *RDS) DescribeDBLogFilesRequest(input *DescribeDBLogFilesInput) (req *aw Name: "DescribeDBLogFiles", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -893,6 +921,11 @@ func (c *RDS) DescribeDBLogFiles(input *DescribeDBLogFilesInput) (*DescribeDBLog return out, err } +func (c *RDS) DescribeDBLogFilesPages(input *DescribeDBLogFilesInput, fn func(p *DescribeDBLogFilesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeDBLogFilesRequest(input) + return page.EachPage(fn) +} + var opDescribeDBLogFiles *aws.Operation // DescribeDBParameterGroupsRequest generates a request for the DescribeDBParameterGroups operation. @@ -905,6 +938,12 @@ func (c *RDS) DescribeDBParameterGroupsRequest(input *DescribeDBParameterGroupsI Name: "DescribeDBParameterGroups", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -927,6 +966,11 @@ func (c *RDS) DescribeDBParameterGroups(input *DescribeDBParameterGroupsInput) ( return out, err } +func (c *RDS) DescribeDBParameterGroupsPages(input *DescribeDBParameterGroupsInput, fn func(p *DescribeDBParameterGroupsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeDBParameterGroupsRequest(input) + return page.EachPage(fn) +} + var opDescribeDBParameterGroups *aws.Operation // DescribeDBParametersRequest generates a request for the DescribeDBParameters operation. @@ -939,6 +983,12 @@ func (c *RDS) DescribeDBParametersRequest(input *DescribeDBParametersInput) (req Name: "DescribeDBParameters", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -959,6 +1009,11 @@ func (c *RDS) DescribeDBParameters(input *DescribeDBParametersInput) (*DescribeD return out, err } +func (c *RDS) DescribeDBParametersPages(input *DescribeDBParametersInput, fn func(p *DescribeDBParametersOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeDBParametersRequest(input) + return page.EachPage(fn) +} + var opDescribeDBParameters *aws.Operation // DescribeDBSecurityGroupsRequest generates a request for the DescribeDBSecurityGroups operation. @@ -971,6 +1026,12 @@ func (c *RDS) DescribeDBSecurityGroupsRequest(input *DescribeDBSecurityGroupsInp Name: "DescribeDBSecurityGroups", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -993,6 +1054,11 @@ func (c *RDS) DescribeDBSecurityGroups(input *DescribeDBSecurityGroupsInput) (*D return out, err } +func (c *RDS) DescribeDBSecurityGroupsPages(input *DescribeDBSecurityGroupsInput, fn func(p *DescribeDBSecurityGroupsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeDBSecurityGroupsRequest(input) + return page.EachPage(fn) +} + var opDescribeDBSecurityGroups *aws.Operation // DescribeDBSnapshotsRequest generates a request for the DescribeDBSnapshots operation. @@ -1005,6 +1071,12 @@ func (c *RDS) DescribeDBSnapshotsRequest(input *DescribeDBSnapshotsInput) (req * Name: "DescribeDBSnapshots", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1025,6 +1097,11 @@ func (c *RDS) DescribeDBSnapshots(input *DescribeDBSnapshotsInput) (*DescribeDBS return out, err } +func (c *RDS) DescribeDBSnapshotsPages(input *DescribeDBSnapshotsInput, fn func(p *DescribeDBSnapshotsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeDBSnapshotsRequest(input) + return page.EachPage(fn) +} + var opDescribeDBSnapshots *aws.Operation // DescribeDBSubnetGroupsRequest generates a request for the DescribeDBSubnetGroups operation. @@ -1037,6 +1114,12 @@ func (c *RDS) DescribeDBSubnetGroupsRequest(input *DescribeDBSubnetGroupsInput) Name: "DescribeDBSubnetGroups", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1060,6 +1143,11 @@ func (c *RDS) DescribeDBSubnetGroups(input *DescribeDBSubnetGroupsInput) (*Descr return out, err } +func (c *RDS) DescribeDBSubnetGroupsPages(input *DescribeDBSubnetGroupsInput, fn func(p *DescribeDBSubnetGroupsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeDBSubnetGroupsRequest(input) + return page.EachPage(fn) +} + var opDescribeDBSubnetGroups *aws.Operation // DescribeEngineDefaultParametersRequest generates a request for the DescribeEngineDefaultParameters operation. @@ -1072,6 +1160,12 @@ func (c *RDS) DescribeEngineDefaultParametersRequest(input *DescribeEngineDefaul Name: "DescribeEngineDefaultParameters", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"EngineDefaults.Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1093,6 +1187,11 @@ func (c *RDS) DescribeEngineDefaultParameters(input *DescribeEngineDefaultParame return out, err } +func (c *RDS) DescribeEngineDefaultParametersPages(input *DescribeEngineDefaultParametersInput, fn func(p *DescribeEngineDefaultParametersOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeEngineDefaultParametersRequest(input) + return page.EachPage(fn) +} + var opDescribeEngineDefaultParameters *aws.Operation // DescribeEventCategoriesRequest generates a request for the DescribeEventCategories operation. @@ -1140,6 +1239,12 @@ func (c *RDS) DescribeEventSubscriptionsRequest(input *DescribeEventSubscription Name: "DescribeEventSubscriptions", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1164,6 +1269,11 @@ func (c *RDS) DescribeEventSubscriptions(input *DescribeEventSubscriptionsInput) return out, err } +func (c *RDS) DescribeEventSubscriptionsPages(input *DescribeEventSubscriptionsInput, fn func(p *DescribeEventSubscriptionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeEventSubscriptionsRequest(input) + return page.EachPage(fn) +} + var opDescribeEventSubscriptions *aws.Operation // DescribeEventsRequest generates a request for the DescribeEvents operation. @@ -1176,6 +1286,12 @@ func (c *RDS) DescribeEventsRequest(input *DescribeEventsInput) (req *aws.Reques Name: "DescribeEvents", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1200,6 +1316,11 @@ func (c *RDS) DescribeEvents(input *DescribeEventsInput) (*DescribeEventsOutput, return out, err } +func (c *RDS) DescribeEventsPages(input *DescribeEventsInput, fn func(p *DescribeEventsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeEventsRequest(input) + return page.EachPage(fn) +} + var opDescribeEvents *aws.Operation // DescribeOptionGroupOptionsRequest generates a request for the DescribeOptionGroupOptions operation. @@ -1212,6 +1333,12 @@ func (c *RDS) DescribeOptionGroupOptionsRequest(input *DescribeOptionGroupOption Name: "DescribeOptionGroupOptions", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1232,6 +1359,11 @@ func (c *RDS) DescribeOptionGroupOptions(input *DescribeOptionGroupOptionsInput) return out, err } +func (c *RDS) DescribeOptionGroupOptionsPages(input *DescribeOptionGroupOptionsInput, fn func(p *DescribeOptionGroupOptionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeOptionGroupOptionsRequest(input) + return page.EachPage(fn) +} + var opDescribeOptionGroupOptions *aws.Operation // DescribeOptionGroupsRequest generates a request for the DescribeOptionGroups operation. @@ -1244,6 +1376,12 @@ func (c *RDS) DescribeOptionGroupsRequest(input *DescribeOptionGroupsInput) (req Name: "DescribeOptionGroups", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1264,6 +1402,11 @@ func (c *RDS) DescribeOptionGroups(input *DescribeOptionGroupsInput) (*DescribeO return out, err } +func (c *RDS) DescribeOptionGroupsPages(input *DescribeOptionGroupsInput, fn func(p *DescribeOptionGroupsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeOptionGroupsRequest(input) + return page.EachPage(fn) +} + var opDescribeOptionGroups *aws.Operation // DescribeOrderableDBInstanceOptionsRequest generates a request for the DescribeOrderableDBInstanceOptions operation. @@ -1276,6 +1419,12 @@ func (c *RDS) DescribeOrderableDBInstanceOptionsRequest(input *DescribeOrderable Name: "DescribeOrderableDBInstanceOptions", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1296,6 +1445,11 @@ func (c *RDS) DescribeOrderableDBInstanceOptions(input *DescribeOrderableDBInsta return out, err } +func (c *RDS) DescribeOrderableDBInstanceOptionsPages(input *DescribeOrderableDBInstanceOptionsInput, fn func(p *DescribeOrderableDBInstanceOptionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeOrderableDBInstanceOptionsRequest(input) + return page.EachPage(fn) +} + var opDescribeOrderableDBInstanceOptions *aws.Operation // DescribePendingMaintenanceActionsRequest generates a request for the DescribePendingMaintenanceActions operation. @@ -1341,6 +1495,12 @@ func (c *RDS) DescribeReservedDBInstancesRequest(input *DescribeReservedDBInstan Name: "DescribeReservedDBInstances", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1362,6 +1522,11 @@ func (c *RDS) DescribeReservedDBInstances(input *DescribeReservedDBInstancesInpu return out, err } +func (c *RDS) DescribeReservedDBInstancesPages(input *DescribeReservedDBInstancesInput, fn func(p *DescribeReservedDBInstancesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeReservedDBInstancesRequest(input) + return page.EachPage(fn) +} + var opDescribeReservedDBInstances *aws.Operation // DescribeReservedDBInstancesOfferingsRequest generates a request for the DescribeReservedDBInstancesOfferings operation. @@ -1374,6 +1539,12 @@ func (c *RDS) DescribeReservedDBInstancesOfferingsRequest(input *DescribeReserve Name: "DescribeReservedDBInstancesOfferings", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1394,6 +1565,11 @@ func (c *RDS) DescribeReservedDBInstancesOfferings(input *DescribeReservedDBInst return out, err } +func (c *RDS) DescribeReservedDBInstancesOfferingsPages(input *DescribeReservedDBInstancesOfferingsInput, fn func(p *DescribeReservedDBInstancesOfferingsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeReservedDBInstancesOfferingsRequest(input) + return page.EachPage(fn) +} + var opDescribeReservedDBInstancesOfferings *aws.Operation // DownloadDBLogFilePortionRequest generates a request for the DownloadDBLogFilePortion operation. @@ -1406,6 +1582,12 @@ func (c *RDS) DownloadDBLogFilePortionRequest(input *DownloadDBLogFilePortionInp Name: "DownloadDBLogFilePortion", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "NumberOfLines", + TruncationToken: "AdditionalDataPending", + }, } } @@ -1426,6 +1608,11 @@ func (c *RDS) DownloadDBLogFilePortion(input *DownloadDBLogFilePortionInput) (*D return out, err } +func (c *RDS) DownloadDBLogFilePortionPages(input *DownloadDBLogFilePortionInput, fn func(p *DownloadDBLogFilePortionOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DownloadDBLogFilePortionRequest(input) + return page.EachPage(fn) +} + var opDownloadDBLogFilePortion *aws.Operation // ListTagsForResourceRequest generates a request for the ListTagsForResource operation. diff --git a/service/redshift/api.go b/service/redshift/api.go index 60cd4861bd3..deeabd9cf07 100644 --- a/service/redshift/api.go +++ b/service/redshift/api.go @@ -830,6 +830,12 @@ func (c *Redshift) DescribeClusterParameterGroupsRequest(input *DescribeClusterP Name: "DescribeClusterParameterGroups", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -868,6 +874,11 @@ func (c *Redshift) DescribeClusterParameterGroups(input *DescribeClusterParamete return out, err } +func (c *Redshift) DescribeClusterParameterGroupsPages(input *DescribeClusterParameterGroupsInput, fn func(p *DescribeClusterParameterGroupsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeClusterParameterGroupsRequest(input) + return page.EachPage(fn) +} + var opDescribeClusterParameterGroups *aws.Operation // DescribeClusterParametersRequest generates a request for the DescribeClusterParameters operation. @@ -880,6 +891,12 @@ func (c *Redshift) DescribeClusterParametersRequest(input *DescribeClusterParame Name: "DescribeClusterParameters", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -911,6 +928,11 @@ func (c *Redshift) DescribeClusterParameters(input *DescribeClusterParametersInp return out, err } +func (c *Redshift) DescribeClusterParametersPages(input *DescribeClusterParametersInput, fn func(p *DescribeClusterParametersOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeClusterParametersRequest(input) + return page.EachPage(fn) +} + var opDescribeClusterParameters *aws.Operation // DescribeClusterSecurityGroupsRequest generates a request for the DescribeClusterSecurityGroups operation. @@ -923,6 +945,12 @@ func (c *Redshift) DescribeClusterSecurityGroupsRequest(input *DescribeClusterSe Name: "DescribeClusterSecurityGroups", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -959,6 +987,11 @@ func (c *Redshift) DescribeClusterSecurityGroups(input *DescribeClusterSecurityG return out, err } +func (c *Redshift) DescribeClusterSecurityGroupsPages(input *DescribeClusterSecurityGroupsInput, fn func(p *DescribeClusterSecurityGroupsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeClusterSecurityGroupsRequest(input) + return page.EachPage(fn) +} + var opDescribeClusterSecurityGroups *aws.Operation // DescribeClusterSnapshotsRequest generates a request for the DescribeClusterSnapshots operation. @@ -971,6 +1004,12 @@ func (c *Redshift) DescribeClusterSnapshotsRequest(input *DescribeClusterSnapsho Name: "DescribeClusterSnapshots", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1006,6 +1045,11 @@ func (c *Redshift) DescribeClusterSnapshots(input *DescribeClusterSnapshotsInput return out, err } +func (c *Redshift) DescribeClusterSnapshotsPages(input *DescribeClusterSnapshotsInput, fn func(p *DescribeClusterSnapshotsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeClusterSnapshotsRequest(input) + return page.EachPage(fn) +} + var opDescribeClusterSnapshots *aws.Operation // DescribeClusterSubnetGroupsRequest generates a request for the DescribeClusterSubnetGroups operation. @@ -1018,6 +1062,12 @@ func (c *Redshift) DescribeClusterSubnetGroupsRequest(input *DescribeClusterSubn Name: "DescribeClusterSubnetGroups", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1050,6 +1100,11 @@ func (c *Redshift) DescribeClusterSubnetGroups(input *DescribeClusterSubnetGroup return out, err } +func (c *Redshift) DescribeClusterSubnetGroupsPages(input *DescribeClusterSubnetGroupsInput, fn func(p *DescribeClusterSubnetGroupsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeClusterSubnetGroupsRequest(input) + return page.EachPage(fn) +} + var opDescribeClusterSubnetGroups *aws.Operation // DescribeClusterVersionsRequest generates a request for the DescribeClusterVersions operation. @@ -1062,6 +1117,12 @@ func (c *Redshift) DescribeClusterVersionsRequest(input *DescribeClusterVersions Name: "DescribeClusterVersions", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1086,6 +1147,11 @@ func (c *Redshift) DescribeClusterVersions(input *DescribeClusterVersionsInput) return out, err } +func (c *Redshift) DescribeClusterVersionsPages(input *DescribeClusterVersionsInput, fn func(p *DescribeClusterVersionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeClusterVersionsRequest(input) + return page.EachPage(fn) +} + var opDescribeClusterVersions *aws.Operation // DescribeClustersRequest generates a request for the DescribeClusters operation. @@ -1098,6 +1164,12 @@ func (c *Redshift) DescribeClustersRequest(input *DescribeClustersInput) (req *a Name: "DescribeClusters", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1131,6 +1203,11 @@ func (c *Redshift) DescribeClusters(input *DescribeClustersInput) (*DescribeClus return out, err } +func (c *Redshift) DescribeClustersPages(input *DescribeClustersInput, fn func(p *DescribeClustersOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeClustersRequest(input) + return page.EachPage(fn) +} + var opDescribeClusters *aws.Operation // DescribeDefaultClusterParametersRequest generates a request for the DescribeDefaultClusterParameters operation. @@ -1143,6 +1220,12 @@ func (c *Redshift) DescribeDefaultClusterParametersRequest(input *DescribeDefaul Name: "DescribeDefaultClusterParameters", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"DefaultClusterParameters.Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1167,6 +1250,11 @@ func (c *Redshift) DescribeDefaultClusterParameters(input *DescribeDefaultCluste return out, err } +func (c *Redshift) DescribeDefaultClusterParametersPages(input *DescribeDefaultClusterParametersInput, fn func(p *DescribeDefaultClusterParametersOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeDefaultClusterParametersRequest(input) + return page.EachPage(fn) +} + var opDescribeDefaultClusterParameters *aws.Operation // DescribeEventCategoriesRequest generates a request for the DescribeEventCategories operation. @@ -1213,6 +1301,12 @@ func (c *Redshift) DescribeEventSubscriptionsRequest(input *DescribeEventSubscri Name: "DescribeEventSubscriptions", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1235,6 +1329,11 @@ func (c *Redshift) DescribeEventSubscriptions(input *DescribeEventSubscriptionsI return out, err } +func (c *Redshift) DescribeEventSubscriptionsPages(input *DescribeEventSubscriptionsInput, fn func(p *DescribeEventSubscriptionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeEventSubscriptionsRequest(input) + return page.EachPage(fn) +} + var opDescribeEventSubscriptions *aws.Operation // DescribeEventsRequest generates a request for the DescribeEvents operation. @@ -1247,6 +1346,12 @@ func (c *Redshift) DescribeEventsRequest(input *DescribeEventsInput) (req *aws.R Name: "DescribeEvents", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1270,6 +1375,11 @@ func (c *Redshift) DescribeEvents(input *DescribeEventsInput) (*DescribeEventsOu return out, err } +func (c *Redshift) DescribeEventsPages(input *DescribeEventsInput, fn func(p *DescribeEventsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeEventsRequest(input) + return page.EachPage(fn) +} + var opDescribeEvents *aws.Operation // DescribeHSMClientCertificatesRequest generates a request for the DescribeHSMClientCertificates operation. @@ -1282,6 +1392,12 @@ func (c *Redshift) DescribeHSMClientCertificatesRequest(input *DescribeHSMClient Name: "DescribeHsmClientCertificates", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1314,6 +1430,11 @@ func (c *Redshift) DescribeHSMClientCertificates(input *DescribeHSMClientCertifi return out, err } +func (c *Redshift) DescribeHSMClientCertificatesPages(input *DescribeHSMClientCertificatesInput, fn func(p *DescribeHSMClientCertificatesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeHSMClientCertificatesRequest(input) + return page.EachPage(fn) +} + var opDescribeHSMClientCertificates *aws.Operation // DescribeHSMConfigurationsRequest generates a request for the DescribeHSMConfigurations operation. @@ -1326,6 +1447,12 @@ func (c *Redshift) DescribeHSMConfigurationsRequest(input *DescribeHSMConfigurat Name: "DescribeHsmConfigurations", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1358,6 +1485,11 @@ func (c *Redshift) DescribeHSMConfigurations(input *DescribeHSMConfigurationsInp return out, err } +func (c *Redshift) DescribeHSMConfigurationsPages(input *DescribeHSMConfigurationsInput, fn func(p *DescribeHSMConfigurationsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeHSMConfigurationsRequest(input) + return page.EachPage(fn) +} + var opDescribeHSMConfigurations *aws.Operation // DescribeLoggingStatusRequest generates a request for the DescribeLoggingStatus operation. @@ -1403,6 +1535,12 @@ func (c *Redshift) DescribeOrderableClusterOptionsRequest(input *DescribeOrderab Name: "DescribeOrderableClusterOptions", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1431,6 +1569,11 @@ func (c *Redshift) DescribeOrderableClusterOptions(input *DescribeOrderableClust return out, err } +func (c *Redshift) DescribeOrderableClusterOptionsPages(input *DescribeOrderableClusterOptionsInput, fn func(p *DescribeOrderableClusterOptionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeOrderableClusterOptionsRequest(input) + return page.EachPage(fn) +} + var opDescribeOrderableClusterOptions *aws.Operation // DescribeReservedNodeOfferingsRequest generates a request for the DescribeReservedNodeOfferings operation. @@ -1443,6 +1586,12 @@ func (c *Redshift) DescribeReservedNodeOfferingsRequest(input *DescribeReservedN Name: "DescribeReservedNodeOfferings", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1472,6 +1621,11 @@ func (c *Redshift) DescribeReservedNodeOfferings(input *DescribeReservedNodeOffe return out, err } +func (c *Redshift) DescribeReservedNodeOfferingsPages(input *DescribeReservedNodeOfferingsInput, fn func(p *DescribeReservedNodeOfferingsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeReservedNodeOfferingsRequest(input) + return page.EachPage(fn) +} + var opDescribeReservedNodeOfferings *aws.Operation // DescribeReservedNodesRequest generates a request for the DescribeReservedNodes operation. @@ -1484,6 +1638,12 @@ func (c *Redshift) DescribeReservedNodesRequest(input *DescribeReservedNodesInpu Name: "DescribeReservedNodes", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "MaxRecords", + TruncationToken: "", + }, } } @@ -1504,6 +1664,11 @@ func (c *Redshift) DescribeReservedNodes(input *DescribeReservedNodesInput) (*De return out, err } +func (c *Redshift) DescribeReservedNodesPages(input *DescribeReservedNodesInput, fn func(p *DescribeReservedNodesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeReservedNodesRequest(input) + return page.EachPage(fn) +} + var opDescribeReservedNodes *aws.Operation // DescribeResizeRequest generates a request for the DescribeResize operation. diff --git a/service/route53/api.go b/service/route53/api.go index a30656b7a9b..ffeef721174 100644 --- a/service/route53/api.go +++ b/service/route53/api.go @@ -834,6 +834,12 @@ func (c *Route53) ListHealthChecksRequest(input *ListHealthChecksInput) (req *aw Name: "ListHealthChecks", HTTPMethod: "GET", HTTPPath: "/2013-04-01/healthcheck", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"NextMarker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -862,6 +868,11 @@ func (c *Route53) ListHealthChecks(input *ListHealthChecksInput) (*ListHealthChe return out, err } +func (c *Route53) ListHealthChecksPages(input *ListHealthChecksInput, fn func(p *ListHealthChecksOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListHealthChecksRequest(input) + return page.EachPage(fn) +} + var opListHealthChecks *aws.Operation // ListHostedZonesRequest generates a request for the ListHostedZones operation. @@ -874,6 +885,12 @@ func (c *Route53) ListHostedZonesRequest(input *ListHostedZonesInput) (req *aws. Name: "ListHostedZones", HTTPMethod: "GET", HTTPPath: "/2013-04-01/hostedzone", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"NextMarker"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -902,6 +919,11 @@ func (c *Route53) ListHostedZones(input *ListHostedZonesInput) (*ListHostedZones return out, err } +func (c *Route53) ListHostedZonesPages(input *ListHostedZonesInput, fn func(p *ListHostedZonesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListHostedZonesRequest(input) + return page.EachPage(fn) +} + var opListHostedZones *aws.Operation // ListHostedZonesByNameRequest generates a request for the ListHostedZonesByName operation. @@ -956,6 +978,12 @@ func (c *Route53) ListResourceRecordSetsRequest(input *ListResourceRecordSetsInp Name: "ListResourceRecordSets", HTTPMethod: "GET", HTTPPath: "/2013-04-01/hostedzone/{Id}/rrset", + Paginator: &aws.Paginator{ + InputTokens: []string{"StartRecordName", "StartRecordType", "StartRecordIdentifier"}, + OutputTokens: []string{"NextRecordName", "NextRecordType", "NextRecordIdentifier"}, + LimitToken: "MaxItems", + TruncationToken: "IsTruncated", + }, } } @@ -1013,6 +1041,11 @@ func (c *Route53) ListResourceRecordSets(input *ListResourceRecordSetsInput) (*L return out, err } +func (c *Route53) ListResourceRecordSetsPages(input *ListResourceRecordSetsInput, fn func(p *ListResourceRecordSetsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListResourceRecordSetsRequest(input) + return page.EachPage(fn) +} + var opListResourceRecordSets *aws.Operation // ListReusableDelegationSetsRequest generates a request for the ListReusableDelegationSets operation. diff --git a/service/route53domains/api.go b/service/route53domains/api.go index f4d0adf2ca9..46edfdcee12 100644 --- a/service/route53domains/api.go +++ b/service/route53domains/api.go @@ -310,6 +310,12 @@ func (c *Route53Domains) ListDomainsRequest(input *ListDomainsInput) (req *aws.R Name: "ListDomains", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"NextPageMarker"}, + LimitToken: "MaxItems", + TruncationToken: "", + }, } } @@ -331,6 +337,11 @@ func (c *Route53Domains) ListDomains(input *ListDomainsInput) (*ListDomainsOutpu return out, err } +func (c *Route53Domains) ListDomainsPages(input *ListDomainsInput, fn func(p *ListDomainsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListDomainsRequest(input) + return page.EachPage(fn) +} + var opListDomains *aws.Operation // ListOperationsRequest generates a request for the ListOperations operation. @@ -343,6 +354,12 @@ func (c *Route53Domains) ListOperationsRequest(input *ListOperationsInput) (req Name: "ListOperations", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"NextPageMarker"}, + LimitToken: "MaxItems", + TruncationToken: "", + }, } } @@ -363,6 +380,11 @@ func (c *Route53Domains) ListOperations(input *ListOperationsInput) (*ListOperat return out, err } +func (c *Route53Domains) ListOperationsPages(input *ListOperationsInput, fn func(p *ListOperationsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListOperationsRequest(input) + return page.EachPage(fn) +} + var opListOperations *aws.Operation // ListTagsForDomainRequest generates a request for the ListTagsForDomain operation. diff --git a/service/s3/api.go b/service/s3/api.go index 94eed825881..af92215f72c 100644 --- a/service/s3/api.go +++ b/service/s3/api.go @@ -1063,6 +1063,12 @@ func (c *S3) ListMultipartUploadsRequest(input *ListMultipartUploadsInput) (req Name: "ListMultipartUploads", HTTPMethod: "GET", HTTPPath: "/{Bucket}?uploads", + Paginator: &aws.Paginator{ + InputTokens: []string{"KeyMarker", "UploadIdMarker"}, + OutputTokens: []string{"NextKeyMarker", "NextUploadIdMarker"}, + LimitToken: "MaxUploads", + TruncationToken: "IsTruncated", + }, } } @@ -1083,6 +1089,11 @@ func (c *S3) ListMultipartUploads(input *ListMultipartUploadsInput) (*ListMultip return out, err } +func (c *S3) ListMultipartUploadsPages(input *ListMultipartUploadsInput, fn func(p *ListMultipartUploadsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListMultipartUploadsRequest(input) + return page.EachPage(fn) +} + var opListMultipartUploads *aws.Operation // ListObjectVersionsRequest generates a request for the ListObjectVersions operation. @@ -1095,6 +1106,12 @@ func (c *S3) ListObjectVersionsRequest(input *ListObjectVersionsInput) (req *aws Name: "ListObjectVersions", HTTPMethod: "GET", HTTPPath: "/{Bucket}?versions", + Paginator: &aws.Paginator{ + InputTokens: []string{"KeyMarker", "VersionIdMarker"}, + OutputTokens: []string{"NextKeyMarker", "NextVersionIdMarker"}, + LimitToken: "MaxKeys", + TruncationToken: "IsTruncated", + }, } } @@ -1115,6 +1132,11 @@ func (c *S3) ListObjectVersions(input *ListObjectVersionsInput) (*ListObjectVers return out, err } +func (c *S3) ListObjectVersionsPages(input *ListObjectVersionsInput, fn func(p *ListObjectVersionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListObjectVersionsRequest(input) + return page.EachPage(fn) +} + var opListObjectVersions *aws.Operation // ListObjectsRequest generates a request for the ListObjects operation. @@ -1127,6 +1149,12 @@ func (c *S3) ListObjectsRequest(input *ListObjectsInput) (req *aws.Request, outp Name: "ListObjects", HTTPMethod: "GET", HTTPPath: "/{Bucket}", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"NextMarker || Contents[-1].Key"}, + LimitToken: "MaxKeys", + TruncationToken: "IsTruncated", + }, } } @@ -1149,6 +1177,11 @@ func (c *S3) ListObjects(input *ListObjectsInput) (*ListObjectsOutput, error) { return out, err } +func (c *S3) ListObjectsPages(input *ListObjectsInput, fn func(p *ListObjectsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListObjectsRequest(input) + return page.EachPage(fn) +} + var opListObjects *aws.Operation // ListPartsRequest generates a request for the ListParts operation. @@ -1161,6 +1194,12 @@ func (c *S3) ListPartsRequest(input *ListPartsInput) (req *aws.Request, output * Name: "ListParts", HTTPMethod: "GET", HTTPPath: "/{Bucket}/{Key+}", + Paginator: &aws.Paginator{ + InputTokens: []string{"PartNumberMarker"}, + OutputTokens: []string{"NextPartNumberMarker"}, + LimitToken: "MaxParts", + TruncationToken: "IsTruncated", + }, } } @@ -1181,6 +1220,11 @@ func (c *S3) ListParts(input *ListPartsInput) (*ListPartsOutput, error) { return out, err } +func (c *S3) ListPartsPages(input *ListPartsInput, fn func(p *ListPartsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListPartsRequest(input) + return page.EachPage(fn) +} + var opListParts *aws.Operation // PutBucketACLRequest generates a request for the PutBucketACL operation. diff --git a/service/ses/api.go b/service/ses/api.go index 616ce4ad64d..506808e8e6c 100644 --- a/service/ses/api.go +++ b/service/ses/api.go @@ -286,6 +286,12 @@ func (c *SES) ListIdentitiesRequest(input *ListIdentitiesInput) (req *aws.Reques Name: "ListIdentities", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxItems", + TruncationToken: "", + }, } } @@ -309,6 +315,11 @@ func (c *SES) ListIdentities(input *ListIdentitiesInput) (*ListIdentitiesOutput, return out, err } +func (c *SES) ListIdentitiesPages(input *ListIdentitiesInput, fn func(p *ListIdentitiesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListIdentitiesRequest(input) + return page.EachPage(fn) +} + var opListIdentities *aws.Operation // ListVerifiedEmailAddressesRequest generates a request for the ListVerifiedEmailAddresses operation. diff --git a/service/sns/api.go b/service/sns/api.go index f6a3060eac0..458730a250f 100644 --- a/service/sns/api.go +++ b/service/sns/api.go @@ -450,6 +450,12 @@ func (c *SNS) ListEndpointsByPlatformApplicationRequest(input *ListEndpointsByPl Name: "ListEndpointsByPlatformApplication", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -477,6 +483,11 @@ func (c *SNS) ListEndpointsByPlatformApplication(input *ListEndpointsByPlatformA return out, err } +func (c *SNS) ListEndpointsByPlatformApplicationPages(input *ListEndpointsByPlatformApplicationInput, fn func(p *ListEndpointsByPlatformApplicationOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListEndpointsByPlatformApplicationRequest(input) + return page.EachPage(fn) +} + var opListEndpointsByPlatformApplication *aws.Operation // ListPlatformApplicationsRequest generates a request for the ListPlatformApplications operation. @@ -489,6 +500,12 @@ func (c *SNS) ListPlatformApplicationsRequest(input *ListPlatformApplicationsInp Name: "ListPlatformApplications", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -516,6 +533,11 @@ func (c *SNS) ListPlatformApplications(input *ListPlatformApplicationsInput) (*L return out, err } +func (c *SNS) ListPlatformApplicationsPages(input *ListPlatformApplicationsInput, fn func(p *ListPlatformApplicationsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListPlatformApplicationsRequest(input) + return page.EachPage(fn) +} + var opListPlatformApplications *aws.Operation // ListSubscriptionsRequest generates a request for the ListSubscriptions operation. @@ -528,6 +550,12 @@ func (c *SNS) ListSubscriptionsRequest(input *ListSubscriptionsInput) (req *aws. Name: "ListSubscriptions", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -551,6 +579,11 @@ func (c *SNS) ListSubscriptions(input *ListSubscriptionsInput) (*ListSubscriptio return out, err } +func (c *SNS) ListSubscriptionsPages(input *ListSubscriptionsInput, fn func(p *ListSubscriptionsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListSubscriptionsRequest(input) + return page.EachPage(fn) +} + var opListSubscriptions *aws.Operation // ListSubscriptionsByTopicRequest generates a request for the ListSubscriptionsByTopic operation. @@ -563,6 +596,12 @@ func (c *SNS) ListSubscriptionsByTopicRequest(input *ListSubscriptionsByTopicInp Name: "ListSubscriptionsByTopic", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -586,6 +625,11 @@ func (c *SNS) ListSubscriptionsByTopic(input *ListSubscriptionsByTopicInput) (*L return out, err } +func (c *SNS) ListSubscriptionsByTopicPages(input *ListSubscriptionsByTopicInput, fn func(p *ListSubscriptionsByTopicOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListSubscriptionsByTopicRequest(input) + return page.EachPage(fn) +} + var opListSubscriptionsByTopic *aws.Operation // ListTopicsRequest generates a request for the ListTopics operation. @@ -598,6 +642,12 @@ func (c *SNS) ListTopicsRequest(input *ListTopicsInput) (req *aws.Request, outpu Name: "ListTopics", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "", + TruncationToken: "", + }, } } @@ -620,6 +670,11 @@ func (c *SNS) ListTopics(input *ListTopicsInput) (*ListTopicsOutput, error) { return out, err } +func (c *SNS) ListTopicsPages(input *ListTopicsInput, fn func(p *ListTopicsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListTopicsRequest(input) + return page.EachPage(fn) +} + var opListTopics *aws.Operation // PublishRequest generates a request for the Publish operation. diff --git a/service/storagegateway/api.go b/service/storagegateway/api.go index 9d3f4775640..927a249e5ec 100644 --- a/service/storagegateway/api.go +++ b/service/storagegateway/api.go @@ -1019,6 +1019,12 @@ func (c *StorageGateway) DescribeTapeArchivesRequest(input *DescribeTapeArchives Name: "DescribeTapeArchives", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "Limit", + TruncationToken: "", + }, } } @@ -1043,6 +1049,11 @@ func (c *StorageGateway) DescribeTapeArchives(input *DescribeTapeArchivesInput) return out, err } +func (c *StorageGateway) DescribeTapeArchivesPages(input *DescribeTapeArchivesInput, fn func(p *DescribeTapeArchivesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeTapeArchivesRequest(input) + return page.EachPage(fn) +} + var opDescribeTapeArchives *aws.Operation // DescribeTapeRecoveryPointsRequest generates a request for the DescribeTapeRecoveryPoints operation. @@ -1055,6 +1066,12 @@ func (c *StorageGateway) DescribeTapeRecoveryPointsRequest(input *DescribeTapeRe Name: "DescribeTapeRecoveryPoints", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "Limit", + TruncationToken: "", + }, } } @@ -1080,6 +1097,11 @@ func (c *StorageGateway) DescribeTapeRecoveryPoints(input *DescribeTapeRecoveryP return out, err } +func (c *StorageGateway) DescribeTapeRecoveryPointsPages(input *DescribeTapeRecoveryPointsInput, fn func(p *DescribeTapeRecoveryPointsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeTapeRecoveryPointsRequest(input) + return page.EachPage(fn) +} + var opDescribeTapeRecoveryPoints *aws.Operation // DescribeTapesRequest generates a request for the DescribeTapes operation. @@ -1092,6 +1114,12 @@ func (c *StorageGateway) DescribeTapesRequest(input *DescribeTapesInput) (req *a Name: "DescribeTapes", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "Limit", + TruncationToken: "", + }, } } @@ -1114,6 +1142,11 @@ func (c *StorageGateway) DescribeTapes(input *DescribeTapesInput) (*DescribeTape return out, err } +func (c *StorageGateway) DescribeTapesPages(input *DescribeTapesInput, fn func(p *DescribeTapesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeTapesRequest(input) + return page.EachPage(fn) +} + var opDescribeTapes *aws.Operation // DescribeUploadBufferRequest generates a request for the DescribeUploadBuffer operation. @@ -1163,6 +1196,12 @@ func (c *StorageGateway) DescribeVTLDevicesRequest(input *DescribeVTLDevicesInpu Name: "DescribeVTLDevices", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "Limit", + TruncationToken: "", + }, } } @@ -1186,6 +1225,11 @@ func (c *StorageGateway) DescribeVTLDevices(input *DescribeVTLDevicesInput) (*De return out, err } +func (c *StorageGateway) DescribeVTLDevicesPages(input *DescribeVTLDevicesInput, fn func(p *DescribeVTLDevicesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeVTLDevicesRequest(input) + return page.EachPage(fn) +} + var opDescribeVTLDevices *aws.Operation // DescribeWorkingStorageRequest generates a request for the DescribeWorkingStorage operation. @@ -1277,6 +1321,12 @@ func (c *StorageGateway) ListGatewaysRequest(input *ListGatewaysInput) (req *aws Name: "ListGateways", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "Limit", + TruncationToken: "", + }, } } @@ -1307,6 +1357,11 @@ func (c *StorageGateway) ListGateways(input *ListGatewaysInput) (*ListGatewaysOu return out, err } +func (c *StorageGateway) ListGatewaysPages(input *ListGatewaysInput, fn func(p *ListGatewaysOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListGatewaysRequest(input) + return page.EachPage(fn) +} + var opListGateways *aws.Operation // ListLocalDisksRequest generates a request for the ListLocalDisks operation. @@ -1398,6 +1453,12 @@ func (c *StorageGateway) ListVolumesRequest(input *ListVolumesInput) (req *aws.R Name: "ListVolumes", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"Marker"}, + OutputTokens: []string{"Marker"}, + LimitToken: "Limit", + TruncationToken: "", + }, } } @@ -1427,6 +1488,11 @@ func (c *StorageGateway) ListVolumes(input *ListVolumesInput) (*ListVolumesOutpu return out, err } +func (c *StorageGateway) ListVolumesPages(input *ListVolumesInput, fn func(p *ListVolumesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListVolumesRequest(input) + return page.EachPage(fn) +} + var opListVolumes *aws.Operation // ResetCacheRequest generates a request for the ResetCache operation. diff --git a/service/support/api.go b/service/support/api.go index a8a59dee78c..e637d2e696d 100644 --- a/service/support/api.go +++ b/service/support/api.go @@ -197,6 +197,12 @@ func (c *Support) DescribeCasesRequest(input *DescribeCasesInput) (req *aws.Requ Name: "DescribeCases", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"nextToken"}, + OutputTokens: []string{"nextToken"}, + LimitToken: "maxResults", + TruncationToken: "", + }, } } @@ -230,6 +236,11 @@ func (c *Support) DescribeCases(input *DescribeCasesInput) (*DescribeCasesOutput return out, err } +func (c *Support) DescribeCasesPages(input *DescribeCasesInput, fn func(p *DescribeCasesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeCasesRequest(input) + return page.EachPage(fn) +} + var opDescribeCases *aws.Operation // DescribeCommunicationsRequest generates a request for the DescribeCommunications operation. @@ -242,6 +253,12 @@ func (c *Support) DescribeCommunicationsRequest(input *DescribeCommunicationsInp Name: "DescribeCommunications", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"nextToken"}, + OutputTokens: []string{"nextToken"}, + LimitToken: "maxResults", + TruncationToken: "", + }, } } @@ -271,6 +288,11 @@ func (c *Support) DescribeCommunications(input *DescribeCommunicationsInput) (*D return out, err } +func (c *Support) DescribeCommunicationsPages(input *DescribeCommunicationsInput, fn func(p *DescribeCommunicationsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeCommunicationsRequest(input) + return page.EachPage(fn) +} + var opDescribeCommunications *aws.Operation // DescribeServicesRequest generates a request for the DescribeServices operation. diff --git a/service/swf/api.go b/service/swf/api.go index b99a12790ec..7664d48e44a 100644 --- a/service/swf/api.go +++ b/service/swf/api.go @@ -574,6 +574,12 @@ func (c *SWF) GetWorkflowExecutionHistoryRequest(input *GetWorkflowExecutionHist Name: "GetWorkflowExecutionHistory", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"nextPageToken"}, + OutputTokens: []string{"nextPageToken"}, + LimitToken: "maximumPageSize", + TruncationToken: "", + }, } } @@ -611,6 +617,11 @@ func (c *SWF) GetWorkflowExecutionHistory(input *GetWorkflowExecutionHistoryInpu return out, err } +func (c *SWF) GetWorkflowExecutionHistoryPages(input *GetWorkflowExecutionHistoryInput, fn func(p *GetWorkflowExecutionHistoryOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.GetWorkflowExecutionHistoryRequest(input) + return page.EachPage(fn) +} + var opGetWorkflowExecutionHistory *aws.Operation // ListActivityTypesRequest generates a request for the ListActivityTypes operation. @@ -623,6 +634,12 @@ func (c *SWF) ListActivityTypesRequest(input *ListActivityTypesInput) (req *aws. Name: "ListActivityTypes", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"nextPageToken"}, + OutputTokens: []string{"nextPageToken"}, + LimitToken: "maximumPageSize", + TruncationToken: "", + }, } } @@ -661,6 +678,11 @@ func (c *SWF) ListActivityTypes(input *ListActivityTypesInput) (*ListActivityTyp return out, err } +func (c *SWF) ListActivityTypesPages(input *ListActivityTypesInput, fn func(p *ListActivityTypesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListActivityTypesRequest(input) + return page.EachPage(fn) +} + var opListActivityTypes *aws.Operation // ListClosedWorkflowExecutionsRequest generates a request for the ListClosedWorkflowExecutions operation. @@ -673,6 +695,12 @@ func (c *SWF) ListClosedWorkflowExecutionsRequest(input *ListClosedWorkflowExecu Name: "ListClosedWorkflowExecutions", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"nextPageToken"}, + OutputTokens: []string{"nextPageToken"}, + LimitToken: "maximumPageSize", + TruncationToken: "", + }, } } @@ -714,6 +742,11 @@ func (c *SWF) ListClosedWorkflowExecutions(input *ListClosedWorkflowExecutionsIn return out, err } +func (c *SWF) ListClosedWorkflowExecutionsPages(input *ListClosedWorkflowExecutionsInput, fn func(p *WorkflowExecutionInfos, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListClosedWorkflowExecutionsRequest(input) + return page.EachPage(fn) +} + var opListClosedWorkflowExecutions *aws.Operation // ListDomainsRequest generates a request for the ListDomains operation. @@ -726,6 +759,12 @@ func (c *SWF) ListDomainsRequest(input *ListDomainsInput) (req *aws.Request, out Name: "ListDomains", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"nextPageToken"}, + OutputTokens: []string{"nextPageToken"}, + LimitToken: "maximumPageSize", + TruncationToken: "", + }, } } @@ -764,6 +803,11 @@ func (c *SWF) ListDomains(input *ListDomainsInput) (*ListDomainsOutput, error) { return out, err } +func (c *SWF) ListDomainsPages(input *ListDomainsInput, fn func(p *ListDomainsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListDomainsRequest(input) + return page.EachPage(fn) +} + var opListDomains *aws.Operation // ListOpenWorkflowExecutionsRequest generates a request for the ListOpenWorkflowExecutions operation. @@ -776,6 +820,12 @@ func (c *SWF) ListOpenWorkflowExecutionsRequest(input *ListOpenWorkflowExecution Name: "ListOpenWorkflowExecutions", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"nextPageToken"}, + OutputTokens: []string{"nextPageToken"}, + LimitToken: "maximumPageSize", + TruncationToken: "", + }, } } @@ -817,6 +867,11 @@ func (c *SWF) ListOpenWorkflowExecutions(input *ListOpenWorkflowExecutionsInput) return out, err } +func (c *SWF) ListOpenWorkflowExecutionsPages(input *ListOpenWorkflowExecutionsInput, fn func(p *WorkflowExecutionInfos, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListOpenWorkflowExecutionsRequest(input) + return page.EachPage(fn) +} + var opListOpenWorkflowExecutions *aws.Operation // ListWorkflowTypesRequest generates a request for the ListWorkflowTypes operation. @@ -829,6 +884,12 @@ func (c *SWF) ListWorkflowTypesRequest(input *ListWorkflowTypesInput) (req *aws. Name: "ListWorkflowTypes", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"nextPageToken"}, + OutputTokens: []string{"nextPageToken"}, + LimitToken: "maximumPageSize", + TruncationToken: "", + }, } } @@ -865,6 +926,11 @@ func (c *SWF) ListWorkflowTypes(input *ListWorkflowTypesInput) (*ListWorkflowTyp return out, err } +func (c *SWF) ListWorkflowTypesPages(input *ListWorkflowTypesInput, fn func(p *ListWorkflowTypesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListWorkflowTypesRequest(input) + return page.EachPage(fn) +} + var opListWorkflowTypes *aws.Operation // PollForActivityTaskRequest generates a request for the PollForActivityTask operation. @@ -933,6 +999,12 @@ func (c *SWF) PollForDecisionTaskRequest(input *PollForDecisionTaskInput) (req * Name: "PollForDecisionTask", HTTPMethod: "POST", HTTPPath: "/", + Paginator: &aws.Paginator{ + InputTokens: []string{"nextPageToken"}, + OutputTokens: []string{"nextPageToken"}, + LimitToken: "maximumPageSize", + TruncationToken: "", + }, } } @@ -985,6 +1057,11 @@ func (c *SWF) PollForDecisionTask(input *PollForDecisionTaskInput) (*PollForDeci return out, err } +func (c *SWF) PollForDecisionTaskPages(input *PollForDecisionTaskInput, fn func(p *PollForDecisionTaskOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.PollForDecisionTaskRequest(input) + return page.EachPage(fn) +} + var opPollForDecisionTask *aws.Operation // RecordActivityTaskHeartbeatRequest generates a request for the RecordActivityTaskHeartbeat operation.