From 97af014d81ffbf13ad6010c1056de20e61f88fa0 Mon Sep 17 00:00:00 2001 From: vince rosso Date: Mon, 15 Feb 2016 11:59:49 -0800 Subject: [PATCH 1/3] updated aws-sdk-go to 1.1.2 --- Godeps/Godeps.json | 169 +++--- .../aws/aws-sdk-go/aws/awserr/error.go | 9 +- .../aws/corehandlers/param_validator.go | 9 + .../ec2rolecreds/ec2_role_provider.go | 8 +- .../aws/aws-sdk-go/aws/ec2metadata/service.go | 23 +- .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../private/protocol/ec2query/build.go | 3 + .../private/protocol/ec2query/unmarshal.go | 9 + .../private/protocol/idempotency.go | 75 +++ .../private/protocol/json/jsonutil/build.go | 16 +- .../private/protocol/jsonrpc/jsonrpc.go | 12 + .../private/protocol/query/build.go | 3 + .../protocol/query/queryutil/queryutil.go | 15 +- .../private/protocol/query/unmarshal.go | 6 + .../private/protocol/query/unmarshal_error.go | 3 + .../aws-sdk-go/private/protocol/rest/build.go | 3 + .../private/protocol/rest/unmarshal.go | 6 + .../private/protocol/restjson/restjson.go | 12 + .../private/protocol/restxml/restxml.go | 12 + .../aws-sdk-go/private/protocol/unmarshal.go | 21 + .../private/protocol/xml/xmlutil/build.go | 16 +- .../aws/aws-sdk-go/service/autoscaling/api.go | 46 +- .../aws-sdk-go/service/autoscaling/service.go | 8 +- .../aws-sdk-go/service/cloudformation/api.go | 10 + .../service/cloudformation/service.go | 8 +- .../aws-sdk-go/service/cloudtrail/service.go | 8 +- .../aws/aws-sdk-go/service/cloudwatch/api.go | 14 + .../aws-sdk-go/service/cloudwatch/service.go | 8 +- .../service/cloudwatchevents/api.go | 8 + .../service/cloudwatchevents/service.go | 8 +- .../aws-sdk-go/service/cloudwatchlogs/api.go | 28 + .../service/cloudwatchlogs/service.go | 8 +- .../aws/aws-sdk-go/service/codecommit/api.go | 10 + .../aws-sdk-go/service/codecommit/service.go | 8 +- .../aws/aws-sdk-go/service/codedeploy/api.go | 18 + .../aws-sdk-go/service/codedeploy/service.go | 8 +- .../service/directoryservice/service.go | 8 +- .../dynamodb/dynamodbattribute/converter.go | 28 +- .../aws-sdk-go/service/dynamodb/service.go | 8 +- .../aws/aws-sdk-go/service/ec2/api.go | 122 ++++ .../aws/aws-sdk-go/service/ec2/service.go | 8 +- .../aws/aws-sdk-go/service/ecr/service.go | 8 +- .../aws/aws-sdk-go/service/ecs/service.go | 8 +- .../aws/aws-sdk-go/service/efs/api.go | 12 + .../aws/aws-sdk-go/service/efs/service.go | 8 +- .../aws/aws-sdk-go/service/elasticache/api.go | 8 + .../aws-sdk-go/service/elasticache/service.go | 8 +- .../service/elasticsearchservice/api.go | 6 + .../service/elasticsearchservice/service.go | 8 +- .../aws/aws-sdk-go/service/elb/service.go | 8 +- .../aws-sdk-go/service/firehose/service.go | 8 +- .../aws/aws-sdk-go/service/glacier/api.go | 26 + .../aws/aws-sdk-go/service/glacier/service.go | 8 +- .../aws/aws-sdk-go/service/iam/api.go | 102 ++++ .../aws/aws-sdk-go/service/iam/service.go | 8 +- .../aws/aws-sdk-go/service/kinesis/api.go | 18 + .../aws/aws-sdk-go/service/kinesis/service.go | 8 +- .../aws/aws-sdk-go/service/lambda/api.go | 558 +++++++++++------- .../aws/aws-sdk-go/service/lambda/service.go | 8 +- .../aws/aws-sdk-go/service/opsworks/api.go | 74 +++ .../aws-sdk-go/service/opsworks/service.go | 8 +- .../aws/aws-sdk-go/service/rds/api.go | 16 + .../aws/aws-sdk-go/service/rds/service.go | 8 +- .../aws/aws-sdk-go/service/redshift/api.go | 20 + .../aws-sdk-go/service/redshift/service.go | 8 +- .../aws/aws-sdk-go/service/route53/service.go | 8 +- .../aws/aws-sdk-go/service/s3/api.go | 62 +- .../aws/aws-sdk-go/service/s3/service.go | 8 +- .../aws/aws-sdk-go/service/sns/api.go | 22 + .../aws/aws-sdk-go/service/sns/service.go | 8 +- .../aws/aws-sdk-go/service/sqs/api.go | 16 + .../aws/aws-sdk-go/service/sqs/service.go | 8 +- 72 files changed, 1427 insertions(+), 461 deletions(-) create mode 100644 vendor/github.com/aws/aws-sdk-go/private/protocol/idempotency.go create mode 100644 vendor/github.com/aws/aws-sdk-go/private/protocol/unmarshal.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index b627c36f3..a924ce449 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -184,208 +184,213 @@ }, { "ImportPath": "github.com/aws/aws-sdk-go/aws", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/endpoints", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + }, + { + "ImportPath": "github.com/aws/aws-sdk-go/private/protocol", + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/ec2query", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/json/jsonutil", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/jsonrpc", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/query", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/rest", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/restjson", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/restxml", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/signer/v4", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/waiter", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/autoscaling", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudformation", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudtrail", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudwatch", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudwatchevents", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudwatchlogs", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/codecommit", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/codedeploy", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/directoryservice", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/dynamodb", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/ec2", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/ecr", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/ecs", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/efs", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/elasticache", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/elasticsearchservice", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/elb", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/firehose", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/glacier", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/iam", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/kinesis", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/lambda", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/opsworks", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/rds", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/redshift", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/route53", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/s3", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/sns", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/sqs", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.2", + "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" }, { "ImportPath": "github.com/bgentry/speakeasy", diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go b/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go index be8b517b3..05a179c2c 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/awserr/error.go @@ -14,13 +14,13 @@ package awserr // if err != nil { // if awsErr, ok := err.(awserr.Error); ok { // // Get error details -// log.Println("Error:", err.Code(), err.Message()) +// log.Println("Error:", awsErr.Code(), awsErr.Message()) // // // Prints out full error message, including original error if there was one. -// log.Println("Error:", err.Error()) +// log.Println("Error:", awsErr.Error()) // // // Get original error -// if origErr := err.Err(); origErr != nil { +// if origErr := awsErr.OrigErr(); origErr != nil { // // operate on original error. // } // } else { @@ -64,9 +64,6 @@ type BatchError interface { // If origErr satisfies the Error interface it will not be wrapped within a new // Error object and will instead be returned. func New(code, message string, origErr error) Error { - if e, ok := origErr.(Error); ok && e != nil { - return e - } return newBaseError(code, message, origErr) } diff --git a/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go index 3b53f5e02..ea07580a9 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go @@ -30,6 +30,11 @@ type validator struct { errors []string } +// There's no validation to be done on the contents of []byte values. Prepare +// to check validateAny arguments against that type so we can quickly skip +// them. +var byteSliceType = reflect.TypeOf([]byte(nil)) + // validateAny will validate any struct, slice or map type. All validations // are also performed recursively for nested types. func (v *validator) validateAny(value reflect.Value, path string) { @@ -42,6 +47,10 @@ func (v *validator) validateAny(value reflect.Value, path string) { case reflect.Struct: v.validateStruct(value, path) case reflect.Slice: + if value.Type() == byteSliceType { + // We don't need to validate the contents of []byte. + return + } for i := 0; i < value.Len(); i++ { v.validateAny(value.Index(i), path+fmt.Sprintf("[%d]", i)) } diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go index 36f8add35..aa9d689a0 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go @@ -132,7 +132,7 @@ const iamSecurityCredsPath = "/iam/security-credentials" func requestCredList(client *ec2metadata.EC2Metadata) ([]string, error) { resp, err := client.GetMetadata(iamSecurityCredsPath) if err != nil { - return nil, awserr.New("EC2RoleRequestError", "failed to list EC2 Roles", err) + return nil, awserr.New("EC2RoleRequestError", "no EC2 instance role found", err) } credsList := []string{} @@ -142,7 +142,7 @@ func requestCredList(client *ec2metadata.EC2Metadata) ([]string, error) { } if err := s.Err(); err != nil { - return nil, awserr.New("SerializationError", "failed to read list of EC2 Roles", err) + return nil, awserr.New("SerializationError", "failed to read EC2 instance role from metadata service", err) } return credsList, nil @@ -157,7 +157,7 @@ func requestCred(client *ec2metadata.EC2Metadata, credsName string) (ec2RoleCred if err != nil { return ec2RoleCredRespBody{}, awserr.New("EC2RoleRequestError", - fmt.Sprintf("failed to get %s EC2 Role credentials", credsName), + fmt.Sprintf("failed to get %s EC2 instance role credentials", credsName), err) } @@ -165,7 +165,7 @@ func requestCred(client *ec2metadata.EC2Metadata, credsName string) (ec2RoleCred if err := json.NewDecoder(strings.NewReader(resp)).Decode(&respCreds); err != nil { return ec2RoleCredRespBody{}, awserr.New("SerializationError", - fmt.Sprintf("failed to decode %s EC2 Role credentials", credsName), + fmt.Sprintf("failed to decode %s EC2 instance role credentials", credsName), err) } diff --git a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go index 9e16c1cf7..5b4379dbd 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go @@ -3,7 +3,9 @@ package ec2metadata import ( - "io/ioutil" + "bytes" + "errors" + "io" "net/http" "time" @@ -91,23 +93,28 @@ type metadataOutput struct { func unmarshalHandler(r *request.Request) { defer r.HTTPResponse.Body.Close() - b, err := ioutil.ReadAll(r.HTTPResponse.Body) - if err != nil { + b := &bytes.Buffer{} + if _, err := io.Copy(b, r.HTTPResponse.Body); err != nil { r.Error = awserr.New("SerializationError", "unable to unmarshal EC2 metadata respose", err) + return } - data := r.Data.(*metadataOutput) - data.Content = string(b) + if data, ok := r.Data.(*metadataOutput); ok { + data.Content = b.String() + } } func unmarshalError(r *request.Request) { defer r.HTTPResponse.Body.Close() - _, err := ioutil.ReadAll(r.HTTPResponse.Body) - if err != nil { + b := &bytes.Buffer{} + if _, err := io.Copy(b, r.HTTPResponse.Body); err != nil { r.Error = awserr.New("SerializationError", "unable to unmarshal EC2 metadata error respose", err) + return } - // TODO extract the error... + // Response body format is not consistent between metadata endpoints. + // Grab the error message as a string and include that as the source error + r.Error = awserr.New("EC2MetadataError", "failed to make EC2Metadata request", errors.New(b.String())) } func validateEndpointHandler(r *request.Request) { diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go index ad215ea8e..1a9a5a853 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/version.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.1.0" +const SDKVersion = "1.1.2" diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/build.go index 0ead0126e..68e344d1f 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/build.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/build.go @@ -11,6 +11,9 @@ import ( "github.com/aws/aws-sdk-go/private/protocol/query/queryutil" ) +// BuildHandler is a named request handler for building ec2query protocol requests +var BuildHandler = request.NamedHandler{Name: "awssdk.ec2query.Build", Fn: Build} + // Build builds a request for the EC2 protocol. func Build(r *request.Request) { body := url.Values{ diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go index 658190f70..9223e8422 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go @@ -11,6 +11,15 @@ import ( "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil" ) +// UnmarshalHandler is a named request handler for unmarshaling ec2query protocol requests +var UnmarshalHandler = request.NamedHandler{Name: "awssdk.ec2query.Unmarshal", Fn: Unmarshal} + +// UnmarshalMetaHandler is a named request handler for unmarshaling ec2query protocol request metadata +var UnmarshalMetaHandler = request.NamedHandler{Name: "awssdk.ec2query.UnmarshalMeta", Fn: UnmarshalMeta} + +// UnmarshalErrorHandler is a named request handler for unmarshaling ec2query protocol request errors +var UnmarshalErrorHandler = request.NamedHandler{Name: "awssdk.ec2query.UnmarshalError", Fn: UnmarshalError} + // Unmarshal unmarshals a response body for the EC2 protocol. func Unmarshal(r *request.Request) { defer r.HTTPResponse.Body.Close() diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/idempotency.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/idempotency.go new file mode 100644 index 000000000..53831dff9 --- /dev/null +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/idempotency.go @@ -0,0 +1,75 @@ +package protocol + +import ( + "crypto/rand" + "fmt" + "reflect" +) + +// RandReader is the random reader the protocol package will use to read +// random bytes from. This is exported for testing, and should not be used. +var RandReader = rand.Reader + +const idempotencyTokenFillTag = `idempotencyToken` + +// CanSetIdempotencyToken returns true if the struct field should be +// automatically populated with a Idempotency token. +// +// Only *string and string type fields that are tagged with idempotencyToken +// which are not already set can be auto filled. +func CanSetIdempotencyToken(v reflect.Value, f reflect.StructField) bool { + switch u := v.Interface().(type) { + // To auto fill an Idempotency token the field must be a string, + // tagged for auto fill, and have a zero value. + case *string: + return u == nil && len(f.Tag.Get(idempotencyTokenFillTag)) != 0 + case string: + return len(u) == 0 && len(f.Tag.Get(idempotencyTokenFillTag)) != 0 + } + + return false +} + +// GetIdempotencyToken returns a randomly generated idempotency token. +func GetIdempotencyToken() string { + b := make([]byte, 16) + RandReader.Read(b) + + return UUIDVersion4(b) +} + +// SetIdempotencyToken will set the value provided with a Idempotency Token. +// Given that the value can be set. Will panic if value is not setable. +func SetIdempotencyToken(v reflect.Value) { + if v.Kind() == reflect.Ptr { + if v.IsNil() && v.CanSet() { + v.Set(reflect.New(v.Type().Elem())) + } + v = v.Elem() + } + v = reflect.Indirect(v) + + if !v.CanSet() { + panic(fmt.Sprintf("unable to set idempotnecy token %v", v)) + } + + b := make([]byte, 16) + _, err := rand.Read(b) + if err != nil { + // TODO handle error + return + } + + v.Set(reflect.ValueOf(UUIDVersion4(b))) +} + +// UUIDVersion4 returns a Version 4 random UUID from the byte slice provided +func UUIDVersion4(u []byte) string { + // https://en.wikipedia.org/wiki/Universally_unique_identifier#Version_4_.28random.29 + // 13th character is "4" + u[6] = (u[6] | 0x40) & 0x4F + // 17th character is "8", "9", "a", or "b" + u[8] = (u[8] | 0x80) & 0xBF + + return fmt.Sprintf(`%X-%X-%X-%X-%X`, u[0:4], u[4:6], u[6:8], u[8:10], u[10:]) +} diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/build.go index 870707c6a..1d552afe4 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/build.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/json/jsonutil/build.go @@ -9,6 +9,8 @@ import ( "sort" "strconv" "time" + + "github.com/aws/aws-sdk-go/private/protocol" ) var timeType = reflect.ValueOf(time.Time{}).Type() @@ -85,11 +87,8 @@ func buildStruct(value reflect.Value, buf *bytes.Buffer, tag reflect.StructTag) first := true for i := 0; i < t.NumField(); i++ { member := value.Field(i) - if (member.Kind() == reflect.Ptr || member.Kind() == reflect.Slice || member.Kind() == reflect.Map) && member.IsNil() { - continue // ignore unset fields - } - field := t.Field(i) + if field.PkgPath != "" { continue // ignore unexported fields } @@ -100,6 +99,15 @@ func buildStruct(value reflect.Value, buf *bytes.Buffer, tag reflect.StructTag) continue // ignore non-body elements } + if protocol.CanSetIdempotencyToken(member, field) { + token := protocol.GetIdempotencyToken() + member = reflect.ValueOf(&token) + } + + if (member.Kind() == reflect.Ptr || member.Kind() == reflect.Slice || member.Kind() == reflect.Map) && member.IsNil() { + continue // ignore unset fields + } + if first { first = false } else { diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go index c4e71cf48..7aff0e0fa 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonrpc/jsonrpc.go @@ -18,6 +18,18 @@ import ( var emptyJSON = []byte("{}") +// BuildHandler is a named request handler for building jsonrpc protocol requests +var BuildHandler = request.NamedHandler{Name: "awssdk.jsonrpc.Build", Fn: Build} + +// UnmarshalHandler is a named request handler for unmarshaling jsonrpc protocol requests +var UnmarshalHandler = request.NamedHandler{Name: "awssdk.jsonrpc.Unmarshal", Fn: Unmarshal} + +// UnmarshalMetaHandler is a named request handler for unmarshaling jsonrpc protocol request metadata +var UnmarshalMetaHandler = request.NamedHandler{Name: "awssdk.jsonrpc.UnmarshalMeta", Fn: UnmarshalMeta} + +// UnmarshalErrorHandler is a named request handler for unmarshaling jsonrpc protocol request errors +var UnmarshalErrorHandler = request.NamedHandler{Name: "awssdk.jsonrpc.UnmarshalError", Fn: UnmarshalError} + // Build builds a JSON payload for a JSON RPC request. func Build(req *request.Request) { var buf []byte diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go index 2d78c35c2..56d69db05 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go @@ -11,6 +11,9 @@ import ( "github.com/aws/aws-sdk-go/private/protocol/query/queryutil" ) +// BuildHandler is a named request handler for building query protocol requests +var BuildHandler = request.NamedHandler{Name: "awssdk.query.Build", Fn: Build} + // Build builds a request for an AWS Query service. func Build(r *request.Request) { body := url.Values{ diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go index 4afa4cf0e..60ea0bd1e 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go @@ -9,6 +9,8 @@ import ( "strconv" "strings" "time" + + "github.com/aws/aws-sdk-go/private/protocol" ) // Parse parses an object i and fills a url.Values object. The isEC2 flag @@ -68,14 +70,19 @@ func (q *queryParser) parseStruct(v url.Values, value reflect.Value, prefix stri t := value.Type() for i := 0; i < value.NumField(); i++ { - if c := t.Field(i).Name[0:1]; strings.ToLower(c) == c { + elemValue := elemOf(value.Field(i)) + field := t.Field(i) + + if field.PkgPath != "" { continue // ignore unexported fields } - elemValue := elemOf(value.Field(i)) - field := t.Field(i) - var name string + if protocol.CanSetIdempotencyToken(value.Field(i), field) { + token := protocol.GetIdempotencyToken() + elemValue = reflect.ValueOf(token) + } + var name string if q.isEC2 { name = field.Tag.Get("queryName") } diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go index f961029ef..a3ea40955 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go @@ -10,6 +10,12 @@ import ( "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil" ) +// UnmarshalHandler is a named request handler for unmarshaling query protocol requests +var UnmarshalHandler = request.NamedHandler{Name: "awssdk.query.Unmarshal", Fn: Unmarshal} + +// UnmarshalMetaHandler is a named request handler for unmarshaling query protocol request metadata +var UnmarshalMetaHandler = request.NamedHandler{Name: "awssdk.query.UnmarshalMeta", Fn: UnmarshalMeta} + // Unmarshal unmarshals a response for an AWS Query service. func Unmarshal(r *request.Request) { defer r.HTTPResponse.Body.Close() diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go index cb87b79f0..b8e3c7a31 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go @@ -15,6 +15,9 @@ type xmlErrorResponse struct { RequestID string `xml:"RequestId"` } +// UnmarshalErrorHandler is a name request handler to unmarshal request errors +var UnmarshalErrorHandler = request.NamedHandler{Name: "awssdk.query.UnmarshalError", Fn: UnmarshalError} + // UnmarshalError unmarshals an error response for an AWS Query service. func UnmarshalError(r *request.Request) { defer r.HTTPResponse.Body.Close() diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go index ed3c2e039..5469edb60 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go @@ -39,6 +39,9 @@ func init() { } } +// BuildHandler is a named request handler for building rest protocol requests +var BuildHandler = request.NamedHandler{Name: "awssdk.rest.Build", Fn: Build} + // Build builds the REST component of a service request. func Build(r *request.Request) { if r.ParamsFilled() { diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go index 46837f66c..ba46f5bc9 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go @@ -15,6 +15,12 @@ import ( "github.com/aws/aws-sdk-go/aws/request" ) +// UnmarshalHandler is a named request handler for unmarshaling rest protocol requests +var UnmarshalHandler = request.NamedHandler{Name: "awssdk.rest.Unmarshal", Fn: Unmarshal} + +// UnmarshalMetaHandler is a named request handler for unmarshaling rest protocol request metadata +var UnmarshalMetaHandler = request.NamedHandler{Name: "awssdk.rest.UnmarshalMeta", Fn: UnmarshalMeta} + // Unmarshal unmarshals the REST component of a response in a REST service. func Unmarshal(r *request.Request) { if r.DataFilled() { diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/restjson/restjson.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/restjson/restjson.go index f0c85c0a3..5a0877cb1 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/restjson/restjson.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/restjson/restjson.go @@ -16,6 +16,18 @@ import ( "github.com/aws/aws-sdk-go/private/protocol/rest" ) +// BuildHandler is a named request handler for building restjson protocol requests +var BuildHandler = request.NamedHandler{Name: "awssdk.restjson.Build", Fn: Build} + +// UnmarshalHandler is a named request handler for unmarshaling restjson protocol requests +var UnmarshalHandler = request.NamedHandler{Name: "awssdk.restjson.Unmarshal", Fn: Unmarshal} + +// UnmarshalMetaHandler is a named request handler for unmarshaling restjson protocol request metadata +var UnmarshalMetaHandler = request.NamedHandler{Name: "awssdk.restjson.UnmarshalMeta", Fn: UnmarshalMeta} + +// UnmarshalErrorHandler is a named request handler for unmarshaling restjson protocol request errors +var UnmarshalErrorHandler = request.NamedHandler{Name: "awssdk.restjson.UnmarshalError", Fn: UnmarshalError} + // Build builds a request for the REST JSON protocol. func Build(r *request.Request) { rest.Build(r) diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go index a6bc0c74c..c74088bfe 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go @@ -16,6 +16,18 @@ import ( "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil" ) +// BuildHandler is a named request handler for building restxml protocol requests +var BuildHandler = request.NamedHandler{Name: "awssdk.restxml.Build", Fn: Build} + +// UnmarshalHandler is a named request handler for unmarshaling restxml protocol requests +var UnmarshalHandler = request.NamedHandler{Name: "awssdk.restxml.Unmarshal", Fn: Unmarshal} + +// UnmarshalMetaHandler is a named request handler for unmarshaling restxml protocol request metadata +var UnmarshalMetaHandler = request.NamedHandler{Name: "awssdk.restxml.UnmarshalMeta", Fn: UnmarshalMeta} + +// UnmarshalErrorHandler is a named request handler for unmarshaling restxml protocol request errors +var UnmarshalErrorHandler = request.NamedHandler{Name: "awssdk.restxml.UnmarshalError", Fn: UnmarshalError} + // Build builds a request payload for the REST XML protocol. func Build(r *request.Request) { rest.Build(r) diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/unmarshal.go new file mode 100644 index 000000000..da1a68111 --- /dev/null +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/unmarshal.go @@ -0,0 +1,21 @@ +package protocol + +import ( + "io" + "io/ioutil" + + "github.com/aws/aws-sdk-go/aws/request" +) + +// UnmarshalDiscardBodyHandler is a named request handler to empty and close a response's body +var UnmarshalDiscardBodyHandler = request.NamedHandler{Name: "awssdk.shared.UnmarshalDiscardBody", Fn: UnmarshalDiscardBody} + +// UnmarshalDiscardBody is a request handler to empty a response's body and closing it. +func UnmarshalDiscardBody(r *request.Request) { + if r.HTTPResponse == nil || r.HTTPResponse.Body == nil { + return + } + + io.Copy(ioutil.Discard, r.HTTPResponse.Body) + r.HTTPResponse.Body.Close() +} diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go index 0d76dffbd..ceb4132c5 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go @@ -8,8 +8,9 @@ import ( "reflect" "sort" "strconv" - "strings" "time" + + "github.com/aws/aws-sdk-go/private/protocol" ) // BuildXML will serialize params into an xml.Encoder. @@ -120,18 +121,23 @@ func (b *xmlBuilder) buildStruct(value reflect.Value, current *XMLNode, tag refl t := value.Type() for i := 0; i < value.NumField(); i++ { - if c := t.Field(i).Name[0:1]; strings.ToLower(c) == c { + member := elemOf(value.Field(i)) + field := t.Field(i) + + if field.PkgPath != "" { continue // ignore unexported fields } - member := elemOf(value.Field(i)) - field := t.Field(i) mTag := field.Tag - if mTag.Get("location") != "" { // skip non-body members continue } + if protocol.CanSetIdempotencyToken(value.Field(i), field) { + token := protocol.GetIdempotencyToken() + member = reflect.ValueOf(token) + } + memberName := mTag.Get("locationName") if memberName == "" { memberName = field.Name diff --git a/vendor/github.com/aws/aws-sdk-go/service/autoscaling/api.go b/vendor/github.com/aws/aws-sdk-go/service/autoscaling/api.go index da7fda939..9f2ce611b 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/autoscaling/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/autoscaling/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/query" ) const opAttachInstances = "AttachInstances" @@ -25,6 +27,8 @@ func (c *AutoScaling) AttachInstancesRequest(input *AttachInstancesInput) (req * } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AttachInstancesOutput{} req.Data = output return @@ -136,6 +140,8 @@ func (c *AutoScaling) CreateAutoScalingGroupRequest(input *CreateAutoScalingGrou } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreateAutoScalingGroupOutput{} req.Data = output return @@ -170,6 +176,8 @@ func (c *AutoScaling) CreateLaunchConfigurationRequest(input *CreateLaunchConfig } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreateLaunchConfigurationOutput{} req.Data = output return @@ -204,6 +212,8 @@ func (c *AutoScaling) CreateOrUpdateTagsRequest(input *CreateOrUpdateTagsInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreateOrUpdateTagsOutput{} req.Data = output return @@ -244,6 +254,8 @@ func (c *AutoScaling) DeleteAutoScalingGroupRequest(input *DeleteAutoScalingGrou } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteAutoScalingGroupOutput{} req.Data = output return @@ -286,6 +298,8 @@ func (c *AutoScaling) DeleteLaunchConfigurationRequest(input *DeleteLaunchConfig } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteLaunchConfigurationOutput{} req.Data = output return @@ -347,6 +361,8 @@ func (c *AutoScaling) DeleteNotificationConfigurationRequest(input *DeleteNotifi } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteNotificationConfigurationOutput{} req.Data = output return @@ -374,6 +390,8 @@ func (c *AutoScaling) DeletePolicyRequest(input *DeletePolicyInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeletePolicyOutput{} req.Data = output return @@ -404,6 +422,8 @@ func (c *AutoScaling) DeleteScheduledActionRequest(input *DeleteScheduledActionI } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteScheduledActionOutput{} req.Data = output return @@ -431,6 +451,8 @@ func (c *AutoScaling) DeleteTagsRequest(input *DeleteTagsInput) (req *request.Re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteTagsOutput{} req.Data = output return @@ -1122,6 +1144,8 @@ func (c *AutoScaling) DisableMetricsCollectionRequest(input *DisableMetricsColle } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DisableMetricsCollectionOutput{} req.Data = output return @@ -1150,6 +1174,8 @@ func (c *AutoScaling) EnableMetricsCollectionRequest(input *EnableMetricsCollect } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &EnableMetricsCollectionOutput{} req.Data = output return @@ -1211,6 +1237,8 @@ func (c *AutoScaling) ExecutePolicyRequest(input *ExecutePolicyInput) (req *requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ExecutePolicyOutput{} req.Data = output return @@ -1317,6 +1345,8 @@ func (c *AutoScaling) PutNotificationConfigurationRequest(input *PutNotification } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutNotificationConfigurationOutput{} req.Data = output return @@ -1387,6 +1417,8 @@ func (c *AutoScaling) PutScheduledUpdateGroupActionRequest(input *PutScheduledUp } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutScheduledUpdateGroupActionOutput{} req.Data = output return @@ -1461,6 +1493,8 @@ func (c *AutoScaling) ResumeProcessesRequest(input *ScalingProcessQuery) (req *r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ResumeProcessesOutput{} req.Data = output return @@ -1492,6 +1526,8 @@ func (c *AutoScaling) SetDesiredCapacityRequest(input *SetDesiredCapacityInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetDesiredCapacityOutput{} req.Data = output return @@ -1522,6 +1558,8 @@ func (c *AutoScaling) SetInstanceHealthRequest(input *SetInstanceHealthInput) (r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetInstanceHealthOutput{} req.Data = output return @@ -1582,6 +1620,8 @@ func (c *AutoScaling) SuspendProcessesRequest(input *ScalingProcessQuery) (req * } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SuspendProcessesOutput{} req.Data = output return @@ -1650,6 +1690,8 @@ func (c *AutoScaling) UpdateAutoScalingGroupRequest(input *UpdateAutoScalingGrou } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateAutoScalingGroupOutput{} req.Data = output return @@ -4308,7 +4350,7 @@ type PutScalingPolicyInput struct { MinAdjustmentMagnitude *int64 `type:"integer"` // Available for backward compatibility. Use MinAdjustmentMagnitude instead. - MinAdjustmentStep *int64 `type:"integer"` + MinAdjustmentStep *int64 `deprecated:"true" type:"integer"` // The name of the policy. PolicyName *string `min:"1" type:"string" required:"true"` @@ -4516,7 +4558,7 @@ type ScalingPolicy struct { MinAdjustmentMagnitude *int64 `type:"integer"` // Available for backward compatibility. Use MinAdjustmentMagnitude instead. - MinAdjustmentStep *int64 `type:"integer"` + MinAdjustmentStep *int64 `deprecated:"true" type:"integer"` // The Amazon Resource Name (ARN) of the policy. PolicyARN *string `min:"1" type:"string"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/autoscaling/service.go b/vendor/github.com/aws/aws-sdk-go/service/autoscaling/service.go index 8107b3e65..bb58f66ed 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/autoscaling/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/autoscaling/service.go @@ -61,10 +61,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(query.Build) - svc.Handlers.Unmarshal.PushBack(query.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(query.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(query.UnmarshalError) + svc.Handlers.Build.PushBackNamed(query.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(query.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(query.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(query.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudformation/api.go b/vendor/github.com/aws/aws-sdk-go/service/cloudformation/api.go index d4bd8475e..72252c3d3 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudformation/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudformation/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/query" ) const opCancelUpdateStack = "CancelUpdateStack" @@ -25,6 +27,8 @@ func (c *CloudFormation) CancelUpdateStackRequest(input *CancelUpdateStackInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CancelUpdateStackOutput{} req.Data = output return @@ -123,6 +127,8 @@ func (c *CloudFormation) DeleteStackRequest(input *DeleteStackInput) (req *reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteStackOutput{} req.Data = output return @@ -556,6 +562,8 @@ func (c *CloudFormation) SetStackPolicyRequest(input *SetStackPolicyInput) (req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetStackPolicyOutput{} req.Data = output return @@ -583,6 +591,8 @@ func (c *CloudFormation) SignalResourceRequest(input *SignalResourceInput) (req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SignalResourceOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudformation/service.go b/vendor/github.com/aws/aws-sdk-go/service/cloudformation/service.go index 2bad95af1..503142b24 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudformation/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudformation/service.go @@ -76,10 +76,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(query.Build) - svc.Handlers.Unmarshal.PushBack(query.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(query.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(query.UnmarshalError) + svc.Handlers.Build.PushBackNamed(query.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(query.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(query.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(query.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudtrail/service.go b/vendor/github.com/aws/aws-sdk-go/service/cloudtrail/service.go index 17a6af85e..b3e217929 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudtrail/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudtrail/service.go @@ -79,10 +79,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(jsonrpc.Build) - svc.Handlers.Unmarshal.PushBack(jsonrpc.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(jsonrpc.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(jsonrpc.UnmarshalError) + svc.Handlers.Build.PushBackNamed(jsonrpc.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(jsonrpc.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(jsonrpc.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(jsonrpc.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudwatch/api.go b/vendor/github.com/aws/aws-sdk-go/service/cloudwatch/api.go index 64164a0a5..62aaa99e8 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudwatch/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudwatch/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/query" ) const opDeleteAlarms = "DeleteAlarms" @@ -25,6 +27,8 @@ func (c *CloudWatch) DeleteAlarmsRequest(input *DeleteAlarmsInput) (req *request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteAlarmsOutput{} req.Data = output return @@ -166,6 +170,8 @@ func (c *CloudWatch) DisableAlarmActionsRequest(input *DisableAlarmActionsInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DisableAlarmActionsOutput{} req.Data = output return @@ -194,6 +200,8 @@ func (c *CloudWatch) EnableAlarmActionsRequest(input *EnableAlarmActionsInput) ( } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &EnableAlarmActionsOutput{} req.Data = output return @@ -316,6 +324,8 @@ func (c *CloudWatch) PutMetricAlarmRequest(input *PutMetricAlarmInput) (req *req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutMetricAlarmOutput{} req.Data = output return @@ -349,6 +359,8 @@ func (c *CloudWatch) PutMetricDataRequest(input *PutMetricDataInput) (req *reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutMetricDataOutput{} req.Data = output return @@ -389,6 +401,8 @@ func (c *CloudWatch) SetAlarmStateRequest(input *SetAlarmStateInput) (req *reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetAlarmStateOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudwatch/service.go b/vendor/github.com/aws/aws-sdk-go/service/cloudwatch/service.go index e6f850684..eaff308c3 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudwatch/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudwatch/service.go @@ -98,10 +98,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(query.Build) - svc.Handlers.Unmarshal.PushBack(query.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(query.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(query.UnmarshalError) + svc.Handlers.Build.PushBackNamed(query.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(query.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(query.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(query.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudwatchevents/api.go b/vendor/github.com/aws/aws-sdk-go/service/cloudwatchevents/api.go index 0ced93d8d..070992321 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudwatchevents/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudwatchevents/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/jsonrpc" ) const opDeleteRule = "DeleteRule" @@ -25,6 +27,8 @@ func (c *CloudWatchEvents) DeleteRuleRequest(input *DeleteRuleInput) (req *reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteRuleOutput{} req.Data = output return @@ -84,6 +88,8 @@ func (c *CloudWatchEvents) DisableRuleRequest(input *DisableRuleInput) (req *req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DisableRuleOutput{} req.Data = output return @@ -116,6 +122,8 @@ func (c *CloudWatchEvents) EnableRuleRequest(input *EnableRuleInput) (req *reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &EnableRuleOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudwatchevents/service.go b/vendor/github.com/aws/aws-sdk-go/service/cloudwatchevents/service.go index 153438728..13ebf43c9 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudwatchevents/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudwatchevents/service.go @@ -74,10 +74,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(jsonrpc.Build) - svc.Handlers.Unmarshal.PushBack(jsonrpc.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(jsonrpc.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(jsonrpc.UnmarshalError) + svc.Handlers.Build.PushBackNamed(jsonrpc.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(jsonrpc.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(jsonrpc.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(jsonrpc.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudwatchlogs/api.go b/vendor/github.com/aws/aws-sdk-go/service/cloudwatchlogs/api.go index 8d3b64937..32098074b 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudwatchlogs/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudwatchlogs/api.go @@ -6,6 +6,8 @@ package cloudwatchlogs import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/jsonrpc" ) const opCancelExportTask = "CancelExportTask" @@ -23,6 +25,8 @@ func (c *CloudWatchLogs) CancelExportTaskRequest(input *CancelExportTaskInput) ( } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CancelExportTaskOutput{} req.Data = output return @@ -87,6 +91,8 @@ func (c *CloudWatchLogs) CreateLogGroupRequest(input *CreateLogGroupInput) (req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreateLogGroupOutput{} req.Data = output return @@ -120,6 +126,8 @@ func (c *CloudWatchLogs) CreateLogStreamRequest(input *CreateLogStreamInput) (re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreateLogStreamOutput{} req.Data = output return @@ -153,6 +161,8 @@ func (c *CloudWatchLogs) DeleteDestinationRequest(input *DeleteDestinationInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteDestinationOutput{} req.Data = output return @@ -182,6 +192,8 @@ func (c *CloudWatchLogs) DeleteLogGroupRequest(input *DeleteLogGroupInput) (req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteLogGroupOutput{} req.Data = output return @@ -210,6 +222,8 @@ func (c *CloudWatchLogs) DeleteLogStreamRequest(input *DeleteLogStreamInput) (re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteLogStreamOutput{} req.Data = output return @@ -238,6 +252,8 @@ func (c *CloudWatchLogs) DeleteMetricFilterRequest(input *DeleteMetricFilterInpu } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteMetricFilterOutput{} req.Data = output return @@ -265,6 +281,8 @@ func (c *CloudWatchLogs) DeleteRetentionPolicyRequest(input *DeleteRetentionPoli } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteRetentionPolicyOutput{} req.Data = output return @@ -293,6 +311,8 @@ func (c *CloudWatchLogs) DeleteSubscriptionFilterRequest(input *DeleteSubscripti } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteSubscriptionFilterOutput{} req.Data = output return @@ -735,6 +755,8 @@ func (c *CloudWatchLogs) PutDestinationPolicyRequest(input *PutDestinationPolicy } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutDestinationPolicyOutput{} req.Data = output return @@ -804,6 +826,8 @@ func (c *CloudWatchLogs) PutMetricFilterRequest(input *PutMetricFilterInput) (re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutMetricFilterOutput{} req.Data = output return @@ -836,6 +860,8 @@ func (c *CloudWatchLogs) PutRetentionPolicyRequest(input *PutRetentionPolicyInpu } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutRetentionPolicyOutput{} req.Data = output return @@ -865,6 +891,8 @@ func (c *CloudWatchLogs) PutSubscriptionFilterRequest(input *PutSubscriptionFilt } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutSubscriptionFilterOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/cloudwatchlogs/service.go b/vendor/github.com/aws/aws-sdk-go/service/cloudwatchlogs/service.go index 7a5d472cd..5ff263356 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/cloudwatchlogs/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/cloudwatchlogs/service.go @@ -92,10 +92,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(jsonrpc.Build) - svc.Handlers.Unmarshal.PushBack(jsonrpc.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(jsonrpc.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(jsonrpc.UnmarshalError) + svc.Handlers.Build.PushBackNamed(jsonrpc.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(jsonrpc.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(jsonrpc.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(jsonrpc.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/codecommit/api.go b/vendor/github.com/aws/aws-sdk-go/service/codecommit/api.go index 831da1e57..5f9ec0124 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/codecommit/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/codecommit/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/jsonrpc" ) const opBatchGetRepositories = "BatchGetRepositories" @@ -58,6 +60,8 @@ func (c *CodeCommit) CreateBranchRequest(input *CreateBranchInput) (req *request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreateBranchOutput{} req.Data = output return @@ -262,6 +266,8 @@ func (c *CodeCommit) UpdateDefaultBranchRequest(input *UpdateDefaultBranchInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateDefaultBranchOutput{} req.Data = output return @@ -293,6 +299,8 @@ func (c *CodeCommit) UpdateRepositoryDescriptionRequest(input *UpdateRepositoryD } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateRepositoryDescriptionOutput{} req.Data = output return @@ -326,6 +334,8 @@ func (c *CodeCommit) UpdateRepositoryNameRequest(input *UpdateRepositoryNameInpu } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateRepositoryNameOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/codecommit/service.go b/vendor/github.com/aws/aws-sdk-go/service/codecommit/service.go index 760d89d93..640216879 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/codecommit/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/codecommit/service.go @@ -67,10 +67,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(jsonrpc.Build) - svc.Handlers.Unmarshal.PushBack(jsonrpc.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(jsonrpc.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(jsonrpc.UnmarshalError) + svc.Handlers.Build.PushBackNamed(jsonrpc.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(jsonrpc.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(jsonrpc.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(jsonrpc.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/codedeploy/api.go b/vendor/github.com/aws/aws-sdk-go/service/codedeploy/api.go index ea7ddc571..e02c5c4f7 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/codedeploy/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/codedeploy/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/jsonrpc" ) const opAddTagsToOnPremisesInstances = "AddTagsToOnPremisesInstances" @@ -25,6 +27,8 @@ func (c *CodeDeploy) AddTagsToOnPremisesInstancesRequest(input *AddTagsToOnPremi } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AddTagsToOnPremisesInstancesOutput{} req.Data = output return @@ -241,6 +245,8 @@ func (c *CodeDeploy) DeleteApplicationRequest(input *DeleteApplicationInput) (re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteApplicationOutput{} req.Data = output return @@ -268,6 +274,8 @@ func (c *CodeDeploy) DeleteDeploymentConfigRequest(input *DeleteDeploymentConfig } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteDeploymentConfigOutput{} req.Data = output return @@ -325,6 +333,8 @@ func (c *CodeDeploy) DeregisterOnPremisesInstanceRequest(input *DeregisterOnPrem } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeregisterOnPremisesInstanceOutput{} req.Data = output return @@ -821,6 +831,8 @@ func (c *CodeDeploy) RegisterApplicationRevisionRequest(input *RegisterApplicati } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RegisterApplicationRevisionOutput{} req.Data = output return @@ -848,6 +860,8 @@ func (c *CodeDeploy) RegisterOnPremisesInstanceRequest(input *RegisterOnPremises } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RegisterOnPremisesInstanceOutput{} req.Data = output return @@ -875,6 +889,8 @@ func (c *CodeDeploy) RemoveTagsFromOnPremisesInstancesRequest(input *RemoveTagsF } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RemoveTagsFromOnPremisesInstancesOutput{} req.Data = output return @@ -929,6 +945,8 @@ func (c *CodeDeploy) UpdateApplicationRequest(input *UpdateApplicationInput) (re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateApplicationOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/codedeploy/service.go b/vendor/github.com/aws/aws-sdk-go/service/codedeploy/service.go index a799244fa..ae02fcfbb 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/codedeploy/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/codedeploy/service.go @@ -109,10 +109,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(jsonrpc.Build) - svc.Handlers.Unmarshal.PushBack(jsonrpc.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(jsonrpc.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(jsonrpc.UnmarshalError) + svc.Handlers.Build.PushBackNamed(jsonrpc.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(jsonrpc.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(jsonrpc.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(jsonrpc.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/directoryservice/service.go b/vendor/github.com/aws/aws-sdk-go/service/directoryservice/service.go index fbf3ee8a8..9eb1b1a91 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/directoryservice/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/directoryservice/service.go @@ -63,10 +63,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(jsonrpc.Build) - svc.Handlers.Unmarshal.PushBack(jsonrpc.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(jsonrpc.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(jsonrpc.UnmarshalError) + svc.Handlers.Build.PushBackNamed(jsonrpc.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(jsonrpc.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(jsonrpc.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(jsonrpc.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute/converter.go b/vendor/github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute/converter.go index 7b2daf464..d2ff2acfe 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute/converter.go +++ b/vendor/github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute/converter.go @@ -4,6 +4,11 @@ // These are most useful to serialize concrete types to dynamodb.AttributeValue for // requests or unmarshalling the dynamodb.AttributeValue into a well known typed form. // +// Converting []byte fields to dynamodb.AttributeValue are only currently supported +// if the input is a map[string]interface{} type. []byte within typed structs are not +// converted correctly and are converted into base64 strings. This is a known bug, +// and will be fixed in a later release. +// // Convert concrete type to dynamodb.AttributeValue: See (ExampleConvertTo) // // type Record struct { @@ -376,15 +381,6 @@ func convertTo(in interface{}) *dynamodb.AttributeValue { return a } - if l, ok := in.([]interface{}); ok { - a.L = make([]*dynamodb.AttributeValue, len(l)) - for index, v := range l { - a.L[index] = convertTo(v) - } - return a - } - - // Only primitive types should remain. v := reflect.ValueOf(in) switch v.Kind() { case reflect.Bool: @@ -407,6 +403,16 @@ func convertTo(in interface{}) *dynamodb.AttributeValue { a.S = new(string) *a.S = v.String() } + case reflect.Slice: + switch v.Type() { + case reflect.TypeOf(([]byte)(nil)): + a.B = v.Bytes() + default: + a.L = make([]*dynamodb.AttributeValue, v.Len()) + for i := 0; i < v.Len(); i++ { + a.L[i] = convertTo(v.Index(i).Interface()) + } + } default: panic(fmt.Sprintf("the type %s is not supported", v.Type().String())) } @@ -459,5 +465,9 @@ func convertFrom(a *dynamodb.AttributeValue) interface{} { return l } + if a.B != nil { + return a.B + } + panic(fmt.Sprintf("%#v is not a supported dynamodb.AttributeValue", a)) } diff --git a/vendor/github.com/aws/aws-sdk-go/service/dynamodb/service.go b/vendor/github.com/aws/aws-sdk-go/service/dynamodb/service.go index 12fc1d81f..719b91546 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/dynamodb/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/dynamodb/service.go @@ -163,10 +163,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(jsonrpc.Build) - svc.Handlers.Unmarshal.PushBack(jsonrpc.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(jsonrpc.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(jsonrpc.UnmarshalError) + svc.Handlers.Build.PushBackNamed(jsonrpc.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(jsonrpc.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(jsonrpc.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(jsonrpc.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go index cd018821b..f4c4fb46a 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/ec2query" ) const opAcceptVpcPeeringConnection = "AcceptVpcPeeringConnection" @@ -115,6 +117,8 @@ func (c *EC2) AssignPrivateIpAddressesRequest(input *AssignPrivateIpAddressesInp } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AssignPrivateIpAddressesOutput{} req.Data = output return @@ -195,6 +199,8 @@ func (c *EC2) AssociateDhcpOptionsRequest(input *AssociateDhcpOptionsInput) (req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AssociateDhcpOptionsOutput{} req.Data = output return @@ -305,6 +311,8 @@ func (c *EC2) AttachInternetGatewayRequest(input *AttachInternetGatewayInput) (r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AttachInternetGatewayOutput{} req.Data = output return @@ -441,6 +449,8 @@ func (c *EC2) AuthorizeSecurityGroupEgressRequest(input *AuthorizeSecurityGroupE } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AuthorizeSecurityGroupEgressOutput{} req.Data = output return @@ -486,6 +496,8 @@ func (c *EC2) AuthorizeSecurityGroupIngressRequest(input *AuthorizeSecurityGroup } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AuthorizeSecurityGroupIngressOutput{} req.Data = output return @@ -594,6 +606,8 @@ func (c *EC2) CancelConversionTaskRequest(input *CancelConversionTaskInput) (req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CancelConversionTaskOutput{} req.Data = output return @@ -629,6 +643,8 @@ func (c *EC2) CancelExportTaskRequest(input *CancelExportTaskInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CancelExportTaskOutput{} req.Data = output return @@ -1230,6 +1246,8 @@ func (c *EC2) CreateNetworkAclEntryRequest(input *CreateNetworkAclEntryInput) (r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreateNetworkAclEntryOutput{} req.Data = output return @@ -1304,6 +1322,8 @@ func (c *EC2) CreatePlacementGroupRequest(input *CreatePlacementGroupInput) (req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreatePlacementGroupOutput{} req.Data = output return @@ -1647,6 +1667,8 @@ func (c *EC2) CreateTagsRequest(input *CreateTagsInput) (req *request.Request, o } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreateTagsOutput{} req.Data = output return @@ -1874,6 +1896,8 @@ func (c *EC2) CreateVpnConnectionRouteRequest(input *CreateVpnConnectionRouteInp } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreateVpnConnectionRouteOutput{} req.Data = output return @@ -1941,6 +1965,8 @@ func (c *EC2) DeleteCustomerGatewayRequest(input *DeleteCustomerGatewayInput) (r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteCustomerGatewayOutput{} req.Data = output return @@ -1969,6 +1995,8 @@ func (c *EC2) DeleteDhcpOptionsRequest(input *DeleteDhcpOptionsInput) (req *requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteDhcpOptionsOutput{} req.Data = output return @@ -2026,6 +2054,8 @@ func (c *EC2) DeleteInternetGatewayRequest(input *DeleteInternetGatewayInput) (r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteInternetGatewayOutput{} req.Data = output return @@ -2054,6 +2084,8 @@ func (c *EC2) DeleteKeyPairRequest(input *DeleteKeyPairInput) (req *request.Requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteKeyPairOutput{} req.Data = output return @@ -2110,6 +2142,8 @@ func (c *EC2) DeleteNetworkAclRequest(input *DeleteNetworkAclInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteNetworkAclOutput{} req.Data = output return @@ -2138,6 +2172,8 @@ func (c *EC2) DeleteNetworkAclEntryRequest(input *DeleteNetworkAclEntryInput) (r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteNetworkAclEntryOutput{} req.Data = output return @@ -2166,6 +2202,8 @@ func (c *EC2) DeleteNetworkInterfaceRequest(input *DeleteNetworkInterfaceInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteNetworkInterfaceOutput{} req.Data = output return @@ -2194,6 +2232,8 @@ func (c *EC2) DeletePlacementGroupRequest(input *DeletePlacementGroupInput) (req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeletePlacementGroupOutput{} req.Data = output return @@ -2224,6 +2264,8 @@ func (c *EC2) DeleteRouteRequest(input *DeleteRouteInput) (req *request.Request, } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteRouteOutput{} req.Data = output return @@ -2251,6 +2293,8 @@ func (c *EC2) DeleteRouteTableRequest(input *DeleteRouteTableInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteRouteTableOutput{} req.Data = output return @@ -2280,6 +2324,8 @@ func (c *EC2) DeleteSecurityGroupRequest(input *DeleteSecurityGroupInput) (req * } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteSecurityGroupOutput{} req.Data = output return @@ -2311,6 +2357,8 @@ func (c *EC2) DeleteSnapshotRequest(input *DeleteSnapshotInput) (req *request.Re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteSnapshotOutput{} req.Data = output return @@ -2352,6 +2400,8 @@ func (c *EC2) DeleteSpotDatafeedSubscriptionRequest(input *DeleteSpotDatafeedSub } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteSpotDatafeedSubscriptionOutput{} req.Data = output return @@ -2379,6 +2429,8 @@ func (c *EC2) DeleteSubnetRequest(input *DeleteSubnetInput) (req *request.Reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteSubnetOutput{} req.Data = output return @@ -2407,6 +2459,8 @@ func (c *EC2) DeleteTagsRequest(input *DeleteTagsInput) (req *request.Request, o } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteTagsOutput{} req.Data = output return @@ -2438,6 +2492,8 @@ func (c *EC2) DeleteVolumeRequest(input *DeleteVolumeInput) (req *request.Reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteVolumeOutput{} req.Data = output return @@ -2471,6 +2527,8 @@ func (c *EC2) DeleteVpcRequest(input *DeleteVpcInput) (req *request.Request, out } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteVpcOutput{} req.Data = output return @@ -2560,6 +2618,8 @@ func (c *EC2) DeleteVpnConnectionRequest(input *DeleteVpnConnectionInput) (req * } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteVpnConnectionOutput{} req.Data = output return @@ -2596,6 +2656,8 @@ func (c *EC2) DeleteVpnConnectionRouteRequest(input *DeleteVpnConnectionRouteInp } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteVpnConnectionRouteOutput{} req.Data = output return @@ -2626,6 +2688,8 @@ func (c *EC2) DeleteVpnGatewayRequest(input *DeleteVpnGatewayInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteVpnGatewayOutput{} req.Data = output return @@ -2657,6 +2721,8 @@ func (c *EC2) DeregisterImageRequest(input *DeregisterImageInput) (req *request. } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeregisterImageOutput{} req.Data = output return @@ -4761,6 +4827,8 @@ func (c *EC2) DetachInternetGatewayRequest(input *DetachInternetGatewayInput) (r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DetachInternetGatewayOutput{} req.Data = output return @@ -4790,6 +4858,8 @@ func (c *EC2) DetachNetworkInterfaceRequest(input *DetachNetworkInterfaceInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DetachNetworkInterfaceOutput{} req.Data = output return @@ -4856,6 +4926,8 @@ func (c *EC2) DetachVpnGatewayRequest(input *DetachVpnGatewayInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DetachVpnGatewayOutput{} req.Data = output return @@ -4890,6 +4962,8 @@ func (c *EC2) DisableVgwRoutePropagationRequest(input *DisableVgwRoutePropagatio } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DisableVgwRoutePropagationOutput{} req.Data = output return @@ -4977,6 +5051,8 @@ func (c *EC2) DisassociateAddressRequest(input *DisassociateAddressInput) (req * } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DisassociateAddressOutput{} req.Data = output return @@ -5012,6 +5088,8 @@ func (c *EC2) DisassociateRouteTableRequest(input *DisassociateRouteTableInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DisassociateRouteTableOutput{} req.Data = output return @@ -5044,6 +5122,8 @@ func (c *EC2) EnableVgwRoutePropagationRequest(input *EnableVgwRoutePropagationI } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &EnableVgwRoutePropagationOutput{} req.Data = output return @@ -5072,6 +5152,8 @@ func (c *EC2) EnableVolumeIORequest(input *EnableVolumeIOInput) (req *request.Re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &EnableVolumeIOOutput{} req.Data = output return @@ -5437,6 +5519,8 @@ func (c *EC2) ModifyIdFormatRequest(input *ModifyIdFormatInput) (req *request.Re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ModifyIdFormatOutput{} req.Data = output return @@ -5474,6 +5558,8 @@ func (c *EC2) ModifyImageAttributeRequest(input *ModifyImageAttributeInput) (req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ModifyImageAttributeOutput{} req.Data = output return @@ -5505,6 +5591,8 @@ func (c *EC2) ModifyInstanceAttributeRequest(input *ModifyInstanceAttributeInput } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ModifyInstanceAttributeOutput{} req.Data = output return @@ -5582,6 +5670,8 @@ func (c *EC2) ModifyNetworkInterfaceAttributeRequest(input *ModifyNetworkInterfa } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ModifyNetworkInterfaceAttributeOutput{} req.Data = output return @@ -5643,6 +5733,8 @@ func (c *EC2) ModifySnapshotAttributeRequest(input *ModifySnapshotAttributeInput } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ModifySnapshotAttributeOutput{} req.Data = output return @@ -5726,6 +5818,8 @@ func (c *EC2) ModifySubnetAttributeRequest(input *ModifySubnetAttributeInput) (r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ModifySubnetAttributeOutput{} req.Data = output return @@ -5753,6 +5847,8 @@ func (c *EC2) ModifyVolumeAttributeRequest(input *ModifyVolumeAttributeInput) (r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ModifyVolumeAttributeOutput{} req.Data = output return @@ -5789,6 +5885,8 @@ func (c *EC2) ModifyVpcAttributeRequest(input *ModifyVpcAttributeInput) (req *re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ModifyVpcAttributeOutput{} req.Data = output return @@ -5979,6 +6077,8 @@ func (c *EC2) RebootInstancesRequest(input *RebootInstancesInput) (req *request. } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RebootInstancesOutput{} req.Data = output return @@ -6106,6 +6206,8 @@ func (c *EC2) ReleaseAddressRequest(input *ReleaseAddressInput) (req *request.Re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ReleaseAddressOutput{} req.Data = output return @@ -6215,6 +6317,8 @@ func (c *EC2) ReplaceNetworkAclEntryRequest(input *ReplaceNetworkAclEntryInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ReplaceNetworkAclEntryOutput{} req.Data = output return @@ -6244,6 +6348,8 @@ func (c *EC2) ReplaceRouteRequest(input *ReplaceRouteInput) (req *request.Reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ReplaceRouteOutput{} req.Data = output return @@ -6311,6 +6417,8 @@ func (c *EC2) ReportInstanceStatusRequest(input *ReportInstanceStatusInput) (req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ReportInstanceStatusOutput{} req.Data = output return @@ -6419,6 +6527,8 @@ func (c *EC2) ResetImageAttributeRequest(input *ResetImageAttributeInput) (req * } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ResetImageAttributeOutput{} req.Data = output return @@ -6448,6 +6558,8 @@ func (c *EC2) ResetInstanceAttributeRequest(input *ResetInstanceAttributeInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ResetInstanceAttributeOutput{} req.Data = output return @@ -6483,6 +6595,8 @@ func (c *EC2) ResetNetworkInterfaceAttributeRequest(input *ResetNetworkInterface } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ResetNetworkInterfaceAttributeOutput{} req.Data = output return @@ -6511,6 +6625,8 @@ func (c *EC2) ResetSnapshotAttributeRequest(input *ResetSnapshotAttributeInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ResetSnapshotAttributeOutput{} req.Data = output return @@ -6574,6 +6690,8 @@ func (c *EC2) RevokeSecurityGroupEgressRequest(input *RevokeSecurityGroupEgressI } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RevokeSecurityGroupEgressOutput{} req.Data = output return @@ -6612,6 +6730,8 @@ func (c *EC2) RevokeSecurityGroupIngressRequest(input *RevokeSecurityGroupIngres } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RevokeSecurityGroupIngressOutput{} req.Data = output return @@ -6899,6 +7019,8 @@ func (c *EC2) UnassignPrivateIpAddressesRequest(input *UnassignPrivateIpAddresse } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(ec2query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UnassignPrivateIpAddressesOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/ec2/service.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/service.go index 2ff4220f7..9d5fa8160 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ec2/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ec2/service.go @@ -62,10 +62,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(ec2query.Build) - svc.Handlers.Unmarshal.PushBack(ec2query.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(ec2query.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(ec2query.UnmarshalError) + svc.Handlers.Build.PushBackNamed(ec2query.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(ec2query.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(ec2query.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(ec2query.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/ecr/service.go b/vendor/github.com/aws/aws-sdk-go/service/ecr/service.go index f6ca31c2a..0f6c6760e 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ecr/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ecr/service.go @@ -66,10 +66,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(jsonrpc.Build) - svc.Handlers.Unmarshal.PushBack(jsonrpc.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(jsonrpc.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(jsonrpc.UnmarshalError) + svc.Handlers.Build.PushBackNamed(jsonrpc.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(jsonrpc.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(jsonrpc.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(jsonrpc.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/ecs/service.go b/vendor/github.com/aws/aws-sdk-go/service/ecs/service.go index 04b9f7180..260b39edc 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ecs/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ecs/service.go @@ -72,10 +72,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(jsonrpc.Build) - svc.Handlers.Unmarshal.PushBack(jsonrpc.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(jsonrpc.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(jsonrpc.UnmarshalError) + svc.Handlers.Build.PushBackNamed(jsonrpc.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(jsonrpc.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(jsonrpc.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(jsonrpc.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/efs/api.go b/vendor/github.com/aws/aws-sdk-go/service/efs/api.go index 8b32301b1..71673c570 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/efs/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/efs/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/restjson" ) const opCreateFileSystem = "CreateFileSystem" @@ -184,6 +186,8 @@ func (c *EFS) CreateTagsRequest(input *CreateTagsInput) (req *request.Request, o } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreateTagsOutput{} req.Data = output return @@ -218,6 +222,8 @@ func (c *EFS) DeleteFileSystemRequest(input *DeleteFileSystemInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteFileSystemOutput{} req.Data = output return @@ -258,6 +264,8 @@ func (c *EFS) DeleteMountTargetRequest(input *DeleteMountTargetInput) (req *requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteMountTargetOutput{} req.Data = output return @@ -306,6 +314,8 @@ func (c *EFS) DeleteTagsRequest(input *DeleteTagsInput) (req *request.Request, o } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteTagsOutput{} req.Data = output return @@ -493,6 +503,8 @@ func (c *EFS) ModifyMountTargetSecurityGroupsRequest(input *ModifyMountTargetSec } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ModifyMountTargetSecurityGroupsOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/efs/service.go b/vendor/github.com/aws/aws-sdk-go/service/efs/service.go index 307d09cf3..cf1ecde58 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/efs/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/efs/service.go @@ -58,10 +58,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(restjson.Build) - svc.Handlers.Unmarshal.PushBack(restjson.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(restjson.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(restjson.UnmarshalError) + svc.Handlers.Build.PushBackNamed(restjson.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(restjson.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(restjson.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(restjson.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/elasticache/api.go b/vendor/github.com/aws/aws-sdk-go/service/elasticache/api.go index ea8233b7c..b8d806b81 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elasticache/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elasticache/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/query" ) const opAddTagsToResource = "AddTagsToResource" @@ -341,6 +343,8 @@ func (c *ElastiCache) DeleteCacheParameterGroupRequest(input *DeleteCacheParamet } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteCacheParameterGroupOutput{} req.Data = output return @@ -370,6 +374,8 @@ func (c *ElastiCache) DeleteCacheSecurityGroupRequest(input *DeleteCacheSecurity } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteCacheSecurityGroupOutput{} req.Data = output return @@ -400,6 +406,8 @@ func (c *ElastiCache) DeleteCacheSubnetGroupRequest(input *DeleteCacheSubnetGrou } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteCacheSubnetGroupOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/elasticache/service.go b/vendor/github.com/aws/aws-sdk-go/service/elasticache/service.go index 820bd48ff..8e4cbb460 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elasticache/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elasticache/service.go @@ -69,10 +69,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(query.Build) - svc.Handlers.Unmarshal.PushBack(query.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(query.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(query.UnmarshalError) + svc.Handlers.Build.PushBackNamed(query.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(query.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(query.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(query.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/api.go b/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/api.go index 7faca62dc..4bd51aa3a 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/restjson" ) const opAddTags = "AddTags" @@ -25,6 +27,8 @@ func (c *ElasticsearchService) AddTagsRequest(input *AddTagsInput) (req *request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AddTagsOutput{} req.Data = output return @@ -252,6 +256,8 @@ func (c *ElasticsearchService) RemoveTagsRequest(input *RemoveTagsInput) (req *r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RemoveTagsOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/service.go b/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/service.go index 082211fce..1617a90df 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elasticsearchservice/service.go @@ -65,10 +65,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(restjson.Build) - svc.Handlers.Unmarshal.PushBack(restjson.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(restjson.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(restjson.UnmarshalError) + svc.Handlers.Build.PushBackNamed(restjson.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(restjson.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(restjson.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(restjson.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/elb/service.go b/vendor/github.com/aws/aws-sdk-go/service/elb/service.go index 428fea0ac..867254809 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elb/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elb/service.go @@ -71,10 +71,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(query.Build) - svc.Handlers.Unmarshal.PushBack(query.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(query.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(query.UnmarshalError) + svc.Handlers.Build.PushBackNamed(query.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(query.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(query.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(query.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/firehose/service.go b/vendor/github.com/aws/aws-sdk-go/service/firehose/service.go index cda2888c6..78f5bed90 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/firehose/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/firehose/service.go @@ -62,10 +62,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(jsonrpc.Build) - svc.Handlers.Unmarshal.PushBack(jsonrpc.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(jsonrpc.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(jsonrpc.UnmarshalError) + svc.Handlers.Build.PushBackNamed(jsonrpc.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(jsonrpc.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(jsonrpc.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(jsonrpc.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/glacier/api.go b/vendor/github.com/aws/aws-sdk-go/service/glacier/api.go index ce8764c50..692bcc29f 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/glacier/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/glacier/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/restjson" ) const opAbortMultipartUpload = "AbortMultipartUpload" @@ -25,6 +27,8 @@ func (c *Glacier) AbortMultipartUploadRequest(input *AbortMultipartUploadInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AbortMultipartUploadOutput{} req.Data = output return @@ -71,6 +75,8 @@ func (c *Glacier) AbortVaultLockRequest(input *AbortVaultLockInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AbortVaultLockOutput{} req.Data = output return @@ -113,6 +119,8 @@ func (c *Glacier) AddTagsToVaultRequest(input *AddTagsToVaultInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AddTagsToVaultOutput{} req.Data = output return @@ -215,6 +223,8 @@ func (c *Glacier) CompleteVaultLockRequest(input *CompleteVaultLockInput) (req * } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CompleteVaultLockOutput{} req.Data = output return @@ -306,6 +316,8 @@ func (c *Glacier) DeleteArchiveRequest(input *DeleteArchiveInput) (req *request. } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteArchiveOutput{} req.Data = output return @@ -353,6 +365,8 @@ func (c *Glacier) DeleteVaultRequest(input *DeleteVaultInput) (req *request.Requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteVaultOutput{} req.Data = output return @@ -402,6 +416,8 @@ func (c *Glacier) DeleteVaultAccessPolicyRequest(input *DeleteVaultAccessPolicyI } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteVaultAccessPolicyOutput{} req.Data = output return @@ -438,6 +454,8 @@ func (c *Glacier) DeleteVaultNotificationsRequest(input *DeleteVaultNotification } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteVaultNotificationsOutput{} req.Data = output return @@ -1355,6 +1373,8 @@ func (c *Glacier) RemoveTagsFromVaultRequest(input *RemoveTagsFromVaultInput) (r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RemoveTagsFromVaultOutput{} req.Data = output return @@ -1386,6 +1406,8 @@ func (c *Glacier) SetDataRetrievalPolicyRequest(input *SetDataRetrievalPolicyInp } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetDataRetrievalPolicyOutput{} req.Data = output return @@ -1419,6 +1441,8 @@ func (c *Glacier) SetVaultAccessPolicyRequest(input *SetVaultAccessPolicyInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetVaultAccessPolicyOutput{} req.Data = output return @@ -1452,6 +1476,8 @@ func (c *Glacier) SetVaultNotificationsRequest(input *SetVaultNotificationsInput } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetVaultNotificationsOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/glacier/service.go b/vendor/github.com/aws/aws-sdk-go/service/glacier/service.go index c71840e8e..b83c63a61 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/glacier/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/glacier/service.go @@ -89,10 +89,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(restjson.Build) - svc.Handlers.Unmarshal.PushBack(restjson.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(restjson.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(restjson.UnmarshalError) + svc.Handlers.Build.PushBackNamed(restjson.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(restjson.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(restjson.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(restjson.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/iam/api.go b/vendor/github.com/aws/aws-sdk-go/service/iam/api.go index 89b862c27..465333a64 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/iam/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/iam/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/query" ) const opAddClientIDToOpenIDConnectProvider = "AddClientIDToOpenIDConnectProvider" @@ -25,6 +27,8 @@ func (c *IAM) AddClientIDToOpenIDConnectProviderRequest(input *AddClientIDToOpen } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AddClientIDToOpenIDConnectProviderOutput{} req.Data = output return @@ -56,6 +60,8 @@ func (c *IAM) AddRoleToInstanceProfileRequest(input *AddRoleToInstanceProfileInp } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AddRoleToInstanceProfileOutput{} req.Data = output return @@ -86,6 +92,8 @@ func (c *IAM) AddUserToGroupRequest(input *AddUserToGroupInput) (req *request.Re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AddUserToGroupOutput{} req.Data = output return @@ -113,6 +121,8 @@ func (c *IAM) AttachGroupPolicyRequest(input *AttachGroupPolicyInput) (req *requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AttachGroupPolicyOutput{} req.Data = output return @@ -147,6 +157,8 @@ func (c *IAM) AttachRolePolicyRequest(input *AttachRolePolicyInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AttachRolePolicyOutput{} req.Data = output return @@ -185,6 +197,8 @@ func (c *IAM) AttachUserPolicyRequest(input *AttachUserPolicyInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AttachUserPolicyOutput{} req.Data = output return @@ -219,6 +233,8 @@ func (c *IAM) ChangePasswordRequest(input *ChangePasswordInput) (req *request.Re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ChangePasswordOutput{} req.Data = output return @@ -294,6 +310,8 @@ func (c *IAM) CreateAccountAliasRequest(input *CreateAccountAliasInput) (req *re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreateAccountAliasOutput{} req.Data = output return @@ -683,6 +701,8 @@ func (c *IAM) DeactivateMFADeviceRequest(input *DeactivateMFADeviceInput) (req * } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeactivateMFADeviceOutput{} req.Data = output return @@ -715,6 +735,8 @@ func (c *IAM) DeleteAccessKeyRequest(input *DeleteAccessKeyInput) (req *request. } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteAccessKeyOutput{} req.Data = output return @@ -747,6 +769,8 @@ func (c *IAM) DeleteAccountAliasRequest(input *DeleteAccountAliasInput) (req *re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteAccountAliasOutput{} req.Data = output return @@ -776,6 +800,8 @@ func (c *IAM) DeleteAccountPasswordPolicyRequest(input *DeleteAccountPasswordPol } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteAccountPasswordPolicyOutput{} req.Data = output return @@ -803,6 +829,8 @@ func (c *IAM) DeleteGroupRequest(input *DeleteGroupInput) (req *request.Request, } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteGroupOutput{} req.Data = output return @@ -831,6 +859,8 @@ func (c *IAM) DeleteGroupPolicyRequest(input *DeleteGroupPolicyInput) (req *requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteGroupPolicyOutput{} req.Data = output return @@ -863,6 +893,8 @@ func (c *IAM) DeleteInstanceProfileRequest(input *DeleteInstanceProfileInput) (r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteInstanceProfileOutput{} req.Data = output return @@ -897,6 +929,8 @@ func (c *IAM) DeleteLoginProfileRequest(input *DeleteLoginProfileInput) (req *re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteLoginProfileOutput{} req.Data = output return @@ -930,6 +964,8 @@ func (c *IAM) DeleteOpenIDConnectProviderRequest(input *DeleteOpenIDConnectProvi } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteOpenIDConnectProviderOutput{} req.Data = output return @@ -964,6 +1000,8 @@ func (c *IAM) DeletePolicyRequest(input *DeletePolicyInput) (req *request.Reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeletePolicyOutput{} req.Data = output return @@ -1008,6 +1046,8 @@ func (c *IAM) DeletePolicyVersionRequest(input *DeletePolicyVersionInput) (req * } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeletePolicyVersionOutput{} req.Data = output return @@ -1043,6 +1083,8 @@ func (c *IAM) DeleteRoleRequest(input *DeleteRoleInput) (req *request.Request, o } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteRoleOutput{} req.Data = output return @@ -1075,6 +1117,8 @@ func (c *IAM) DeleteRolePolicyRequest(input *DeleteRolePolicyInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteRolePolicyOutput{} req.Data = output return @@ -1107,6 +1151,8 @@ func (c *IAM) DeleteSAMLProviderRequest(input *DeleteSAMLProviderInput) (req *re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteSAMLProviderOutput{} req.Data = output return @@ -1140,6 +1186,8 @@ func (c *IAM) DeleteSSHPublicKeyRequest(input *DeleteSSHPublicKeyInput) (req *re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteSSHPublicKeyOutput{} req.Data = output return @@ -1173,6 +1221,8 @@ func (c *IAM) DeleteServerCertificateRequest(input *DeleteServerCertificateInput } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteServerCertificateOutput{} req.Data = output return @@ -1215,6 +1265,8 @@ func (c *IAM) DeleteSigningCertificateRequest(input *DeleteSigningCertificateInp } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteSigningCertificateOutput{} req.Data = output return @@ -1247,6 +1299,8 @@ func (c *IAM) DeleteUserRequest(input *DeleteUserInput) (req *request.Request, o } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteUserOutput{} req.Data = output return @@ -1275,6 +1329,8 @@ func (c *IAM) DeleteUserPolicyRequest(input *DeleteUserPolicyInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteUserPolicyOutput{} req.Data = output return @@ -1307,6 +1363,8 @@ func (c *IAM) DeleteVirtualMFADeviceRequest(input *DeleteVirtualMFADeviceInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteVirtualMFADeviceOutput{} req.Data = output return @@ -1337,6 +1395,8 @@ func (c *IAM) DetachGroupPolicyRequest(input *DetachGroupPolicyInput) (req *requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DetachGroupPolicyOutput{} req.Data = output return @@ -1369,6 +1429,8 @@ func (c *IAM) DetachRolePolicyRequest(input *DetachRolePolicyInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DetachRolePolicyOutput{} req.Data = output return @@ -1401,6 +1463,8 @@ func (c *IAM) DetachUserPolicyRequest(input *DetachUserPolicyInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DetachUserPolicyOutput{} req.Data = output return @@ -1433,6 +1497,8 @@ func (c *IAM) EnableMFADeviceRequest(input *EnableMFADeviceInput) (req *request. } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &EnableMFADeviceOutput{} req.Data = output return @@ -3305,6 +3371,8 @@ func (c *IAM) PutGroupPolicyRequest(input *PutGroupPolicyInput) (req *request.Re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutGroupPolicyOutput{} req.Data = output return @@ -3348,6 +3416,8 @@ func (c *IAM) PutRolePolicyRequest(input *PutRolePolicyInput) (req *request.Requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutRolePolicyOutput{} req.Data = output return @@ -3397,6 +3467,8 @@ func (c *IAM) PutUserPolicyRequest(input *PutUserPolicyInput) (req *request.Requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutUserPolicyOutput{} req.Data = output return @@ -3440,6 +3512,8 @@ func (c *IAM) RemoveClientIDFromOpenIDConnectProviderRequest(input *RemoveClient } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RemoveClientIDFromOpenIDConnectProviderOutput{} req.Data = output return @@ -3471,6 +3545,8 @@ func (c *IAM) RemoveRoleFromInstanceProfileRequest(input *RemoveRoleFromInstance } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RemoveRoleFromInstanceProfileOutput{} req.Data = output return @@ -3506,6 +3582,8 @@ func (c *IAM) RemoveUserFromGroupRequest(input *RemoveUserFromGroupInput) (req * } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RemoveUserFromGroupOutput{} req.Data = output return @@ -3533,6 +3611,8 @@ func (c *IAM) ResyncMFADeviceRequest(input *ResyncMFADeviceInput) (req *request. } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ResyncMFADeviceOutput{} req.Data = output return @@ -3564,6 +3644,8 @@ func (c *IAM) SetDefaultPolicyVersionRequest(input *SetDefaultPolicyVersionInput } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetDefaultPolicyVersionOutput{} req.Data = output return @@ -3696,6 +3778,8 @@ func (c *IAM) UpdateAccessKeyRequest(input *UpdateAccessKeyInput) (req *request. } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateAccessKeyOutput{} req.Data = output return @@ -3734,6 +3818,8 @@ func (c *IAM) UpdateAccountPasswordPolicyRequest(input *UpdateAccountPasswordPol } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateAccountPasswordPolicyOutput{} req.Data = output return @@ -3770,6 +3856,8 @@ func (c *IAM) UpdateAssumeRolePolicyRequest(input *UpdateAssumeRolePolicyInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateAssumeRolePolicyOutput{} req.Data = output return @@ -3799,6 +3887,8 @@ func (c *IAM) UpdateGroupRequest(input *UpdateGroupInput) (req *request.Request, } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateGroupOutput{} req.Data = output return @@ -3835,6 +3925,8 @@ func (c *IAM) UpdateLoginProfileRequest(input *UpdateLoginProfileInput) (req *re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateLoginProfileOutput{} req.Data = output return @@ -3866,6 +3958,8 @@ func (c *IAM) UpdateOpenIDConnectProviderThumbprintRequest(input *UpdateOpenIDCo } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateOpenIDConnectProviderThumbprintOutput{} req.Data = output return @@ -3935,6 +4029,8 @@ func (c *IAM) UpdateSSHPublicKeyRequest(input *UpdateSSHPublicKeyInput) (req *re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateSSHPublicKeyOutput{} req.Data = output return @@ -3971,6 +4067,8 @@ func (c *IAM) UpdateServerCertificateRequest(input *UpdateServerCertificateInput } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateServerCertificateOutput{} req.Data = output return @@ -4013,6 +4111,8 @@ func (c *IAM) UpdateSigningCertificateRequest(input *UpdateSigningCertificateInp } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateSigningCertificateOutput{} req.Data = output return @@ -4047,6 +4147,8 @@ func (c *IAM) UpdateUserRequest(input *UpdateUserInput) (req *request.Request, o } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateUserOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/iam/service.go b/vendor/github.com/aws/aws-sdk-go/service/iam/service.go index e8cfb9c6f..e4416226b 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/iam/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/iam/service.go @@ -106,10 +106,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(query.Build) - svc.Handlers.Unmarshal.PushBack(query.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(query.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(query.UnmarshalError) + svc.Handlers.Build.PushBackNamed(query.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(query.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(query.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(query.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/kinesis/api.go b/vendor/github.com/aws/aws-sdk-go/service/kinesis/api.go index a40f4481e..e900781a3 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/kinesis/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/kinesis/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/jsonrpc" ) const opAddTagsToStream = "AddTagsToStream" @@ -25,6 +27,8 @@ func (c *Kinesis) AddTagsToStreamRequest(input *AddTagsToStreamInput) (req *requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AddTagsToStreamOutput{} req.Data = output return @@ -56,6 +60,8 @@ func (c *Kinesis) CreateStreamRequest(input *CreateStreamInput) (req *request.Re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreateStreamOutput{} req.Data = output return @@ -118,6 +124,8 @@ func (c *Kinesis) DecreaseStreamRetentionPeriodRequest(input *DecreaseStreamRete } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DecreaseStreamRetentionPeriodOutput{} req.Data = output return @@ -151,6 +159,8 @@ func (c *Kinesis) DeleteStreamRequest(input *DeleteStreamInput) (req *request.Re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteStreamOutput{} req.Data = output return @@ -397,6 +407,8 @@ func (c *Kinesis) IncreaseStreamRetentionPeriodRequest(input *IncreaseStreamRete } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &IncreaseStreamRetentionPeriodOutput{} req.Data = output return @@ -517,6 +529,8 @@ func (c *Kinesis) MergeShardsRequest(input *MergeShardsInput) (req *request.Requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &MergeShardsOutput{} req.Data = output return @@ -731,6 +745,8 @@ func (c *Kinesis) RemoveTagsFromStreamRequest(input *RemoveTagsFromStreamInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RemoveTagsFromStreamOutput{} req.Data = output return @@ -760,6 +776,8 @@ func (c *Kinesis) SplitShardRequest(input *SplitShardInput) (req *request.Reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SplitShardOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/kinesis/service.go b/vendor/github.com/aws/aws-sdk-go/service/kinesis/service.go index da32f7556..ca728dc2f 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/kinesis/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/kinesis/service.go @@ -62,10 +62,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(jsonrpc.Build) - svc.Handlers.Unmarshal.PushBack(jsonrpc.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(jsonrpc.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(jsonrpc.UnmarshalError) + svc.Handlers.Build.PushBackNamed(jsonrpc.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(jsonrpc.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(jsonrpc.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(jsonrpc.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/lambda/api.go b/vendor/github.com/aws/aws-sdk-go/service/lambda/api.go index fb3b9be05..358ef8710 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/lambda/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/lambda/api.go @@ -9,6 +9,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/restjson" ) const opAddPermission = "AddPermission" @@ -33,18 +35,17 @@ func (c *Lambda) AddPermissionRequest(input *AddPermissionInput) (req *request.R // Adds a permission to the resource policy associated with the specified AWS // Lambda function. You use resource policies to grant permissions to event -// sources that use "push" model. In "push" model, event sources (such as Amazon +// sources that use push model. In a push model, event sources (such as Amazon // S3 and custom applications) invoke your Lambda function. Each permission // you add to the resource policy allows an event source, permission to invoke // the Lambda function. // // For information about the push model, see AWS Lambda: How it Works (http://docs.aws.amazon.com/lambda/latest/dg/lambda-introduction.html). // -// If you are using versioning feature (see AWS Lambda Function Versioning -// and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases-v2.html)), -// a Lambda function can have multiple ARNs that can be used to invoke the function. -// Note that, each permission you add to resource policy using this API is specific -// to an ARN, specified using the Qualifier parameter +// If you are using versioning, the permissions you add are specific to the +// Lambda function version or alias you specify in the AddPermission request +// via the Qualifier parameter. For more information about versioning, see AWS +// Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). // // This operation requires permission for the lambda:AddPermission action. func (c *Lambda) AddPermission(input *AddPermissionInput) (*AddPermissionOutput, error) { @@ -73,10 +74,11 @@ func (c *Lambda) CreateAliasRequest(input *CreateAliasInput) (req *request.Reque return } -// Creates an alias to the specified Lambda function version. For more information, -// see Introduction to AWS Lambda Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-v2-intro-aliases.html) +// Creates an alias that points to the specified Lambda function version. For +// more information, see Introduction to AWS Lambda Aliases (http://docs.aws.amazon.com/lambda/latest/dg/aliases-intro.html). // -// This requires permission for the lambda:CreateAlias action. +// Alias names are unique for a given function. This requires permission for +// the lambda:CreateAlias action. func (c *Lambda) CreateAlias(input *CreateAliasInput) (*AliasConfiguration, error) { req, out := c.CreateAliasRequest(input) err := req.Send() @@ -107,20 +109,25 @@ func (c *Lambda) CreateEventSourceMappingRequest(input *CreateEventSourceMapping // an Amazon Kinesis stream or an Amazon DynamoDB stream. AWS Lambda invokes // the specified function when records are posted to the stream. // -// This is the pull model, where AWS Lambda invokes the function. For more -// information, go to AWS Lambda: How it Works (http://docs.aws.amazon.com/lambda/latest/dg/lambda-introduction.html) -// in the AWS Lambda Developer Guide. +// This association between a stream source and a Lambda function is called +// the event source mapping. // -// This association between an Amazon Kinesis stream and a Lambda function -// is called the event source mapping. You provide the configuration information -// (for example, which stream to read from and which Lambda function to invoke) -// for the event source mapping in the request body. +// This event source mapping is relevant only in the AWS Lambda pull model, +// where AWS Lambda invokes the function. For more information, go to AWS Lambda: +// How it Works (http://docs.aws.amazon.com/lambda/latest/dg/lambda-introduction.html) +// in the AWS Lambda Developer Guide. You provide mapping information (for +// example, which stream to read from and which Lambda function to invoke) in +// the request body. // // Each event source, such as an Amazon Kinesis or a DynamoDB stream, can // be associated with multiple AWS Lambda function. A given Lambda function // can be associated with multiple AWS event sources. // -// This operation requires permission for the lambda:CreateEventSourceMapping +// If you are using versioning, you can specify a specific function version +// or an alias via the function name parameter. For more information about versioning, +// see AWS Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). +// +// This operation requires permission for the lambda:CreateEventSourceMapping // action. func (c *Lambda) CreateEventSourceMapping(input *CreateEventSourceMappingInput) (*EventSourceMappingConfiguration, error) { req, out := c.CreateEventSourceMappingRequest(input) @@ -153,6 +160,10 @@ func (c *Lambda) CreateFunctionRequest(input *CreateFunctionInput) (req *request // in the request body. If the function name already exists, the operation will // fail. Note that the function name is case-sensitive. // +// If you are using versioning, you can also publish a version of the Lambda +// function you are creating using the Publish parameter. For more information +// about versioning, see AWS Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). +// // This operation requires permission for the lambda:CreateFunction action. func (c *Lambda) CreateFunction(input *CreateFunctionInput) (*FunctionConfiguration, error) { req, out := c.CreateFunctionRequest(input) @@ -175,13 +186,15 @@ func (c *Lambda) DeleteAliasRequest(input *DeleteAliasInput) (req *request.Reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteAliasOutput{} req.Data = output return } -// Deletes specified Lambda function alias. For more information, see Introduction -// to AWS Lambda Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-v2-intro-aliases.html) +// Deletes the specified Lambda function alias. For more information, see Introduction +// to AWS Lambda Aliases (http://docs.aws.amazon.com/lambda/latest/dg/aliases-intro.html). // // This requires permission for the lambda:DeleteAlias action. func (c *Lambda) DeleteAlias(input *DeleteAliasInput) (*DeleteAliasOutput, error) { @@ -236,6 +249,8 @@ func (c *Lambda) DeleteFunctionRequest(input *DeleteFunctionInput) (req *request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteFunctionOutput{} req.Data = output return @@ -243,15 +258,16 @@ func (c *Lambda) DeleteFunctionRequest(input *DeleteFunctionInput) (req *request // Deletes the specified Lambda function code and configuration. // -// If you don't specify a function version, AWS Lambda will delete the function, +// If you are using the versioning feature and you don't specify a function +// version in your DeleteFunction request, AWS Lambda will delete the function, // including all its versions, and any aliases pointing to the function versions. +// To delete a specific function version, you must provide the function version +// via the Qualifier parameter. For information about function versioning, see +// AWS Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). // // When you delete a function the associated resource policy is also deleted. // You will need to delete the event source mappings explicitly. // -// For information about function versioning, see AWS Lambda Function Versioning -// and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases-v2.html). -// // This operation requires permission for the lambda:DeleteFunction action. func (c *Lambda) DeleteFunction(input *DeleteFunctionInput) (*DeleteFunctionOutput, error) { req, out := c.DeleteFunctionRequest(input) @@ -281,7 +297,7 @@ func (c *Lambda) GetAliasRequest(input *GetAliasInput) (req *request.Request, ou // Returns the specified alias information such as the alias ARN, description, // and function version it is pointing to. For more information, see Introduction -// to AWS Lambda Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-v2-intro-aliases.html) +// to AWS Lambda Aliases (http://docs.aws.amazon.com/lambda/latest/dg/aliases-intro.html). // // This requires permission for the lambda:GetAlias action. func (c *Lambda) GetAlias(input *GetAliasInput) (*AliasConfiguration, error) { @@ -351,7 +367,7 @@ func (c *Lambda) GetFunctionRequest(input *GetFunctionInput) (req *request.Reque // version for which you want this information. If you don't specify this parameter, // the API uses unqualified function ARN which return information about the // $LATEST version of the Lambda function. For more information, see AWS Lambda -// Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases-v2.html). +// Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). // // This operation requires permission for the lambda:GetFunction action. func (c *Lambda) GetFunction(input *GetFunctionInput) (*GetFunctionOutput, error) { @@ -384,10 +400,12 @@ func (c *Lambda) GetFunctionConfigurationRequest(input *GetFunctionConfiguration // information you provided as parameters when uploading the function by using // CreateFunction. // -// You can use the optional Qualifier parameter to retrieve configuration information -// for a specific Lambda function version. If you don't provide it, the API -// returns information about the $LATEST version of the function. For more information -// about versioning, see AWS Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases-v2.html). +// If you are using the versioning feature, you can retrieve this information +// for a specific function version by using the optional Qualifier parameter +// and specifying the function version or alias that points to it. If you don't +// provide it, the API returns information about the $LATEST version of the +// function. For more information about versioning, see AWS Lambda Function +// Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). // // This operation requires permission for the lambda:GetFunctionConfiguration // operation. @@ -417,10 +435,14 @@ func (c *Lambda) GetPolicyRequest(input *GetPolicyInput) (req *request.Request, return } -// Returns the resource policy, containing a list of permissions that apply -// to a specific to an ARN that you specify via the Qualifier paramter. +// Returns the resource policy associated with the specified Lambda function. // -// For informration about adding permissions, see AddPermission. +// If you are using the versioning feature, you can get the resource policy +// associated with the specific Lambda function version or alias by specifying +// the version or alias name using the Qualifier parameter. For more information +// about versioning, see AWS Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). +// +// For information about adding permissions, see AddPermission. // // You need permission for the lambda:GetPolicy action. func (c *Lambda) GetPolicy(input *GetPolicyInput) (*GetPolicyOutput, error) { @@ -449,20 +471,14 @@ func (c *Lambda) InvokeRequest(input *InvokeInput) (req *request.Request, output return } -// Invokes a specific Lambda function version. +// Invokes a specific Lambda function. // -// If you don't provide the Qualifier parameter, it uses the unqualified function -// ARN which results in invocation of the $LATEST version of the Lambda function -// (when you create a Lambda function, the $LATEST is the version). The AWS -// Lambda versioning and aliases feature allows you to publish multiple versions -// of a Lambda function and also create aliases for each function version. So -// each your Lambda function version can be invoked using multiple ARNs. For -// more information, see AWS Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases-v2.html). -// Using the Qualifier parameter, you can specify a function version or alias -// name to invoke specific function version. If you specify function version, -// the API uses the qualified function ARN to invoke a specific function version. -// If you specify alias name, the API uses the alias ARN to invoke the function -// version to which the alias points. +// If you are using the versioning feature, you can invoke the specific function +// version by providing function version or alias name that is pointing to the +// function version using the Qualifier parameter in the request. If you don't +// provide the Qualifier parameter, the $LATEST version of the Lambda function +// is invoked. For information about the versioning feature, see AWS Lambda +// Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). // // This operation requires permission for the lambda:InvokeFunction action. func (c *Lambda) Invoke(input *InvokeInput) (*InvokeOutput, error) { @@ -475,6 +491,9 @@ const opInvokeAsync = "InvokeAsync" // InvokeAsyncRequest generates a request for the InvokeAsync operation. func (c *Lambda) InvokeAsyncRequest(input *InvokeAsyncInput) (req *request.Request, output *InvokeAsyncOutput) { + if c.Client.Config.Logger != nil { + c.Client.Config.Logger.Log("This operation, InvokeAsync, has been deprecated") + } op := &request.Operation{ Name: opInvokeAsync, HTTPMethod: "POST", @@ -494,7 +513,7 @@ func (c *Lambda) InvokeAsyncRequest(input *InvokeAsyncInput) (req *request.Reque // This API is deprecated. We recommend you use Invoke API (see Invoke). Submits // an invocation request to AWS Lambda. Upon receiving the request, Lambda executes // the specified function asynchronously. To see the logs generated by the Lambda -// function execution, see the CloudWatch logs console. +// function execution, see the CloudWatch Logs console. // // This operation requires permission for the lambda:InvokeFunction action. func (c *Lambda) InvokeAsync(input *InvokeAsyncInput) (*InvokeAsyncOutput, error) { @@ -526,7 +545,7 @@ func (c *Lambda) ListAliasesRequest(input *ListAliasesInput) (req *request.Reque // Returns list of aliases created for a Lambda function. For each alias, the // response includes information such as the alias ARN, description, alias name, // and the function version to which it points. For more information, see Introduction -// to AWS Lambda Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-v2-intro-aliases.html) +// to AWS Lambda Aliases (http://docs.aws.amazon.com/lambda/latest/dg/aliases-intro.html). // // This requires permission for the lambda:ListAliases action. func (c *Lambda) ListAliases(input *ListAliasesInput) (*ListAliasesOutput, error) { @@ -562,12 +581,16 @@ func (c *Lambda) ListEventSourceMappingsRequest(input *ListEventSourceMappingsIn } // Returns a list of event source mappings you created using the CreateEventSourceMapping -// (see CreateEventSourceMapping), where you identify a stream as an event source. -// This list does not include Amazon S3 event sources. +// (see CreateEventSourceMapping). // // For each mapping, the API returns configuration information. You can optionally // specify filters to retrieve specific event source mappings. // +// If you are using the versioning feature, you can get list of event source +// mappings for a specific Lambda function version or an alias as described +// in the FunctionName parameter. For information about the versioning feature, +// see AWS Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). +// // This operation requires permission for the lambda:ListEventSourceMappings // action. func (c *Lambda) ListEventSourceMappings(input *ListEventSourceMappingsInput) (*ListEventSourceMappingsOutput, error) { @@ -615,6 +638,10 @@ func (c *Lambda) ListFunctionsRequest(input *ListFunctionsInput) (req *request.R // to retrieve the code for your function. // // This operation requires permission for the lambda:ListFunctions action. +// +// If you are using versioning feature, the response returns list of $LATEST +// versions of your functions. For information about the versioning feature, +// see AWS Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). func (c *Lambda) ListFunctions(input *ListFunctionsInput) (*ListFunctionsOutput, error) { req, out := c.ListFunctionsRequest(input) err := req.Send() @@ -649,7 +676,8 @@ func (c *Lambda) ListVersionsByFunctionRequest(input *ListVersionsByFunctionInpu return } -// List all versions of a function. +// List all versions of a function. For information about the versioning feature, +// see AWS Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). func (c *Lambda) ListVersionsByFunction(input *ListVersionsByFunctionInput) (*ListVersionsByFunctionOutput, error) { req, out := c.ListVersionsByFunctionRequest(input) err := req.Send() @@ -676,11 +704,11 @@ func (c *Lambda) PublishVersionRequest(input *PublishVersionInput) (req *request return } -// Publishes a version of your function from the current snapshot of HEAD. That -// is, AWS Lambda takes a snapshot of the function code and configuration information -// from HEAD and publishes a new version. The code and handler of this specific -// Lambda function version cannot be modified after publication, but you can -// modify the configuration information. +// Publishes a version of your function from the current snapshot of $LATEST. +// That is, AWS Lambda takes a snapshot of the function code and configuration +// information from $LATEST and publishes a new version. The code and configuration +// cannot be modified after publication. For information about the versioning +// feature, see AWS Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). func (c *Lambda) PublishVersion(input *PublishVersionInput) (*FunctionConfiguration, error) { req, out := c.PublishVersionRequest(input) err := req.Send() @@ -702,6 +730,8 @@ func (c *Lambda) RemovePermissionRequest(input *RemovePermissionInput) (req *req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RemovePermissionOutput{} req.Data = output return @@ -709,8 +739,12 @@ func (c *Lambda) RemovePermissionRequest(input *RemovePermissionInput) (req *req // You can remove individual permissions from an resource policy associated // with a Lambda function by providing a statement ID that you provided when -// you addded the permission. The API removes corresponding permission that -// is associated with the specific ARN identified by the Qualifier parameter. +// you added the permission. +// +// If you are using versioning, the permissions you remove are specific to +// the Lambda function version or alias you specify in the AddPermission request +// via the Qualifier parameter. For more information about versioning, see AWS +// Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). // // Note that removal of a permission will cause an active event source to lose // permission to the function. @@ -742,9 +776,9 @@ func (c *Lambda) UpdateAliasRequest(input *UpdateAliasInput) (req *request.Reque return } -// Using this API you can update function version to which the alias points -// to and alias description. For more information, see Introduction to AWS Lambda -// Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-v2-intro-aliases.html) +// Using this API you can update the function version to which the alias points +// and the alias description. For more information, see Introduction to AWS +// Lambda Aliases (http://docs.aws.amazon.com/lambda/latest/dg/aliases-intro.html). // // This requires permission for the lambda:UpdateAlias action. func (c *Lambda) UpdateAlias(input *UpdateAliasInput) (*AliasConfiguration, error) { @@ -778,6 +812,16 @@ func (c *Lambda) UpdateEventSourceMappingRequest(input *UpdateEventSourceMapping // stream. You can change which function will receive the stream records, but // to change the stream itself, you must create a new mapping. // +// If you are using the versioning feature, you can update the event source +// mapping to map to a specific Lambda function version or alias as described +// in the FunctionName parameter. For information about the versioning feature, +// see AWS Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). +// +// If you disable the event source mapping, AWS Lambda stops polling. If you +// enable again, it will resume polling from the time it had stopped polling, +// so you don't lose processing of any records. However, if you delete event +// source mapping and create it again, it will reset. +// // This operation requires permission for the lambda:UpdateEventSourceMapping // action. func (c *Lambda) UpdateEventSourceMapping(input *UpdateEventSourceMappingInput) (*EventSourceMappingConfiguration, error) { @@ -810,6 +854,10 @@ func (c *Lambda) UpdateFunctionCodeRequest(input *UpdateFunctionCodeInput) (req // be used on an existing Lambda function and cannot be used to update the function // configuration. // +// If you are using the versioning feature, note this API will always update +// the $LATEST version of your Lambda function. For information about the versioning +// feature, see AWS Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). +// // This operation requires permission for the lambda:UpdateFunctionCode action. func (c *Lambda) UpdateFunctionCode(input *UpdateFunctionCodeInput) (*FunctionConfiguration, error) { req, out := c.UpdateFunctionCodeRequest(input) @@ -842,6 +890,10 @@ func (c *Lambda) UpdateFunctionConfigurationRequest(input *UpdateFunctionConfigu // you want to change. This operation must only be used on an existing Lambda // function and cannot be used to update the function's code. // +// If you are using the versioning feature, note this API will always update +// the $LATEST version of your Lambda function. For information about the versioning +// feature, see AWS Lambda Function Versioning and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html). +// // This operation requires permission for the lambda:UpdateFunctionConfiguration // action. func (c *Lambda) UpdateFunctionConfiguration(input *UpdateFunctionConfigurationInput) (*FunctionConfiguration, error) { @@ -854,38 +906,38 @@ type AddPermissionInput struct { _ struct{} `type:"structure"` // The AWS Lambda action you want to allow in this statement. Each Lambda action - // is a string starting with "lambda:" followed by the API name (see Operations). - // For example, "lambda:CreateFunction". You can use wildcard ("lambda:*") to - // grant permission for all AWS Lambda actions. + // is a string starting with lambda: followed by the API name (see Operations). + // For example, lambda:CreateFunction. You can use wildcard (lambda:*) to grant + // permission for all AWS Lambda actions. Action *string `type:"string" required:"true"` // Name of the Lambda function whose resource policy you are updating by adding // a new permission. // - // You can specify an unqualified function name (for example, "Thumbnail") - // or you can specify Amazon Resource Name (ARN) of the function (for example, - // "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). AWS Lambda also - // allows you to specify only the account ID qualifier (for example, "account-id:Thumbnail"). + // You can specify a function name (for example, Thumbnail) or you can specify + // Amazon Resource Name (ARN) of the function (for example, arn:aws:lambda:us-west-2:account-id:function:ThumbNail). + // AWS Lambda also allows you to specify partial ARN (for example, account-id:Thumbnail). // Note that the length constraint applies only to the ARN. If you specify only // the function name, it is limited to 64 character in length. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` // The principal who is getting this permission. It can be Amazon S3 service - // Principal ("s3.amazonaws.com") if you want Amazon S3 to invoke the function, + // Principal (s3.amazonaws.com) if you want Amazon S3 to invoke the function, // an AWS account ID if you are granting cross-account permission, or any valid - // AWS service principal such as "sns.amazonaws.com". For example, you might - // want to allow a custom application in another AWS account to push events - // to AWS Lambda by invoking your function. + // AWS service principal such as sns.amazonaws.com. For example, you might want + // to allow a custom application in another AWS account to push events to AWS + // Lambda by invoking your function. Principal *string `type:"string" required:"true"` - // You can specify this optional query parameter to specify function version - // or alias name. The permission will then apply to the specific qualified ARN. - // For example, if you specify function version 2 as the qualifier, then permission - // applies only when request is made using qualified function ARN: + // You can use this optional query parameter to describe a qualified ARN using + // a function version or an alias name. The permission will then apply to the + // specific qualified ARN. For example, if you specify function version 2 as + // the qualifier, then permission applies only when request is made using qualified + // function ARN: // // arn:aws:lambda:aws-region:acct-id:function:function-name:2 // - // If you specify alias name, for example "PROD", then the permission is valid + // If you specify an alias name, for example PROD, then the permission is valid // only for requests made using the alias ARN: // // arn:aws:lambda:aws-region:acct-id:function:function-name:PROD @@ -933,7 +985,8 @@ type AddPermissionOutput struct { _ struct{} `type:"structure"` // The permission statement you specified in the request. The response returns - // the same as a string using "\" as an escape character in the JSON. + // the same as a string using a backslash ("\") as an escape character in the + // JSON. Statement *string `type:"string"` } @@ -951,9 +1004,9 @@ func (s AddPermissionOutput) GoString() string { type AliasConfiguration struct { _ struct{} `type:"structure"` - // Lambda function ARN that is qualified using alias name as the suffix. For - // example, if you create an alias "BETA" pointing to a helloworld function - // version, the ARN is arn:aws:lambda:aws-regions:acct-id:function:helloworld:BETA. + // Lambda function ARN that is qualified using the alias name as the suffix. + // For example, if you create an alias called BETA that points to a helloworld + // function version, the ARN is arn:aws:lambda:aws-regions:acct-id:function:helloworld:BETA. AliasArn *string `type:"string"` // Alias description. @@ -988,7 +1041,7 @@ type CreateAliasInput struct { // Lambda function version for which you are creating the alias. FunctionVersion *string `min:"1" type:"string" required:"true"` - // Name for the alias your creating. + // Name for the alias you are creating. Name *string `min:"1" type:"string" required:"true"` } @@ -1023,12 +1076,19 @@ type CreateEventSourceMappingInput struct { // The Lambda function to invoke when AWS Lambda detects an event on the stream. // - // You can specify an unqualified function name (for example, "Thumbnail") - // or you can specify Amazon Resource Name (ARN) of the function (for example, - // "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). AWS Lambda also - // allows you to specify only the account ID qualifier (for example, "account-id:Thumbnail"). - // Note that the length constraint applies only to the ARN. If you specify only - // the function name, it is limited to 64 character in length. + // You can specify the function name (for example, Thumbnail) or you can specify + // Amazon Resource Name (ARN) of the function (for example, arn:aws:lambda:us-west-2:account-id:function:ThumbNail). + // + // If you are using versioning, you can also provide a qualified function + // ARN (ARN that is qualified with function version or alias name as suffix). + // For more information about versioning, see AWS Lambda Function Versioning + // and Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html) + // + // AWS Lambda also allows you to specify only the function name with the account + // ID qualifier (for example, account-id:Thumbnail). + // + // Note that the length constraint applies only to the ARN. If you specify + // only the function name, it is limited to 64 character in length. FunctionName *string `min:"1" type:"string" required:"true"` // The position in the stream where AWS Lambda should start reading. For more @@ -1057,15 +1117,9 @@ type CreateFunctionInput struct { // Assign a meaningful description as you see fit. Description *string `type:"string"` - // The name you want to assign to the function you are uploading. You can specify - // an unqualified function name (for example, "Thumbnail") or you can specify - // Amazon Resource Name (ARN) of the function (for example, "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). - // AWS Lambda also allows you to specify only the account ID qualifier (for - // example, "account-id:Thumbnail"). Note that the length constraint applies - // only to the ARN. If you specify only the function name, it is limited to - // 64 character in length. The function names appear in the console and are - // returned in the ListFunctions API. Function names are used to specify functions - // to other AWS Lambda APIs, such as Invoke. + // The name you want to assign to the function you are uploading. The function + // names appear in the console and are returned in the ListFunctions API. Function + // names are used to specify functions to other AWS Lambda APIs, such as Invoke. FunctionName *string `min:"1" type:"string" required:"true"` // The function within your code that Lambda calls to begin execution. For Node.js, @@ -1088,17 +1142,22 @@ type CreateFunctionInput struct { // The Amazon Resource Name (ARN) of the IAM role that Lambda assumes when it // executes your function to access any other Amazon Web Services (AWS) resources. - // For more information, see AWS Lambda: How it Works (http://docs.aws.amazon.com/lambda/latest/dg/lambda-introduction.html) + // For more information, see AWS Lambda: How it Works (http://docs.aws.amazon.com/lambda/latest/dg/lambda-introduction.html). Role *string `type:"string" required:"true"` - // The runtime environment for the Lambda function you are uploading. Currently, - // Lambda supports "java" and "nodejs" as the runtime. + // The runtime environment for the Lambda function you are uploading. Runtime *string `type:"string" required:"true" enum:"Runtime"` // The function execution time at which Lambda should terminate the function. // Because the execution time has cost implications, we recommend you set this // value based on your expected execution time. The default is 3 seconds. Timeout *int64 `min:"1" type:"integer"` + + // If your Lambda function accesses resources in a VPC, you provide this parameter + // identifying the list of security group IDs and subnet IDs. These must belong + // to the same VPC. You must provide at least one security group and one subnet + // ID. + VpcConfig *VpcConfig `type:"structure"` } // String returns the string representation @@ -1114,7 +1173,8 @@ func (s CreateFunctionInput) GoString() string { type DeleteAliasInput struct { _ struct{} `type:"structure"` - // The Lambda function name for which the alias is created. + // The Lambda function name for which the alias is created. Deleting an alias + // does not delete the function version to which it is pointing. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` // Name of the alias to delete. @@ -1167,12 +1227,14 @@ type DeleteFunctionInput struct { // The Lambda function to delete. // - // You can specify an unqualified function name (for example, "Thumbnail") - // or you can specify Amazon Resource Name (ARN) of the function (for example, - // "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). AWS Lambda also - // allows you to specify only the account ID qualifier (for example, "account-id:Thumbnail"). - // Note that the length constraint applies only to the ARN. If you specify only - // the function name, it is limited to 64 character in length. + // You can specify the function name (for example, Thumbnail) or you can specify + // Amazon Resource Name (ARN) of the function (for example, arn:aws:lambda:us-west-2:account-id:function:ThumbNail). + // If you are using versioning, you can also provide a qualified function ARN + // (ARN that is qualified with function version or alias name as suffix). AWS + // Lambda also allows you to specify only the function name with the account + // ID qualifier (for example, account-id:Thumbnail). Note that the length constraint + // applies only to the ARN. If you specify only the function name, it is limited + // to 64 character in length. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` // Using this optional parameter you can specify a function version (but not @@ -1183,11 +1245,11 @@ type DeleteFunctionInput struct { // as the value of this parameter. The $LATEST version can be deleted only when // you want to delete all the function versions and aliases. // - // You can only specify a function version and not alias name using this parameter. + // You can only specify a function version, not an alias name, using this parameter. // You cannot delete a function version using its alias. // // If you don't specify this parameter, AWS Lambda will delete the function, - // including all its versions and aliases. + // including all of its versions and aliases. Qualifier *string `location:"querystring" locationName:"Qualifier" min:"1" type:"string"` } @@ -1237,8 +1299,8 @@ type EventSourceMappingConfiguration struct { // The result of the last AWS Lambda invocation of your Lambda function. LastProcessingResult *string `type:"string"` - // The state of the event source mapping. It can be "Creating", "Enabled", "Disabled", - // "Enabling", "Disabling", "Updating", or "Deleting". + // The state of the event source mapping. It can be Creating, Enabled, Disabled, + // Enabling, Disabling, Updating, or Deleting. State *string `type:"string"` // The reason the event source mapping is in its current state. It is either @@ -1274,7 +1336,9 @@ type FunctionCode struct { // The Amazon S3 object (the deployment package) version you want to upload. S3ObjectVersion *string `min:"1" type:"string"` - // A base64-encoded .zip file containing your deployment package. For more information + // A zip file containing your deployment package. If you are using the API directly, + // the zip file must be base64-encoded (if you are using the AWS SDKs or the + // AWS CLI, the SDKs or CLI will do the encoding for you). For more information // about creating a .zip file, go to Execution Permissions (http://docs.aws.amazon.com/lambda/latest/dg/intro-permission-model.html#lambda-intro-execution-role.html) // in the AWS Lambda Developer Guide. ZipFile []byte `type:"blob"` @@ -1334,7 +1398,7 @@ type FunctionConfiguration struct { // The function Lambda calls to begin executing your function. Handler *string `type:"string"` - // The timestamp of the last time you updated the function. + // The time stamp of the last time you updated the function. LastModified *string `type:"string"` // The memory size, in MB, you configured for the function. Must be a multiple @@ -1355,6 +1419,9 @@ type FunctionConfiguration struct { // The version of the Lambda function. Version *string `min:"1" type:"string"` + + // VPC configuration associated with your Lambda function. + VpcConfig *VpcConfigResponse `type:"structure"` } // String returns the string representation @@ -1371,7 +1438,7 @@ type GetAliasInput struct { _ struct{} `type:"structure"` // Function name for which the alias is created. An alias is a subresource that - // exists only in the context of an existing Lambda function. So you must specify + // exists only in the context of an existing Lambda function so you must specify // the function name. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` @@ -1412,19 +1479,18 @@ type GetFunctionConfigurationInput struct { // The name of the Lambda function for which you want to retrieve the configuration // information. // - // You can specify an unqualified function name (for example, "Thumbnail") - // or you can specify Amazon Resource Name (ARN) of the function (for example, - // "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). AWS Lambda also - // allows you to specify only the account ID qualifier (for example, "account-id:Thumbnail"). + // You can specify a function name (for example, Thumbnail) or you can specify + // Amazon Resource Name (ARN) of the function (for example, arn:aws:lambda:us-west-2:account-id:function:ThumbNail). + // AWS Lambda also allows you to specify a partial ARN (for example, account-id:Thumbnail). // Note that the length constraint applies only to the ARN. If you specify only // the function name, it is limited to 64 character in length. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` - // Using this optional parameter you can specify function version or alias name. - // If you specify function version, the API uses qualified function ARN and - // returns information about the specific function version. if you specify alias - // name, the API uses alias ARN and returns information about the function version - // to which the alias points. + // Using this optional parameter you can specify a function version or an alias + // name. If you specify function version, the API uses qualified function ARN + // and returns information about the specific function version. If you specify + // an alias name, the API uses the alias ARN and returns information about the + // function version to which the alias points. // // If you don't specify this parameter, the API uses unqualified function ARN, // and returns information about the $LATEST function version. @@ -1446,18 +1512,17 @@ type GetFunctionInput struct { // The Lambda function name. // - // You can specify an unqualified function name (for example, "Thumbnail") - // or you can specify Amazon Resource Name (ARN) of the function (for example, - // "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). AWS Lambda also - // allows you to specify only the account ID qualifier (for example, "account-id:Thumbnail"). + // You can specify a function name (for example, Thumbnail) or you can specify + // Amazon Resource Name (ARN) of the function (for example, arn:aws:lambda:us-west-2:account-id:function:ThumbNail). + // AWS Lambda also allows you to specify a partial ARN (for example, account-id:Thumbnail). // Note that the length constraint applies only to the ARN. If you specify only // the function name, it is limited to 64 character in length. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` - // Using this optional parameter to specify a function version or alias name. + // Using this optional parameter to specify a function version or an alias name. // If you specify function version, the API uses qualified function ARN for // the request and returns information about the specific Lambda function version. - // If you specify alias name, the API uses alias ARN and returns information + // If you specify an alias name, the API uses the alias ARN and returns information // about the function version to which the alias points. If you don't provide // this parameter, the API uses unqualified function ARN and returns information // about the $LATEST version of the Lambda function. @@ -1474,7 +1539,7 @@ func (s GetFunctionInput) GoString() string { return s.String() } -// This response contains the object for the Lambda function location (see API_FunctionCodeLocation +// This response contains the object for the Lambda function location (see API_FunctionCodeLocation. type GetFunctionOutput struct { _ struct{} `type:"structure"` @@ -1500,19 +1565,21 @@ type GetPolicyInput struct { // Function name whose resource policy you want to retrieve. // - // You can specify an unqualified function name (for example, "Thumbnail") - // or you can specify Amazon Resource Name (ARN) of the function (for example, - // "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). AWS Lambda also - // allows you to specify only the account ID qualifier (for example, "account-id:Thumbnail"). - // Note that the length constraint applies only to the ARN. If you specify only - // the function name, it is limited to 64 character in length. + // You can specify the function name (for example, Thumbnail) or you can specify + // Amazon Resource Name (ARN) of the function (for example, arn:aws:lambda:us-west-2:account-id:function:ThumbNail). + // If you are using versioning, you can also provide a qualified function ARN + // (ARN that is qualified with function version or alias name as suffix). AWS + // Lambda also allows you to specify only the function name with the account + // ID qualifier (for example, account-id:Thumbnail). Note that the length constraint + // applies only to the ARN. If you specify only the function name, it is limited + // to 64 character in length. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` - // You can specify this optional query parameter to specify function version - // or alias name in which case this API will return all permissions associated - // with the specific ARN. If you don't provide this parameter, the API will - // return permissions that apply to the unqualified function ARN. - Qualifier *string `min:"1" type:"string"` + // You can specify this optional query parameter to specify a function version + // or an alias name in which case this API will return all permissions associated + // with the specific qualified ARN. If you don't provide this parameter, the + // API will return permissions that apply to the unqualified function ARN. + Qualifier *string `location:"querystring" locationName:"Qualifier" min:"1" type:"string"` } // String returns the string representation @@ -1529,7 +1596,8 @@ type GetPolicyOutput struct { _ struct{} `type:"structure"` // The resource policy associated with the specified function. The response - // returns the same as a string using "\" as an escape character in the JSON. + // returns the same as a string using a backslash ("\") as an escape character + // in the JSON. Policy *string `type:"string"` } @@ -1544,7 +1612,7 @@ func (s GetPolicyOutput) GoString() string { } type InvokeAsyncInput struct { - _ struct{} `type:"structure" payload:"InvokeArgs"` + _ struct{} `deprecated:"true" type:"structure" payload:"InvokeArgs"` // The Lambda function name. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` @@ -1565,7 +1633,7 @@ func (s InvokeAsyncInput) GoString() string { // Upon success, it returns empty response. Otherwise, throws an exception. type InvokeAsyncOutput struct { - _ struct{} `type:"structure"` + _ struct{} `deprecated:"true" type:"structure"` // It will be 202 upon success. Status *int64 `location:"statusCode" type:"integer"` @@ -1587,7 +1655,7 @@ type InvokeInput struct { // Using the ClientContext you can pass client-specific information to the Lambda // function you are invoking. You can then process the client information in // your Lambda function as you choose through the context variable. For an example - // of a ClientContext JSON, go to PutEvents (http://docs.aws.amazon.com/mobileanalytics/latest/ug/PutEvents.html) + // of a ClientContext JSON, see PutEvents (http://docs.aws.amazon.com/mobileanalytics/latest/ug/PutEvents.html) // in the Amazon Mobile Analytics API Reference and User Guide. // // The ClientContext JSON must be base64-encoded. @@ -1595,37 +1663,36 @@ type InvokeInput struct { // The Lambda function name. // - // You can specify an unqualified function name (for example, "Thumbnail") - // or you can specify Amazon Resource Name (ARN) of the function (for example, - // "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). AWS Lambda also - // allows you to specify only the account ID qualifier (for example, "account-id:Thumbnail"). + // You can specify a function name (for example, Thumbnail) or you can specify + // Amazon Resource Name (ARN) of the function (for example, arn:aws:lambda:us-west-2:account-id:function:ThumbNail). + // AWS Lambda also allows you to specify a partial ARN (for example, account-id:Thumbnail). // Note that the length constraint applies only to the ARN. If you specify only // the function name, it is limited to 64 character in length. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` - // By default, the Invoke API assumes "RequestResponse" invocation type. You - // can optionally request asynchronous execution by specifying "Event" as the - // InvocationType. You can also use this parameter to request AWS Lambda to - // not execute the function but do some verification, such as if the caller - // is authorized to invoke the function and if the inputs are valid. You request - // this by specifying "DryRun" as the InvocationType. This is useful in a cross-account - // scenario when you want to verify access to a function without running it. + // By default, the Invoke API assumes RequestResponse invocation type. You can + // optionally request asynchronous execution by specifying Event as the InvocationType. + // You can also use this parameter to request AWS Lambda to not execute the + // function but do some verification, such as if the caller is authorized to + // invoke the function and if the inputs are valid. You request this by specifying + // DryRun as the InvocationType. This is useful in a cross-account scenario + // when you want to verify access to a function without running it. InvocationType *string `location:"header" locationName:"X-Amz-Invocation-Type" type:"string" enum:"InvocationType"` - // You can set this optional parameter to "Tail" in the request only if you - // specify the InvocationType parameter with value "RequestResponse". In this - // case, AWS Lambda returns the base64-encoded last 4 KB of log data produced - // by your Lambda function in the x-amz-log-results header. + // You can set this optional parameter to Tail in the request only if you specify + // the InvocationType parameter with value RequestResponse. In this case, AWS + // Lambda returns the base64-encoded last 4 KB of log data produced by your + // Lambda function in the x-amz-log-results header. LogType *string `location:"header" locationName:"X-Amz-Log-Type" type:"string" enum:"LogType"` // JSON that you want to provide to your Lambda function as input. Payload []byte `type:"blob"` - // You can use this optional paramter to specify a Lambda function version or - // alias name. If you specify function version, the API uses qualified function - // ARN to invoke a specific Lambda function. If you specify alias name, the - // API uses the alias ARN to invoke the Lambda function version to which the - // alias points. + // You can use this optional parameter to specify a Lambda function version + // or alias name. If you specify a function version, the API uses the qualified + // function ARN to invoke a specific Lambda function. If you specify an alias + // name, the API uses the alias ARN to invoke the Lambda function version to + // which the alias points. // // If you don't provide this parameter, then the API uses unqualified function // ARN which results in invocation of the $LATEST version. @@ -1655,12 +1722,12 @@ type InvokeOutput struct { FunctionError *string `location:"header" locationName:"X-Amz-Function-Error" type:"string"` // It is the base64-encoded logs for the Lambda function invocation. This is - // present only if the invocation type is "RequestResponse" and the logs were + // present only if the invocation type is RequestResponse and the logs were // requested. LogResult *string `location:"header" locationName:"X-Amz-Log-Result" type:"string"` // It is the JSON representation of the object returned by the Lambda function. - // In This is present only if the invocation type is "RequestResponse". + // In This is present only if the invocation type is RequestResponse. // // In the event of a function error this field contains a message describing // the error. For the Handled errors the Lambda function will report this message. @@ -1668,8 +1735,8 @@ type InvokeOutput struct { Payload []byte `type:"blob"` // The HTTP status code will be in the 200 range for successful request. For - // the "RequestResonse" invocation type this status code will be 200. For the - // "Event" invocation type this status code will be 202. For the "DryRun" invocation + // the RequestResonse invocation type this status code will be 200. For the + // Event invocation type this status code will be 202. For the DryRun invocation // type the status code will be 204. StatusCode *int64 `location:"statusCode" type:"integer"` } @@ -1691,8 +1758,8 @@ type ListAliasesInput struct { FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` // If you specify this optional parameter, the API returns only the aliases - // pointing to the specific Lambda function version, otherwise returns all aliases - // created for the Lambda function. + // that are pointing to the specific Lambda function version, otherwise the + // API returns all of the aliases created for the Lambda function. FunctionVersion *string `location:"querystring" locationName:"FunctionVersion" min:"1" type:"string"` // Optional string. An opaque pagination token returned from a previous ListAliases @@ -1717,7 +1784,7 @@ func (s ListAliasesInput) GoString() string { type ListAliasesOutput struct { _ struct{} `type:"structure"` - // An list of alises. + // A list of aliases. Aliases []*AliasConfiguration `type:"list"` // A string, present if there are more aliases. @@ -1742,12 +1809,14 @@ type ListEventSourceMappingsInput struct { // The name of the Lambda function. // - // You can specify an unqualified function name (for example, "Thumbnail") - // or you can specify Amazon Resource Name (ARN) of the function (for example, - // "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). AWS Lambda also - // allows you to specify only the account ID qualifier (for example, "account-id:Thumbnail"). - // Note that the length constraint applies only to the ARN. If you specify only - // the function name, it is limited to 64 character in length. + // You can specify the function name (for example, Thumbnail) or you can specify + // Amazon Resource Name (ARN) of the function (for example, arn:aws:lambda:us-west-2:account-id:function:ThumbNail). + // If you are using versioning, you can also provide a qualified function ARN + // (ARN that is qualified with function version or alias name as suffix). AWS + // Lambda also allows you to specify only the function name with the account + // ID qualifier (for example, account-id:Thumbnail). Note that the length constraint + // applies only to the ARN. If you specify only the function name, it is limited + // to 64 character in length. FunctionName *string `location:"querystring" locationName:"FunctionName" min:"1" type:"string"` // Optional string. An opaque pagination token returned from a previous ListEventSourceMappings @@ -1837,13 +1906,12 @@ func (s ListFunctionsOutput) GoString() string { type ListVersionsByFunctionInput struct { _ struct{} `type:"structure"` - // Function name whose versions to list. You can specify an unqualified function - // name (for example, "Thumbnail") or you can specify Amazon Resource Name (ARN) - // of the function (for example, "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). - // AWS Lambda also allows you to specify only the account ID qualifier (for - // example, "account-id:Thumbnail"). Note that the length constraint applies - // only to the ARN. If you specify only the function name, it is limited to - // 64 character in length. + // Function name whose versions to list. You can specify a function name (for + // example, Thumbnail) or you can specify Amazon Resource Name (ARN) of the + // function (for example, arn:aws:lambda:us-west-2:account-id:function:ThumbNail). + // AWS Lambda also allows you to specify a partial ARN (for example, account-id:Thumbnail). + // Note that the length constraint applies only to the ARN. If you specify only + // the function name, it is limited to 64 character in length. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` // Optional string. An opaque pagination token returned from a previous ListVersionsByFunction @@ -1890,20 +1958,20 @@ type PublishVersionInput struct { // The SHA256 hash of the deployment package you want to publish. This provides // validation on the code you are publishing. If you provide this parameter - // value must match the SHA256 of the HEAD version for the publication to succeed. + // value must match the SHA256 of the $LATEST version for the publication to + // succeed. CodeSha256 *string `type:"string"` // The description for the version you are publishing. If not provided, AWS - // Lambda copies the description from the HEAD version. + // Lambda copies the description from the $LATEST version. Description *string `type:"string"` - // The Lambda function name. You can specify an unqualified function name (for - // example, "Thumbnail") or you can specify Amazon Resource Name (ARN) of the - // function (for example, "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). - // AWS Lambda also allows you to specify only the account ID qualifier (for - // example, "account-id:Thumbnail"). Note that the length constraint applies - // only to the ARN. If you specify only the function name, it is limited to - // 64 character in length. + // The Lambda function name. You can specify a function name (for example, Thumbnail) + // or you can specify Amazon Resource Name (ARN) of the function (for example, + // arn:aws:lambda:us-west-2:account-id:function:ThumbNail). AWS Lambda also + // allows you to specify a partial ARN (for example, account-id:Thumbnail). + // Note that the length constraint applies only to the ARN. If you specify only + // the function name, it is limited to 64 character in length. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` } @@ -1922,18 +1990,17 @@ type RemovePermissionInput struct { // Lambda function whose resource policy you want to remove a permission from. // - // You can specify an unqualified function name (for example, "Thumbnail") - // or you can specify Amazon Resource Name (ARN) of the function (for example, - // "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). AWS Lambda also - // allows you to specify only the account ID qualifier (for example, "account-id:Thumbnail"). + // You can specify a function name (for example, Thumbnail) or you can specify + // Amazon Resource Name (ARN) of the function (for example, arn:aws:lambda:us-west-2:account-id:function:ThumbNail). + // AWS Lambda also allows you to specify a partial ARN (for example, account-id:Thumbnail). // Note that the length constraint applies only to the ARN. If you specify only // the function name, it is limited to 64 character in length. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` // You can specify this optional parameter to remove permission associated with - // a specific function version or function alias. The value of this paramter - // is the function version or alias name. If you don't specify this parameter, - // the API removes permission associated with the unqualified function ARN. + // a specific function version or function alias. If you don't specify this + // parameter, the API removes permission associated with the unqualified function + // ARN. Qualifier *string `location:"querystring" locationName:"Qualifier" min:"1" type:"string"` // Statement ID of the permission to remove. @@ -1967,14 +2034,14 @@ func (s RemovePermissionOutput) GoString() string { type UpdateAliasInput struct { _ struct{} `type:"structure"` - // You can optionally change the description of the alias using this parameter. + // You can change the description of the alias using this parameter. Description *string `type:"string"` // The function name for which the alias is created. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` - // Using this parameter you can optionally change the Lambda function version - // to which the alias to points to. + // Using this parameter you can change the Lambda function version to which + // the alias points. FunctionVersion *string `min:"1" type:"string"` // The alias name. @@ -2004,12 +2071,17 @@ type UpdateEventSourceMappingInput struct { // The Lambda function to which you want the stream records sent. // - // You can specify an unqualified function name (for example, "Thumbnail") - // or you can specify Amazon Resource Name (ARN) of the function (for example, - // "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). AWS Lambda also - // allows you to specify only the account ID qualifier (for example, "account-id:Thumbnail"). - // Note that the length constraint applies only to the ARN. If you specify only - // the function name, it is limited to 64 character in length. + // You can specify a function name (for example, Thumbnail) or you can specify + // Amazon Resource Name (ARN) of the function (for example, arn:aws:lambda:us-west-2:account-id:function:ThumbNail). + // AWS Lambda also allows you to specify a partial ARN (for example, account-id:Thumbnail). + // + // If you are using versioning, you can also provide a qualified function ARN + // (ARN that is qualified with function version or alias name as suffix). For + // more information about versioning, see AWS Lambda Function Versioning and + // Aliases (http://docs.aws.amazon.com/lambda/latest/dg/versioning-aliases.html) + // + // Note that the length constraint applies only to the ARN. If you specify + // only the function name, it is limited to 64 character in length. FunctionName *string `min:"1" type:"string"` // The event source mapping identifier. @@ -2031,10 +2103,9 @@ type UpdateFunctionCodeInput struct { // The existing Lambda function name whose code you want to replace. // - // You can specify an unqualified function name (for example, "Thumbnail") - // or you can specify Amazon Resource Name (ARN) of the function (for example, - // "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). AWS Lambda also - // allows you to specify only the account ID qualifier (for example, "account-id:Thumbnail"). + // You can specify a function name (for example, Thumbnail) or you can specify + // Amazon Resource Name (ARN) of the function (for example, arn:aws:lambda:us-west-2:account-id:function:ThumbNail). + // AWS Lambda also allows you to specify a partial ARN (for example, account-id:Thumbnail). // Note that the length constraint applies only to the ARN. If you specify only // the function name, it is limited to 64 character in length. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` @@ -2077,10 +2148,9 @@ type UpdateFunctionConfigurationInput struct { // The name of the Lambda function. // - // You can specify an unqualified function name (for example, "Thumbnail") - // or you can specify Amazon Resource Name (ARN) of the function (for example, - // "arn:aws:lambda:us-west-2:account-id:function:ThumbNail"). AWS Lambda also - // allows you to specify only the account ID qualifier (for example, "account-id:Thumbnail"). + // You can specify a function name (for example, Thumbnail) or you can specify + // Amazon Resource Name (ARN) of the function (for example, arn:aws:lambda:us-west-2:account-id:function:ThumbNail). + // AWS Lambda also allows you to specify a partial ARN (for example, account-id:Thumbnail). // Note that the length constraint applies only to the ARN. If you specify only // the function name, it is limited to 64 character in length. FunctionName *string `location:"uri" locationName:"FunctionName" min:"1" type:"string" required:"true"` @@ -2105,6 +2175,12 @@ type UpdateFunctionConfigurationInput struct { // Because the execution time has cost implications, we recommend you set this // value based on your expected execution time. The default is 3 seconds. Timeout *int64 `min:"1" type:"integer"` + + // If your Lambda function accesses resources in a VPC, you provide this parameter + // identifying the list of security group IDs and subnet IDs. These must belong + // to the same VPC. You must provide at least one security group and one subnet + // ID. + VpcConfig *VpcConfig `type:"structure"` } // String returns the string representation @@ -2117,6 +2193,54 @@ func (s UpdateFunctionConfigurationInput) GoString() string { return s.String() } +// If your Lambda function accesses resources in a VPC, you provide this parameter +// identifying the list of security group IDs and subnet IDs. These must belong +// to the same VPC. You must provide at least one security group and one subnet +// ID. +type VpcConfig struct { + _ struct{} `type:"structure"` + + // A list of one or more security groups IDs in your VPC. + SecurityGroupIds []*string `type:"list"` + + // A list of one or more subnet IDs in your VPC. + SubnetIds []*string `type:"list"` +} + +// String returns the string representation +func (s VpcConfig) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s VpcConfig) GoString() string { + return s.String() +} + +// VPC configuration associated with your Lambda function. +type VpcConfigResponse struct { + _ struct{} `type:"structure"` + + // A list of security group IDs associated with the Lambda function. + SecurityGroupIds []*string `type:"list"` + + // A list of subnet IDs associated with the Lambda function. + SubnetIds []*string `type:"list"` + + // The VPC ID associated with you Lambda function. + VpcId *string `type:"string"` +} + +// String returns the string representation +func (s VpcConfigResponse) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s VpcConfigResponse) GoString() string { + return s.String() +} + const ( // @enum EventSourcePosition EventSourcePositionTrimHorizon = "TRIM_HORIZON" diff --git a/vendor/github.com/aws/aws-sdk-go/service/lambda/service.go b/vendor/github.com/aws/aws-sdk-go/service/lambda/service.go index bac7c3af7..0ccde6c02 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/lambda/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/lambda/service.go @@ -65,10 +65,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(restjson.Build) - svc.Handlers.Unmarshal.PushBack(restjson.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(restjson.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(restjson.UnmarshalError) + svc.Handlers.Build.PushBackNamed(restjson.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(restjson.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(restjson.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(restjson.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/opsworks/api.go b/vendor/github.com/aws/aws-sdk-go/service/opsworks/api.go index eef0f2612..cf1cda6e4 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/opsworks/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/opsworks/api.go @@ -6,6 +6,8 @@ package opsworks import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/jsonrpc" ) const opAssignInstance = "AssignInstance" @@ -23,6 +25,8 @@ func (c *OpsWorks) AssignInstanceRequest(input *AssignInstanceInput) (req *reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AssignInstanceOutput{} req.Data = output return @@ -58,6 +62,8 @@ func (c *OpsWorks) AssignVolumeRequest(input *AssignVolumeInput) (req *request.R } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AssignVolumeOutput{} req.Data = output return @@ -94,6 +100,8 @@ func (c *OpsWorks) AssociateElasticIpRequest(input *AssociateElasticIpInput) (re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AssociateElasticIpOutput{} req.Data = output return @@ -128,6 +136,8 @@ func (c *OpsWorks) AttachElasticLoadBalancerRequest(input *AttachElasticLoadBala } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AttachElasticLoadBalancerOutput{} req.Data = output return @@ -399,6 +409,8 @@ func (c *OpsWorks) DeleteAppRequest(input *DeleteAppInput) (req *request.Request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteAppOutput{} req.Data = output return @@ -431,6 +443,8 @@ func (c *OpsWorks) DeleteInstanceRequest(input *DeleteInstanceInput) (req *reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteInstanceOutput{} req.Data = output return @@ -466,6 +480,8 @@ func (c *OpsWorks) DeleteLayerRequest(input *DeleteLayerInput) (req *request.Req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteLayerOutput{} req.Data = output return @@ -500,6 +516,8 @@ func (c *OpsWorks) DeleteStackRequest(input *DeleteStackInput) (req *request.Req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteStackOutput{} req.Data = output return @@ -534,6 +552,8 @@ func (c *OpsWorks) DeleteUserProfileRequest(input *DeleteUserProfileInput) (req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteUserProfileOutput{} req.Data = output return @@ -565,6 +585,8 @@ func (c *OpsWorks) DeregisterEcsClusterRequest(input *DeregisterEcsClusterInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeregisterEcsClusterOutput{} req.Data = output return @@ -597,6 +619,8 @@ func (c *OpsWorks) DeregisterElasticIpRequest(input *DeregisterElasticIpInput) ( } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeregisterElasticIpOutput{} req.Data = output return @@ -630,6 +654,8 @@ func (c *OpsWorks) DeregisterInstanceRequest(input *DeregisterInstanceInput) (re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeregisterInstanceOutput{} req.Data = output return @@ -664,6 +690,8 @@ func (c *OpsWorks) DeregisterRdsDbInstanceRequest(input *DeregisterRdsDbInstance } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeregisterRdsDbInstanceOutput{} req.Data = output return @@ -696,6 +724,8 @@ func (c *OpsWorks) DeregisterVolumeRequest(input *DeregisterVolumeInput) (req *r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeregisterVolumeOutput{} req.Data = output return @@ -1436,6 +1466,8 @@ func (c *OpsWorks) DetachElasticLoadBalancerRequest(input *DetachElasticLoadBala } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DetachElasticLoadBalancerOutput{} req.Data = output return @@ -1468,6 +1500,8 @@ func (c *OpsWorks) DisassociateElasticIpRequest(input *DisassociateElasticIpInpu } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DisassociateElasticIpOutput{} req.Data = output return @@ -1563,6 +1597,8 @@ func (c *OpsWorks) RebootInstanceRequest(input *RebootInstanceInput) (req *reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RebootInstanceOutput{} req.Data = output return @@ -1704,6 +1740,8 @@ func (c *OpsWorks) RegisterRdsDbInstanceRequest(input *RegisterRdsDbInstanceInpu } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RegisterRdsDbInstanceOutput{} req.Data = output return @@ -1771,6 +1809,8 @@ func (c *OpsWorks) SetLoadBasedAutoScalingRequest(input *SetLoadBasedAutoScaling } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetLoadBasedAutoScalingOutput{} req.Data = output return @@ -1810,6 +1850,8 @@ func (c *OpsWorks) SetPermissionRequest(input *SetPermissionInput) (req *request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetPermissionOutput{} req.Data = output return @@ -1843,6 +1885,8 @@ func (c *OpsWorks) SetTimeBasedAutoScalingRequest(input *SetTimeBasedAutoScaling } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetTimeBasedAutoScalingOutput{} req.Data = output return @@ -1877,6 +1921,8 @@ func (c *OpsWorks) StartInstanceRequest(input *StartInstanceInput) (req *request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &StartInstanceOutput{} req.Data = output return @@ -1910,6 +1956,8 @@ func (c *OpsWorks) StartStackRequest(input *StartStackInput) (req *request.Reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &StartStackOutput{} req.Data = output return @@ -1942,6 +1990,8 @@ func (c *OpsWorks) StopInstanceRequest(input *StopInstanceInput) (req *request.R } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &StopInstanceOutput{} req.Data = output return @@ -1977,6 +2027,8 @@ func (c *OpsWorks) StopStackRequest(input *StopStackInput) (req *request.Request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &StopStackOutput{} req.Data = output return @@ -2009,6 +2061,8 @@ func (c *OpsWorks) UnassignInstanceRequest(input *UnassignInstanceInput) (req *r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UnassignInstanceOutput{} req.Data = output return @@ -2044,6 +2098,8 @@ func (c *OpsWorks) UnassignVolumeRequest(input *UnassignVolumeInput) (req *reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UnassignVolumeOutput{} req.Data = output return @@ -2077,6 +2133,8 @@ func (c *OpsWorks) UpdateAppRequest(input *UpdateAppInput) (req *request.Request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateAppOutput{} req.Data = output return @@ -2109,6 +2167,8 @@ func (c *OpsWorks) UpdateElasticIpRequest(input *UpdateElasticIpInput) (req *req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateElasticIpOutput{} req.Data = output return @@ -2142,6 +2202,8 @@ func (c *OpsWorks) UpdateInstanceRequest(input *UpdateInstanceInput) (req *reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateInstanceOutput{} req.Data = output return @@ -2174,6 +2236,8 @@ func (c *OpsWorks) UpdateLayerRequest(input *UpdateLayerInput) (req *request.Req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateLayerOutput{} req.Data = output return @@ -2206,6 +2270,8 @@ func (c *OpsWorks) UpdateMyUserProfileRequest(input *UpdateMyUserProfileInput) ( } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateMyUserProfileOutput{} req.Data = output return @@ -2237,6 +2303,8 @@ func (c *OpsWorks) UpdateRdsDbInstanceRequest(input *UpdateRdsDbInstanceInput) ( } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateRdsDbInstanceOutput{} req.Data = output return @@ -2269,6 +2337,8 @@ func (c *OpsWorks) UpdateStackRequest(input *UpdateStackInput) (req *request.Req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateStackOutput{} req.Data = output return @@ -2301,6 +2371,8 @@ func (c *OpsWorks) UpdateUserProfileRequest(input *UpdateUserProfileInput) (req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateUserProfileOutput{} req.Data = output return @@ -2332,6 +2404,8 @@ func (c *OpsWorks) UpdateVolumeRequest(input *UpdateVolumeInput) (req *request.R } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateVolumeOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/opsworks/service.go b/vendor/github.com/aws/aws-sdk-go/service/opsworks/service.go index 70ea0a0a5..9b8500d12 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/opsworks/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/opsworks/service.go @@ -97,10 +97,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(jsonrpc.Build) - svc.Handlers.Unmarshal.PushBack(jsonrpc.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(jsonrpc.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(jsonrpc.UnmarshalError) + svc.Handlers.Build.PushBackNamed(jsonrpc.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(jsonrpc.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(jsonrpc.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(jsonrpc.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/rds/api.go b/vendor/github.com/aws/aws-sdk-go/service/rds/api.go index 66b2f2c34..a23f7533e 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/rds/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/rds/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/query" ) const opAddSourceIdentifierToSubscription = "AddSourceIdentifierToSubscription" @@ -52,6 +54,8 @@ func (c *RDS) AddTagsToResourceRequest(input *AddTagsToResourceInput) (req *requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AddTagsToResourceOutput{} req.Data = output return @@ -674,6 +678,8 @@ func (c *RDS) DeleteDBClusterParameterGroupRequest(input *DeleteDBClusterParamet } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteDBClusterParameterGroupOutput{} req.Data = output return @@ -777,6 +783,8 @@ func (c *RDS) DeleteDBParameterGroupRequest(input *DeleteDBParameterGroupInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteDBParameterGroupOutput{} req.Data = output return @@ -805,6 +813,8 @@ func (c *RDS) DeleteDBSecurityGroupRequest(input *DeleteDBSecurityGroupInput) (r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteDBSecurityGroupOutput{} req.Data = output return @@ -864,6 +874,8 @@ func (c *RDS) DeleteDBSubnetGroupRequest(input *DeleteDBSubnetGroupInput) (req * } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteDBSubnetGroupOutput{} req.Data = output return @@ -920,6 +932,8 @@ func (c *RDS) DeleteOptionGroupRequest(input *DeleteOptionGroupInput) (req *requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteOptionGroupOutput{} req.Data = output return @@ -2454,6 +2468,8 @@ func (c *RDS) RemoveTagsFromResourceRequest(input *RemoveTagsFromResourceInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RemoveTagsFromResourceOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/rds/service.go b/vendor/github.com/aws/aws-sdk-go/service/rds/service.go index 906277204..3769bba44 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/rds/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/rds/service.go @@ -82,10 +82,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(query.Build) - svc.Handlers.Unmarshal.PushBack(query.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(query.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(query.UnmarshalError) + svc.Handlers.Build.PushBackNamed(query.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(query.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(query.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(query.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/redshift/api.go b/vendor/github.com/aws/aws-sdk-go/service/redshift/api.go index a23ff66fe..4b656e6a6 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/redshift/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/redshift/api.go @@ -8,6 +8,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/query" ) const opAuthorizeClusterSecurityGroupIngress = "AuthorizeClusterSecurityGroupIngress" @@ -455,6 +457,8 @@ func (c *Redshift) CreateTagsRequest(input *CreateTagsInput) (req *request.Reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreateTagsOutput{} req.Data = output return @@ -531,6 +535,8 @@ func (c *Redshift) DeleteClusterParameterGroupRequest(input *DeleteClusterParame } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteClusterParameterGroupOutput{} req.Data = output return @@ -559,6 +565,8 @@ func (c *Redshift) DeleteClusterSecurityGroupRequest(input *DeleteClusterSecurit } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteClusterSecurityGroupOutput{} req.Data = output return @@ -625,6 +633,8 @@ func (c *Redshift) DeleteClusterSubnetGroupRequest(input *DeleteClusterSubnetGro } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteClusterSubnetGroupOutput{} req.Data = output return @@ -652,6 +662,8 @@ func (c *Redshift) DeleteEventSubscriptionRequest(input *DeleteEventSubscription } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteEventSubscriptionOutput{} req.Data = output return @@ -679,6 +691,8 @@ func (c *Redshift) DeleteHsmClientCertificateRequest(input *DeleteHsmClientCerti } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteHsmClientCertificateOutput{} req.Data = output return @@ -706,6 +720,8 @@ func (c *Redshift) DeleteHsmConfigurationRequest(input *DeleteHsmConfigurationIn } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteHsmConfigurationOutput{} req.Data = output return @@ -733,6 +749,8 @@ func (c *Redshift) DeleteSnapshotCopyGrantRequest(input *DeleteSnapshotCopyGrant } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteSnapshotCopyGrantOutput{} req.Data = output return @@ -760,6 +778,8 @@ func (c *Redshift) DeleteTagsRequest(input *DeleteTagsInput) (req *request.Reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteTagsOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/redshift/service.go b/vendor/github.com/aws/aws-sdk-go/service/redshift/service.go index 6d1c8db11..c25dff23b 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/redshift/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/redshift/service.go @@ -80,10 +80,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(query.Build) - svc.Handlers.Unmarshal.PushBack(query.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(query.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(query.UnmarshalError) + svc.Handlers.Build.PushBackNamed(query.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(query.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(query.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(query.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/route53/service.go b/vendor/github.com/aws/aws-sdk-go/service/route53/service.go index 7711d53d1..f4a82bde5 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/route53/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/route53/service.go @@ -59,10 +59,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(restxml.Build) - svc.Handlers.Unmarshal.PushBack(restxml.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(restxml.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(restxml.UnmarshalError) + svc.Handlers.Build.PushBackNamed(restxml.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(restxml.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(restxml.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(restxml.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/api.go b/vendor/github.com/aws/aws-sdk-go/service/s3/api.go index 1d6312207..54bebd096 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/s3/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/s3/api.go @@ -9,6 +9,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/restxml" ) const opAbortMultipartUpload = "AbortMultipartUpload" @@ -171,6 +173,8 @@ func (c *S3) DeleteBucketRequest(input *DeleteBucketInput) (req *request.Request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteBucketOutput{} req.Data = output return @@ -199,6 +203,8 @@ func (c *S3) DeleteBucketCorsRequest(input *DeleteBucketCorsInput) (req *request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteBucketCorsOutput{} req.Data = output return @@ -226,6 +232,8 @@ func (c *S3) DeleteBucketLifecycleRequest(input *DeleteBucketLifecycleInput) (re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteBucketLifecycleOutput{} req.Data = output return @@ -253,6 +261,8 @@ func (c *S3) DeleteBucketPolicyRequest(input *DeleteBucketPolicyInput) (req *req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteBucketPolicyOutput{} req.Data = output return @@ -280,6 +290,8 @@ func (c *S3) DeleteBucketReplicationRequest(input *DeleteBucketReplicationInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteBucketReplicationOutput{} req.Data = output return @@ -306,6 +318,8 @@ func (c *S3) DeleteBucketTaggingRequest(input *DeleteBucketTaggingInput) (req *r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteBucketTaggingOutput{} req.Data = output return @@ -333,6 +347,8 @@ func (c *S3) DeleteBucketWebsiteRequest(input *DeleteBucketWebsiteInput) (req *r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteBucketWebsiteOutput{} req.Data = output return @@ -460,6 +476,9 @@ const opGetBucketLifecycle = "GetBucketLifecycle" // GetBucketLifecycleRequest generates a request for the GetBucketLifecycle operation. func (c *S3) GetBucketLifecycleRequest(input *GetBucketLifecycleInput) (req *request.Request, output *GetBucketLifecycleOutput) { + if c.Client.Config.Logger != nil { + c.Client.Config.Logger.Log("This operation, GetBucketLifecycle, has been deprecated") + } op := &request.Operation{ Name: opGetBucketLifecycle, HTTPMethod: "GET", @@ -569,6 +588,9 @@ const opGetBucketNotification = "GetBucketNotification" // GetBucketNotificationRequest generates a request for the GetBucketNotification operation. func (c *S3) GetBucketNotificationRequest(input *GetBucketNotificationConfigurationRequest) (req *request.Request, output *NotificationConfigurationDeprecated) { + if c.Client.Config.Logger != nil { + c.Client.Config.Logger.Log("This operation, GetBucketNotification, has been deprecated") + } op := &request.Operation{ Name: opGetBucketNotification, HTTPMethod: "GET", @@ -876,6 +898,8 @@ func (c *S3) HeadBucketRequest(input *HeadBucketInput) (req *request.Request, ou } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &HeadBucketOutput{} req.Data = output return @@ -1126,6 +1150,8 @@ func (c *S3) PutBucketAclRequest(input *PutBucketAclInput) (req *request.Request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutBucketAclOutput{} req.Data = output return @@ -1153,6 +1179,8 @@ func (c *S3) PutBucketCorsRequest(input *PutBucketCorsInput) (req *request.Reque } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutBucketCorsOutput{} req.Data = output return @@ -1169,6 +1197,9 @@ const opPutBucketLifecycle = "PutBucketLifecycle" // PutBucketLifecycleRequest generates a request for the PutBucketLifecycle operation. func (c *S3) PutBucketLifecycleRequest(input *PutBucketLifecycleInput) (req *request.Request, output *PutBucketLifecycleOutput) { + if c.Client.Config.Logger != nil { + c.Client.Config.Logger.Log("This operation, PutBucketLifecycle, has been deprecated") + } op := &request.Operation{ Name: opPutBucketLifecycle, HTTPMethod: "PUT", @@ -1180,6 +1211,8 @@ func (c *S3) PutBucketLifecycleRequest(input *PutBucketLifecycleInput) (req *req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutBucketLifecycleOutput{} req.Data = output return @@ -1207,6 +1240,8 @@ func (c *S3) PutBucketLifecycleConfigurationRequest(input *PutBucketLifecycleCon } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutBucketLifecycleConfigurationOutput{} req.Data = output return @@ -1235,6 +1270,8 @@ func (c *S3) PutBucketLoggingRequest(input *PutBucketLoggingInput) (req *request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutBucketLoggingOutput{} req.Data = output return @@ -1253,6 +1290,9 @@ const opPutBucketNotification = "PutBucketNotification" // PutBucketNotificationRequest generates a request for the PutBucketNotification operation. func (c *S3) PutBucketNotificationRequest(input *PutBucketNotificationInput) (req *request.Request, output *PutBucketNotificationOutput) { + if c.Client.Config.Logger != nil { + c.Client.Config.Logger.Log("This operation, PutBucketNotification, has been deprecated") + } op := &request.Operation{ Name: opPutBucketNotification, HTTPMethod: "PUT", @@ -1264,6 +1304,8 @@ func (c *S3) PutBucketNotificationRequest(input *PutBucketNotificationInput) (re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutBucketNotificationOutput{} req.Data = output return @@ -1291,6 +1333,8 @@ func (c *S3) PutBucketNotificationConfigurationRequest(input *PutBucketNotificat } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutBucketNotificationConfigurationOutput{} req.Data = output return @@ -1318,6 +1362,8 @@ func (c *S3) PutBucketPolicyRequest(input *PutBucketPolicyInput) (req *request.R } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutBucketPolicyOutput{} req.Data = output return @@ -1346,6 +1392,8 @@ func (c *S3) PutBucketReplicationRequest(input *PutBucketReplicationInput) (req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutBucketReplicationOutput{} req.Data = output return @@ -1374,6 +1422,8 @@ func (c *S3) PutBucketRequestPaymentRequest(input *PutBucketRequestPaymentInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutBucketRequestPaymentOutput{} req.Data = output return @@ -1405,6 +1455,8 @@ func (c *S3) PutBucketTaggingRequest(input *PutBucketTaggingInput) (req *request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutBucketTaggingOutput{} req.Data = output return @@ -1432,6 +1484,8 @@ func (c *S3) PutBucketVersioningRequest(input *PutBucketVersioningInput) (req *r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutBucketVersioningOutput{} req.Data = output return @@ -1460,6 +1514,8 @@ func (c *S3) PutBucketWebsiteRequest(input *PutBucketWebsiteInput) (req *request } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutBucketWebsiteOutput{} req.Data = output return @@ -1784,7 +1840,7 @@ type CloudFunctionConfiguration struct { CloudFunction *string `type:"string"` // Bucket event for which to send notifications. - Event *string `type:"string" enum:"Event"` + Event *string `deprecated:"true" type:"string" enum:"Event"` Events []*string `locationName:"Event" type:"list" flattened:"true"` @@ -5346,7 +5402,7 @@ type QueueConfigurationDeprecated struct { _ struct{} `type:"structure"` // Bucket event for which to send notifications. - Event *string `type:"string" enum:"Event"` + Event *string `deprecated:"true" type:"string" enum:"Event"` Events []*string `locationName:"Event" type:"list" flattened:"true"` @@ -5714,7 +5770,7 @@ type TopicConfigurationDeprecated struct { _ struct{} `type:"structure"` // Bucket event for which to send notifications. - Event *string `type:"string" enum:"Event"` + Event *string `deprecated:"true" type:"string" enum:"Event"` Events []*string `locationName:"Event" type:"list" flattened:"true"` diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/service.go b/vendor/github.com/aws/aws-sdk-go/service/s3/service.go index e80d95429..cf01da535 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/s3/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/s3/service.go @@ -59,10 +59,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(restxml.Build) - svc.Handlers.Unmarshal.PushBack(restxml.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(restxml.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(restxml.UnmarshalError) + svc.Handlers.Build.PushBackNamed(restxml.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(restxml.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(restxml.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(restxml.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/sns/api.go b/vendor/github.com/aws/aws-sdk-go/service/sns/api.go index 8b2c05831..f04cc7dad 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/sns/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/sns/api.go @@ -6,6 +6,8 @@ package sns import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/query" ) const opAddPermission = "AddPermission" @@ -23,6 +25,8 @@ func (c *SNS) AddPermissionRequest(input *AddPermissionInput) (req *request.Requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AddPermissionOutput{} req.Data = output return @@ -192,6 +196,8 @@ func (c *SNS) DeleteEndpointRequest(input *DeleteEndpointInput) (req *request.Re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteEndpointOutput{} req.Data = output return @@ -220,6 +226,8 @@ func (c *SNS) DeletePlatformApplicationRequest(input *DeletePlatformApplicationI } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeletePlatformApplicationOutput{} req.Data = output return @@ -249,6 +257,8 @@ func (c *SNS) DeleteTopicRequest(input *DeleteTopicInput) (req *request.Request, } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteTopicOutput{} req.Data = output return @@ -655,6 +665,8 @@ func (c *SNS) RemovePermissionRequest(input *RemovePermissionInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RemovePermissionOutput{} req.Data = output return @@ -682,6 +694,8 @@ func (c *SNS) SetEndpointAttributesRequest(input *SetEndpointAttributesInput) (r } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetEndpointAttributesOutput{} req.Data = output return @@ -711,6 +725,8 @@ func (c *SNS) SetPlatformApplicationAttributesRequest(input *SetPlatformApplicat } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetPlatformApplicationAttributesOutput{} req.Data = output return @@ -740,6 +756,8 @@ func (c *SNS) SetSubscriptionAttributesRequest(input *SetSubscriptionAttributesI } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetSubscriptionAttributesOutput{} req.Data = output return @@ -767,6 +785,8 @@ func (c *SNS) SetTopicAttributesRequest(input *SetTopicAttributesInput) (req *re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetTopicAttributesOutput{} req.Data = output return @@ -824,6 +844,8 @@ func (c *SNS) UnsubscribeRequest(input *UnsubscribeInput) (req *request.Request, } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UnsubscribeOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/sns/service.go b/vendor/github.com/aws/aws-sdk-go/service/sns/service.go index eb8121874..7d87839b3 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/sns/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/sns/service.go @@ -71,10 +71,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(query.Build) - svc.Handlers.Unmarshal.PushBack(query.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(query.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(query.UnmarshalError) + svc.Handlers.Build.PushBackNamed(query.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(query.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(query.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(query.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { diff --git a/vendor/github.com/aws/aws-sdk-go/service/sqs/api.go b/vendor/github.com/aws/aws-sdk-go/service/sqs/api.go index eb9350545..567b66fe4 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/sqs/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/sqs/api.go @@ -6,6 +6,8 @@ package sqs import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/query" ) const opAddPermission = "AddPermission" @@ -23,6 +25,8 @@ func (c *SQS) AddPermissionRequest(input *AddPermissionInput) (req *request.Requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AddPermissionOutput{} req.Data = output return @@ -67,6 +71,8 @@ func (c *SQS) ChangeMessageVisibilityRequest(input *ChangeMessageVisibilityInput } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &ChangeMessageVisibilityOutput{} req.Data = output return @@ -214,6 +220,8 @@ func (c *SQS) DeleteMessageRequest(input *DeleteMessageInput) (req *request.Requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteMessageOutput{} req.Data = output return @@ -299,6 +307,8 @@ func (c *SQS) DeleteQueueRequest(input *DeleteQueueInput) (req *request.Request, } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteQueueOutput{} req.Data = output return @@ -497,6 +507,8 @@ func (c *SQS) PurgeQueueRequest(input *PurgeQueueInput) (req *request.Request, o } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PurgeQueueOutput{} req.Data = output return @@ -600,6 +612,8 @@ func (c *SQS) RemovePermissionRequest(input *RemovePermissionInput) (req *reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RemovePermissionOutput{} req.Data = output return @@ -718,6 +732,8 @@ func (c *SQS) SetQueueAttributesRequest(input *SetQueueAttributesInput) (req *re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SetQueueAttributesOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/sqs/service.go b/vendor/github.com/aws/aws-sdk-go/service/sqs/service.go index c6e820834..dca9d855c 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/sqs/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/sqs/service.go @@ -83,10 +83,10 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio // Handlers svc.Handlers.Sign.PushBack(v4.Sign) - svc.Handlers.Build.PushBack(query.Build) - svc.Handlers.Unmarshal.PushBack(query.Unmarshal) - svc.Handlers.UnmarshalMeta.PushBack(query.UnmarshalMeta) - svc.Handlers.UnmarshalError.PushBack(query.UnmarshalError) + svc.Handlers.Build.PushBackNamed(query.BuildHandler) + svc.Handlers.Unmarshal.PushBackNamed(query.UnmarshalHandler) + svc.Handlers.UnmarshalMeta.PushBackNamed(query.UnmarshalMetaHandler) + svc.Handlers.UnmarshalError.PushBackNamed(query.UnmarshalErrorHandler) // Run custom client initialization if present if initClient != nil { From 3baabb0186ba79799b1dc314f711054bd4c994ce Mon Sep 17 00:00:00 2001 From: vince rosso Date: Mon, 15 Feb 2016 21:38:17 -0800 Subject: [PATCH 2/3] VPC config support in Lambda functions fixes #5105 --- .../aws/resource_aws_lambda_function.go | 51 ++++++++++++++ .../aws/resource_aws_lambda_function_test.go | 68 +++++++++++++++++++ builtin/providers/aws/structure.go | 15 ++++ 3 files changed, 134 insertions(+) diff --git a/builtin/providers/aws/resource_aws_lambda_function.go b/builtin/providers/aws/resource_aws_lambda_function.go index 4cce32f4d..363a18af2 100644 --- a/builtin/providers/aws/resource_aws_lambda_function.go +++ b/builtin/providers/aws/resource_aws_lambda_function.go @@ -83,6 +83,29 @@ func resourceAwsLambdaFunction() *schema.Resource { Default: 3, ForceNew: true, // TODO make this editable }, + "vpc_config": &schema.Schema{ + Type: schema.TypeList, + Optional: true, + ForceNew: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "subnet_ids": &schema.Schema{ + Type: schema.TypeSet, + Required: true, + ForceNew: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + "security_group_ids": &schema.Schema{ + Type: schema.TypeSet, + Required: true, + ForceNew: true, + Elem: &schema.Schema{Type: schema.TypeString}, + Set: schema.HashString, + }, + }, + }, + }, "arn": &schema.Schema{ Type: schema.TypeString, Computed: true, @@ -149,6 +172,31 @@ func resourceAwsLambdaFunctionCreate(d *schema.ResourceData, meta interface{}) e Timeout: aws.Int64(int64(d.Get("timeout").(int))), } + if v, ok := d.GetOk("vpc_config"); ok { + configs := v.([]interface{}) + + if len(configs) > 1 { + return errors.New("Only a single vpc_config block is expected") + } else if len(configs) == 1 { + config := configs[0].(map[string]interface{}) + var subnetIds []*string + for _, id := range config["subnet_ids"].(*schema.Set).List() { + subnetIds = append(subnetIds, aws.String(id.(string))) + } + + var securityGroupIds []*string + for _, id := range config["security_group_ids"].(*schema.Set).List() { + securityGroupIds = append(securityGroupIds, aws.String(id.(string))) + } + + var vpcConfig = &lambda.VpcConfig{ + SubnetIds: subnetIds, + SecurityGroupIds: securityGroupIds, + } + params.VpcConfig = vpcConfig + } + } + // IAM profiles can take ~10 seconds to propagate in AWS: // http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html#launch-instance-with-role-console // Error creating Lambda function: InvalidParameterValueException: The role defined for the task cannot be assumed by Lambda. @@ -157,10 +205,12 @@ func resourceAwsLambdaFunctionCreate(d *schema.ResourceData, meta interface{}) e if err != nil { if awserr, ok := err.(awserr.Error); ok { if awserr.Code() == "InvalidParameterValueException" { + log.Printf("[DEBUG] InvalidParameterValueException creating Lambda Function: %s", awserr) // Retryable return awserr } } + log.Printf("[DEBUG] Error creating Lambda Function: %s", err) // Not retryable return resource.RetryError{Err: err} } @@ -207,6 +257,7 @@ func resourceAwsLambdaFunctionRead(d *schema.ResourceData, meta interface{}) err d.Set("role", function.Role) d.Set("runtime", function.Runtime) d.Set("timeout", function.Timeout) + d.Set("vpc_config", flattenLambdaVpcConfigResponse(function.VpcConfig)) return nil } diff --git a/builtin/providers/aws/resource_aws_lambda_function_test.go b/builtin/providers/aws/resource_aws_lambda_function_test.go index acf991b9f..ff6f92bd4 100644 --- a/builtin/providers/aws/resource_aws_lambda_function_test.go +++ b/builtin/providers/aws/resource_aws_lambda_function_test.go @@ -97,6 +97,36 @@ func testAccCheckAWSLambdaAttributes(function *lambda.GetFunctionOutput) resourc } const testAccAWSLambdaConfig = ` +resource "aws_iam_role_policy" "iam_policy_for_lambda" { + name = "iam_policy_for_lambda" + role = "${aws_iam_role.iam_for_lambda.id}" + policy = < Date: Tue, 16 Feb 2016 12:15:28 -0800 Subject: [PATCH 3/3] documentation for lambda in VPC --- .../docs/providers/aws/r/lambda_function.html.markdown | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/website/source/docs/providers/aws/r/lambda_function.html.markdown b/website/source/docs/providers/aws/r/lambda_function.html.markdown index 5bc79c0fc..ed5e15892 100644 --- a/website/source/docs/providers/aws/r/lambda_function.html.markdown +++ b/website/source/docs/providers/aws/r/lambda_function.html.markdown @@ -55,6 +55,12 @@ resource "aws_lambda_function" "test_lambda" { * `memory_size` - (Optional) Amount of memory in MB your Lambda Function can use at runtime. Defaults to `128`. See [Limits][5] * `runtime` - (Optional) Defaults to `nodejs`. See [Runtimes][6] for valid values. * `timeout` - (Optional) The amount of time your Lambda Function has to run in seconds. Defaults to `3`. See [Limits][5] +* `vpc_config` - (Optional) Provide this to allow your function to access your VPC. Fields documented below. See [Lambda in VPC][7] + +**vpc\_config** requires the following: + +* `subnet_ids` - (Required) A list of subnet IDs associated with the Lambda function. +* `security_group_ids` - (Required) A list of security group IDs associated with the Lambda function. ## Attributes Reference @@ -67,3 +73,4 @@ resource "aws_lambda_function" "test_lambda" { [4]: https://docs.aws.amazon.com/lambda/latest/dg/intro-permission-model.html [5]: https://docs.aws.amazon.com/lambda/latest/dg/limits.html [6]: https://docs.aws.amazon.com/lambda/latest/dg/API_CreateFunction.html#API_CreateFunction_RequestBody +[7]: http://docs.aws.amazon.com/lambda/latest/dg/vpc.html