From 1d74bfd46745bcc0068c25ef538a07a0d169dd80 Mon Sep 17 00:00:00 2001 From: Paul Hinze Date: Thu, 10 Mar 2016 18:27:37 -0600 Subject: [PATCH] deps: Update vendored aws-sdk-go to v1.1.9 We had actually caught mismatched deps versions between the `kms` package and others, so `godep restore` was not working on master. Fixing it requires a `godep update` so I figured we might as well update to the latest release. --- Godeps/Godeps.json | 228 ++--- .../aws/aws-sdk-go/aws/awserr/error.go | 4 +- .../aws-sdk-go/aws/client/default_retryer.go | 9 +- .../aws-sdk-go/aws/corehandlers/handlers.go | 5 + .../aws/aws-sdk-go/aws/defaults/defaults.go | 1 + .../github.com/aws/aws-sdk-go/aws/logger.go | 14 + .../aws/aws-sdk-go/aws/request/handlers.go | 53 +- .../aws-sdk-go/aws/request/offset_reader.go | 49 + .../aws/aws-sdk-go/aws/request/request.go | 48 +- .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../private/endpoints/endpoints.json | 30 +- .../private/endpoints/endpoints_map.go | 27 +- .../aws/aws-sdk-go/service/apigateway/api.go | 177 +++- .../aws/aws-sdk-go/service/autoscaling/api.go | 302 +++---- .../aws-sdk-go/service/autoscaling/waiters.go | 94 ++ .../aws-sdk-go/service/cloudformation/api.go | 24 +- .../aws/aws-sdk-go/service/cloudwatch/api.go | 216 +++-- .../aws-sdk-go/service/cloudwatch/service.go | 51 +- .../service/cloudwatchevents/api.go | 72 +- .../service/cloudwatchevents/service.go | 2 +- .../aws-sdk-go/service/cloudwatchlogs/api.go | 69 +- .../service/cloudwatchlogs/service.go | 53 +- .../aws/aws-sdk-go/service/codecommit/api.go | 480 +++++++++- .../aws-sdk-go/service/codecommit/service.go | 26 +- .../aws/aws-sdk-go/service/codedeploy/api.go | 332 ++++++- .../service/directoryservice/api.go | 249 +++++- .../aws/aws-sdk-go/service/dynamodb/api.go | 536 +++++++---- .../aws-sdk-go/service/dynamodb/service.go | 38 +- .../aws/aws-sdk-go/service/ec2/api.go | 114 ++- .../aws/aws-sdk-go/service/ec2/waiters.go | 94 +- .../service/elasticbeanstalk/api.go | 20 + .../elasticbeanstalkiface/interface.go | 148 --- .../service/elasticbeanstalk/examples_test.go | 839 ------------------ .../service/elasticbeanstalk/service.go | 8 +- .../aws/aws-sdk-go/service/kms/api.go | 24 + .../service/kms/kmsiface/interface.go | 138 --- .../aws/aws-sdk-go/service/kms/service.go | 8 +- .../aws/aws-sdk-go/service/rds/api.go | 55 +- .../aws/aws-sdk-go/service/route53/api.go | 356 ++++---- 39 files changed, 2880 insertions(+), 2115 deletions(-) create mode 100644 vendor/github.com/aws/aws-sdk-go/aws/request/offset_reader.go create mode 100644 vendor/github.com/aws/aws-sdk-go/service/autoscaling/waiters.go delete mode 100644 vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/elasticbeanstalkiface/interface.go delete mode 100644 vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/examples_test.go delete mode 100644 vendor/github.com/aws/aws-sdk-go/service/kms/kmsiface/interface.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index e5e93962da9f..1f113f594bb9 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -173,288 +173,288 @@ }, { "ImportPath": "github.com/aws/aws-sdk-go/aws", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/awserr", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/awsutil", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/client", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/client/metadata", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/corehandlers", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/credentials", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/defaults", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/ec2metadata", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/request", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/session", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/endpoints", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/ec2query", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/json/jsonutil", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/jsonrpc", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/query", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/query/queryutil", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/rest", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/restjson", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/restxml", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/signer/v4", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/waiter", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/apigateway", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/autoscaling", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudformation", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudtrail", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudwatch", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudwatchevents", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudwatchlogs", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/codecommit", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/codedeploy", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/directoryservice", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/dynamodb", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/ec2", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/ecr", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/ecs", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/efs", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/elasticache", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/elasticbeanstalk", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/elasticsearchservice", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/elb", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/firehose", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/glacier", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/iam", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/kinesis", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/kms", - "Comment": "v1.1.0", - "Rev": "be2ec39e520e3c4088c0c6288055bdc8184a89ee" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/lambda", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/opsworks", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/rds", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/redshift", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/route53", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/s3", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/sns", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/sqs", - "Comment": "v1.1.2", - "Rev": "8041be5461786460d86b4358305fbdf32d37cfb2" + "Comment": "v1.1.9", + "Rev": "2e7cf03d7f5c8a4b4c9f7341ddf1e13102845cf2" }, { "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 05a179c2c5bd..cbc6bb1c0bff 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 @@ -82,9 +82,9 @@ func NewBatchError(code, message string, errs []error) BatchError { // output, err := s3manage.Upload(svc, input, opts) // if err != nil { // if reqerr, ok := err.(RequestFailure); ok { -// log.Printf("Request failed", reqerr.Code(), reqerr.Message(), reqerr.RequestID()) +// log.Println("Request failed", reqerr.Code(), reqerr.Message(), reqerr.RequestID()) // } else { -// log.Printf("Error:", err.Error() +// log.Println("Error:", err.Error()) // } // } // diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go index 24d39ce5641e..83badef7cc81 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go @@ -1,7 +1,6 @@ package client import ( - "math" "math/rand" "time" @@ -32,7 +31,13 @@ func (d DefaultRetryer) MaxRetries() int { // RetryRules returns the delay duration before retrying this request again func (d DefaultRetryer) RetryRules(r *request.Request) time.Duration { - delay := int(math.Pow(2, float64(r.RetryCount))) * (rand.Intn(30) + 30) + // Set the upper limit of delay in retrying at ~five minutes + retryCount := r.RetryCount + if retryCount > 13 { + retryCount = 13 + } + + delay := (1 << uint(retryCount)) * (rand.Intn(30) + 30) return time.Duration(delay) * time.Millisecond } diff --git a/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go index 1d3e656fd68e..a054d39346c0 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go @@ -64,6 +64,11 @@ var SendHandler = request.NamedHandler{Name: "core.SendHandler", Fn: func(r *req var err error r.HTTPResponse, err = r.Config.HTTPClient.Do(r.HTTPRequest) if err != nil { + // Prevent leaking if an HTTPResponse was returned. Clean up + // the body. + if r.HTTPResponse != nil { + r.HTTPResponse.Body.Close() + } // Capture the case where url.Error is returned for error processing // response. e.g. 301 without location header comes back as string // error and r.HTTPResponse is nil. Other url redirect errors will diff --git a/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go index 42c883aa9fa6..043960d3fcde 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go @@ -67,6 +67,7 @@ func Handlers() request.Handlers { handlers.Validate.PushBackNamed(corehandlers.ValidateEndpointHandler) handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler) + handlers.Build.AfterEachFn = request.HandlerListStopOnError handlers.Sign.PushBackNamed(corehandlers.BuildContentLengthHandler) handlers.Send.PushBackNamed(corehandlers.SendHandler) handlers.AfterRetry.PushBackNamed(corehandlers.AfterRetryHandler) diff --git a/vendor/github.com/aws/aws-sdk-go/aws/logger.go b/vendor/github.com/aws/aws-sdk-go/aws/logger.go index f5369487384e..db87188e20c7 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/logger.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/logger.go @@ -79,6 +79,20 @@ type Logger interface { Log(...interface{}) } +// A LoggerFunc is a convenience type to convert a function taking a variadic +// list of arguments and wrap it so the Logger interface can be used. +// +// Example: +// s3.New(sess, &aws.Config{Logger: aws.LoggerFunc(func(args ...interface{}) { +// fmt.Fprintln(os.Stdout, args...) +// })}) +type LoggerFunc func(...interface{}) + +// Log calls the wrapped function with the arguments provided +func (f LoggerFunc) Log(args ...interface{}) { + f(args...) +} + // NewDefaultLogger returns a Logger which will write log messages to stdout, and // use same formatting runes as the stdlib log.Logger func NewDefaultLogger() Logger { diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go index 3e90a7976aef..5279c19c09dd 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go @@ -50,9 +50,28 @@ func (h *Handlers) Clear() { h.AfterRetry.Clear() } +// A HandlerListRunItem represents an entry in the HandlerList which +// is being run. +type HandlerListRunItem struct { + Index int + Handler NamedHandler + Request *Request +} + // A HandlerList manages zero or more handlers in a list. type HandlerList struct { list []NamedHandler + + // Called after each request handler in the list is called. If set + // and the func returns true the HandlerList will continue to iterate + // over the request handlers. If false is returned the HandlerList + // will stop iterating. + // + // Should be used if extra logic to be performed between each handler + // in the list. This can be used to terminate a list's iteration + // based on a condition such as error like, HandlerListStopOnError. + // Or for logging like HandlerListLogItem. + AfterEachFn func(item HandlerListRunItem) bool } // A NamedHandler is a struct that contains a name and function callback. @@ -63,7 +82,9 @@ type NamedHandler struct { // copy creates a copy of the handler list. func (l *HandlerList) copy() HandlerList { - var n HandlerList + n := HandlerList{ + AfterEachFn: l.AfterEachFn, + } n.list = append([]NamedHandler{}, l.list...) return n } @@ -111,11 +132,37 @@ func (l *HandlerList) Remove(n NamedHandler) { // Run executes all handlers in the list with a given request object. func (l *HandlerList) Run(r *Request) { - for _, f := range l.list { - f.Fn(r) + for i, h := range l.list { + h.Fn(r) + item := HandlerListRunItem{ + Index: i, Handler: h, Request: r, + } + if l.AfterEachFn != nil && !l.AfterEachFn(item) { + return + } } } +// HandlerListLogItem logs the request handler and the state of the +// request's Error value. Always returns true to continue iterating +// request handlers in a HandlerList. +func HandlerListLogItem(item HandlerListRunItem) bool { + if item.Request.Config.Logger == nil { + return true + } + item.Request.Config.Logger.Log("DEBUG: RequestHandler", + item.Index, item.Handler.Name, item.Request.Error) + + return true +} + +// HandlerListStopOnError returns false to stop the HandlerList iterating +// over request handlers if Request.Error is not nil. True otherwise +// to continue iterating. +func HandlerListStopOnError(item HandlerListRunItem) bool { + return item.Request.Error == nil +} + // MakeAddToUserAgentHandler will add the name/version pair to the User-Agent request // header. If the extra parameters are provided they will be added as metadata to the // name/version pair resulting in the following format. diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/offset_reader.go b/vendor/github.com/aws/aws-sdk-go/aws/request/offset_reader.go new file mode 100644 index 000000000000..da6396d2d93b --- /dev/null +++ b/vendor/github.com/aws/aws-sdk-go/aws/request/offset_reader.go @@ -0,0 +1,49 @@ +package request + +import ( + "io" + "sync" +) + +// offsetReader is a thread-safe io.ReadCloser to prevent racing +// with retrying requests +type offsetReader struct { + buf io.ReadSeeker + lock sync.RWMutex + closed bool +} + +func newOffsetReader(buf io.ReadSeeker, offset int64) *offsetReader { + reader := &offsetReader{} + buf.Seek(offset, 0) + + reader.buf = buf + return reader +} + +// Close is a thread-safe close. Uses the write lock. +func (o *offsetReader) Close() error { + o.lock.Lock() + defer o.lock.Unlock() + o.closed = true + return nil +} + +// Read is a thread-safe read using a read lock. +func (o *offsetReader) Read(p []byte) (int, error) { + o.lock.RLock() + defer o.lock.RUnlock() + + if o.closed { + return 0, io.EOF + } + + return o.buf.Read(p) +} + +// CloseAndCopy will return a new offsetReader with a copy of the old buffer +// and close the old buffer. +func (o *offsetReader) CloseAndCopy(offset int64) *offsetReader { + o.Close() + return newOffsetReader(o.buf, offset) +} diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go index 61bb4a8ca757..a4b70545a2d5 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/request/request.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go @@ -131,7 +131,7 @@ func (r *Request) SetStringBody(s string) { // SetReaderBody will set the request's body reader. func (r *Request) SetReaderBody(reader io.ReadSeeker) { - r.HTTPRequest.Body = ioutil.NopCloser(reader) + r.HTTPRequest.Body = newOffsetReader(reader, 0) r.Body = reader } @@ -192,6 +192,10 @@ func (r *Request) Build() error { return r.Error } r.Handlers.Build.Run(r) + if r.Error != nil { + debugLogReqError(r, "Build Request", false, r.Error) + return r.Error + } r.built = true } @@ -219,22 +223,46 @@ func (r *Request) Sign() error { // be executed in the order they were set. func (r *Request) Send() error { for { - r.Sign() - if r.Error != nil { - return r.Error - } - if aws.BoolValue(r.Retryable) { if r.Config.LogLevel.Matches(aws.LogDebugWithRequestRetries) { r.Config.Logger.Log(fmt.Sprintf("DEBUG: Retrying Request %s/%s, attempt %d", r.ClientInfo.ServiceName, r.Operation.Name, r.RetryCount)) } - // Re-seek the body back to the original point in for a retry so that - // send will send the body's contents again in the upcoming request. - r.Body.Seek(r.BodyStart, 0) - r.HTTPRequest.Body = ioutil.NopCloser(r.Body) + var body io.ReadCloser + if reader, ok := r.HTTPRequest.Body.(*offsetReader); ok { + body = reader.CloseAndCopy(r.BodyStart) + } else { + if r.Config.Logger != nil { + r.Config.Logger.Log("Request body type has been overwritten. May cause race conditions") + } + r.Body.Seek(r.BodyStart, 0) + body = ioutil.NopCloser(r.Body) + } + + r.HTTPRequest = &http.Request{ + URL: r.HTTPRequest.URL, + Header: r.HTTPRequest.Header, + Close: r.HTTPRequest.Close, + Form: r.HTTPRequest.Form, + PostForm: r.HTTPRequest.PostForm, + Body: body, + MultipartForm: r.HTTPRequest.MultipartForm, + Host: r.HTTPRequest.Host, + Method: r.HTTPRequest.Method, + Proto: r.HTTPRequest.Proto, + ContentLength: r.HTTPRequest.ContentLength, + } + // Closing response body. Since we are setting a new request to send off, this + // response will get squashed and leaked. + r.HTTPResponse.Body.Close() + } + + r.Sign() + if r.Error != nil { + return r.Error } + r.Retryable = nil r.Handlers.Send.Run(r) 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 1a9a5a85308d..af9a461f80bc 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.2" +const SDKVersion = "1.1.9" diff --git a/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json b/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json index 7819eedc39e3..0cb6917bad14 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json +++ b/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints.json @@ -57,36 +57,14 @@ "endpoint": "sdb.amazonaws.com", "signingRegion": "us-east-1" }, - "us-east-1/s3": { - "endpoint": "s3.amazonaws.com" - }, - "us-west-1/s3": { - "endpoint": "s3-{region}.amazonaws.com" - }, - "us-west-2/s3": { - "endpoint": "s3-{region}.amazonaws.com" - }, - "eu-west-1/s3": { - "endpoint": "s3-{region}.amazonaws.com" - }, - "ap-southeast-1/s3": { - "endpoint": "s3-{region}.amazonaws.com" - }, - "ap-southeast-2/s3": { - "endpoint": "s3-{region}.amazonaws.com" - }, - "ap-northeast-1/s3": { - "endpoint": "s3-{region}.amazonaws.com" - }, - "ap-northeast-2/s3": { + "*/s3": { "endpoint": "s3-{region}.amazonaws.com" }, - "sa-east-1/s3": { - "endpoint": "s3-{region}.amazonaws.com" + "us-east-1/s3": { + "endpoint": "s3.amazonaws.com" }, "eu-central-1/s3": { - "endpoint": "{service}.{region}.amazonaws.com", - "signatureVersion": "v4" + "endpoint": "{service}.{region}.amazonaws.com" } } } diff --git a/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go b/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go index 9b2e1b699b24..6183dcd3deef 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go +++ b/vendor/github.com/aws/aws-sdk-go/private/endpoints/endpoints_map.go @@ -46,6 +46,9 @@ var endpointsMap = endpointStruct{ Endpoint: "route53.amazonaws.com", SigningRegion: "us-east-1", }, + "*/s3": { + Endpoint: "s3-{region}.amazonaws.com", + }, "*/sts": { Endpoint: "sts.amazonaws.com", SigningRegion: "us-east-1", @@ -54,30 +57,12 @@ var endpointsMap = endpointStruct{ Endpoint: "waf.amazonaws.com", SigningRegion: "us-east-1", }, - "ap-northeast-1/s3": { - Endpoint: "s3-{region}.amazonaws.com", - }, - "ap-northeast-2/s3": { - Endpoint: "s3-{region}.amazonaws.com", - }, - "ap-southeast-1/s3": { - Endpoint: "s3-{region}.amazonaws.com", - }, - "ap-southeast-2/s3": { - Endpoint: "s3-{region}.amazonaws.com", - }, "cn-north-1/*": { Endpoint: "{service}.{region}.amazonaws.com.cn", }, "eu-central-1/s3": { Endpoint: "{service}.{region}.amazonaws.com", }, - "eu-west-1/s3": { - Endpoint: "s3-{region}.amazonaws.com", - }, - "sa-east-1/s3": { - Endpoint: "s3-{region}.amazonaws.com", - }, "us-east-1/s3": { Endpoint: "s3.amazonaws.com", }, @@ -94,11 +79,5 @@ var endpointsMap = endpointStruct{ "us-gov-west-1/sts": { Endpoint: "sts.us-gov-west-1.amazonaws.com", }, - "us-west-1/s3": { - Endpoint: "s3-{region}.amazonaws.com", - }, - "us-west-2/s3": { - Endpoint: "s3-{region}.amazonaws.com", - }, }, } diff --git a/vendor/github.com/aws/aws-sdk-go/service/apigateway/api.go b/vendor/github.com/aws/aws-sdk-go/service/apigateway/api.go index 05dc4bfb8171..a40689d140b2 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/apigateway/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/apigateway/api.go @@ -661,6 +661,35 @@ func (c *APIGateway) DeleteStage(input *DeleteStageInput) (*DeleteStageOutput, e return out, err } +const opFlushStageAuthorizersCache = "FlushStageAuthorizersCache" + +// FlushStageAuthorizersCacheRequest generates a request for the FlushStageAuthorizersCache operation. +func (c *APIGateway) FlushStageAuthorizersCacheRequest(input *FlushStageAuthorizersCacheInput) (req *request.Request, output *FlushStageAuthorizersCacheOutput) { + op := &request.Operation{ + Name: opFlushStageAuthorizersCache, + HTTPMethod: "DELETE", + HTTPPath: "/restapis/{restapi_id}/stages/{stage_name}/cache/authorizers", + } + + if input == nil { + input = &FlushStageAuthorizersCacheInput{} + } + + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(restjson.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) + output = &FlushStageAuthorizersCacheOutput{} + req.Data = output + return +} + +// Flushes all authorizer cache entries on a stage. +func (c *APIGateway) FlushStageAuthorizersCache(input *FlushStageAuthorizersCacheInput) (*FlushStageAuthorizersCacheOutput, error) { + req, out := c.FlushStageAuthorizersCacheRequest(input) + err := req.Send() + return out, err +} + const opFlushStageCache = "FlushStageCache" // FlushStageCacheRequest generates a request for the FlushStageCache operation. @@ -1690,6 +1719,32 @@ func (c *APIGateway) PutMethodResponse(input *PutMethodResponseInput) (*MethodRe return out, err } +const opTestInvokeAuthorizer = "TestInvokeAuthorizer" + +// TestInvokeAuthorizerRequest generates a request for the TestInvokeAuthorizer operation. +func (c *APIGateway) TestInvokeAuthorizerRequest(input *TestInvokeAuthorizerInput) (req *request.Request, output *TestInvokeAuthorizerOutput) { + op := &request.Operation{ + Name: opTestInvokeAuthorizer, + HTTPMethod: "POST", + HTTPPath: "/restapis/{restapi_id}/authorizers/{authorizer_id}", + } + + if input == nil { + input = &TestInvokeAuthorizerInput{} + } + + req = c.newRequest(op, input, output) + output = &TestInvokeAuthorizerOutput{} + req.Data = output + return +} + +func (c *APIGateway) TestInvokeAuthorizer(input *TestInvokeAuthorizerInput) (*TestInvokeAuthorizerOutput, error) { + req, out := c.TestInvokeAuthorizerRequest(input) + err := req.Send() + return out, err +} + const opTestInvokeMethod = "TestInvokeMethod" // TestInvokeMethodRequest generates a request for the TestInvokeMethod operation. @@ -3132,6 +3187,41 @@ func (s DomainName) GoString() string { return s.String() } +// Request to flush authorizer cache entries on a specified stage. +type FlushStageAuthorizersCacheInput struct { + _ struct{} `type:"structure"` + + // The API identifier of the stage to flush. + RestApiId *string `location:"uri" locationName:"restapi_id" type:"string" required:"true"` + + // The name of the stage to flush. + StageName *string `location:"uri" locationName:"stage_name" type:"string" required:"true"` +} + +// String returns the string representation +func (s FlushStageAuthorizersCacheInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s FlushStageAuthorizersCacheInput) GoString() string { + return s.String() +} + +type FlushStageAuthorizersCacheOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s FlushStageAuthorizersCacheOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s FlushStageAuthorizersCacheOutput) GoString() string { + return s.String() +} + // Requests Amazon API Gateway to flush a stage's cache. type FlushStageCacheInput struct { _ struct{} `type:"structure"` @@ -4292,6 +4382,11 @@ type MethodSetting struct { // and the value is a Boolean. MetricsEnabled *bool `locationName:"metricsEnabled" type:"boolean"` + // Specifies whether authorization is required for a cache invalidation request. + // The PATCH path for this setting is /{method_setting_key}/caching/requireAuthorizationForCacheControl, + // and the value is a Boolean. + RequireAuthorizationForCacheControl *bool `locationName:"requireAuthorizationForCacheControl" type:"boolean"` + // Specifies the throttling burst limit. The PATCH path for this setting is // /{method_setting_key}/throttling/burstLimit, and the value is an integer. ThrottlingBurstLimit *int64 `locationName:"throttlingBurstLimit" type:"integer"` @@ -4299,6 +4394,12 @@ type MethodSetting struct { // Specifies the throttling rate limit. The PATCH path for this setting is /{method_setting_key}/throttling/rateLimit, // and the value is a double. ThrottlingRateLimit *float64 `locationName:"throttlingRateLimit" type:"double"` + + // Specifies the strategy on how to handle the unauthorized requests for cache + // invalidation. The PATCH path for this setting is /{method_setting_key}/caching/unauthorizedCacheControlHeaderStrategy, + // and the available values are FAIL_WITH_403, SUCCEED_WITH_RESPONSE_HEADER, + // SUCCEED_WITHOUT_RESPONSE_HEADER. + UnauthorizedCacheControlHeaderStrategy *string `locationName:"unauthorizedCacheControlHeaderStrategy" type:"string" enum:"UnauthorizedCacheControlHeaderStrategy"` } // String returns the string representation @@ -4415,7 +4516,8 @@ type PutIntegrationInput struct { // Specifies a put integration request's HTTP method. HttpMethod *string `location:"uri" locationName:"http_method" type:"string" required:"true"` - // Specifies a put integration HTTP method. + // Specifies a put integration HTTP method. When the integration type is HTTP + // or AWS, this field is required. IntegrationHttpMethod *string `locationName:"httpMethod" type:"string"` // Represents request parameters that are sent with the backend request. Request @@ -4442,7 +4544,8 @@ type PutIntegrationInput struct { // Specifies a put integration input's type. Type *string `locationName:"type" type:"string" required:"true" enum:"IntegrationType"` - // Specifies a put integration input's Uniform Resource Identifier (URI). + // Specifies a put integration input's Uniform Resource Identifier (URI). When + // the integration type is HTTP or AWS, this field is required. Uri *string `locationName:"uri" type:"string"` } @@ -4724,6 +4827,67 @@ func (s StageKey) GoString() string { return s.String() } +type TestInvokeAuthorizerInput struct { + _ struct{} `type:"structure"` + + AdditionalContext map[string]*string `locationName:"additionalContext" type:"map"` + + AuthorizerId *string `location:"uri" locationName:"authorizer_id" type:"string" required:"true"` + + Body *string `locationName:"body" type:"string"` + + Headers map[string]*string `locationName:"headers" type:"map"` + + PathWithQueryString *string `locationName:"pathWithQueryString" type:"string"` + + RestApiId *string `location:"uri" locationName:"restapi_id" type:"string" required:"true"` + + StageVariables map[string]*string `locationName:"stageVariables" type:"map"` +} + +// String returns the string representation +func (s TestInvokeAuthorizerInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TestInvokeAuthorizerInput) GoString() string { + return s.String() +} + +// Represents the response of the test invoke request in for a custom Authorizer +type TestInvokeAuthorizerOutput struct { + _ struct{} `type:"structure"` + + Authorization map[string][]*string `locationName:"authorization" type:"map"` + + // The HTTP status code that the client would have received. Value is 0 if the + // authorizer succeeded. + ClientStatus *int64 `locationName:"clientStatus" type:"integer"` + + // The execution latency of the test authorizer request + Latency *int64 `locationName:"latency" type:"long"` + + // The Amazon API Gateway execution log for the test authorizer request. + Log *string `locationName:"log" type:"string"` + + // The policy JSON document returned by the Authorizer + Policy *string `locationName:"policy" type:"string"` + + // The principal identity returned by the Authorizer + PrincipalId *string `locationName:"principalId" type:"string"` +} + +// String returns the string representation +func (s TestInvokeAuthorizerOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TestInvokeAuthorizerOutput) GoString() string { + return s.String() +} + type TestInvokeMethodInput struct { _ struct{} `type:"structure"` @@ -5231,6 +5395,15 @@ const ( IntegrationTypeMock = "MOCK" ) +const ( + // @enum UnauthorizedCacheControlHeaderStrategy + UnauthorizedCacheControlHeaderStrategyFailWith403 = "FAIL_WITH_403" + // @enum UnauthorizedCacheControlHeaderStrategy + UnauthorizedCacheControlHeaderStrategySucceedWithResponseHeader = "SUCCEED_WITH_RESPONSE_HEADER" + // @enum UnauthorizedCacheControlHeaderStrategy + UnauthorizedCacheControlHeaderStrategySucceedWithoutResponseHeader = "SUCCEED_WITHOUT_RESPONSE_HEADER" +) + const ( // @enum op OpAdd = "add" 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 9f2ce611b481..4958ba2a76f6 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 @@ -104,20 +104,22 @@ func (c *AutoScaling) CompleteLifecycleActionRequest(input *CompleteLifecycleAct return } -// Completes the lifecycle action for the associated token initiated under the -// given lifecycle hook with the specified result. +// Completes the lifecycle action for the specified token or instance with the +// specified result. // -// This operation is a part of the basic sequence for adding a lifecycle hook -// to an Auto Scaling group: +// This step is a part of the procedure for adding a lifecycle hook to an Auto +// Scaling group: // -// Create a notification target. A target can be either an Amazon SQS queue -// or an Amazon SNS topic. Create an IAM role. This role allows Auto Scaling -// to publish lifecycle notifications to the designated SQS queue or SNS topic. -// Create the lifecycle hook. You can create a hook that acts when instances -// launch or when instances terminate. If necessary, record the lifecycle action -// heartbeat to keep the instance in a pending state. Complete the lifecycle -// action. For more information, see Auto Scaling Pending State (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingPendingState.html) -// and Auto Scaling Terminating State (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingTerminatingState.html) +// (Optional) Create a Lambda function and a rule that allows CloudWatch Events +// to invoke your Lambda function when Auto Scaling launches or terminates instances. +// (Optional) Create a notification target and an IAM role. The target can be +// either an Amazon SQS queue or an Amazon SNS topic. The role allows Auto Scaling +// to publish lifecycle notifications to the target. Create the lifecycle hook. +// Specify whether the hook is used when the instances launch or terminate. +// If you need more time, record the lifecycle action heartbeat to keep the +// instance in a pending state. If you finish before the timeout period ends, +// complete the lifecycle action. For more information, see Auto Scaling Lifecycle +// (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingGroupLifecycle.html) // in the Auto Scaling Developer Guide. func (c *AutoScaling) CompleteLifecycleAction(input *CompleteLifecycleActionInput) (*CompleteLifecycleActionOutput, error) { req, out := c.CompleteLifecycleActionRequest(input) @@ -221,13 +223,6 @@ func (c *AutoScaling) CreateOrUpdateTagsRequest(input *CreateOrUpdateTagsInput) // Creates or updates tags for the specified Auto Scaling group. // -// A tag is defined by its resource ID, resource type, key, value, and propagate -// flag. The value and the propagate flag are optional parameters. The only -// supported resource type is auto-scaling-group, and the resource ID must be -// the name of the group. The PropagateAtLaunch flag determines whether the -// tag is added to instances launched in the group. Valid values are true or -// false. -// // When you specify a tag with a key that already exists, the operation overwrites // the previous tag definition, and you do not get an error message. // @@ -1214,7 +1209,7 @@ func (c *AutoScaling) EnterStandbyRequest(input *EnterStandbyInput) (req *reques // Moves the specified instances into Standby mode. // -// For more information, see Auto Scaling InService State (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingInServiceState.html) +// For more information, see Auto Scaling Lifecycle (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingGroupLifecycle.html) // in the Auto Scaling Developer Guide. func (c *AutoScaling) EnterStandby(input *EnterStandbyInput) (*EnterStandbyOutput, error) { req, out := c.EnterStandbyRequest(input) @@ -1273,7 +1268,7 @@ func (c *AutoScaling) ExitStandbyRequest(input *ExitStandbyInput) (req *request. // Moves the specified instances out of Standby mode. // -// For more information, see Auto Scaling InService State (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingInServiceState.html) +// For more information, see Auto Scaling Lifecycle (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingGroupLifecycle.html) // in the Auto Scaling Developer Guide. func (c *AutoScaling) ExitStandby(input *ExitStandbyInput) (*ExitStandbyOutput, error) { req, out := c.ExitStandbyRequest(input) @@ -1307,17 +1302,19 @@ func (c *AutoScaling) PutLifecycleHookRequest(input *PutLifecycleHookInput) (req // an instance that is not actively in service; for example, either when the // instance launches or before the instance terminates. // -// This operation is a part of the basic sequence for adding a lifecycle hook -// to an Auto Scaling group: +// This step is a part of the procedure for adding a lifecycle hook to an Auto +// Scaling group: // -// Create a notification target. A target can be either an Amazon SQS queue -// or an Amazon SNS topic. Create an IAM role. This role allows Auto Scaling -// to publish lifecycle notifications to the designated SQS queue or SNS topic. -// Create the lifecycle hook. You can create a hook that acts when instances -// launch or when instances terminate. If necessary, record the lifecycle action -// heartbeat to keep the instance in a pending state. Complete the lifecycle -// action. For more information, see Auto Scaling Pending State (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingPendingState.html) -// and Auto Scaling Terminating State (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingTerminatingState.html) +// (Optional) Create a Lambda function and a rule that allows CloudWatch Events +// to invoke your Lambda function when Auto Scaling launches or terminates instances. +// (Optional) Create a notification target and an IAM role. The target can be +// either an Amazon SQS queue or an Amazon SNS topic. The role allows Auto Scaling +// to publish lifecycle notifications to the target. Create the lifecycle hook. +// Specify whether the hook is used when the instances launch or terminate. +// If you need more time, record the lifecycle action heartbeat to keep the +// instance in a pending state. If you finish before the timeout period ends, +// complete the lifecycle action. For more information, see Auto Scaling Lifecycle +// (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingGroupLifecycle.html) // in the Auto Scaling Developer Guide. // // If you exceed your maximum limit of lifecycle hooks, which by default is @@ -1456,21 +1453,23 @@ func (c *AutoScaling) RecordLifecycleActionHeartbeatRequest(input *RecordLifecyc return } -// Records a heartbeat for the lifecycle action associated with a specific token. -// This extends the timeout by the length of time defined by the HeartbeatTimeout -// parameter of PutLifecycleHook. +// Records a heartbeat for the lifecycle action associated with the specified +// token or instance. This extends the timeout by the length of time defined +// using PutLifecycleHook. // -// This operation is a part of the basic sequence for adding a lifecycle hook -// to an Auto Scaling group: +// This step is a part of the procedure for adding a lifecycle hook to an Auto +// Scaling group: // -// Create a notification target. A target can be either an Amazon SQS queue -// or an Amazon SNS topic. Create an IAM role. This role allows Auto Scaling -// to publish lifecycle notifications to the designated SQS queue or SNS topic. -// Create the lifecycle hook. You can create a hook that acts when instances -// launch or when instances terminate. If necessary, record the lifecycle action -// heartbeat to keep the instance in a pending state. Complete the lifecycle -// action. For more information, see Auto Scaling Pending State (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingPendingState.html) -// and Auto Scaling Terminating State (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingTerminatingState.html) +// (Optional) Create a Lambda function and a rule that allows CloudWatch Events +// to invoke your Lambda function when Auto Scaling launches or terminates instances. +// (Optional) Create a notification target and an IAM role. The target can be +// either an Amazon SQS queue or an Amazon SNS topic. The role allows Auto Scaling +// to publish lifecycle notifications to the target. Create the lifecycle hook. +// Specify whether the hook is used when the instances launch or terminate. +// If you need more time, record the lifecycle action heartbeat to keep the +// instance in a pending state. If you finish before the timeout period ends, +// complete the lifecycle action. For more information, see Auto Scaling Lifecycle +// (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingGroupLifecycle.html) // in the Auto Scaling Developer Guide. func (c *AutoScaling) RecordLifecycleActionHeartbeat(input *RecordLifecycleActionHeartbeatInput) (*RecordLifecycleActionHeartbeatOutput, error) { req, out := c.RecordLifecycleActionHeartbeatRequest(input) @@ -1500,10 +1499,11 @@ func (c *AutoScaling) ResumeProcessesRequest(input *ScalingProcessQuery) (req *r return } -// Resumes the specified suspended Auto Scaling processes for the specified -// Auto Scaling group. To resume specific processes, use the ScalingProcesses -// parameter. To resume all processes, omit the ScalingProcesses parameter. -// For more information, see Suspend and Resume Auto Scaling Processes (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/US_SuspendResume.html) +// Resumes the specified suspended Auto Scaling processes, or all suspended +// process, for the specified Auto Scaling group. +// +// For more information, see Suspending and Resuming Auto Scaling Processes +// (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/US_SuspendResume.html) // in the Auto Scaling Developer Guide. func (c *AutoScaling) ResumeProcesses(input *ScalingProcessQuery) (*ResumeProcessesOutput, error) { req, out := c.ResumeProcessesRequest(input) @@ -1627,16 +1627,16 @@ func (c *AutoScaling) SuspendProcessesRequest(input *ScalingProcessQuery) (req * return } -// Suspends the specified Auto Scaling processes for the specified Auto Scaling -// group. To suspend specific processes, use the ScalingProcesses parameter. -// To suspend all processes, omit the ScalingProcesses parameter. +// Suspends the specified Auto Scaling processes, or all processes, for the +// specified Auto Scaling group. // // Note that if you suspend either the Launch or Terminate process types, it // can prevent other process types from functioning properly. // // To resume processes that have been suspended, use ResumeProcesses. // -// For more information, see Suspend and Resume Auto Scaling Processes (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/US_SuspendResume.html) +// For more information, see Suspending and Resuming Auto Scaling Processes +// (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/US_SuspendResume.html) // in the Auto Scaling Developer Guide. func (c *AutoScaling) SuspendProcesses(input *ScalingProcessQuery) (*SuspendProcessesOutput, error) { req, out := c.SuspendProcessesRequest(input) @@ -1823,7 +1823,7 @@ type AttachInstancesInput struct { // The name of the group. AutoScalingGroupName *string `min:"1" type:"string" required:"true"` - // One or more EC2 instance IDs. + // One or more instance IDs. InstanceIds []*string `type:"list"` } @@ -1922,6 +1922,9 @@ type CompleteLifecycleActionInput struct { // The name of the group for the lifecycle hook. AutoScalingGroupName *string `min:"1" type:"string" required:"true"` + // The ID of the instance. + InstanceId *string `min:"1" type:"string"` + // The action for the group to take. This parameter can be either CONTINUE or // ABANDON. LifecycleActionResult *string `type:"string" required:"true"` @@ -1929,7 +1932,7 @@ type CompleteLifecycleActionInput struct { // A universally unique identifier (UUID) that identifies a specific lifecycle // action associated with an instance. Auto Scaling sends this token to the // notification target you specified when you created the lifecycle hook. - LifecycleActionToken *string `min:"36" type:"string" required:"true"` + LifecycleActionToken *string `min:"36" type:"string"` // The name of the lifecycle hook. LifecycleHookName *string `min:"1" type:"string" required:"true"` @@ -1967,13 +1970,13 @@ type CreateAutoScalingGroupInput struct { AutoScalingGroupName *string `min:"1" type:"string" required:"true"` // One or more Availability Zones for the group. This parameter is optional - // if you specify subnets using the VPCZoneIdentifier parameter. + // if you specify one or more subnets. AvailabilityZones []*string `min:"1" type:"list"` // The amount of time, in seconds, after a scaling activity completes before // another scaling activity can start. The default is 300. // - // For more information, see Understanding Auto Scaling Cooldowns (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/Cooldown.html) + // For more information, see Auto Scaling Cooldowns (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/Cooldown.html) // in the Auto Scaling Developer Guide. DefaultCooldown *int64 `type:"integer"` @@ -1989,7 +1992,7 @@ type CreateAutoScalingGroupInput struct { // // This parameter is required if you are adding an ELB health check. // - // For more information, see Health Checks for Auto Scaling Instances (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/healthcheck.html) + // For more information, see Health Checks (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/healthcheck.html) // in the Auto Scaling Developer Guide. HealthCheckGracePeriod *int64 `type:"integer"` @@ -2000,27 +2003,27 @@ type CreateAutoScalingGroupInput struct { // in the Auto Scaling Developer Guide. HealthCheckType *string `min:"1" type:"string"` - // The ID of the EC2 instance used to create a launch configuration for the - // group. Alternatively, use the LaunchConfigurationName parameter to specify - // a launch configuration instead of an EC2 instance. + // The ID of the instance used to create a launch configuration for the group. + // Alternatively, specify a launch configuration instead of an EC2 instance. // // When you specify an ID of an instance, Auto Scaling creates a new launch // configuration and associates it with the group. This launch configuration // derives its attributes from the specified instance, with the exception of // the block device mapping. // - // For more information, see Create an Auto Scaling Group from an EC2 Instance + // For more information, see Create an Auto Scaling Group Using an EC2 Instance // (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/create-asg-from-instance.html) // in the Auto Scaling Developer Guide. InstanceId *string `min:"1" type:"string"` - // The name of the launch configuration. Alternatively, use the InstanceId parameter - // to specify an EC2 instance instead of a launch configuration. + // The name of the launch configuration. Alternatively, specify an EC2 instance + // instead of a launch configuration. LaunchConfigurationName *string `min:"1" type:"string"` // One or more load balancers. // - // For more information, see Load Balance Your Auto Scaling Group (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/US_SetUpASLBApp.html) + // For more information, see Using a Load Balancer With an Auto Scaling Group + // (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/US_SetUpASLBApp.html) // in the Auto Scaling Developer Guide. LoadBalancerNames []*string `type:"list"` @@ -2039,9 +2042,7 @@ type CreateAutoScalingGroupInput struct { // in the Amazon Elastic Compute Cloud User Guide. PlacementGroup *string `min:"1" type:"string"` - // The tag to be created or updated. Each tag should be defined by its resource - // type, resource ID, key, value, and a propagate flag. Valid values: key=value, - // value=value, propagate=true or false. Value and propagate are optional parameters. + // One or more tags. // // For more information, see Tagging Auto Scaling Groups and Instances (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/ASTagging.html) // in the Auto Scaling Developer Guide. @@ -2050,8 +2051,8 @@ type CreateAutoScalingGroupInput struct { // One or more termination policies used to select the instance to terminate. // These policies are executed in the order that they are listed. // - // For more information, see Choosing a Termination Policy for Your Auto Scaling - // Group (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/us-termination-policy.html) + // For more information, see Controlling Which Instances Auto Scaling Terminates + // During Scale In (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingBehavior.InstanceTermination.html) // in the Auto Scaling Developer Guide. TerminationPolicies []*string `type:"list"` @@ -2061,8 +2062,7 @@ type CreateAutoScalingGroupInput struct { // If you specify subnets and Availability Zones with this call, ensure that // the subnets' Availability Zones match the Availability Zones specified. // - // For more information, see Auto Scaling and Amazon Virtual Private Cloud - // (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/autoscalingsubnets.html) + // For more information, see Launching Auto Scaling Instances in a VPC (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/asg-in-vpc.html) // in the Auto Scaling Developer Guide. VPCZoneIdentifier *string `min:"1" type:"string"` } @@ -2096,11 +2096,11 @@ type CreateLaunchConfigurationInput struct { // Used for groups that launch instances into a virtual private cloud (VPC). // Specifies whether to assign a public IP address to each instance. For more - // information, see Auto Scaling and Amazon Virtual Private Cloud (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/autoscalingsubnets.html) + // information, see Launching Auto Scaling Instances in a VPC (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/asg-in-vpc.html) // in the Auto Scaling Developer Guide. // - // If you specify a value for this parameter, be sure to specify at least one - // subnet using the VPCZoneIdentifier parameter when you create your group. + // If you specify this parameter, be sure to specify at least one subnet when + // you create your group. // // Default: If the instance is launched into a default subnet, the default // is true. If the instance is launched into a nondefault subnet, the default @@ -2119,9 +2119,9 @@ type CreateLaunchConfigurationInput struct { // in the Amazon Elastic Compute Cloud User Guide. ClassicLinkVPCId *string `min:"1" type:"string"` - // The IDs of one or more security groups for the VPC specified in ClassicLinkVPCId. - // This parameter is required if ClassicLinkVPCId is specified, and is not supported - // otherwise. For more information, see ClassicLink (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html) + // The IDs of one or more security groups for the specified ClassicLink-enabled + // VPC. This parameter is required if you specify a ClassicLink-enabled VPC, + // and is not supported otherwise. For more information, see ClassicLink (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html) // in the Amazon Elastic Compute Cloud User Guide. ClassicLinkVPCSecurityGroups []*string `type:"list"` @@ -2150,7 +2150,7 @@ type CreateLaunchConfigurationInput struct { // in the Amazon Elastic Compute Cloud User Guide. ImageId *string `min:"1" type:"string"` - // The ID of the EC2 instance to use to create the launch configuration. + // The ID of the instance to use to create the launch configuration. // // The new launch configuration derives attributes from the instance, with // the exception of the block device mapping. @@ -2169,7 +2169,8 @@ type CreateLaunchConfigurationInput struct { // When detailed monitoring is enabled, Amazon CloudWatch generates metrics // every minute and your account is charged a fee. When you disable detailed // monitoring, by specifying False, CloudWatch generates metrics every 5 minutes. - // For more information, see Monitor Your Auto Scaling Instances (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/as-instance-monitoring.html) + // For more information, see Monitoring Your Auto Scaling Instances and Groups + // (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/as-instance-monitoring.html) // in the Auto Scaling Developer Guide. InstanceMonitoring *InstanceMonitoring `type:"structure"` @@ -2197,11 +2198,10 @@ type CreateLaunchConfigurationInput struct { // Dedicated Instances into a shared tenancy VPC (VPC with instance placement // tenancy attribute set to default). // - // If you specify a value for this parameter, be sure to specify at least one - // subnet using the VPCZoneIdentifier parameter when you create your group. + // If you specify this parameter, be sure to specify at least one subnet when + // you create your group. // - // For more information, see Auto Scaling and Amazon Virtual Private Cloud - // (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/autoscalingsubnets.html) + // For more information, see Launching Auto Scaling Instances in a VPC (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/asg-in-vpc.html) // in the Auto Scaling Developer Guide. // // Valid values: default | dedicated @@ -2224,7 +2224,7 @@ type CreateLaunchConfigurationInput struct { // The maximum hourly price to be paid for any Spot Instance launched to fulfill // the request. Spot Instances are launched when the price you specify exceeds - // the current Spot market price. For more information, see Launch Spot Instances + // the current Spot market price. For more information, see Launching Spot Instances // in Your Auto Scaling Group (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/US-SpotInstances.html) // in the Auto Scaling Developer Guide. SpotPrice *string `min:"1" type:"string"` @@ -2232,9 +2232,6 @@ type CreateLaunchConfigurationInput struct { // The user data to make available to the launched EC2 instances. For more information, // see Instance Metadata and User Data (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html) // in the Amazon Elastic Compute Cloud User Guide. - // - // At this time, launch configurations don't support compressed (zipped) user - // data files. UserData *string `type:"string"` } @@ -2500,10 +2497,7 @@ func (s DeleteScheduledActionOutput) GoString() string { type DeleteTagsInput struct { _ struct{} `type:"structure"` - // Each tag should be defined by its resource type, resource ID, key, value, - // and a propagate flag. Valid values are: Resource type = auto-scaling-group, - // Resource ID = AutoScalingGroupName, key=value, value=value, propagate=true - // or false. + // One or more tags. Tags []*Tag `type:"list" required:"true"` } @@ -2652,9 +2646,9 @@ func (s DescribeAutoScalingGroupsOutput) GoString() string { type DescribeAutoScalingInstancesInput struct { _ struct{} `type:"structure"` - // One or more Auto Scaling instances to describe, up to 50 instances. If you - // omit this parameter, all Auto Scaling instances are described. If you specify - // an ID that does not exist, it is ignored with no error. + // The instances to describe; up to 50 instance IDs. If you omit this parameter, + // all Auto Scaling instances are described. If you specify an ID that does + // not exist, it is ignored with no error. InstanceIds []*string `type:"list"` // The maximum number of items to return with this call. @@ -3036,10 +3030,10 @@ type DescribeScalingActivitiesInput struct { _ struct{} `type:"structure"` // The activity IDs of the desired scaling activities. If this list is omitted, - // all activities are described. If the AutoScalingGroupName parameter is provided, - // the results are limited to that group. The list of requested activities cannot - // contain more than 50 items. If unknown activities are requested, they are - // ignored with no error. + // all activities are described. If you specify an Auto Scaling group, the results + // are limited to that group. The list of requested activities cannot contain + // more than 50 items. If unknown activities are requested, they are ignored + // with no error. ActivityIds []*string `type:"list"` // The name of the group. @@ -3138,7 +3132,7 @@ type DescribeScheduledActionsInput struct { // // You can describe up to a maximum of 50 instances with a single call. If // there are more items to return, the call returns a token. To get the next - // set of items, repeat the call with the returned token in the NextToken parameter. + // set of items, repeat the call with the returned token. ScheduledActionNames []*string `type:"list"` // The earliest scheduled start time to return. If scheduled action names are @@ -3208,7 +3202,7 @@ type DescribeTagsOutput struct { // items to return, the string is empty. NextToken *string `type:"string"` - // The tags. + // One or more tags. Tags []*TagDescription `type:"list"` } @@ -3384,7 +3378,7 @@ func (s DisableMetricsCollectionOutput) GoString() string { type Ebs struct { _ struct{} `type:"structure"` - // Indicates whether to delete the volume on instance termination. + // Indicates whether the volume is deleted on instance termination. // // Default: true DeleteOnTermination *bool `type:"boolean"` @@ -3398,28 +3392,25 @@ type Ebs struct { // the Amazon Elastic Compute Cloud User Guide. Encrypted *bool `type:"boolean"` - // For Provisioned IOPS (SSD) volumes only. The number of I/O operations per - // second (IOPS) to provision for the volume. + // The number of I/O operations per second (IOPS) to provision for the volume. // - // Default: None + // Constraint: Required when the volume type is io1. Iops *int64 `min:"100" type:"integer"` // The ID of the snapshot. SnapshotId *string `min:"1" type:"string"` - // The volume size, in gigabytes. - // - // Valid values: If the volume type is io1, the minimum size of the volume - // is 10 GiB. If you specify SnapshotId and VolumeSize, VolumeSize must be equal - // to or larger than the size of the snapshot. + // The volume size, in GiB. For standard volumes, specify a value from 1 to + // 1,024. For io1 volumes, specify a value from 4 to 16,384. For gp2 volumes, + // specify a value from 1 to 16,384. If you specify a snapshot, the volume size + // must be equal to or larger than the snapshot size. // // Default: If you create a volume from a snapshot and you don't specify a - // volume size, the default is the size of the snapshot. - // - // Required: Required when the volume type is io1. + // volume size, the default is the snapshot size. VolumeSize *int64 `min:"1" type:"integer"` - // The volume type. + // The volume type. For more information, see Amazon EBS Volume Types (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html) + // in the Amazon Elastic Compute Cloud User Guide. // // Valid values: standard | io1 | gp2 // @@ -3594,7 +3585,7 @@ type ExecutePolicyInput struct { // // This parameter is not supported if the policy type is StepScaling. // - // For more information, see Understanding Auto Scaling Cooldowns (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/Cooldown.html) + // For more information, see Auto Scaling Cooldowns (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/Cooldown.html) // in the Auto Scaling Developer Guide. HonorCooldown *bool `type:"boolean"` @@ -3791,7 +3782,9 @@ type Instance struct { // The Availability Zone in which the instance is running. AvailabilityZone *string `min:"1" type:"string" required:"true"` - // The health status of the instance. + // The health status of the instance. "Healthy" means that the instance is healthy + // and should remain in service. "Unhealthy" means that the instance is unhealthy + // and Auto Scaling should terminate and replace it. HealthStatus *string `min:"1" type:"string" required:"true"` // The ID of the instance. @@ -3841,7 +3834,7 @@ type InstanceDetails struct { LaunchConfigurationName *string `min:"1" type:"string" required:"true"` // The lifecycle state for the instance. For more information, see Auto Scaling - // Instance States (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingGroupLifecycle.html#AutoScalingStates) + // Lifecycle (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingGroupLifecycle.html) // in the Auto Scaling Developer Guide. LifecycleState *string `min:"1" type:"string" required:"true"` @@ -3895,8 +3888,8 @@ type LaunchConfiguration struct { ClassicLinkVPCId *string `min:"1" type:"string"` // The IDs of one or more security groups for the VPC specified in ClassicLinkVPCId. - // This parameter is required if ClassicLinkVPCId is specified, and cannot be - // used otherwise. For more information, see ClassicLink (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html) + // This parameter is required if you specify a ClassicLink-enabled VPC, and + // cannot be used otherwise. For more information, see ClassicLink (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html) // in the Amazon Elastic Compute Cloud User Guide. ClassicLinkVPCSecurityGroups []*string `type:"list"` @@ -3965,8 +3958,7 @@ func (s LaunchConfiguration) GoString() string { // // Pause the instance after it launches, but before it is put into service // Pause the instance as it terminates, but before it is fully terminated For -// more information, see Auto Scaling Pending State (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingPendingState.html) -// and Auto Scaling Terminating State (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingTerminatingState.html) +// more information, see Auto Scaling Lifecycle (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingGroupLifecycle.html) // in the Auto Scaling Developer Guide. type LifecycleHook struct { _ struct{} `type:"structure"` @@ -3985,8 +3977,8 @@ type LifecycleHook struct { // The maximum time, in seconds, that can elapse before the lifecycle hook times // out. The default is 3600 seconds (1 hour). When the lifecycle hook times - // out, Auto Scaling performs the action defined in the DefaultResult parameter. - // You can prevent the lifecycle hook from timing out by calling RecordLifecycleActionHeartbeat. + // out, Auto Scaling performs the default action. You can prevent the lifecycle + // hook from timing out by calling RecordLifecycleActionHeartbeat. HeartbeatTimeout *int64 `type:"integer"` // The name of the lifecycle hook. @@ -4188,16 +4180,14 @@ type PutLifecycleHookInput struct { AutoScalingGroupName *string `min:"1" type:"string" required:"true"` // Defines the action the Auto Scaling group should take when the lifecycle - // hook timeout elapses or if an unexpected failure occurs. The value for this - // parameter can be either CONTINUE or ABANDON. The default value for this parameter - // is ABANDON. + // hook timeout elapses or if an unexpected failure occurs. This parameter can + // be either CONTINUE or ABANDON. The default value is ABANDON. DefaultResult *string `type:"string"` // The amount of time, in seconds, that can elapse before the lifecycle hook - // times out. When the lifecycle hook times out, Auto Scaling performs the action - // defined in the DefaultResult parameter. You can prevent the lifecycle hook - // from timing out by calling RecordLifecycleActionHeartbeat. The default is - // 3600 seconds (1 hour). + // times out. When the lifecycle hook times out, Auto Scaling performs the default + // action. You can prevent the lifecycle hook from timing out by calling RecordLifecycleActionHeartbeat. + // The default is 3600 seconds (1 hour). HeartbeatTimeout *int64 `type:"integer"` // The name of the lifecycle hook. @@ -4216,24 +4206,23 @@ type PutLifecycleHookInput struct { // The ARN of the notification target that Auto Scaling will use to notify you // when an instance is in the transition state for the lifecycle hook. This - // ARN target can be either an SQS queue or an SNS topic. - // - // This parameter is required for new lifecycle hooks, but optional when updating - // existing hooks. + // target can be either an SQS queue or an SNS topic. If you specify an empty + // string, this overrides the current ARN. // - // The notification message sent to the target will include: + // The notification messages sent to the target include the following information: // - // LifecycleActionToken. The Lifecycle action token. AccountId. The user account - // ID. AutoScalingGroupName. The name of the Auto Scaling group. LifecycleHookName. - // The lifecycle hook name. EC2InstanceId. The EC2 instance ID. LifecycleTransition. - // The lifecycle transition. NotificationMetadata. The notification metadata. + // AutoScalingGroupName. The name of the Auto Scaling group. AccountId. The + // AWS account ID. LifecycleTransition. The lifecycle hook type. LifecycleActionToken. + // The lifecycle action token. EC2InstanceId. The EC2 instance ID. LifecycleHookName. + // The name of the lifecycle hook. NotificationMetadata. User-defined information. // This operation uses the JSON format when sending notifications to an Amazon // SQS queue, and an email key/value pair format when sending notifications // to an Amazon SNS topic. // - // When you call this operation, a test message is sent to the notification - // target. This test message contains an additional key/value pair: Event:autoscaling:TEST_NOTIFICATION. - NotificationTargetARN *string `min:"1" type:"string"` + // When you specify a notification target, Auto Scaling sends it a test message. + // Test messages contains the following additional key/value pair: "Event": + // "autoscaling:TEST_NOTIFICATION". + NotificationTargetARN *string `type:"string"` // The ARN of the IAM role that allows the Auto Scaling group to publish to // the specified notification target. @@ -4325,7 +4314,7 @@ type PutScalingPolicyInput struct { // // This parameter is not supported unless the policy type is SimpleScaling. // - // For more information, see Understanding Auto Scaling Cooldowns (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/Cooldown.html) + // For more information, see Auto Scaling Cooldowns (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/Cooldown.html) // in the Auto Scaling Developer Guide. Cooldown *int64 `type:"integer"` @@ -4441,10 +4430,7 @@ type PutScheduledUpdateGroupActionInput struct { // boundaries of when the recurring action starts and stops. StartTime *time.Time `type:"timestamp" timestampFormat:"iso8601"` - // This parameter is deprecated; use StartTime instead. - // - // The time for this action to start. If both Time and StartTime are specified, - // their values must be identical. + // This parameter is deprecated. Time *time.Time `type:"timestamp" timestampFormat:"iso8601"` } @@ -4478,10 +4464,13 @@ type RecordLifecycleActionHeartbeatInput struct { // The name of the Auto Scaling group for the hook. AutoScalingGroupName *string `min:"1" type:"string" required:"true"` + // The ID of the instance. + InstanceId *string `min:"1" type:"string"` + // A token that uniquely identifies a specific lifecycle action associated with // an instance. Auto Scaling sends this token to the notification target you // specified when you created the lifecycle hook. - LifecycleActionToken *string `min:"36" type:"string" required:"true"` + LifecycleActionToken *string `min:"36" type:"string"` // The name of the lifecycle hook. LifecycleHookName *string `min:"1" type:"string" required:"true"` @@ -4661,7 +4650,7 @@ type ScheduledUpdateGroupAction struct { // boundaries of when the recurring action will start and stop. StartTime *time.Time `type:"timestamp" timestampFormat:"iso8601"` - // This parameter is deprecated; use StartTime instead. + // This parameter is deprecated. Time *time.Time `type:"timestamp" timestampFormat:"iso8601"` } @@ -4723,7 +4712,7 @@ type SetInstanceHealthInput struct { // of service. Auto Scaling will terminate and replace the unhealthy instance. HealthStatus *string `min:"1" type:"string" required:"true"` - // The ID of the EC2 instance. + // The ID of the instance. InstanceId *string `min:"1" type:"string" required:"true"` // If the Auto Scaling group of the specified instance has a HealthCheckGracePeriod @@ -4731,7 +4720,7 @@ type SetInstanceHealthInput struct { // Set this to False, if you do not want the call to respect the grace period // associated with the group. // - // For more information, see the HealthCheckGracePeriod parameter description + // For more information, see the description of the health check grace period // for CreateAutoScalingGroup. ShouldRespectGracePeriod *bool `type:"boolean"` } @@ -4963,7 +4952,7 @@ func (s TagDescription) GoString() string { type TerminateInstanceInAutoScalingGroupInput struct { _ struct{} `type:"structure"` - // The ID of the EC2 instance. + // The ID of the instance. InstanceId *string `min:"1" type:"string" required:"true"` // If true, terminating the instance also decrements the size of the Auto Scaling @@ -5010,7 +4999,7 @@ type UpdateAutoScalingGroupInput struct { // The amount of time, in seconds, after a scaling activity completes before // another scaling activity can start. The default is 300. // - // For more information, see Understanding Auto Scaling Cooldowns (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/Cooldown.html) + // For more information, see Auto Scaling Cooldowns (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/Cooldown.html) // in the Auto Scaling Developer Guide. DefaultCooldown *int64 `type:"integer"` @@ -5023,7 +5012,7 @@ type UpdateAutoScalingGroupInput struct { // health status of an EC2 instance that has come into service. The default // is 300. // - // For more information, see Health Checks For Auto Scaling Instances (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/healthcheck.html) + // For more information, see Health Checks (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/healthcheck.html) // in the Auto Scaling Developer Guide. HealthCheckGracePeriod *int64 `type:"integer"` @@ -5052,8 +5041,8 @@ type UpdateAutoScalingGroupInput struct { // select the instance to terminate. The policies are executed in the order // that they are listed. // - // For more information, see Choosing a Termination Policy for Your Auto Scaling - // Group (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/us-termination-policy.html) + // For more information, see Controlling Which Instances Auto Scaling Terminates + // During Scale In (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/AutoScalingBehavior.InstanceTermination.html) // in the Auto Scaling Developer Guide. TerminationPolicies []*string `type:"list"` @@ -5063,8 +5052,7 @@ type UpdateAutoScalingGroupInput struct { // When you specify VPCZoneIdentifier with AvailabilityZones, ensure that the // subnets' Availability Zones match the values you specify for AvailabilityZones. // - // For more information, see Auto Scaling and Amazon Virtual Private Cloud - // (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/autoscalingsubnets.html) + // For more information, see Launching Auto Scaling Instances in a VPC (http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/asg-in-vpc.html) // in the Auto Scaling Developer Guide. VPCZoneIdentifier *string `min:"1" type:"string"` } diff --git a/vendor/github.com/aws/aws-sdk-go/service/autoscaling/waiters.go b/vendor/github.com/aws/aws-sdk-go/service/autoscaling/waiters.go new file mode 100644 index 000000000000..42ffccb852dc --- /dev/null +++ b/vendor/github.com/aws/aws-sdk-go/service/autoscaling/waiters.go @@ -0,0 +1,94 @@ +// THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. + +package autoscaling + +import ( + "github.com/aws/aws-sdk-go/private/waiter" +) + +func (c *AutoScaling) WaitUntilGroupExists(input *DescribeAutoScalingGroupsInput) error { + waiterCfg := waiter.Config{ + Operation: "DescribeAutoScalingGroups", + Delay: 5, + MaxAttempts: 10, + Acceptors: []waiter.WaitAcceptor{ + { + State: "success", + Matcher: "pathAll", + Argument: "length(AutoScalingGroups)", + Expected: 1, + }, + { + State: "retry", + Matcher: "pathAll", + Argument: "length(AutoScalingGroups)", + Expected: 0, + }, + }, + } + + w := waiter.Waiter{ + Client: c, + Input: input, + Config: waiterCfg, + } + return w.Wait() +} + +func (c *AutoScaling) WaitUntilGroupInService(input *DescribeAutoScalingGroupsInput) error { + waiterCfg := waiter.Config{ + Operation: "DescribeAutoScalingGroups", + Delay: 15, + MaxAttempts: 40, + Acceptors: []waiter.WaitAcceptor{ + { + State: "success", + Matcher: "pathAll", + Argument: "contains(AutoScalingGroups[].[length(Instances[?LifecycleState=='InService']) >= MinSize][], `false`)", + Expected: false, + }, + { + State: "retry", + Matcher: "pathAll", + Argument: "contains(AutoScalingGroups[].[length(Instances[?LifecycleState=='InService']) >= MinSize][], `false`)", + Expected: true, + }, + }, + } + + w := waiter.Waiter{ + Client: c, + Input: input, + Config: waiterCfg, + } + return w.Wait() +} + +func (c *AutoScaling) WaitUntilGroupNotExists(input *DescribeAutoScalingGroupsInput) error { + waiterCfg := waiter.Config{ + Operation: "DescribeAutoScalingGroups", + Delay: 15, + MaxAttempts: 40, + Acceptors: []waiter.WaitAcceptor{ + { + State: "success", + Matcher: "pathAll", + Argument: "length(AutoScalingGroups)", + Expected: 0, + }, + { + State: "retry", + Matcher: "pathAll", + Argument: "length(AutoScalingGroups)", + Expected: 1, + }, + }, + } + + w := waiter.Waiter{ + Client: c, + Input: input, + Config: waiterCfg, + } + return w.Wait() +} 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 72252c3d3284..ca79c979cfa2 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 @@ -68,8 +68,8 @@ func (c *CloudFormation) ContinueUpdateRollbackRequest(input *ContinueUpdateRoll // rolling it back to the UPDATE_ROLLBACK_COMPLETE state. Depending on the cause // of the failure, you can manually fix the error (http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/troubleshooting.html#troubleshooting-errors-update-rollback-failed) // and continue the rollback. By continuing the rollback, you can return your -// stack to a working state (the UPDATE_ROLLBACK_COMPLETE state), return the -// stack to its original settings, and then try to update the stack again. +// stack to a working state (the UPDATE_ROLLBACK_COMPLETE state), and then try +// to update the stack again. // // A stack goes into the UPDATE_ROLLBACK_FAILED state when AWS CloudFormation // cannot roll back all changes after a failed stack update. For example, you @@ -637,9 +637,6 @@ func (c *CloudFormation) UpdateStackRequest(input *UpdateStackInput) (req *reque // To get a copy of the template for an existing stack, you can use the GetTemplate // action. // -// Tags that were associated with this stack during creation time will still -// be associated with the stack after an UpdateStack operation. -// // For more information about creating an update template, updating a stack, // and monitoring the progress of the update, see Updating a Stack (http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks.html). func (c *CloudFormation) UpdateStack(input *UpdateStackInput) (*UpdateStackOutput, error) { @@ -904,6 +901,14 @@ func (s CreateStackOutput) GoString() string { type DeleteStackInput struct { _ struct{} `type:"structure"` + // For stacks in the DELETE_FAILED state, a list of resource logical IDs that + // are associated with the resources you want to retain. During deletion, AWS + // CloudFormation deletes the stack but does not delete the retained resources. + // + // Retaining resources is useful when you cannot delete a resource, such as + // a non-empty S3 bucket, but you want to delete the stack. + RetainResources []*string `type:"list"` + // The name or the unique stack ID that is associated with the stack. StackName *string `type:"string" required:"true"` } @@ -2108,6 +2113,15 @@ type UpdateStackInput struct { // stack policy, the current policy that is associated with the stack is unchanged. StackPolicyURL *string `min:"1" type:"string"` + // Key-value pairs to associate with this stack. AWS CloudFormation also propagates + // these tags to supported resources in the stack. You can specify a maximum + // number of 10 tags. + // + // If you don't specify this parameter, AWS CloudFormation doesn't modify the + // stack's tags. If you specify an empty value, AWS CloudFormation removes all + // associated tags. + Tags []*Tag `type:"list"` + // Structure containing the template body with a minimum length of 1 byte and // a maximum length of 51,200 bytes. (For more information, go to Template Anatomy // (http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/template-anatomy.html) 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 62aaa99e85a2..8115cfc7a6b0 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 @@ -70,6 +70,9 @@ func (c *CloudWatch) DescribeAlarmHistoryRequest(input *DescribeAlarmHistoryInpu // Retrieves history for the specified alarm. Filter alarms by date range or // item type. If an alarm name is not specified, Amazon CloudWatch returns histories // for all of the owner's alarms. +// +// Amazon CloudWatch retains the history of an alarm for two weeks, whether +// or not you delete the alarm. func (c *CloudWatch) DescribeAlarmHistory(input *DescribeAlarmHistoryInput) (*DescribeAlarmHistoryOutput, error) { req, out := c.DescribeAlarmHistoryRequest(input) err := req.Send() @@ -236,12 +239,13 @@ func (c *CloudWatch) GetMetricStatisticsRequest(input *GetMetricStatisticsInput) // Gets statistics for the specified metric. // -// The maximum number of data points returned from a single GetMetricStatistics -// request is 1,440, wereas the maximum number of data points that can be queried -// is 50,850. If you make a request that generates more than 1,440 data points, -// Amazon CloudWatch returns an error. In such a case, you can alter the request -// by narrowing the specified time range or increasing the specified period. -// Alternatively, you can make multiple requests across adjacent time ranges. +// The maximum number of data points that can be queried is 50,850, whereas +// the maximum number of data points returned from a single GetMetricStatistics +// request is 1,440. If you make a request that generates more than 1,440 data +// points, Amazon CloudWatch returns an error. In such a case, you can alter +// the request by narrowing the specified time range or increasing the specified +// period. Alternatively, you can make multiple requests across adjacent time +// ranges. GetMetricStatistics does not return the data in chronological order. // // Amazon CloudWatch aggregates data points based on the length of the period // that you specify. For example, if you request statistics with a one-minute @@ -257,7 +261,7 @@ func (c *CloudWatch) GetMetricStatisticsRequest(input *GetMetricStatisticsInput) // up to 35 instances over a span of 24 hours Statistics for up to 2 instances // over a span of 2 weeks For information about the namespace, metric names, // and dimensions that other Amazon Web Services products use to send metrics -// to Cloudwatch, go to Amazon CloudWatch Metrics, Namespaces, and Dimensions +// to CloudWatch, go to Amazon CloudWatch Metrics, Namespaces, and Dimensions // Reference (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html) // in the Amazon CloudWatch Developer Guide. func (c *CloudWatch) GetMetricStatistics(input *GetMetricStatisticsInput) (*GetMetricStatisticsOutput, error) { @@ -295,6 +299,12 @@ func (c *CloudWatch) ListMetricsRequest(input *ListMetricsInput) (req *request.R // Returns a list of valid metrics stored for the AWS account owner. Returned // metrics can be used with GetMetricStatistics to obtain statistical data for // a given metric. +// +// Up to 500 results are returned for any one call. To retrieve further results, +// use returned NextToken values with subsequent ListMetrics operations. If +// you create a metric with the PutMetricData action, allow up to fifteen minutes +// for the metric to appear in calls to the ListMetrics action. Statistics about +// the metric, however, are available sooner using GetMetricStatistics. func (c *CloudWatch) ListMetrics(input *ListMetricsInput) (*ListMetricsOutput, error) { req, out := c.ListMetricsRequest(input) err := req.Send() @@ -338,6 +348,30 @@ func (c *CloudWatch) PutMetricAlarmRequest(input *PutMetricAlarmInput) (req *req // When this operation creates an alarm, the alarm state is immediately set // to INSUFFICIENT_DATA. The alarm is evaluated and its StateValue is set appropriately. // Any actions associated with the StateValue is then executed. +// +// When updating an existing alarm, its StateValue is left unchanged. If +// you are using an AWS Identity and Access Management (IAM) account to create +// or modify an alarm, you must have the following Amazon EC2 permissions: +// ec2:DescribeInstanceStatus and ec2:DescribeInstances for all alarms on Amazon +// EC2 instance status metrics. ec2:StopInstances for alarms with stop actions. +// ec2:TerminateInstances for alarms with terminate actions. ec2:DescribeInstanceRecoveryAttribute, +// and ec2:RecoverInstances for alarms with recover actions. If you have read/write +// permissions for Amazon CloudWatch but not for Amazon EC2, you can still create +// an alarm but the stop or terminate actions won't be performed on the Amazon +// EC2 instance. However, if you are later granted permission to use the associated +// Amazon EC2 APIs, the alarm actions you created earlier will be performed. +// For more information about IAM permissions, see Permissions and Policies +// (http://docs.aws.amazon.com//IAM/latest/UserGuide/PermissionsAndPolicies.html) +// in Using IAM. +// +// If you are using an IAM role (e.g., an Amazon EC2 instance profile), you +// cannot stop or terminate the instance using alarm actions. However, you can +// still see the alarm state and perform any other actions such as Amazon SNS +// notifications or Auto Scaling policies. +// +// If you are using temporary security credentials granted using the AWS Security +// Token Service (AWS STS), you cannot stop or terminate an Amazon EC2 instance +// using alarm actions. func (c *CloudWatch) PutMetricAlarm(input *PutMetricAlarmInput) (*PutMetricAlarmOutput, error) { req, out := c.PutMetricAlarmRequest(input) err := req.Send() @@ -366,20 +400,22 @@ func (c *CloudWatch) PutMetricDataRequest(input *PutMetricDataInput) (req *reque return } -// Publishes metric data points to Amazon CloudWatch. Amazon Cloudwatch associates +// Publishes metric data points to Amazon CloudWatch. Amazon CloudWatch associates // the data points with the specified metric. If the specified metric does not -// exist, Amazon CloudWatch creates the metric. It can take up to fifteen minutes -// for a new metric to appear in calls to the ListMetrics action. +// exist, Amazon CloudWatch creates the metric. When Amazon CloudWatch creates +// a metric, it can take up to fifteen minutes for the metric to appear in calls +// to the ListMetrics action. // -// The size of a PutMetricData request is limited to 8 KB for HTTP GET requests -// and 40 KB for HTTP POST requests. +// Each PutMetricData request is limited to 8 KB in size for HTTP GET requests +// and is limited to 40 KB in size for HTTP POST requests. // -// Although the Value parameter accepts numbers of type Double, Amazon CloudWatch -// truncates values with very large exponents. Values with base-10 exponents -// greater than 126 (1 x 10^126) are truncated. Likewise, values with base-10 -// exponents less than -130 (1 x 10^-130) are also truncated. Data that is -// timestamped 24 hours or more in the past may take in excess of 48 hours to -// become available from submission time using GetMetricStatistics. +// Although the Value parameter accepts numbers of type Double, Amazon CloudWatch +// rejects values that are either too small or too large. Values must be in +// the range of 8.515920e-109 to 1.174271e+108 (Base 10) or 2e-360 to 2e360 +// (Base 2). In addition, special values (e.g., NaN, +Infinity, -Infinity) are +// not supported. Data that is timestamped 24 hours or more in the past may +// take in excess of 48 hours to become available from submission time using +// GetMetricStatistics. func (c *CloudWatch) PutMetricData(input *PutMetricDataInput) (*PutMetricDataOutput, error) { req, out := c.PutMetricDataRequest(input) err := req.Send() @@ -410,8 +446,13 @@ func (c *CloudWatch) SetAlarmStateRequest(input *SetAlarmStateInput) (req *reque // Temporarily sets the state of an alarm. When the updated StateValue differs // from the previous value, the action configured for the appropriate state -// is invoked. This is not a permanent change. The next periodic alarm check -// (in about a minute) will set the alarm to its actual state. +// is invoked. For example, if your alarm is configured to send an Amazon SNS +// message when an alarm is triggered, temporarily changing the alarm's state +// to ALARM will send an Amazon SNS message. This is not a permanent change. +// The next periodic alarm check (in about a minute) will set the alarm to its +// actual state. Because the alarm state change happens very quickly, it is +// typically only visibile in the alarm's History tab in the Amazon CloudWatch +// console or through DescribeAlarmHistory. func (c *CloudWatch) SetAlarmState(input *SetAlarmStateInput) (*SetAlarmStateOutput, error) { req, out := c.SetAlarmStateRequest(input) err := req.Send() @@ -436,11 +477,7 @@ type AlarmHistoryItem struct { // A human-readable summary of the alarm history. HistorySummary *string `min:"1" type:"string"` - // The time stamp for the alarm history item. Amazon CloudWatch uses Coordinated - // Universal Time (UTC) when returning time stamps, which do not accommodate - // seasonal adjustments such as daylight savings time. For more information, - // see Time stamps (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/cloudwatch_concepts.html#about_timestamp) - // in the Amazon CloudWatch Developer Guide. + // The time stamp for the alarm history item. Timestamp *time.Time `type:"timestamp" timestampFormat:"iso8601"` } @@ -475,11 +512,7 @@ type Datapoint struct { // The sum of metric values used for the datapoint. Sum *float64 `type:"double"` - // The time stamp used for the datapoint. Amazon CloudWatch uses Coordinated - // Universal Time (UTC) when returning time stamps, which do not accommodate - // seasonal adjustments such as daylight savings time. For more information, - // see Time stamps (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/cloudwatch_concepts.html#about_timestamp) - // in the Amazon CloudWatch Developer Guide. + // The time stamp used for the datapoint. Timestamp *time.Time `type:"timestamp" timestampFormat:"iso8601"` // The standard unit used for the datapoint. @@ -584,7 +617,9 @@ func (s DescribeAlarmHistoryOutput) GoString() string { type DescribeAlarmsForMetricInput struct { _ struct{} `type:"structure"` - // The list of dimensions associated with the metric. + // The list of dimensions associated with the metric. If the metric has any + // associated dimensions, you must specify them in order for the DescribeAlarmsForMetric + // to succeed. Dimensions []*Dimension `type:"list"` // The name of the metric. @@ -718,6 +753,9 @@ type DimensionFilter struct { Name *string `min:"1" type:"string" required:"true"` // The value of the dimension to be matched. + // + // Specifying a Name without specifying a Value returns all values associated + // with that Name. Value *string `min:"1" type:"string"` } @@ -801,7 +839,7 @@ type GetMetricStatisticsInput struct { // The time stamp to use for determining the last datapoint to return. The value // specified is exclusive; results will include datapoints up to the time stamp - // specified. + // specified. The time stamp must be in ISO 8601 UTC format (e.g., 2014-09-03T23:00:00Z). EndTime *time.Time `type:"timestamp" timestampFormat:"iso8601" required:"true"` // The name of the metric, with or without spaces. @@ -816,14 +854,19 @@ type GetMetricStatisticsInput struct { // The time stamp to use for determining the first datapoint to return. The // value specified is inclusive; results include datapoints with the time stamp - // specified. + // specified. The time stamp must be in ISO 8601 UTC format (e.g., 2014-09-03T23:00:00Z). + // + // The specified start time is rounded down to the nearest value. Datapoints + // are returned for start times up to two weeks in the past. Specified start + // times that are more than two weeks in the past will not return datapoints + // for metrics that are older than two weeks. Data that is timestamped 24 hours + // or more in the past may take in excess of 48 hours to become available from + // submission time using GetMetricStatistics. StartTime *time.Time `type:"timestamp" timestampFormat:"iso8601" required:"true"` // The metric statistics to return. For information about specific statistics - // returned by GetMetricStatistics, go to Statistics (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/index.html?CHAP_TerminologyandKeyConcepts.html#Statistic) + // returned by GetMetricStatistics, see Statistics (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/cloudwatch_concepts.html#Statistic) // in the Amazon CloudWatch Developer Guide. - // - // Valid Values: Average | Sum | SampleCount | Maximum | Minimum Statistics []*string `min:"1" type:"list" required:"true"` // The unit for the metric. @@ -950,18 +993,13 @@ type MetricAlarm struct { // The list of actions to execute when this alarm transitions into an ALARM // state from any other state. Each action is specified as an Amazon Resource - // Number (ARN). Currently the only actions supported are publishing to an Amazon - // SNS topic and triggering an Auto Scaling policy. + // Name (ARN). AlarmActions []*string `type:"list"` // The Amazon Resource Name (ARN) of the alarm. AlarmArn *string `min:"1" type:"string"` - // The time stamp of the last update to the alarm configuration. Amazon CloudWatch - // uses Coordinated Universal Time (UTC) when returning time stamps, which do - // not accommodate seasonal adjustments such as daylight savings time. For more - // information, see Time stamps (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/cloudwatch_concepts.html#about_timestamp) - // in the Amazon CloudWatch Developer Guide. + // The time stamp of the last update to the alarm configuration. AlarmConfigurationUpdatedTimestamp *time.Time `type:"timestamp" timestampFormat:"iso8601"` // The description for the alarm. @@ -982,8 +1020,7 @@ type MetricAlarm struct { // The list of actions to execute when this alarm transitions into an INSUFFICIENT_DATA // state from any other state. Each action is specified as an Amazon Resource - // Number (ARN). Currently the only actions supported are publishing to an Amazon - // SNS topic or triggering an Auto Scaling policy. + // Name (ARN). // // The current WSDL lists this attribute as UnknownActions. InsufficientDataActions []*string `type:"list"` @@ -995,9 +1032,8 @@ type MetricAlarm struct { Namespace *string `min:"1" type:"string"` // The list of actions to execute when this alarm transitions into an OK state - // from any other state. Each action is specified as an Amazon Resource Number - // (ARN). Currently the only actions supported are publishing to an Amazon SNS - // topic and triggering an Auto Scaling policy. + // from any other state. Each action is specified as an Amazon Resource Name + // (ARN). OKActions []*string `type:"list"` // The period in seconds over which the statistic is applied. @@ -1009,11 +1045,7 @@ type MetricAlarm struct { // An explanation for the alarm's state in machine-readable JSON format StateReasonData *string `type:"string"` - // The time stamp of the last update to the alarm's state. Amazon CloudWatch - // uses Coordinated Universal Time (UTC) when returning time stamps, which do - // not accommodate seasonal adjustments such as daylight savings time. For more - // information, see Time stamps (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/cloudwatch_concepts.html#about_timestamp) - // in the Amazon CloudWatch Developer Guide. + // The time stamp of the last update to the alarm's state. StateUpdatedTimestamp *time.Time `type:"timestamp" timestampFormat:"iso8601"` // The state value for the alarm. @@ -1055,12 +1087,9 @@ type MetricDatum struct { // A set of statistical values describing the metric. StatisticValues *StatisticSet `type:"structure"` - // The time stamp used for the metric. If not specified, the default value is - // set to the time the metric data was received. Amazon CloudWatch uses Coordinated - // Universal Time (UTC) when returning time stamps, which do not accommodate - // seasonal adjustments such as daylight savings time. For more information, - // see Time stamps (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/cloudwatch_concepts.html#about_timestamp) - // in the Amazon CloudWatch Developer Guide. + // The time stamp used for the metric in ISO 8601 Universal Coordinated Time + // (UTC) format. If not specified, the default value is set to the time the + // metric data was received. Timestamp *time.Time `type:"timestamp" timestampFormat:"iso8601"` // The unit of the metric. @@ -1069,9 +1098,10 @@ type MetricDatum struct { // The value for the metric. // // Although the Value parameter accepts numbers of type Double, Amazon CloudWatch - // truncates values with very large exponents. Values with base-10 exponents - // greater than 126 (1 x 10^126) are truncated. Likewise, values with base-10 - // exponents less than -130 (1 x 10^-130) are also truncated. + // rejects values that are either too small or too large. Values must be in + // the range of 8.515920e-109 to 1.174271e+108 (Base 10) or 2e-360 to 2e360 + // (Base 2). In addition, special values (e.g., NaN, +Infinity, -Infinity) are + // not supported. Value *float64 `type:"double"` } @@ -1094,8 +1124,19 @@ type PutMetricAlarmInput struct { // The list of actions to execute when this alarm transitions into an ALARM // state from any other state. Each action is specified as an Amazon Resource - // Number (ARN). Currently the only action supported is publishing to an Amazon - // SNS topic or an Amazon Auto Scaling policy. + // Name (ARN). + // + // Valid Values: arn:aws:automate:region (e.g., us-east-1):ec2:stop | arn:aws:automate:region + // (e.g., us-east-1):ec2:terminate | arn:aws:automate:region (e.g., us-east-1):ec2:recover + // + // Valid Values (for use with IAM roles): arn:aws:swf:us-east-1:{customer-account}:action/actions/AWS_EC2.InstanceId.Stop/1.0 + // | arn:aws:swf:us-east-1:{customer-account}:action/actions/AWS_EC2.InstanceId.Terminate/1.0 + // | arn:aws:swf:us-east-1:{customer-account}:action/actions/AWS_EC2.InstanceId.Reboot/1.0 + // + // Note: You must create at least one stop, terminate, or reboot alarm using + // the Amazon EC2 or CloudWatch console to create the EC2ActionsAccess IAM role + // for the first time. After this IAM role is created, you can create stop, + // terminate, or reboot alarms using the CLI. AlarmActions []*string `type:"list"` // The description for the alarm. @@ -1117,8 +1158,19 @@ type PutMetricAlarmInput struct { // The list of actions to execute when this alarm transitions into an INSUFFICIENT_DATA // state from any other state. Each action is specified as an Amazon Resource - // Number (ARN). Currently the only action supported is publishing to an Amazon - // SNS topic or an Amazon Auto Scaling policy. + // Name (ARN). + // + // Valid Values: arn:aws:automate:region (e.g., us-east-1):ec2:stop | arn:aws:automate:region + // (e.g., us-east-1):ec2:terminate | arn:aws:automate:region (e.g., us-east-1):ec2:recover + // + // Valid Values (for use with IAM roles): arn:aws:swf:us-east-1:{customer-account}:action/actions/AWS_EC2.InstanceId.Stop/1.0 + // | arn:aws:swf:us-east-1:{customer-account}:action/actions/AWS_EC2.InstanceId.Terminate/1.0 + // | arn:aws:swf:us-east-1:{customer-account}:action/actions/AWS_EC2.InstanceId.Reboot/1.0 + // + // Note: You must create at least one stop, terminate, or reboot alarm using + // the Amazon EC2 or CloudWatch console to create the EC2ActionsAccess IAM role + // for the first time. After this IAM role is created, you can create stop, + // terminate, or reboot alarms using the CLI. InsufficientDataActions []*string `type:"list"` // The name for the alarm's associated metric. @@ -1128,9 +1180,20 @@ type PutMetricAlarmInput struct { Namespace *string `min:"1" type:"string" required:"true"` // The list of actions to execute when this alarm transitions into an OK state - // from any other state. Each action is specified as an Amazon Resource Number - // (ARN). Currently the only action supported is publishing to an Amazon SNS - // topic or an Amazon Auto Scaling policy. + // from any other state. Each action is specified as an Amazon Resource Name + // (ARN). + // + // Valid Values: arn:aws:automate:region (e.g., us-east-1):ec2:stop | arn:aws:automate:region + // (e.g., us-east-1):ec2:terminate | arn:aws:automate:region (e.g., us-east-1):ec2:recover + // + // Valid Values (for use with IAM roles): arn:aws:swf:us-east-1:{customer-account}:action/actions/AWS_EC2.InstanceId.Stop/1.0 + // | arn:aws:swf:us-east-1:{customer-account}:action/actions/AWS_EC2.InstanceId.Terminate/1.0 + // | arn:aws:swf:us-east-1:{customer-account}:action/actions/AWS_EC2.InstanceId.Reboot/1.0 + // + // Note: You must create at least one stop, terminate, or reboot alarm using + // the Amazon EC2 or CloudWatch console to create the EC2ActionsAccess IAM role + // for the first time. After this IAM role is created, you can create stop, + // terminate, or reboot alarms using the CLI. OKActions []*string `type:"list"` // The period in seconds over which the specified statistic is applied. @@ -1142,7 +1205,16 @@ type PutMetricAlarmInput struct { // The value against which the specified statistic is compared. Threshold *float64 `type:"double" required:"true"` - // The unit for the alarm's associated metric. + // The statistic's unit of measure. For example, the units for the Amazon EC2 + // NetworkIn metric are Bytes because NetworkIn tracks the number of bytes that + // an instance receives on all network interfaces. You can also specify a unit + // when you create a custom metric. Units help provide conceptual meaning to + // your data. Metric data points that specify a unit of measure, such as Percent, + // are aggregated separately. + // + // Note: If you specify a unit, you must use a unit that is appropriate for + // the metric. Otherwise, this can cause an Amazon CloudWatch alarm to get stuck + // in the INSUFFICIENT DATA state. Unit *string `type:"string" enum:"StandardUnit"` } @@ -1177,6 +1249,10 @@ type PutMetricDataInput struct { MetricData []*MetricDatum `type:"list" required:"true"` // The namespace for the metric data. + // + // You cannot specify a namespace that begins with "AWS/". Namespaces that + // begin with "AWS/" are reserved for other Amazon Web Services products that + // send metrics to Amazon CloudWatch. Namespace *string `min:"1" type:"string" required:"true"` } 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 eaff308c3ee6..342498f0ec49 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 @@ -11,46 +11,21 @@ import ( "github.com/aws/aws-sdk-go/private/signer/v4" ) -// This is the Amazon CloudWatch API Reference. This guide provides detailed -// information about Amazon CloudWatch actions, data types, parameters, and -// errors. For detailed information about Amazon CloudWatch features and their -// associated API calls, go to the Amazon CloudWatch Developer Guide (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide). +// Amazon CloudWatch monitors your Amazon Web Services (AWS) resources and the +// applications you run on AWS in real-time. You can use CloudWatch to collect +// and track metrics, which are the variables you want to measure for your resources +// and applications. // -// Amazon CloudWatch is a web service that enables you to publish, monitor, -// and manage various metrics, as well as configure alarm actions based on data -// from metrics. For more information about this product go to http://aws.amazon.com/cloudwatch -// (http://aws.amazon.com/cloudwatch). +// CloudWatch alarms send notifications or automatically make changes to the +// resources you are monitoring based on rules that you define. For example, +// you can monitor the CPU usage and disk reads and writes of your Amazon Elastic +// Compute Cloud (Amazon EC2) instances and then use this data to determine +// whether you should launch additional instances to handle increased load. +// You can also use this data to stop under-used instances to save money. // -// For information about the namespace, metric names, and dimensions that -// other Amazon Web Services products use to send metrics to Cloudwatch, go -// to Amazon CloudWatch Metrics, Namespaces, and Dimensions Reference (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html) -// in the Amazon CloudWatch Developer Guide. -// -// Use the following links to get started using the Amazon CloudWatch API Reference: -// -// Actions (http://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_Operations.html): -// An alphabetical list of all Amazon CloudWatch actions. Data Types (http://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_Types.html): -// An alphabetical list of all Amazon CloudWatch data types. Common Parameters -// (http://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/CommonParameters.html): -// Parameters that all Query actions can use. Common Errors (http://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/CommonErrors.html): -// Client and server errors that all actions can return. Regions and Endpoints -// (http://docs.aws.amazon.com/general/latest/gr/index.html?rande.html): Itemized -// regions and endpoints for all AWS products. WSDL Location (http://monitoring.amazonaws.com/doc/2010-08-01/CloudWatch.wsdl): -// http://monitoring.amazonaws.com/doc/2010-08-01/CloudWatch.wsdl In addition -// to using the Amazon CloudWatch API, you can also use the following SDKs and -// third-party libraries to access Amazon CloudWatch programmatically. -// -// AWS SDK for Java Documentation (http://aws.amazon.com/documentation/sdkforjava/) -// AWS SDK for .NET Documentation (http://aws.amazon.com/documentation/sdkfornet/) -// AWS SDK for PHP Documentation (http://aws.amazon.com/documentation/sdkforphp/) -// AWS SDK for Ruby Documentation (http://aws.amazon.com/documentation/sdkforruby/) -// Developers in the AWS developer community also provide their own libraries, -// which you can find at the following AWS developer centers: -// -// AWS Java Developer Center (http://aws.amazon.com/java/) AWS PHP Developer -// Center (http://aws.amazon.com/php/) AWS Python Developer Center (http://aws.amazon.com/python/) -// AWS Ruby Developer Center (http://aws.amazon.com/ruby/) AWS Windows and .NET -// Developer Center (http://aws.amazon.com/net/) +// In addition to monitoring the built-in metrics that come with AWS, you can +// monitor your own custom metrics. With CloudWatch, you gain system-wide visibility +// into resource utilization, application performance, and operational health. //The service client's operations are safe to be used concurrently. // It is not safe to mutate any of the client's properties though. type CloudWatch struct { 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 07099232160f..157cd82aab53 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 @@ -37,9 +37,9 @@ func (c *CloudWatchEvents) DeleteRuleRequest(input *DeleteRuleInput) (req *reque // Deletes a rule. You must remove all targets from a rule using RemoveTargets // before you can delete the rule. // -// Note: When you make a change with this action, incoming events might still -// continue to match to the deleted rule. Please allow a short period of time -// for changes to take effect. +// Note: When you delete a rule, incoming events might still continue to match +// to the deleted rule. Please allow a short period of time for changes to take +// effect. func (c *CloudWatchEvents) DeleteRule(input *DeleteRuleInput) (*DeleteRuleOutput, error) { req, out := c.DeleteRuleRequest(input) err := req.Send() @@ -98,9 +98,9 @@ func (c *CloudWatchEvents) DisableRuleRequest(input *DisableRuleInput) (req *req // Disables a rule. A disabled rule won't match any events, and won't self-trigger // if it has a schedule expression. // -// Note: When you make a change with this action, incoming events might still -// continue to match to the disabled rule. Please allow a short period of time -// for changes to take effect. +// Note: When you disable a rule, incoming events might still continue to +// match to the disabled rule. Please allow a short period of time for changes +// to take effect. func (c *CloudWatchEvents) DisableRule(input *DisableRuleInput) (*DisableRuleOutput, error) { req, out := c.DisableRuleRequest(input) err := req.Send() @@ -131,9 +131,9 @@ func (c *CloudWatchEvents) EnableRuleRequest(input *EnableRuleInput) (req *reque // Enables a rule. If the rule does not exist, the operation fails. // -// Note: When you make a change with this action, incoming events might not -// immediately start matching to a newly enabled rule. Please allow a short -// period of time for changes to take effect. +// Note: When you enable a rule, incoming events might not immediately start +// matching to a newly enabled rule. Please allow a short period of time for +// changes to take effect. func (c *CloudWatchEvents) EnableRule(input *EnableRuleInput) (*EnableRuleOutput, error) { req, out := c.EnableRuleRequest(input) err := req.Send() @@ -160,12 +160,12 @@ func (c *CloudWatchEvents) ListRuleNamesByTargetRequest(input *ListRuleNamesByTa return } -// Lists the names of the rules that the given target is put to. Using this -// action, you can find out which of the rules in Amazon CloudWatch Events can -// invoke a specific target in your account. If you have more rules in your -// account than the given limit, the results will be paginated. In that case, -// use the next token returned in the response and repeat the ListRulesByTarget -// action until the NextToken in the response is returned as null. +// Lists the names of the rules that the given target is put to. You can see +// which of the rules in Amazon CloudWatch Events can invoke a specific target +// in your account. If you have more rules in your account than the given limit, +// the results will be paginated. In that case, use the next token returned +// in the response and repeat ListRulesByTarget until the NextToken in the response +// is returned as null. func (c *CloudWatchEvents) ListRuleNamesByTarget(input *ListRuleNamesByTargetInput) (*ListRuleNamesByTargetOutput, error) { req, out := c.ListRuleNamesByTargetRequest(input) err := req.Send() @@ -196,8 +196,7 @@ func (c *CloudWatchEvents) ListRulesRequest(input *ListRulesInput) (req *request // list all the rules or you can provide a prefix to match to the rule names. // If you have more rules in your account than the given limit, the results // will be paginated. In that case, use the next token returned in the response -// and repeat the ListRules action until the NextToken in the response is returned -// as null. +// and repeat ListRules until the NextToken in the response is returned as null. func (c *CloudWatchEvents) ListRules(input *ListRulesInput) (*ListRulesOutput, error) { req, out := c.ListRulesRequest(input) err := req.Send() @@ -282,9 +281,9 @@ func (c *CloudWatchEvents) PutRuleRequest(input *PutRuleInput) (req *request.Req // Creates or updates a rule. Rules are enabled by default, or based on value // of the State parameter. You can disable a rule using DisableRule. // -// Note: When you make a change with this action, incoming events might not -// immediately start matching to new or updated rules. Please allow a short -// period of time for changes to take effect. +// Note: When you create or update a rule, incoming events might not immediately +// start matching to new or updated rules. Please allow a short period of time +// for changes to take effect. // // A rule must contain at least an EventPattern or ScheduleExpression. Rules // with EventPatterns are triggered when a matching event is observed. Rules @@ -323,13 +322,30 @@ func (c *CloudWatchEvents) PutTargetsRequest(input *PutTargetsInput) (req *reque return } -// Adds target(s) to a rule. Updates the target(s) if they are already associated +// Adds target(s) to a rule. Targets are the resources that can be invoked when +// a rule is triggered. For example, AWS Lambda functions, Amazon Kinesis streams, +// and built-in targets. Updates the target(s) if they are already associated // with the role. In other words, if there is already a target with the given // target ID, then the target associated with that ID is updated. // -// Note: When you make a change with this action, when the associated rule -// triggers, new or updated targets might not be immediately invoked. Please -// allow a short period of time for changes to take effect. +// In order to be able to make API calls against the resources you own, Amazon +// CloudWatch Events needs the appropriate permissions. For AWS Lambda and Amazon +// SNS resources, CloudWatch Events relies on resource-based policies. For Amazon +// Kinesis streams, CloudWatch Events relies on IAM roles. For more information, +// see Permissions for Sending Events to Targets (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/EventsTargetPermissions.html) +// in the Amazon CloudWatch Developer Guide. +// +// Input and InputPath are mutually-exclusive and optional parameters of a +// target. When a rule is triggered due to a matched event, if for a target: +// +// Neither Input nor InputPath is specified, then the entire event is passed +// to the target in JSON form. InputPath is specified in the form of JSONPath +// (e.g. $.detail), then only the part of the event specified in the path is +// passed to the target (e.g. only the detail part of the event is passed). +// Input is specified in the form of a valid JSON, then the matched event +// is overridden with this constant. Note: When you add targets to a rule, +// when the associated rule triggers, new or updated targets might not be immediately +// invoked. Please allow a short period of time for changes to take effect. func (c *CloudWatchEvents) PutTargets(input *PutTargetsInput) (*PutTargetsOutput, error) { req, out := c.PutTargetsRequest(input) err := req.Send() @@ -359,9 +375,9 @@ func (c *CloudWatchEvents) RemoveTargetsRequest(input *RemoveTargetsInput) (req // Removes target(s) from a rule so that when the rule is triggered, those targets // will no longer be invoked. // -// Note: When you make a change with this action, when the associated rule -// triggers, removed targets might still continue to be invoked. Please allow -// a short period of time for changes to take effect. +// Note: When you remove a target, when the associated rule triggers, removed +// targets might still continue to be invoked. Please allow a short period of +// time for changes to take effect. func (c *CloudWatchEvents) RemoveTargets(input *RemoveTargetsInput) (*RemoveTargetsOutput, error) { req, out := c.RemoveTargetsRequest(input) err := req.Send() @@ -734,7 +750,7 @@ func (s PutEventsOutput) GoString() string { return s.String() } -// Contains information about the event to be used in the PutEvents action. +// Contains information about the event to be used in PutEvents. type PutEventsRequestEntry struct { _ struct{} `type:"structure"` 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 13ebf43c9242..14f99f9b4035 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 @@ -64,7 +64,7 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio ServiceName: ServiceName, SigningRegion: signingRegion, Endpoint: endpoint, - APIVersion: "2014-02-03", + APIVersion: "2015-10-07", JSONVersion: "1.1", TargetPrefix: "AWSEvents", }, 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 32098074bbcb..6a5f99ceeb37 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 @@ -65,6 +65,8 @@ func (c *CloudWatchLogs) CreateExportTaskRequest(input *CreateExportTaskInput) ( // This is an asynchronous call. If all the required information is provided, // this API will initiate an export task and respond with the task Id. Once // started, DescribeExportTasks can be used to get the status of an export task. +// You can only have one active (RUNNING or PENDING) export task at a time, +// per account. // // You can export logs from multiple log groups or multiple time ranges to // the same Amazon S3 bucket. To separate out log data for each export task, @@ -805,6 +807,8 @@ func (c *CloudWatchLogs) PutLogEventsRequest(input *PutLogEventsInput) (req *req // log events in the batch can be older than 14 days or the retention period // of the log group. The log events in the batch must be in chronological ordered // by their timestamp. The maximum number of log events in a batch is 10,000. +// A batch of log events in a single PutLogEvents request cannot span more than +// 24 hours. Otherwise, the PutLogEvents operation will fail. func (c *CloudWatchLogs) PutLogEvents(input *PutLogEventsInput) (*PutLogEventsOutput, error) { req, out := c.PutLogEventsRequest(input) err := req.Send() @@ -901,10 +905,14 @@ func (c *CloudWatchLogs) PutSubscriptionFilterRequest(input *PutSubscriptionFilt // Creates or updates a subscription filter and associates it with the specified // log group. Subscription filters allow you to subscribe to a real-time stream // of log events ingested through PutLogEvents requests and have them delivered -// to a specific destination. Currently, the supported destinations are: A +// to a specific destination. Currently, the supported destinations are: An // Amazon Kinesis stream belonging to the same account as the subscription filter, // for same-account delivery. A logical destination (used via an ARN of Destination) -// belonging to a different account, for cross-account delivery. +// belonging to a different account, for cross-account delivery. An Amazon +// Kinesis Firehose stream belonging to the same account as the subscription +// filter, for same-account delivery. An AWS Lambda function belonging to +// the same account as the subscription filter, for same-account delivery. +// // // Currently there can only be one subscription filter associated with a log // group. @@ -979,7 +987,7 @@ type CreateExportTaskInput struct { // Name of Amazon S3 bucket to which the log data will be exported. // - // NOTE: Only buckets in the same AWS region are supported + // Note: Only buckets in the same AWS region are supported. Destination *string `locationName:"destination" min:"1" type:"string" required:"true"` // Prefix that will be used as the start of Amazon S3 key for every object exported. @@ -1909,9 +1917,9 @@ func (s GetLogEventsOutput) GoString() string { } // A log event is a record of some activity that was recorded by the application -// or resource being monitored. The log event record that Amazon CloudWatch -// Logs understands contains two properties: the timestamp of when the event -// occurred, and the raw event message. +// or resource being monitored. The log event record that CloudWatch Logs understands +// contains two properties: the timestamp of when the event occurred, and the +// raw event message. type InputLogEvent struct { _ struct{} `type:"structure"` @@ -2006,9 +2014,9 @@ func (s LogStream) GoString() string { return s.String() } -// Metric filters can be used to express how Amazon CloudWatch Logs would extract -// metric observations from ingested log events and transform them to metric -// data in a CloudWatch metric. +// Metric filters can be used to express how CloudWatch Logs would extract metric +// observations from ingested log events and transform them to metric data in +// a CloudWatch metric. type MetricFilter struct { _ struct{} `type:"structure"` @@ -2019,10 +2027,10 @@ type MetricFilter struct { // A name for a metric or subscription filter. FilterName *string `locationName:"filterName" min:"1" type:"string"` - // A symbolic description of how Amazon CloudWatch Logs should interpret the - // data in each log event. For example, a log event may contain timestamps, - // IP addresses, strings, and so on. You use the filter pattern to specify what - // to look for in the log event message. + // A symbolic description of how CloudWatch Logs should interpret the data in + // each log event. For example, a log event may contain timestamps, IP addresses, + // strings, and so on. You use the filter pattern to specify what to look for + // in the log event message. FilterPattern *string `locationName:"filterPattern" type:"string"` MetricTransformations []*MetricTransformation `locationName:"metricTransformations" min:"1" type:"list"` @@ -2115,8 +2123,8 @@ type PutDestinationInput struct { // A name for the destination. DestinationName *string `locationName:"destinationName" min:"1" type:"string" required:"true"` - // The ARN of an IAM role that grants Amazon CloudWatch Logs permissions to - // do Amazon Kinesis PutRecord requests on the desitnation stream. + // The ARN of an IAM role that grants CloudWatch Logs permissions to do Amazon + // Kinesis PutRecord requests on the desitnation stream. RoleArn *string `locationName:"roleArn" min:"1" type:"string" required:"true"` // The ARN of an Amazon Kinesis stream to deliver matching log events to. @@ -2314,10 +2322,13 @@ type PutSubscriptionFilterInput struct { _ struct{} `type:"structure"` // The ARN of the destination to deliver matching log events to. Currently, - // the supported destinations are: A Amazon Kinesis stream belonging to the + // the supported destinations are: An Amazon Kinesis stream belonging to the // same account as the subscription filter, for same-account delivery. A logical // destination (used via an ARN of Destination) belonging to a different account, - // for cross-account delivery. + // for cross-account delivery. An Amazon Kinesis Firehose stream belonging + // to the same account as the subscription filter, for same-account delivery. + // An AWS Lambda function belonging to the same account as the subscription + // filter, for same-account delivery. DestinationArn *string `locationName:"destinationArn" min:"1" type:"string" required:"true"` // A name for the subscription filter. @@ -2330,10 +2341,10 @@ type PutSubscriptionFilterInput struct { // The name of the log group to associate the subscription filter with. LogGroupName *string `locationName:"logGroupName" min:"1" type:"string" required:"true"` - // The ARN of an IAM role that grants Amazon CloudWatch Logs permissions to - // deliver ingested log events to the destination stream. You don't need to - // provide the ARN when you are working with a logical destination (used via - // an ARN of Destination) for cross-account delivery. + // The ARN of an IAM role that grants CloudWatch Logs permissions to deliver + // ingested log events to the destination stream. You don't need to provide + // the ARN when you are working with a logical destination (used via an ARN + // of Destination) for cross-account delivery. RoleArn *string `locationName:"roleArn" min:"1" type:"string"` } @@ -2416,10 +2427,10 @@ type SubscriptionFilter struct { // A name for a metric or subscription filter. FilterName *string `locationName:"filterName" min:"1" type:"string"` - // A symbolic description of how Amazon CloudWatch Logs should interpret the - // data in each log event. For example, a log event may contain timestamps, - // IP addresses, strings, and so on. You use the filter pattern to specify what - // to look for in the log event message. + // A symbolic description of how CloudWatch Logs should interpret the data in + // each log event. For example, a log event may contain timestamps, IP addresses, + // strings, and so on. You use the filter pattern to specify what to look for + // in the log event message. FilterPattern *string `locationName:"filterPattern" type:"string"` LogGroupName *string `locationName:"logGroupName" min:"1" type:"string"` @@ -2440,10 +2451,10 @@ func (s SubscriptionFilter) GoString() string { type TestMetricFilterInput struct { _ struct{} `type:"structure"` - // A symbolic description of how Amazon CloudWatch Logs should interpret the - // data in each log event. For example, a log event may contain timestamps, - // IP addresses, strings, and so on. You use the filter pattern to specify what - // to look for in the log event message. + // A symbolic description of how CloudWatch Logs should interpret the data in + // each log event. For example, a log event may contain timestamps, IP addresses, + // strings, and so on. You use the filter pattern to specify what to look for + // in the log event message. FilterPattern *string `locationName:"filterPattern" type:"string" required:"true"` // A list of log event messages to test. 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 5ff263356e2e..e5a47270c5c2 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 @@ -11,38 +11,35 @@ import ( "github.com/aws/aws-sdk-go/private/signer/v4" ) -// This is the Amazon CloudWatch Logs API Reference. Amazon CloudWatch Logs -// enables you to monitor, store, and access your system, application, and custom -// log files. This guide provides detailed information about Amazon CloudWatch -// Logs actions, data types, parameters, and errors. For detailed information -// about Amazon CloudWatch Logs features and their associated API calls, go -// to the Amazon CloudWatch Developer Guide (http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide). +// You can use Amazon CloudWatch Logs to monitor, store, and access your log +// files from Amazon Elastic Compute Cloud (Amazon EC2) instances, Amazon CloudTrail, +// or other sources. You can then retrieve the associated log data from CloudWatch +// Logs using the Amazon CloudWatch console, the CloudWatch Logs commands in +// the AWS CLI, the CloudWatch Logs API, or the CloudWatch Logs SDK. // -// Use the following links to get started using the Amazon CloudWatch Logs -// API Reference: +// You can use CloudWatch Logs to: // -// Actions (http://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_Operations.html): -// An alphabetical list of all Amazon CloudWatch Logs actions. Data Types (http://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_Types.html): -// An alphabetical list of all Amazon CloudWatch Logs data types. Common Parameters -// (http://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/CommonParameters.html): -// Parameters that all Query actions can use. Common Errors (http://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/CommonErrors.html): -// Client and server errors that all actions can return. Regions and Endpoints -// (http://docs.aws.amazon.com/general/latest/gr/index.html?rande.html): Itemized -// regions and endpoints for all AWS products. In addition to using the Amazon -// CloudWatch Logs API, you can also use the following SDKs and third-party -// libraries to access Amazon CloudWatch Logs programmatically. +// Monitor Logs from Amazon EC2 Instances in Real-time: You can use CloudWatch +// Logs to monitor applications and systems using log data. For example, CloudWatch +// Logs can track the number of errors that occur in your application logs and +// send you a notification whenever the rate of errors exceeds a threshold you +// specify. CloudWatch Logs uses your log data for monitoring; so, no code changes +// are required. For example, you can monitor application logs for specific +// literal terms (such as "NullReferenceException") or count the number of occurrences +// of a literal term at a particular position in log data (such as "404" status +// codes in an Apache access log). When the term you are searching for is found, +// CloudWatch Logs reports the data to a Amazon CloudWatch metric that you specify. // -// AWS SDK for Java Documentation (http://aws.amazon.com/documentation/sdkforjava/) -// AWS SDK for .NET Documentation (http://aws.amazon.com/documentation/sdkfornet/) -// AWS SDK for PHP Documentation (http://aws.amazon.com/documentation/sdkforphp/) -// AWS SDK for Ruby Documentation (http://aws.amazon.com/documentation/sdkforruby/) -// Developers in the AWS developer community also provide their own libraries, -// which you can find at the following AWS developer centers: +// Monitor Amazon CloudTrail Logged Events: You can create alarms in Amazon +// CloudWatch and receive notifications of particular API activity as captured +// by CloudTrail and use the notification to perform troubleshooting. // -// AWS Java Developer Center (http://aws.amazon.com/java/) AWS PHP Developer -// Center (http://aws.amazon.com/php/) AWS Python Developer Center (http://aws.amazon.com/python/) -// AWS Ruby Developer Center (http://aws.amazon.com/ruby/) AWS Windows and .NET -// Developer Center (http://aws.amazon.com/net/) +// Archive Log Data: You can use CloudWatch Logs to store your log data in +// highly durable storage. You can change the log retention setting so that +// any log events older than this setting are automatically deleted. The CloudWatch +// Logs agent makes it easy to quickly send both rotated and non-rotated log +// data off of a host and into the log service. You can then access the raw +// log data when you need it. //The service client's operations are safe to be used concurrently. // It is not safe to mutate any of the client's properties though. type CloudWatchLogs struct { 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 5f9ec01247dc..74cc04c2c9cd 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 @@ -32,7 +32,7 @@ func (c *CodeCommit) BatchGetRepositoriesRequest(input *BatchGetRepositoriesInpu return } -// Gets information about one or more repositories. +// Returns information about one or more repositories. // // The description field for a repository accepts all HTML characters and all // valid Unicode characters. Applications that do not HTML-encode the description @@ -156,7 +156,7 @@ func (c *CodeCommit) GetBranchRequest(input *GetBranchInput) (req *request.Reque return } -// Retrieves information about a repository branch, including its name and the +// Returns information about a repository branch, including its name and the // last commit ID. func (c *CodeCommit) GetBranch(input *GetBranchInput) (*GetBranchOutput, error) { req, out := c.GetBranchRequest(input) @@ -164,6 +164,34 @@ func (c *CodeCommit) GetBranch(input *GetBranchInput) (*GetBranchOutput, error) return out, err } +const opGetCommit = "GetCommit" + +// GetCommitRequest generates a request for the GetCommit operation. +func (c *CodeCommit) GetCommitRequest(input *GetCommitInput) (req *request.Request, output *GetCommitOutput) { + op := &request.Operation{ + Name: opGetCommit, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &GetCommitInput{} + } + + req = c.newRequest(op, input, output) + output = &GetCommitOutput{} + req.Data = output + return +} + +// Returns information about a commit, including commit message and committer +// information. +func (c *CodeCommit) GetCommit(input *GetCommitInput) (*GetCommitOutput, error) { + req, out := c.GetCommitRequest(input) + err := req.Send() + return out, err +} + const opGetRepository = "GetRepository" // GetRepositoryRequest generates a request for the GetRepository operation. @@ -184,7 +212,7 @@ func (c *CodeCommit) GetRepositoryRequest(input *GetRepositoryInput) (req *reque return } -// Gets information about a repository. +// Returns information about a repository. // // The description field for a repository accepts all HTML characters and all // valid Unicode characters. Applications that do not HTML-encode the description @@ -197,6 +225,33 @@ func (c *CodeCommit) GetRepository(input *GetRepositoryInput) (*GetRepositoryOut return out, err } +const opGetRepositoryTriggers = "GetRepositoryTriggers" + +// GetRepositoryTriggersRequest generates a request for the GetRepositoryTriggers operation. +func (c *CodeCommit) GetRepositoryTriggersRequest(input *GetRepositoryTriggersInput) (req *request.Request, output *GetRepositoryTriggersOutput) { + op := &request.Operation{ + Name: opGetRepositoryTriggers, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &GetRepositoryTriggersInput{} + } + + req = c.newRequest(op, input, output) + output = &GetRepositoryTriggersOutput{} + req.Data = output + return +} + +// Gets information about triggers configured for a repository. +func (c *CodeCommit) GetRepositoryTriggers(input *GetRepositoryTriggersInput) (*GetRepositoryTriggersOutput, error) { + req, out := c.GetRepositoryTriggersRequest(input) + err := req.Send() + return out, err +} + const opListBranches = "ListBranches" // ListBranchesRequest generates a request for the ListBranches operation. @@ -205,6 +260,12 @@ func (c *CodeCommit) ListBranchesRequest(input *ListBranchesInput) (req *request Name: opListBranches, HTTPMethod: "POST", HTTPPath: "/", + Paginator: &request.Paginator{ + InputTokens: []string{"nextToken"}, + OutputTokens: []string{"nextToken"}, + LimitToken: "", + TruncationToken: "", + }, } if input == nil { @@ -224,6 +285,14 @@ func (c *CodeCommit) ListBranches(input *ListBranchesInput) (*ListBranchesOutput return out, err } +func (c *CodeCommit) ListBranchesPages(input *ListBranchesInput, fn func(p *ListBranchesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListBranchesRequest(input) + page.Handlers.Build.PushBack(request.MakeAddToUserAgentFreeFormHandler("Paginator")) + return page.EachPage(func(p interface{}, lastPage bool) bool { + return fn(p.(*ListBranchesOutput), lastPage) + }) +} + const opListRepositories = "ListRepositories" // ListRepositoriesRequest generates a request for the ListRepositories operation. @@ -232,6 +301,12 @@ func (c *CodeCommit) ListRepositoriesRequest(input *ListRepositoriesInput) (req Name: opListRepositories, HTTPMethod: "POST", HTTPPath: "/", + Paginator: &request.Paginator{ + InputTokens: []string{"nextToken"}, + OutputTokens: []string{"nextToken"}, + LimitToken: "", + TruncationToken: "", + }, } if input == nil { @@ -251,6 +326,72 @@ func (c *CodeCommit) ListRepositories(input *ListRepositoriesInput) (*ListReposi return out, err } +func (c *CodeCommit) ListRepositoriesPages(input *ListRepositoriesInput, fn func(p *ListRepositoriesOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.ListRepositoriesRequest(input) + page.Handlers.Build.PushBack(request.MakeAddToUserAgentFreeFormHandler("Paginator")) + return page.EachPage(func(p interface{}, lastPage bool) bool { + return fn(p.(*ListRepositoriesOutput), lastPage) + }) +} + +const opPutRepositoryTriggers = "PutRepositoryTriggers" + +// PutRepositoryTriggersRequest generates a request for the PutRepositoryTriggers operation. +func (c *CodeCommit) PutRepositoryTriggersRequest(input *PutRepositoryTriggersInput) (req *request.Request, output *PutRepositoryTriggersOutput) { + op := &request.Operation{ + Name: opPutRepositoryTriggers, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &PutRepositoryTriggersInput{} + } + + req = c.newRequest(op, input, output) + output = &PutRepositoryTriggersOutput{} + req.Data = output + return +} + +// Replaces all triggers for a repository. This can be used to create or delete +// triggers. +func (c *CodeCommit) PutRepositoryTriggers(input *PutRepositoryTriggersInput) (*PutRepositoryTriggersOutput, error) { + req, out := c.PutRepositoryTriggersRequest(input) + err := req.Send() + return out, err +} + +const opTestRepositoryTriggers = "TestRepositoryTriggers" + +// TestRepositoryTriggersRequest generates a request for the TestRepositoryTriggers operation. +func (c *CodeCommit) TestRepositoryTriggersRequest(input *TestRepositoryTriggersInput) (req *request.Request, output *TestRepositoryTriggersOutput) { + op := &request.Operation{ + Name: opTestRepositoryTriggers, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &TestRepositoryTriggersInput{} + } + + req = c.newRequest(op, input, output) + output = &TestRepositoryTriggersOutput{} + req.Data = output + return +} + +// Tests the functionality of repository triggers by sending information to +// the trigger target. If real data is available in the repository, the test +// will send data from the last commit. If no data is available, sample data +// will be generated. +func (c *CodeCommit) TestRepositoryTriggers(input *TestRepositoryTriggersInput) (*TestRepositoryTriggersOutput, error) { + req, out := c.TestRepositoryTriggersRequest(input) + err := req.Send() + return out, err +} + const opUpdateDefaultBranch = "UpdateDefaultBranch" // UpdateDefaultBranchRequest generates a request for the UpdateDefaultBranch operation. @@ -341,7 +482,12 @@ func (c *CodeCommit) UpdateRepositoryNameRequest(input *UpdateRepositoryNameInpu return } -// Renames a repository. +// Renames a repository. The repository name must be unique across the calling +// AWS account. In addition, repository names are limited to 100 alphanumeric, +// dash, and underscore characters, and cannot include certain characters. The +// suffix ".git" is prohibited. For a full description of the limits on repository +// names, see Limits (http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html) +// in the AWS CodeCommit User Guide. func (c *CodeCommit) UpdateRepositoryName(input *UpdateRepositoryNameInput) (*UpdateRepositoryNameOutput, error) { req, out := c.UpdateRepositoryNameRequest(input) err := req.Send() @@ -408,6 +554,42 @@ func (s BranchInfo) GoString() string { return s.String() } +// Returns information about a specific commit. +type Commit struct { + _ struct{} `type:"structure"` + + // Any additional data associated with the specified commit. + AdditionalData *string `locationName:"additionalData" type:"string"` + + // Information about the author of the specified commit. + Author *UserInfo `locationName:"author" type:"structure"` + + // Information about the person who committed the specified commit, also known + // as the committer. For more information about the difference between an author + // and a committer in Git, see Viewing the Commit History (http://git-scm.com/book/ch2-3.html) + // in Pro Git by Scott Chacon and Ben Straub. + Committer *UserInfo `locationName:"committer" type:"structure"` + + // The message associated with the specified commit. + Message *string `locationName:"message" type:"string"` + + // The parent list for the specified commit. + Parents []*string `locationName:"parents" type:"list"` + + // Tree information for the specified commit. + TreeId *string `locationName:"treeId" type:"string"` +} + +// String returns the string representation +func (s Commit) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s Commit) GoString() string { + return s.String() +} + // Represents the input of a create branch operation. type CreateBranchInput struct { _ struct{} `type:"structure"` @@ -416,9 +598,6 @@ type CreateBranchInput struct { BranchName *string `locationName:"branchName" min:"1" type:"string" required:"true"` // The ID of the commit to point the new branch to. - // - // If this commit ID is not specified, the new branch will point to the commit - // that is pointed to by the repository's default branch. CommitId *string `locationName:"commitId" type:"string" required:"true"` // The name of the repository in which you want to create the new branch. @@ -454,13 +633,21 @@ type CreateRepositoryInput struct { _ struct{} `type:"structure"` // A comment or description about the new repository. + // + // The description field for a repository accepts all HTML characters and all + // valid Unicode characters. Applications that do not HTML-encode the description + // and display it in a web page could expose users to potentially malicious + // code. Make sure that you HTML-encode the description field in any application + // that uses this API to display the repository description on a web page. RepositoryDescription *string `locationName:"repositoryDescription" type:"string"` // The name of the new repository to be created. // // The repository name must be unique across the calling AWS account. In addition, - // repository names are restricted to alphanumeric characters. The suffix ".git" - // is prohibited. + // repository names are limited to 100 alphanumeric, dash, and underscore characters, + // and cannot include certain characters. For a full description of the limits + // on repository names, see Limits (http://docs.aws.amazon.com/codecommit/latest/userguide/limits.html) + // in the AWS CodeCommit User Guide. The suffix ".git" is prohibited. RepositoryName *string `locationName:"repositoryName" min:"1" type:"string" required:"true"` } @@ -535,9 +722,8 @@ type GetBranchInput struct { // The name of the branch for which you want to retrieve information. BranchName *string `locationName:"branchName" min:"1" type:"string"` - // Repository name is restricted to alphanumeric characters (a-z, A-Z, 0-9), - // ".", "_", and "-". Additionally, the suffix ".git" is prohibited in a repository - // name. + // The name of the repository that contains the branch for which you want to + // retrieve information. RepositoryName *string `locationName:"repositoryName" min:"1" type:"string"` } @@ -569,6 +755,45 @@ func (s GetBranchOutput) GoString() string { return s.String() } +// Represents the input of a get commit operation. +type GetCommitInput struct { + _ struct{} `type:"structure"` + + // The commit ID. + CommitId *string `locationName:"commitId" type:"string" required:"true"` + + // The name of the repository to which the commit was made. + RepositoryName *string `locationName:"repositoryName" min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s GetCommitInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetCommitInput) GoString() string { + return s.String() +} + +// Represents the output of a get commit operation. +type GetCommitOutput struct { + _ struct{} `type:"structure"` + + // Information about the specified commit. + Commit *Commit `locationName:"commit" type:"structure" required:"true"` +} + +// String returns the string representation +func (s GetCommitOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetCommitOutput) GoString() string { + return s.String() +} + // Represents the input of a get repository operation. type GetRepositoryInput struct { _ struct{} `type:"structure"` @@ -605,6 +830,45 @@ func (s GetRepositoryOutput) GoString() string { return s.String() } +// Represents the input of a get repository triggers operation. +type GetRepositoryTriggersInput struct { + _ struct{} `type:"structure"` + + // The name of the repository for which the trigger is configured. + RepositoryName *string `locationName:"repositoryName" min:"1" type:"string"` +} + +// String returns the string representation +func (s GetRepositoryTriggersInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetRepositoryTriggersInput) GoString() string { + return s.String() +} + +// Represents the output of a get repository triggers operation. +type GetRepositoryTriggersOutput struct { + _ struct{} `type:"structure"` + + // The system-generated unique ID for the trigger. + ConfigurationId *string `locationName:"configurationId" type:"string"` + + // The JSON block of configuration information for each trigger. + Triggers []*RepositoryTrigger `locationName:"triggers" type:"list"` +} + +// String returns the string representation +func (s GetRepositoryTriggersOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s GetRepositoryTriggersOutput) GoString() string { + return s.String() +} + // Represents the input of a list branches operation. type ListBranchesInput struct { _ struct{} `type:"structure"` @@ -698,6 +962,45 @@ func (s ListRepositoriesOutput) GoString() string { return s.String() } +// Represents the input ofa put repository triggers operation. +type PutRepositoryTriggersInput struct { + _ struct{} `type:"structure"` + + // The name of the repository where you want to create or update the trigger. + RepositoryName *string `locationName:"repositoryName" min:"1" type:"string"` + + // The JSON block of configuration information for each trigger. + Triggers []*RepositoryTrigger `locationName:"triggers" type:"list"` +} + +// String returns the string representation +func (s PutRepositoryTriggersInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PutRepositoryTriggersInput) GoString() string { + return s.String() +} + +// Represents the output of a put repository triggers operation. +type PutRepositoryTriggersOutput struct { + _ struct{} `type:"structure"` + + // The system-generated unique ID for the create or update operation. + ConfigurationId *string `locationName:"configurationId" type:"string"` +} + +// String returns the string representation +func (s PutRepositoryTriggersOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s PutRepositoryTriggersOutput) GoString() string { + return s.String() +} + // Information about a repository. type RepositoryMetadata struct { _ struct{} `type:"structure"` @@ -747,12 +1050,10 @@ func (s RepositoryMetadata) GoString() string { type RepositoryNameIdPair struct { _ struct{} `type:"structure"` - // The ID associated with the repository name. + // The ID associated with the repository. RepositoryId *string `locationName:"repositoryId" type:"string"` - // Repository name is restricted to alphanumeric characters (a-z, A-Z, 0-9), - // ".", "_", and "-". Additionally, the suffix ".git" is prohibited in a repository - // name. + // The name associated with the repository. RepositoryName *string `locationName:"repositoryName" min:"1" type:"string"` } @@ -766,6 +1067,107 @@ func (s RepositoryNameIdPair) GoString() string { return s.String() } +// Information about a trigger for a repository. +type RepositoryTrigger struct { + _ struct{} `type:"structure"` + + // The branches that will be included in the trigger configuration. If no branches + // are specified, the trigger will apply to all branches. + Branches []*string `locationName:"branches" type:"list"` + + // Any custom data associated with the trigger that will be included in the + // information sent to the target of the trigger. + CustomData *string `locationName:"customData" type:"string"` + + // The ARN of the resource that is the target for a trigger. For example, the + // ARN of a topic in Amazon Simple Notification Service (SNS). + DestinationArn *string `locationName:"destinationArn" type:"string"` + + // The repository events that will cause the trigger to run actions in another + // service, such as sending a notification through Amazon Simple Notification + // Service (SNS). If no events are specified, the trigger will run for all repository + // events. + Events []*string `locationName:"events" type:"list"` + + // The name of the trigger. + Name *string `locationName:"name" type:"string"` +} + +// String returns the string representation +func (s RepositoryTrigger) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RepositoryTrigger) GoString() string { + return s.String() +} + +// A trigger failed to run. +type RepositoryTriggerExecutionFailure struct { + _ struct{} `type:"structure"` + + // Additional message information about the trigger that did not run. + FailureMessage *string `locationName:"failureMessage" type:"string"` + + // The name of the trigger that did not run. + Trigger *string `locationName:"trigger" type:"string"` +} + +// String returns the string representation +func (s RepositoryTriggerExecutionFailure) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RepositoryTriggerExecutionFailure) GoString() string { + return s.String() +} + +// Represents the input of a test repository triggers operation. +type TestRepositoryTriggersInput struct { + _ struct{} `type:"structure"` + + // The name of the repository in which to test the triggers. + RepositoryName *string `locationName:"repositoryName" min:"1" type:"string"` + + // The list of triggers to test. + Triggers []*RepositoryTrigger `locationName:"triggers" type:"list"` +} + +// String returns the string representation +func (s TestRepositoryTriggersInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TestRepositoryTriggersInput) GoString() string { + return s.String() +} + +// Represents the output of a test repository triggers operation. +type TestRepositoryTriggersOutput struct { + _ struct{} `type:"structure"` + + // The list of triggers that were not able to be tested. This list provides + // the names of the triggers that could not be tested, separated by commas. + FailedExecutions []*RepositoryTriggerExecutionFailure `locationName:"failedExecutions" type:"list"` + + // The list of triggers that were successfully tested. This list provides the + // names of the triggers that were successfully tested, separated by commas. + SuccessfulExecutions []*string `locationName:"successfulExecutions" type:"list"` +} + +// String returns the string representation +func (s TestRepositoryTriggersOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TestRepositoryTriggersOutput) GoString() string { + return s.String() +} + // Represents the input of an update default branch operation. type UpdateDefaultBranchInput struct { _ struct{} `type:"structure"` @@ -805,7 +1207,8 @@ func (s UpdateDefaultBranchOutput) GoString() string { type UpdateRepositoryDescriptionInput struct { _ struct{} `type:"structure"` - // The new comment or description for the specified repository. + // The new comment or description for the specified repository. Repository descriptions + // are limited to 1,000 characters. RepositoryDescription *string `locationName:"repositoryDescription" type:"string"` // The name of the repository to set or change the comment or description for. @@ -840,14 +1243,10 @@ func (s UpdateRepositoryDescriptionOutput) GoString() string { type UpdateRepositoryNameInput struct { _ struct{} `type:"structure"` - // Repository name is restricted to alphanumeric characters (a-z, A-Z, 0-9), - // ".", "_", and "-". Additionally, the suffix ".git" is prohibited in a repository - // name. + // The new name for the repository. NewName *string `locationName:"newName" min:"1" type:"string" required:"true"` - // Repository name is restricted to alphanumeric characters (a-z, A-Z, 0-9), - // ".", "_", and "-". Additionally, the suffix ".git" is prohibited in a repository - // name. + // The existing name of the repository. OldName *string `locationName:"oldName" min:"1" type:"string" required:"true"` } @@ -875,6 +1274,30 @@ func (s UpdateRepositoryNameOutput) GoString() string { return s.String() } +// Information about the user who made a specified commit. +type UserInfo struct { + _ struct{} `type:"structure"` + + // The date when the specified commit was pushed to the repository. + Date *string `locationName:"date" type:"string"` + + // The email address associated with the user who made the commit, if any. + Email *string `locationName:"email" type:"string"` + + // The name of the user who made the specified commit. + Name *string `locationName:"name" type:"string"` +} + +// String returns the string representation +func (s UserInfo) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s UserInfo) GoString() string { + return s.String() +} + const ( // @enum OrderEnum OrderEnumAscending = "ascending" @@ -882,6 +1305,17 @@ const ( OrderEnumDescending = "descending" ) +const ( + // @enum RepositoryTriggerEventEnum + RepositoryTriggerEventEnumAll = "all" + // @enum RepositoryTriggerEventEnum + RepositoryTriggerEventEnumUpdateReference = "updateReference" + // @enum RepositoryTriggerEventEnum + RepositoryTriggerEventEnumCreateReference = "createReference" + // @enum RepositoryTriggerEventEnum + RepositoryTriggerEventEnumDeleteReference = "deleteReference" +) + const ( // @enum SortByEnum SortByEnumRepositoryName = "repositoryName" 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 6402168790ae..bf756307abae 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 @@ -12,12 +12,32 @@ import ( ) // This is the AWS CodeCommit API Reference. This reference provides descriptions -// of the AWS CodeCommit API. +// of the operations and data types for AWS CodeCommit API. // // You can use the AWS CodeCommit API to work with the following objects: // -// Repositories Branches Commits For information about how to use AWS CodeCommit, -// see the AWS CodeCommit User Guide. +// Repositories, by calling the following: BatchGetRepositories, which returns +// information about one or more repositories associated with your AWS account +// CreateRepository, which creates an AWS CodeCommit repository DeleteRepository, +// which deletes an AWS CodeCommit repository GetRepository, which returns information +// about a specified repository ListRepositories, which lists all AWS CodeCommit +// repositories associated with your AWS account UpdateRepositoryDescription, +// which sets or updates the description of the repository UpdateRepositoryName, +// which changes the name of the repository. If you change the name of a repository, +// no other users of that repository will be able to access it until you send +// them the new HTTPS or SSH URL to use. Branches, by calling the following: +// CreateBranch, which creates a new branch in a specified repository GetBranch, +// which returns information about a specified branch ListBranches, which lists +// all branches for a specified repository UpdateDefaultBranch, which changes +// the default branch for a repository Information about committed code in +// a repository, by calling the following: GetCommit, which returns information +// about a commit, including commit messages and committer information. Triggers, +// by calling the following: GetRepositoryTriggers, which returns information +// about triggers configured for a repository PutRepositoryTriggers, which replaces +// all triggers for a repository and can be used to create or delete triggers +// TestRepositoryTriggers, which tests the functionality of a repository trigger +// by sending data to the trigger target For information about how to use +// AWS CodeCommit, see the AWS CodeCommit User Guide (http://docs.aws.amazon.com/codecommit/latest/userguide/welcome.html). //The service client's operations are safe to be used concurrently. // It is not safe to mutate any of the client's properties though. type CodeCommit struct { 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 e02c5c4f7fb5..f109221526c9 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 @@ -41,6 +41,33 @@ func (c *CodeDeploy) AddTagsToOnPremisesInstances(input *AddTagsToOnPremisesInst return out, err } +const opBatchGetApplicationRevisions = "BatchGetApplicationRevisions" + +// BatchGetApplicationRevisionsRequest generates a request for the BatchGetApplicationRevisions operation. +func (c *CodeDeploy) BatchGetApplicationRevisionsRequest(input *BatchGetApplicationRevisionsInput) (req *request.Request, output *BatchGetApplicationRevisionsOutput) { + op := &request.Operation{ + Name: opBatchGetApplicationRevisions, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &BatchGetApplicationRevisionsInput{} + } + + req = c.newRequest(op, input, output) + output = &BatchGetApplicationRevisionsOutput{} + req.Data = output + return +} + +// Gets information about one or more application revisions. +func (c *CodeDeploy) BatchGetApplicationRevisions(input *BatchGetApplicationRevisionsInput) (*BatchGetApplicationRevisionsOutput, error) { + req, out := c.BatchGetApplicationRevisionsRequest(input) + err := req.Send() + return out, err +} + const opBatchGetApplications = "BatchGetApplications" // BatchGetApplicationsRequest generates a request for the BatchGetApplications operation. @@ -68,6 +95,34 @@ func (c *CodeDeploy) BatchGetApplications(input *BatchGetApplicationsInput) (*Ba return out, err } +const opBatchGetDeploymentInstances = "BatchGetDeploymentInstances" + +// BatchGetDeploymentInstancesRequest generates a request for the BatchGetDeploymentInstances operation. +func (c *CodeDeploy) BatchGetDeploymentInstancesRequest(input *BatchGetDeploymentInstancesInput) (req *request.Request, output *BatchGetDeploymentInstancesOutput) { + op := &request.Operation{ + Name: opBatchGetDeploymentInstances, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &BatchGetDeploymentInstancesInput{} + } + + req = c.newRequest(op, input, output) + output = &BatchGetDeploymentInstancesOutput{} + req.Data = output + return +} + +// Gets information about one or more instances that are part of a deployment +// group. +func (c *CodeDeploy) BatchGetDeploymentInstances(input *BatchGetDeploymentInstancesInput) (*BatchGetDeploymentInstancesOutput, error) { + req, out := c.BatchGetDeploymentInstancesRequest(input) + err := req.Send() + return out, err +} + const opBatchGetDeployments = "BatchGetDeployments" // BatchGetDeploymentsRequest generates a request for the BatchGetDeployments operation. @@ -986,7 +1041,7 @@ func (c *CodeDeploy) UpdateDeploymentGroup(input *UpdateDeploymentGroupInput) (* return out, err } -// Represents the input of an adds tags to on-premises instance operation. +// Represents the input of and adds tags to on-premises instance operation. type AddTagsToOnPremisesInstancesInput struct { _ struct{} `type:"structure"` @@ -1073,6 +1128,54 @@ func (s AutoScalingGroup) GoString() string { return s.String() } +// Represents the input of a batch get application revisions operation. +type BatchGetApplicationRevisionsInput struct { + _ struct{} `type:"structure"` + + // The name of an existing AWS CodeDeploy application to get revision information + // about. + ApplicationName *string `locationName:"applicationName" min:"1" type:"string" required:"true"` + + // Information to get about the application revisions, including revision type + // and location. + Revisions []*RevisionLocation `locationName:"revisions" type:"list" required:"true"` +} + +// String returns the string representation +func (s BatchGetApplicationRevisionsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s BatchGetApplicationRevisionsInput) GoString() string { + return s.String() +} + +// Represents the output of a batch get application revisions operation. +type BatchGetApplicationRevisionsOutput struct { + _ struct{} `type:"structure"` + + // The name of the application that corresponds to the revisions. + ApplicationName *string `locationName:"applicationName" min:"1" type:"string"` + + // Information about errors that may have occurred during the API call. + ErrorMessage *string `locationName:"errorMessage" type:"string"` + + // Additional information about the revisions, including the revision type and + // location. + Revisions []*RevisionInfo `locationName:"revisions" type:"list"` +} + +// String returns the string representation +func (s BatchGetApplicationRevisionsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s BatchGetApplicationRevisionsOutput) GoString() string { + return s.String() +} + // Represents the input of a batch get applications operation. type BatchGetApplicationsInput struct { _ struct{} `type:"structure"` @@ -1110,6 +1213,48 @@ func (s BatchGetApplicationsOutput) GoString() string { return s.String() } +// Represents the input of a batch get deployment instances operation. +type BatchGetDeploymentInstancesInput struct { + _ struct{} `type:"structure"` + + // The unique ID of a deployment. + DeploymentId *string `locationName:"deploymentId" type:"string" required:"true"` + + // The unique IDs of instances in the deployment's deployment group. + InstanceIds []*string `locationName:"instanceIds" type:"list" required:"true"` +} + +// String returns the string representation +func (s BatchGetDeploymentInstancesInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s BatchGetDeploymentInstancesInput) GoString() string { + return s.String() +} + +// Represents the output of a batch get deployment instances operation. +type BatchGetDeploymentInstancesOutput struct { + _ struct{} `type:"structure"` + + // Information about errors that may have occurred during the API call. + ErrorMessage *string `locationName:"errorMessage" type:"string"` + + // Information about the instances. + InstancesSummary []*InstanceSummary `locationName:"instancesSummary" type:"list"` +} + +// String returns the string representation +func (s BatchGetDeploymentInstancesOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s BatchGetDeploymentInstancesOutput) GoString() string { + return s.String() +} + // Represents the input of a batch get deployments operation. type BatchGetDeploymentsInput struct { _ struct{} `type:"structure"` @@ -1284,38 +1429,60 @@ type CreateDeploymentGroupInput struct { // A list of associated Auto Scaling groups. AutoScalingGroups []*string `locationName:"autoScalingGroups" type:"list"` - // If specified, the deployment configuration name must be one of the predefined - // values, or it can be a custom deployment configuration: - // - // CodeDeployDefault.AllAtOnce deploys an application revision to up to all - // of the instances at once. The overall deployment succeeds if the application - // revision deploys to at least one of the instances. The overall deployment - // fails after the application revision fails to deploy to all of the instances. - // For example, for 9 instances, deploy to up to all 9 instances at once. The - // overall deployment succeeds if any of the 9 instances is successfully deployed - // to, and it fails if all 9 instances fail to be deployed to. CodeDeployDefault.HalfAtATime - // deploys to up to half of the instances at a time (with fractions rounded - // down). The overall deployment succeeds if the application revision deploys - // to at least half of the instances (with fractions rounded up); otherwise, - // the deployment fails. For example, for 9 instances, deploy to up to 4 instances - // at a time. The overall deployment succeeds if 5 or more instances are successfully - // deployed to; otherwise, the deployment fails. Note that the deployment may - // successfully deploy to some instances, even if the overall deployment fails. - // CodeDeployDefault.OneAtATime deploys the application revision to only one - // of the instances at a time. The overall deployment succeeds if the application - // revision deploys to all of the instances. The overall deployment fails after - // the application revision first fails to deploy to any one instances. For - // example, for 9 instances, deploy to one instance at a time. The overall deployment - // succeeds if all 9 instances are successfully deployed to, and it fails if - // any of one of the 9 instances fail to be deployed to. Note that the deployment - // may successfully deploy to some instances, even if the overall deployment - // fails. This is the default deployment configuration if a configuration isn't - // specified for either the deployment or the deployment group. To create a - // custom deployment configuration, call the create deployment configuration + // If specified, the deployment configuration name can be either one of the + // predefined configurations provided with AWS CodeDeploy, or a custom deployment + // configuration that you created by calling the create deployment configuration // operation. + // + // CodeDeployDefault.OneAtATime is the default deployment configuration that + // is used if a configuration isn't specified for either the deployment or the + // deployment group. + // + // The predefined deployment configurations including the following: + // + // CodeDeployDefault.AllAtOnce attempts to deploy an application revision + // to as many instances as possible at once. The status of the overall deployment + // will be displayed as Succeeded if the application revision is deployed to + // one or more of the instances. The status of the overall deployment will be + // displayed as Failed if the application revision is not deployed to any of + // the instances. Using an example of nine instances, CodeDeployDefault.AllAtOnce + // will attempt to deploy to all nine instances at once. The overall deployment + // will succeed if deployment to even a single instance is successful; it will + // fail only if deployments to all nine instances fail. + // + // CodeDeployDefault.HalfAtATime deploys to up to half of the instances at + // a time (with fractions rounded down). The overall deployment succeeds if + // the application revision deploys to at least half of the instances (with + // fractions rounded up); otherwise, the deployment fails. For example, for + // nine instances, deploy to up to four instances at a time. The overall deployment + // succeeds if deployment to five or more instances succeed; otherwise, the + // deployment fails. Note that the deployment may successfully deploy to some + // instances, even if the overall deployment fails. + // + // CodeDeployDefault.OneAtATime deploys the application revision to only + // one instance at a time. + // + // For deployment groups that contain more than one instance: + // + // The overall deployment succeeds if the application revision deploys to + // all of the instances. The exception to this rule is that if deployment to + // the last instance fails, the overall deployment still succeeds. This is because + // AWS CodeDeploy allows only one instance to be taken offline at a time with + // the CodeDeployDefault.OneAtATime configuration. + // + // The overall deployment fails as soon as the application revision fails + // to deploy to any but the last instance. Note that the deployment may successfully + // deploy to some instances, even if the overall deployment fails. + // + // Example: For nine instances, deploy to one instance at a time. The overall + // deployment succeeds if the first eight instances are successfully deployed + // to, but it fails if deployment to any of the first eight instances fails. + // + // For deployment groups that contain only one instance, the overall deployment + // is of course successful only if deployment to the single instance succeeds. DeploymentConfigName *string `locationName:"deploymentConfigName" min:"1" type:"string"` - // The name of an existing deployment group for the specified application. + // The name of a new deployment group for the specified application. DeploymentGroupName *string `locationName:"deploymentGroupName" min:"1" type:"string" required:"true"` // The Amazon EC2 tags to filter on. @@ -1327,6 +1494,9 @@ type CreateDeploymentGroupInput struct { // A service role ARN that allows AWS CodeDeploy to act on the user's behalf // when interacting with AWS services. ServiceRoleArn *string `locationName:"serviceRoleArn" type:"string" required:"true"` + + // Information about triggers to create when the deployment group is created. + TriggerConfigurations []*TriggerConfig `locationName:"triggerConfigurations" type:"list"` } // String returns the string representation @@ -1592,6 +1762,9 @@ type DeploymentGroupInfo struct { // Information about the deployment group's target revision, including the revision's // type and its location. TargetRevision *RevisionLocation `locationName:"targetRevision" type:"structure"` + + // A list of associated triggers. + TriggerConfigurations []*TriggerConfig `locationName:"triggerConfigurations" type:"list"` } // String returns the string representation @@ -1755,6 +1928,9 @@ type Diagnostics struct { ErrorCode *string `locationName:"errorCode" type:"string" enum:"LifecycleErrorCode"` // The last portion of the associated diagnostic log. + // + // If available, AWS CodeDeploy returns up to the last 4 KB of the associated + // diagnostic log. LogTail *string `locationName:"logTail" type:"string"` // The message associated with the error. @@ -1845,7 +2021,7 @@ func (s ErrorInformation) GoString() string { type GenericRevisionInfo struct { _ struct{} `type:"structure"` - // A list of deployment groups that use this revision. + // The deployment groups where this is the current target revision. DeploymentGroups []*string `locationName:"deploymentGroups" type:"list"` // A comment about the revision. @@ -2149,8 +2325,8 @@ func (s GetOnPremisesInstanceOutput) GoString() string { type GitHubLocation struct { _ struct{} `type:"structure"` - // The SHA1 commit ID of the GitHub commit that references the that represents - // the bundled artifacts for the application revision. + // The SHA1 commit ID of the GitHub commit that represents the bundled artifacts + // for the application revision. CommitId *string `locationName:"commitId" type:"string"` // The GitHub account and repository pair that stores a reference to the commit @@ -2691,8 +2867,13 @@ type MinimumHealthyHosts struct { // // In a call to the get deployment configuration operation, CodeDeployDefault.OneAtATime // will return a minimum healthy instances type of MOST_CONCURRENCY and a value - // of 1. This means a deployment to only one instances at a time. (You cannot - // set the type to MOST_CONCURRENCY, only to HOST_COUNT or FLEET_PERCENT.) + // of 1. This means a deployment to only one instance at a time. (You cannot + // set the type to MOST_CONCURRENCY, only to HOST_COUNT or FLEET_PERCENT.) In + // addition, with CodeDeployDefault.OneAtATime, AWS CodeDeploy will try to ensure + // that all but one instance are kept in healthy states during the deployment + // operation. While this allows one instance at a time to be taken offline for + // a new deployment, it also means that if the deployment to the last instance + // fails, the overall deployment still succeeds. Type *string `locationName:"type" type:"string" enum:"MinimumHealthyHostsType"` // The minimum healthy instances value. @@ -2819,6 +3000,27 @@ func (s RemoveTagsFromOnPremisesInstancesOutput) GoString() string { return s.String() } +// Information about an application revision. +type RevisionInfo struct { + _ struct{} `type:"structure"` + + // Information about an application revision. + GenericRevisionInfo *GenericRevisionInfo `locationName:"genericRevisionInfo" type:"structure"` + + // Information about an application revision's location. + RevisionLocation *RevisionLocation `locationName:"revisionLocation" type:"structure"` +} + +// String returns the string representation +func (s RevisionInfo) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RevisionInfo) GoString() string { + return s.String() +} + // Information about an application revision's location. type RevisionLocation struct { _ struct{} `type:"structure"` @@ -3004,6 +3206,36 @@ func (s TimeRange) GoString() string { return s.String() } +// Information about notification triggers for the deployment group. +type TriggerConfig struct { + _ struct{} `type:"structure"` + + // The event type or types for which notifications are triggered. + // + // The following event type values are supported: + // + // DEPLOYMENT_START DEPLOYMENT_SUCCESS DEPLOYMENT_FAILURE DEPLOYMENT_STOP + // INSTANCE_START INSTANCE_SUCCESS INSTANCE_FAILURE + TriggerEvents []*string `locationName:"triggerEvents" type:"list"` + + // The name of the notification trigger. + TriggerName *string `locationName:"triggerName" type:"string"` + + // The arn of the Amazon Simple Notification Service topic through which notifications + // about deployment or instance events are sent. + TriggerTargetArn *string `locationName:"triggerTargetArn" type:"string"` +} + +// String returns the string representation +func (s TriggerConfig) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s TriggerConfig) GoString() string { + return s.String() +} + // Represents the input of an update application operation. type UpdateApplicationInput struct { _ struct{} `type:"structure"` @@ -3047,7 +3279,9 @@ type UpdateDeploymentGroupInput struct { ApplicationName *string `locationName:"applicationName" min:"1" type:"string" required:"true"` // The replacement list of Auto Scaling groups to be included in the deployment - // group, if you want to change them. + // group, if you want to change them. To keep the existing Auto Scaling groups, + // enter their names. To remove Auto Scaling groups, do not enter any Auto Scaling + // group names. AutoScalingGroups []*string `locationName:"autoScalingGroups" type:"list"` // The current name of the existing deployment group. @@ -3058,18 +3292,23 @@ type UpdateDeploymentGroupInput struct { DeploymentConfigName *string `locationName:"deploymentConfigName" min:"1" type:"string"` // The replacement set of Amazon EC2 tags to filter on, if you want to change - // them. + // them. To keep the existing tags, enter their names. To remove tags, do not + // enter any tag names. Ec2TagFilters []*EC2TagFilter `locationName:"ec2TagFilters" type:"list"` // The new name of the deployment group, if you want to change it. NewDeploymentGroupName *string `locationName:"newDeploymentGroupName" min:"1" type:"string"` // The replacement set of on-premises instance tags for filter on, if you want - // to change them. + // to change them. To keep the existing tags, enter their names. To remove tags, + // do not enter any tag names. OnPremisesInstanceTagFilters []*TagFilter `locationName:"onPremisesInstanceTagFilters" type:"list"` // A replacement service role's ARN, if you want to change it. ServiceRoleArn *string `locationName:"serviceRoleArn" type:"string"` + + // Information about triggers to change when the deployment group is updated. + TriggerConfigurations []*TriggerConfig `locationName:"triggerConfigurations" type:"list"` } // String returns the string representation @@ -3279,3 +3518,20 @@ const ( // @enum TagFilterType TagFilterTypeKeyAndValue = "KEY_AND_VALUE" ) + +const ( + // @enum TriggerEventType + TriggerEventTypeDeploymentStart = "DeploymentStart" + // @enum TriggerEventType + TriggerEventTypeDeploymentSuccess = "DeploymentSuccess" + // @enum TriggerEventType + TriggerEventTypeDeploymentFailure = "DeploymentFailure" + // @enum TriggerEventType + TriggerEventTypeDeploymentStop = "DeploymentStop" + // @enum TriggerEventType + TriggerEventTypeInstanceStart = "InstanceStart" + // @enum TriggerEventType + TriggerEventTypeInstanceSuccess = "InstanceSuccess" + // @enum TriggerEventType + TriggerEventTypeInstanceFailure = "InstanceFailure" +) diff --git a/vendor/github.com/aws/aws-sdk-go/service/directoryservice/api.go b/vendor/github.com/aws/aws-sdk-go/service/directoryservice/api.go index c374080e23ce..9607afa77c9d 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/directoryservice/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/directoryservice/api.go @@ -171,7 +171,7 @@ func (c *DirectoryService) CreateSnapshotRequest(input *CreateSnapshotInput) (re return } -// Creates a snapshot of a Simple AD directory. +// Creates a snapshot of a Simple AD or Microsoft AD directory in the AWS cloud. // // You cannot take snapshots of AD Connector directories. func (c *DirectoryService) CreateSnapshot(input *CreateSnapshotInput) (*CreateSnapshotOutput, error) { @@ -296,6 +296,33 @@ func (c *DirectoryService) DeleteTrust(input *DeleteTrustInput) (*DeleteTrustOut return out, err } +const opDeregisterEventTopic = "DeregisterEventTopic" + +// DeregisterEventTopicRequest generates a request for the DeregisterEventTopic operation. +func (c *DirectoryService) DeregisterEventTopicRequest(input *DeregisterEventTopicInput) (req *request.Request, output *DeregisterEventTopicOutput) { + op := &request.Operation{ + Name: opDeregisterEventTopic, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DeregisterEventTopicInput{} + } + + req = c.newRequest(op, input, output) + output = &DeregisterEventTopicOutput{} + req.Data = output + return +} + +// Removes the specified directory as a publisher to the specified SNS topic. +func (c *DirectoryService) DeregisterEventTopic(input *DeregisterEventTopicInput) (*DeregisterEventTopicOutput, error) { + req, out := c.DeregisterEventTopicRequest(input) + err := req.Send() + return out, err +} + const opDescribeDirectories = "DescribeDirectories" // DescribeDirectoriesRequest generates a request for the DescribeDirectories operation. @@ -334,6 +361,37 @@ func (c *DirectoryService) DescribeDirectories(input *DescribeDirectoriesInput) return out, err } +const opDescribeEventTopics = "DescribeEventTopics" + +// DescribeEventTopicsRequest generates a request for the DescribeEventTopics operation. +func (c *DirectoryService) DescribeEventTopicsRequest(input *DescribeEventTopicsInput) (req *request.Request, output *DescribeEventTopicsOutput) { + op := &request.Operation{ + Name: opDescribeEventTopics, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeEventTopicsInput{} + } + + req = c.newRequest(op, input, output) + output = &DescribeEventTopicsOutput{} + req.Data = output + return +} + +// Obtains information about which SNS topics receive status messages from the +// specified directory. +// +// If no input parameters are provided, such as DirectoryId or TopicName, this +// request describes all of the associations in the account. +func (c *DirectoryService) DescribeEventTopics(input *DescribeEventTopicsInput) (*DescribeEventTopicsOutput, error) { + req, out := c.DescribeEventTopicsRequest(input) + err := req.Send() + return out, err +} + const opDescribeSnapshots = "DescribeSnapshots" // DescribeSnapshotsRequest generates a request for the DescribeSnapshots operation. @@ -562,6 +620,38 @@ func (c *DirectoryService) GetSnapshotLimits(input *GetSnapshotLimitsInput) (*Ge return out, err } +const opRegisterEventTopic = "RegisterEventTopic" + +// RegisterEventTopicRequest generates a request for the RegisterEventTopic operation. +func (c *DirectoryService) RegisterEventTopicRequest(input *RegisterEventTopicInput) (req *request.Request, output *RegisterEventTopicOutput) { + op := &request.Operation{ + Name: opRegisterEventTopic, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &RegisterEventTopicInput{} + } + + req = c.newRequest(op, input, output) + output = &RegisterEventTopicOutput{} + req.Data = output + return +} + +// Associates a directory with an SNS topic. This establishes the directory +// as a publisher to the specified SNS topic. You can then receive email or +// text (SMS) messages when the status of your directory changes. You get notified +// if your directory goes from an Active status to an Impaired or Inoperable +// status. You also receive a notification when the directory returns to an +// Active status. +func (c *DirectoryService) RegisterEventTopic(input *RegisterEventTopicInput) (*RegisterEventTopicOutput, error) { + req, out := c.RegisterEventTopicRequest(input) + err := req.Send() + return out, err +} + const opRestoreFromSnapshot = "RestoreFromSnapshot" // RestoreFromSnapshotRequest generates a request for the RestoreFromSnapshot operation. @@ -960,7 +1050,7 @@ func (s CreateMicrosoftADOutput) GoString() string { type CreateSnapshotInput struct { _ struct{} `type:"structure"` - // The identifier of the directory to take a snapshot of. + // The identifier of the directory of which to take a snapshot. DirectoryId *string `type:"string" required:"true"` // The descriptive name to apply to the snapshot. @@ -1160,6 +1250,42 @@ func (s DeleteTrustOutput) GoString() string { return s.String() } +// Removes the specified directory as a publisher to the specified SNS topic. +type DeregisterEventTopicInput struct { + _ struct{} `type:"structure"` + + // The Directory ID to remove as a publisher. This directory will no longer + // send messages to the specified SNS topic. + DirectoryId *string `type:"string" required:"true"` + + // The name of the SNS topic from which to remove the directory as a publisher. + TopicName *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s DeregisterEventTopicInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeregisterEventTopicInput) GoString() string { + return s.String() +} + +type DeregisterEventTopicOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DeregisterEventTopicOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeregisterEventTopicOutput) GoString() string { + return s.String() +} + // Contains the inputs for the DescribeDirectories operation. type DescribeDirectoriesInput struct { _ struct{} `type:"structure"` @@ -1218,6 +1344,48 @@ func (s DescribeDirectoriesOutput) GoString() string { return s.String() } +type DescribeEventTopicsInput struct { + _ struct{} `type:"structure"` + + // The Directory ID for which to get the list of associated SNS topics. If this + // member is null, associations for all Directory IDs are returned. + DirectoryId *string `type:"string"` + + // A list of SNS topic names for which to obtain the information. If this member + // is null, all associations for the specified Directory ID are returned. + // + // An empty list results in an InvalidParameterException being thrown. + TopicNames []*string `type:"list"` +} + +// String returns the string representation +func (s DescribeEventTopicsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeEventTopicsInput) GoString() string { + return s.String() +} + +type DescribeEventTopicsOutput struct { + _ struct{} `type:"structure"` + + // A list of SNS topic names that receive status messages from the specified + // Directory ID. + EventTopics []*EventTopic `type:"list"` +} + +// String returns the string representation +func (s DescribeEventTopicsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeEventTopicsOutput) GoString() string { + return s.String() +} + // Contains the inputs for the DescribeSnapshots operation. type DescribeSnapshotsInput struct { _ struct{} `type:"structure"` @@ -1746,6 +1914,37 @@ func (s EnableSsoOutput) GoString() string { return s.String() } +// Information about SNS topic and AWS Directory Service directory associations. +type EventTopic struct { + _ struct{} `type:"structure"` + + // The date and time of when you associated your directory with the SNS topic. + CreatedDateTime *time.Time `type:"timestamp" timestampFormat:"unix"` + + // The Directory ID of an AWS Directory Service directory that will publish + // status messages to an SNS topic. + DirectoryId *string `type:"string"` + + // The topic registration status. + Status *string `type:"string" enum:"TopicStatus"` + + // The SNS topic ARN (Amazon Resource Name). + TopicArn *string `type:"string"` + + // The name of an AWS SNS topic the receives status messages from the directory. + TopicName *string `min:"1" type:"string"` +} + +// String returns the string representation +func (s EventTopic) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s EventTopic) GoString() string { + return s.String() +} + // Contains the inputs for the GetDirectoryLimits operation. type GetDirectoryLimitsInput struct { _ struct{} `type:"structure"` @@ -1862,6 +2061,41 @@ func (s RadiusSettings) GoString() string { return s.String() } +type RegisterEventTopicInput struct { + _ struct{} `type:"structure"` + + // The Directory ID that will publish status messages to the SNS topic. + DirectoryId *string `type:"string" required:"true"` + + // The SNS topic name to which the directory will publish status messages. This + // SNS topic must be in the same region as the specified Directory ID. + TopicName *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation +func (s RegisterEventTopicInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RegisterEventTopicInput) GoString() string { + return s.String() +} + +type RegisterEventTopicOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s RegisterEventTopicOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RegisterEventTopicOutput) GoString() string { + return s.String() +} + // An object representing the inputs for the RestoreFromSnapshot operation. type RestoreFromSnapshotInput struct { _ struct{} `type:"structure"` @@ -2145,6 +2379,17 @@ const ( SnapshotTypeManual = "Manual" ) +const ( + // @enum TopicStatus + TopicStatusRegistered = "Registered" + // @enum TopicStatus + TopicStatusTopicnotfound = "Topic not found" + // @enum TopicStatus + TopicStatusFailed = "Failed" + // @enum TopicStatus + TopicStatusDeleted = "Deleted" +) + const ( // @enum TrustDirection TrustDirectionOneWayOutgoing = "One-Way: Outgoing" diff --git a/vendor/github.com/aws/aws-sdk-go/service/dynamodb/api.go b/vendor/github.com/aws/aws-sdk-go/service/dynamodb/api.go index 25922a5d5e0d..c4a7f49edc02 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/dynamodb/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/dynamodb/api.go @@ -185,9 +185,9 @@ func (c *DynamoDB) BatchWriteItemRequest(input *BatchWriteItemInput) (req *reque // // There are more than 25 requests in the batch. // -// Any individual item in a batch exceeds 400 KB. +// Any individual item in a batch exceeds 400 KB. // -// The total request size exceeds 16 MB. +// The total request size exceeds 16 MB. func (c *DynamoDB) BatchWriteItem(input *BatchWriteItemInput) (*BatchWriteItemOutput, error) { req, out := c.BatchWriteItemRequest(input) err := req.Send() @@ -319,6 +319,80 @@ func (c *DynamoDB) DeleteTable(input *DeleteTableInput) (*DeleteTableOutput, err return out, err } +const opDescribeLimits = "DescribeLimits" + +// DescribeLimitsRequest generates a request for the DescribeLimits operation. +func (c *DynamoDB) DescribeLimitsRequest(input *DescribeLimitsInput) (req *request.Request, output *DescribeLimitsOutput) { + op := &request.Operation{ + Name: opDescribeLimits, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DescribeLimitsInput{} + } + + req = c.newRequest(op, input, output) + output = &DescribeLimitsOutput{} + req.Data = output + return +} + +// Returns the current provisioned-capacity limits for your AWS account in a +// region, both for the region as a whole and for any one DynamoDB table that +// you create there. +// +// When you establish an AWS account, the account has initial limits on the +// maximum read capacity units and write capacity units that you can provision +// across all of your DynamoDB tables in a given region. Also, there are per-table +// limits that apply when you create a table there. For more information, see +// Limits (http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Limits.html) +// page in the Amazon DynamoDB Developer Guide. +// +// Although you can increase these limits by filing a case at AWS Support Center +// (https://console.aws.amazon.com/support/home#/), obtaining the increase is +// not instantaneous. The DescribeLimits API lets you write code to compare +// the capacity you are currently using to those limits imposed by your account +// so that you have enough time to apply for an increase before you hit a limit. +// +// For example, you could use one of the AWS SDKs to do the following: +// +// Call DescribeLimits for a particular region to obtain your current account +// limits on provisioned capacity there. Create a variable to hold the aggregate +// read capacity units provisioned for all your tables in that region, and one +// to hold the aggregate write capacity units. Zero them both. Call ListTables +// to obtain a list of all your DynamoDB tables. For each table name listed +// by ListTables, do the following: +// +// Call DescribeTable with the table name. Use the data returned by DescribeTable +// to add the read capacity units and write capacity units provisioned for the +// table itself to your variables. If the table has one or more global secondary +// indexes (GSIs), loop over these GSIs and add their provisioned capacity values +// to your variables as well. Report the account limits for that region returned +// by DescribeLimits, along with the total current provisioned capacity levels +// you have calculated. This will let you see whether you are getting close +// to your account-level limits. +// +// The per-table limits apply only when you are creating a new table. They +// restrict the sum of the provisioned capacity of the new table itself and +// all its global secondary indexes. +// +// For existing tables and their GSIs, DynamoDB will not let you increase provisioned +// capacity extremely rapidly, but the only upper limit that applies is that +// the aggregate provisioned capacity over all your tables and GSIs cannot exceed +// either of the per-account limits. +// +// DescribeLimits should only be called periodically. You can expect throttling +// errors if you call it more than once in a minute. +// +// The DescribeLimits Request element has no content. +func (c *DynamoDB) DescribeLimits(input *DescribeLimitsInput) (*DescribeLimitsOutput, error) { + req, out := c.DescribeLimitsRequest(input) + err := req.Send() + return out, err +} + const opDescribeTable = "DescribeTable" // DescribeTableRequest generates a request for the DescribeTable operation. @@ -470,8 +544,10 @@ func (c *DynamoDB) PutItemRequest(input *PutItemInput) (req *request.Request, ou // see the ReturnValues description below. // // To prevent a new item from replacing an existing item, use a conditional -// put operation with ComparisonOperator set to NULL for the primary key attribute, -// or attributes. +// expression that contains the attribute_not_exists function with the name +// of the attribute being used as the partition key for the table. Since every +// record must contain that attribute, the attribute_not_exists function will +// only succeed if no matching item exists. // // For more information about using this API, see Working with Items (http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/WorkingWithItems.html) // in the Amazon DynamoDB Developer Guide. @@ -510,12 +586,12 @@ func (c *DynamoDB) QueryRequest(input *QueryInput) (req *request.Request, output // A Query operation uses the primary key of a table or a secondary index to // directly access items from that table or index. // -// Use the KeyConditionExpression parameter to provide a specific hash key -// value. The Query operation will return all of the items from the table or -// index with that hash key value. You can optionally narrow the scope of the -// Query operation by specifying a range key value and a comparison operator -// in KeyConditionExpression. You can use the ScanIndexForward parameter to -// get results in forward or reverse order, by range key or by index key. +// Use the KeyConditionExpression parameter to provide a specific value for +// the partition key. The Query operation will return all of the items from +// the table or index with that partition key value. You can optionally narrow +// the scope of the Query operation by specifying a sort key value and a comparison +// operator in KeyConditionExpression. You can use the ScanIndexForward parameter +// to get results in forward or reverse order, by sort key. // // Queries that do not return results consume the minimum number of read capacity // units for that type of read operation. @@ -588,9 +664,11 @@ func (c *DynamoDB) ScanRequest(input *ScanInput) (req *request.Request, output * // more information, see Parallel Scan (http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/QueryAndScan.html#QueryAndScanParallelScan) // in the Amazon DynamoDB Developer Guide. // -// By default, Scan uses eventually consistent reads when acessing the data -// in the table or local secondary index. However, you can use strongly consistent -// reads instead by setting the ConsistentRead parameter to true. +// By default, Scan uses eventually consistent reads when accessing the data +// in a table; therefore, the result set might not include the changes to data +// in the table immediately before the operation began. If you need a consistent +// copy of the data, as of the time that the Scan begins, you can set the ConsistentRead +// parameter to true. func (c *DynamoDB) Scan(input *ScanInput) (*ScanOutput, error) { req, out := c.ScanRequest(input) err := req.Send() @@ -629,9 +707,7 @@ func (c *DynamoDB) UpdateItemRequest(input *UpdateItemInput) (req *request.Reque // does not already exist. You can put, delete, or add attribute values. You // can also perform a conditional update on an existing item (insert a new attribute // name-value pair if it doesn't exist, or replace an existing name-value pair -// if it has certain expected attribute values). If conditions are specified -// and the item does not exist, then the operation fails and a new item is not -// created. +// if it has certain expected attribute values). // // You can also return the item's attribute values in the same UpdateItem operation // using the ReturnValues parameter. @@ -675,7 +751,7 @@ func (c *DynamoDB) UpdateTableRequest(input *UpdateTableInput) (req *request.Req // Create a new global secondary index on the table. Once the index begins // backfilling, you can use UpdateTable to perform other operations. // -// UpdateTable is an asynchronous operation; while it is executing, the table +// UpdateTable is an asynchronous operation; while it is executing, the table // status changes from ACTIVE to UPDATING. While it is UPDATING, you cannot // issue another UpdateTable request. When the table returns to the ACTIVE state, // the UpdateTable operation is complete. @@ -692,7 +768,10 @@ type AttributeDefinition struct { // A name for the attribute. AttributeName *string `min:"1" type:"string" required:"true"` - // The data type for the attribute. + // The data type for the attribute, where: + // + // S - the attribute is of type String N - the attribute is of type Number + // B - the attribute is of type Binary AttributeType *string `type:"string" required:"true" enum:"ScalarAttributeType"` } @@ -905,9 +984,9 @@ type BatchGetItemInput struct { // // Keys - An array of primary key attribute values that define specific items // in the table. For each primary key, you must provide all of the key attributes. - // For example, with a hash type primary key, you only need to provide the hash - // attribute. For a hash-and-range type primary key, you must provide both the - // hash attribute and the range attribute. + // For example, with a simple primary key, you only need to provide the partition + // key value. For a composite key, you must provide both the partition key value + // and the sort key value. // // ProjectionExpression - A string that identifies one or more attributes // to retrieve from the table. These attributes can include scalars, sets, or @@ -943,7 +1022,7 @@ type BatchGetItemInput struct { // Determines the level of detail about provisioned throughput consumption that // is returned in the response: // - // INDEXES - The response includes the aggregate ConsumedCapacity for the + // INDEXES - The response includes the aggregate ConsumedCapacity for the // operation, together with ConsumedCapacity for each table and secondary index // that was accessed. // @@ -951,7 +1030,7 @@ type BatchGetItemInput struct { // any indexes at all. In these cases, specifying INDEXES will only return ConsumedCapacity // information for table(s). // - // TOTAL - The response includes only the aggregate ConsumedCapacity for the + // TOTAL - The response includes only the aggregate ConsumedCapacity for the // operation. // // NONE - No ConsumedCapacity details are included in the response. @@ -1033,9 +1112,9 @@ type BatchWriteItemInput struct { // Key - A map of primary key attribute values that uniquely identify the // ! item. Each entry in this map consists of an attribute name and an attribute // value. For each primary key, you must provide all of the key attributes. - // For example, with a hash type primary key, you only need to provide the hash - // attribute. For a hash-and-range type primary key, you must provide both the - // hash attribute and the range attribute. + // For example, with a simple primary key, you only need to provide a value + // for the partition key. For a composite primary key, you must provide values + // for both the partition key and the sort key. // // PutRequest - Perform a PutItem operation on the specified item. The // item to be put is identified by an Item subelement: @@ -1054,7 +1133,7 @@ type BatchWriteItemInput struct { // Determines the level of detail about provisioned throughput consumption that // is returned in the response: // - // INDEXES - The response includes the aggregate ConsumedCapacity for the + // INDEXES - The response includes the aggregate ConsumedCapacity for the // operation, together with ConsumedCapacity for each table and secondary index // that was accessed. // @@ -1062,7 +1141,7 @@ type BatchWriteItemInput struct { // any indexes at all. In these cases, specifying INDEXES will only return ConsumedCapacity // information for table(s). // - // TOTAL - The response includes only the aggregate ConsumedCapacity for the + // TOTAL - The response includes only the aggregate ConsumedCapacity for the // operation. // // NONE - No ConsumedCapacity details are included in the response. @@ -1104,8 +1183,8 @@ type BatchWriteItemOutput struct { // // Each entry consists of the following subelements: // - // ItemCollectionKey - The hash key value of the item collection. This is - // the same as the hash key of the item. + // ItemCollectionKey - The partition key value of the item collection. This + // is the same as the partition key value of the item. // // SizeEstimateRange - An estimate of item collection size, expressed in // GB. This is a two-element array containing a lower bound and an upper bound @@ -1471,12 +1550,25 @@ type CreateTableInput struct { // // AttributeName - The name of this key attribute. // - // KeyType - Determines whether the key attribute is HASH or RANGE. + // KeyType - The role that the key attribute will assume: + // + // HASH - partition key // - // For a primary key that consists of a hash attribute, you must provide - // exactly one element with a KeyType of HASH. + // RANGE - sort key // - // For a primary key that consists of hash and range attributes, you must provide + // The partition key of an item is also known as its hash attribute. The + // term "hash attribute" derives from DynamoDB' usage of an internal hash function + // to evenly distribute data items across partitions, based on their partition + // key values. + // + // The sort key of an item is also known as its range attribute. The term "range + // attribute" derives from the way DynamoDB stores items with the same partition + // key physically close together, in sorted order by the sort key value. + // + // For a simple primary key (partition key), you must provide exactly one element + // with a KeyType of HASH. + // + // For a composite primary key (partition key and sort key), you must provide // exactly two elements, in this order: The first element must have a KeyType // of HASH, and the second element must have a KeyType of RANGE. // @@ -1485,9 +1577,9 @@ type CreateTableInput struct { KeySchema []*KeySchemaElement `min:"1" type:"list" required:"true"` // One or more local secondary indexes (the maximum is five) to be created on - // the table. Each index is scoped to a given hash key value. There is a 10 - // GB size limit per hash key; otherwise, the size of a local secondary index - // is unconstrained. + // the table. Each index is scoped to a given partition key value. There is + // a 10 GB size limit per partition key value; otherwise, the size of a local + // secondary index is unconstrained. // // Each local secondary index in the array includes the following: // @@ -1495,7 +1587,7 @@ type CreateTableInput struct { // for this table. // // KeySchema - Specifies the key schema for the local secondary index. The - // key schema must begin with the same hash key attribute as the table. + // key schema must begin with the same partition key as the table. // // Projection - Specifies attributes that are copied (projected) from the // table into the index. These are in addition to the primary key attributes @@ -1612,7 +1704,7 @@ type DeleteItemInput struct { // // These function names are case-sensitive. // - // Comparison operators: = | <> | < | > | <= | >= | BETWEEN | IN + // Comparison operators: = | | | | = | = | BETWEEN | IN // // Logical operators: AND | OR | NOT // @@ -1901,15 +1993,15 @@ type DeleteItemInput struct { // key of the item to delete. // // For the primary key, you must provide all of the attributes. For example, - // with a hash type primary key, you only need to provide the hash attribute. - // For a hash-and-range type primary key, you must provide both the hash attribute - // and the range attribute. + // with a simple primary key, you only need to provide a value for the partition + // key. For a composite primary key, you must provide values for both the partition + // key and the sort key. Key map[string]*AttributeValue `type:"map" required:"true"` // Determines the level of detail about provisioned throughput consumption that // is returned in the response: // - // INDEXES - The response includes the aggregate ConsumedCapacity for the + // INDEXES - The response includes the aggregate ConsumedCapacity for the // operation, together with ConsumedCapacity for each table and secondary index // that was accessed. // @@ -1917,7 +2009,7 @@ type DeleteItemInput struct { // any indexes at all. In these cases, specifying INDEXES will only return ConsumedCapacity // information for table(s). // - // TOTAL - The response includes only the aggregate ConsumedCapacity for the + // TOTAL - The response includes only the aggregate ConsumedCapacity for the // operation. // // NONE - No ConsumedCapacity details are included in the response. @@ -1976,8 +2068,8 @@ type DeleteItemOutput struct { // // Each ItemCollectionMetrics element consists of: // - // ItemCollectionKey - The hash key value of the item collection. This is - // the same as the hash key of the item. + // ItemCollectionKey - The partition key value of the item collection. This + // is the same as the partition key value of the item itself. // // SizeEstimateRange - An estimate of item collection size, in gigabytes. This // value is a two-element array containing a lower bound and an upper bound @@ -2057,6 +2149,54 @@ func (s DeleteTableOutput) GoString() string { return s.String() } +// Represents the input of a DescribeLimits operation. Has no content. +type DescribeLimitsInput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation +func (s DescribeLimitsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeLimitsInput) GoString() string { + return s.String() +} + +// Represents the output of a DescribeLimits operation. +type DescribeLimitsOutput struct { + _ struct{} `type:"structure"` + + // The maximum total read capacity units that your account allows you to provision + // across all of your tables in this region. + AccountMaxReadCapacityUnits *int64 `min:"1" type:"long"` + + // The maximum total write capacity units that your account allows you to provision + // across all of your tables in this region. + AccountMaxWriteCapacityUnits *int64 `min:"1" type:"long"` + + // The maximum read capacity units that your account allows you to provision + // for a new table that you are creating in this region, including the read + // capacity units provisioned for its global secondary indexes (GSIs). + TableMaxReadCapacityUnits *int64 `min:"1" type:"long"` + + // The maximum write capacity units that your account allows you to provision + // for a new table that you are creating in this region, including the write + // capacity units provisioned for its global secondary indexes (GSIs). + TableMaxWriteCapacityUnits *int64 `min:"1" type:"long"` +} + +// String returns the string representation +func (s DescribeLimitsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DescribeLimitsOutput) GoString() string { + return s.String() +} + // Represents the input of a DescribeTable operation. type DescribeTableInput struct { _ struct{} `type:"structure"` @@ -2372,9 +2512,9 @@ type GetItemInput struct { // key of the item to retrieve. // // For the primary key, you must provide all of the attributes. For example, - // with a hash type primary key, you only need to provide the hash attribute. - // For a hash-and-range type primary key, you must provide both the hash attribute - // and the range attribute. + // with a simple primary key, you only need to provide a value for the partition + // key. For a composite primary key, you must provide values for both the partition + // key and the sort key. Key map[string]*AttributeValue `type:"map" required:"true"` // A string that identifies one or more attributes to retrieve from the table. @@ -2394,7 +2534,7 @@ type GetItemInput struct { // Determines the level of detail about provisioned throughput consumption that // is returned in the response: // - // INDEXES - The response includes the aggregate ConsumedCapacity for the + // INDEXES - The response includes the aggregate ConsumedCapacity for the // operation, together with ConsumedCapacity for each table and secondary index // that was accessed. // @@ -2402,7 +2542,7 @@ type GetItemInput struct { // any indexes at all. In these cases, specifying INDEXES will only return ConsumedCapacity // information for table(s). // - // TOTAL - The response includes only the aggregate ConsumedCapacity for the + // TOTAL - The response includes only the aggregate ConsumedCapacity for the // operation. // // NONE - No ConsumedCapacity details are included in the response. @@ -2457,7 +2597,20 @@ type GlobalSecondaryIndex struct { IndexName *string `min:"3" type:"string" required:"true"` // The complete key schema for a global secondary index, which consists of one - // or more pairs of attribute names and key types (HASH or RANGE). + // or more pairs of attribute names and key types: + // + // HASH - partition key + // + // RANGE - sort key + // + // The partition key of an item is also known as its hash attribute. The + // term "hash attribute" derives from DynamoDB' usage of an internal hash function + // to evenly distribute data items across partitions, based on their partition + // key values. + // + // The sort key of an item is also known as its range attribute. The term "range + // attribute" derives from the way DynamoDB stores items with the same partition + // key physically close together, in sorted order by the sort key value. KeySchema []*KeySchemaElement `min:"1" type:"list" required:"true"` // Represents attributes that are copied (projected) from the table into an @@ -2490,8 +2643,8 @@ type GlobalSecondaryIndexDescription struct { // Indicates whether the index is currently backfilling. Backfilling is the // process of reading items from the table and determining whether they can - // be added to the index. (Not all items will qualify: For example, a hash key - // attribute cannot have any duplicates.) If an item can be added to the index, + // be added to the index. (Not all items will qualify: For example, a partition + // key cannot have any duplicate values.) If an item can be added to the index, // DynamoDB will do so. After all items have been processed, the backfilling // operation is complete and Backfilling is false. // @@ -2525,8 +2678,21 @@ type GlobalSecondaryIndexDescription struct { // every six hours. Recent changes might not be reflected in this value. ItemCount *int64 `type:"long"` - // The complete key schema for the global secondary index, consisting of one - // or more pairs of attribute names and key types (HASH or RANGE). + // The complete key schema for a global secondary index, which consists of one + // or more pairs of attribute names and key types: + // + // HASH - partition key + // + // RANGE - sort key + // + // The partition key of an item is also known as its hash attribute. The + // term "hash attribute" derives from DynamoDB' usage of an internal hash function + // to evenly distribute data items across partitions, based on their partition + // key values. + // + // The sort key of an item is also known as its range attribute. The term "range + // attribute" derives from the way DynamoDB stores items with the same partition + // key physically close together, in sorted order by the sort key value. KeySchema []*KeySchemaElement `min:"1" type:"list"` // Represents attributes that are copied (projected) from the table into an @@ -2598,8 +2764,8 @@ func (s GlobalSecondaryIndexUpdate) GoString() string { type ItemCollectionMetrics struct { _ struct{} `type:"structure"` - // The hash key value of the item collection. This value is the same as the - // hash key of the item. + // The partition key value of the item collection. This value is the same as + // the partition key value of the item. ItemCollectionKey map[string]*AttributeValue `type:"map"` // An estimate of item collection size, in gigabytes. This value is a two-element @@ -2628,16 +2794,33 @@ func (s ItemCollectionMetrics) GoString() string { // that make up the primary key of a table, or the key attributes of an index. // // A KeySchemaElement represents exactly one attribute of the primary key. -// For example, a hash type primary key would be represented by one KeySchemaElement. -// A hash-and-range type primary key would require one KeySchemaElement for -// the hash attribute, and another KeySchemaElement for the range attribute. +// For example, a simple primary key would be represented by one KeySchemaElement +// (for the partition key). A composite primary key would require one KeySchemaElement +// for the partition key, and another KeySchemaElement for the sort key. +// +// A KeySchemaElement must be a scalar, top-level attribute (not a nested attribute). +// The data type must be one of String, Number, or Binary. The attribute cannot +// be nested within a List or a Map. type KeySchemaElement struct { _ struct{} `type:"structure"` // The name of a key attribute. AttributeName *string `min:"1" type:"string" required:"true"` - // The attribute data, consisting of the data type and the attribute value itself. + // The role that this key attribute will assume: + // + // HASH - partition key + // + // RANGE - sort key + // + // The partition key of an item is also known as its hash attribute. The + // term "hash attribute" derives from DynamoDB' usage of an internal hash function + // to evenly distribute data items across partitions, based on their partition + // key values. + // + // The sort key of an item is also known as its range attribute. The term "range + // attribute" derives from the way DynamoDB stores items with the same partition + // key physically close together, in sorted order by the sort key value. KeyType *string `type:"string" required:"true" enum:"KeyType"` } @@ -2655,9 +2838,9 @@ func (s KeySchemaElement) GoString() string { // from the table. // // For each primary key, you must provide all of the key attributes. For example, -// with a hash type primary key, you only need to provide the hash attribute. -// For a hash-and-range type primary key, you must provide both the hash attribute -// and the range attribute. +// with a simple primary key, you only need to provide the partition key. For +// a composite primary key, you must provide both the partition key and the +// sort key. type KeysAndAttributes struct { _ struct{} `type:"structure"` @@ -2799,7 +2982,20 @@ type LocalSecondaryIndex struct { IndexName *string `min:"3" type:"string" required:"true"` // The complete key schema for the local secondary index, consisting of one - // or more pairs of attribute names and key types (HASH or RANGE). + // or more pairs of attribute names and key types: + // + // HASH - partition key + // + // RANGE - sort key + // + // The partition key of an item is also known as its hash attribute. The + // term "hash attribute" derives from DynamoDB' usage of an internal hash function + // to evenly distribute data items across partitions, based on their partition + // key values. + // + // The sort key of an item is also known as its range attribute. The term "range + // attribute" derives from the way DynamoDB stores items with the same partition + // key physically close together, in sorted order by the sort key value. KeySchema []*KeySchemaElement `min:"1" type:"list" required:"true"` // Represents attributes that are copied (projected) from the table into an @@ -2837,8 +3033,21 @@ type LocalSecondaryIndexDescription struct { // every six hours. Recent changes might not be reflected in this value. ItemCount *int64 `type:"long"` - // The complete index key schema, which consists of one or more pairs of attribute - // names and key types (HASH or RANGE). + // The complete key schema for the local secondary index, consisting of one + // or more pairs of attribute names and key types: + // + // HASH - partition key + // + // RANGE - sort key + // + // The partition key of an item is also known as its hash attribute. The + // term "hash attribute" derives from DynamoDB' usage of an internal hash function + // to evenly distribute data items across partitions, based on their partition + // key values. + // + // The sort key of an item is also known as its range attribute. The term "range + // attribute" derives from the way DynamoDB stores items with the same partition + // key physically close together, in sorted order by the sort key value. KeySchema []*KeySchemaElement `min:"1" type:"list"` // Represents attributes that are copied (projected) from the table into an @@ -2976,7 +3185,7 @@ type PutItemInput struct { // // These function names are case-sensitive. // - // Comparison operators: = | <> | < | > | <= | >= | BETWEEN | IN + // Comparison operators: = | | | | = | = | BETWEEN | IN // // Logical operators: AND | OR | NOT // @@ -3266,9 +3475,9 @@ type PutItemInput struct { // pairs for the item. // // You must provide all of the attributes for the primary key. For example, - // with a hash type primary key, you only need to provide the hash attribute. - // For a hash-and-range type primary key, you must provide both the hash attribute - // and the range attribute. + // with a simple primary key, you only need to provide a value for the partition + // key. For a composite primary key, you must provide both values for both the + // partition key and the sort key. // // If you specify any attributes that are part of an index key, then the data // types for those attributes must match those of the schema in the table's @@ -3283,7 +3492,7 @@ type PutItemInput struct { // Determines the level of detail about provisioned throughput consumption that // is returned in the response: // - // INDEXES - The response includes the aggregate ConsumedCapacity for the + // INDEXES - The response includes the aggregate ConsumedCapacity for the // operation, together with ConsumedCapacity for each table and secondary index // that was accessed. // @@ -3291,7 +3500,7 @@ type PutItemInput struct { // any indexes at all. In these cases, specifying INDEXES will only return ConsumedCapacity // information for table(s). // - // TOTAL - The response includes only the aggregate ConsumedCapacity for the + // TOTAL - The response includes only the aggregate ConsumedCapacity for the // operation. // // NONE - No ConsumedCapacity details are included in the response. @@ -3312,8 +3521,6 @@ type PutItemInput struct { // // ALL_OLD - If PutItem overwrote an attribute name-value pair, then the // content of the old item is returned. - // - // Other "Valid Values" are not relevant to PutItem. ReturnValues *string `type:"string" enum:"ReturnValue"` // The name of the table to contain the item. @@ -3354,8 +3561,8 @@ type PutItemOutput struct { // // Each ItemCollectionMetrics element consists of: // - // ItemCollectionKey - The hash key value of the item collection. This is - // the same as the hash key of the item. + // ItemCollectionKey - The partition key value of the item collection. This + // is the same as the partition key value of the item itself. // // SizeEstimateRange - An estimate of item collection size, in gigabytes. This // value is a two-element array containing a lower bound and an upper bound @@ -3553,50 +3760,51 @@ type QueryInput struct { // The condition that specifies the key value(s) for items to be retrieved by // the Query action. // - // The condition must perform an equality test on a single hash key value. + // The condition must perform an equality test on a single partition key value. // The condition can also perform one of several comparison tests on a single - // range key value. Query can use KeyConditionExpression to retrieve one item - // with a given hash and range key value, or several items that have the same - // hash key value but different range key values. + // sort key value. Query can use KeyConditionExpression to retrieve one item + // with a given partition key value and sort key value, or several items that + // have the same partition key value but different sort key values. // - // The hash key equality test is required, and must be specified in the following - // format: + // The partition key equality test is required, and must be specified in the + // following format: // - // hashAttributeName = :hashval + // partitionKeyName = :partitionkeyval // - // If you also want to provide a range key condition, it must be combined using - // AND with the hash key condition. Following is an example, using the = comparison - // operator for the range key: + // If you also want to provide a condition for the sort key, it must be combined + // using AND with the condition for the sort key. Following is an example, using + // the = comparison operator for the sort key: // - // hashAttributeName = :hashval AND rangeAttributeName = :rangeval + // partitionKeyName = :partitionkeyval AND sortKeyName = :sortkeyval // - // Valid comparisons for the range key condition are as follows: + // Valid comparisons for the sort key condition are as follows: // - // rangeAttributeName = :rangeval - true if the range key is equal to :rangeval. + // sortKeyName = :sortkeyval - true if the sort key value is equal to :sortkeyval. // - // rangeAttributeName < :rangeval - true if the range key is less than :rangeval. + // sortKeyName :sortkeyval - true if the sort key value is less than :sortkeyval. // - // rangeAttributeName <= :rangeval - true if the range key is less than or - // equal to :rangeval. + // sortKeyName = :sortkeyval - true if the sort key value is less than or + // equal to :sortkeyval. // - // rangeAttributeName > :rangeval - true if the range key is greater than - // :rangeval. + // sortKeyName :sortkeyval - true if the sort key value is greater than + // :sortkeyval. // - // rangeAttributeName >= :rangeval - true if the range key is greater than - // or equal to :rangeval. + // sortKeyName = :sortkeyval - true if the sort key value is greater than + // or equal to :sortkeyval. // - // rangeAttributeName BETWEEN :rangeval1 AND :rangeval2 - true if the range - // key is greater than or equal to :rangeval1, and less than or equal to :rangeval2. + // sortKeyName BETWEEN :sortkeyval1 AND :sortkeyval2 - true if the sort key + // value is greater than or equal to :sortkeyval1, and less than or equal to + // :sortkeyval2. // - // begins_with (rangeAttributeName, :rangeval) - true if the range key begins - // with a particular operand. (You cannot use this function with a range key + // begins_with (sortKeyName, :sortkeyval) - true if the sort key value begins + // with a particular operand. (You cannot use this function with a sort key // that is of type Number.) Note that the function name begins_with is case-sensitive. // // Use the ExpressionAttributeValues parameter to replace tokens such as - // :hashval and :rangeval with actual values at runtime. + // :partitionval and :sortval with actual values at runtime. // // You can optionally use the ExpressionAttributeNames parameter to replace - // the names of the hash and range attributes with placeholder tokens. This + // the names of the partition key and sort key with placeholder tokens. This // option might be necessary if an attribute name conflicts with a DynamoDB // reserved word. For example, the following KeyConditionExpression parameter // causes an error because Size is a reserved word: @@ -3621,17 +3829,17 @@ type QueryInput struct { // // The selection criteria for the query. For a query on a table, you can have // conditions only on the table primary key attributes. You must provide the - // hash key attribute name and value as an EQ condition. You can optionally - // provide a second condition, referring to the range key attribute. + // partition key name and value as an EQ condition. You can optionally provide + // a second condition, referring to the sort key. // - // If you don't provide a range key condition, all of the items that match - // the hash key will be retrieved. If a FilterExpression or QueryFilter is present, - // it will be applied after the items are retrieved. + // If you don't provide a sort key condition, all of the items that match + // the partition key will be retrieved. If a FilterExpression or QueryFilter + // is present, it will be applied after the items are retrieved. // // For a query on an index, you can have conditions only on the index key attributes. - // You must provide the index hash attribute name and value as an EQ condition. - // You can optionally provide a second condition, referring to the index key - // range attribute. + // You must provide the index partition key name and value as an EQ condition. + // You can optionally provide a second condition, referring to the index sort + // key. // // Each KeyConditions element consists of an attribute name to compare, along // with the following: @@ -3766,7 +3974,7 @@ type QueryInput struct { // must evaluate to true, rather than all of them.) // // Note that QueryFilter does not allow key attributes. You cannot define a - // filter condition on a hash key or range key. + // filter condition on a partition key or a sort key. // // Each QueryFilter element consists of an attribute name to compare, along // with the following: @@ -3788,7 +3996,7 @@ type QueryInput struct { // For information on specifying data types in JSON, see JSON Data Format (http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DataFormat.html) // in the Amazon DynamoDB Developer Guide. // - // ComparisonOperator - A comparator for evaluating attributes. For example, + // ComparisonOperator - A comparator for evaluating attributes. For example, // equals, greater than, less than, etc. // // The following comparison operators are available: @@ -3804,7 +4012,7 @@ type QueryInput struct { // Determines the level of detail about provisioned throughput consumption that // is returned in the response: // - // INDEXES - The response includes the aggregate ConsumedCapacity for the + // INDEXES - The response includes the aggregate ConsumedCapacity for the // operation, together with ConsumedCapacity for each table and secondary index // that was accessed. // @@ -3812,26 +4020,26 @@ type QueryInput struct { // any indexes at all. In these cases, specifying INDEXES will only return ConsumedCapacity // information for table(s). // - // TOTAL - The response includes only the aggregate ConsumedCapacity for the + // TOTAL - The response includes only the aggregate ConsumedCapacity for the // operation. // // NONE - No ConsumedCapacity details are included in the response. ReturnConsumedCapacity *string `type:"string" enum:"ReturnConsumedCapacity"` - // Specifies the order in which to return the query results - either ascending - // (true) or descending (false). - // - // Items with the same hash key are stored in sorted order by range key .If - // the range key data type is Number, the results are stored in numeric order. - // For type String, the results are returned in order of ASCII character code - // values. For type Binary, DynamoDB treats each byte of the binary data as - // unsigned. + // Specifies the order for index traversal: If true (default), the traversal + // is performed in ascending order; if false, the traversal is performed in + // descending order. // - // If ScanIndexForward is true, DynamoDB returns the results in order, by range - // key. This is the default behavior. + // Items with the same partition key value are stored in sorted order by sort + // key. If the sort key data type is Number, the results are stored in numeric + // order. For type String, the results are stored in order of ASCII character + // code values. For type Binary, DynamoDB treats each byte of the binary data + // as unsigned. // - // If ScanIndexForward is false, DynamoDB sorts the results in descending order - // by range key, and then returns the results to the client. + // If ScanIndexForward is true, DynamoDB returns the results in the order in + // which they are stored (by sort key value). This is the default behavior. + // If ScanIndexForward is false, DynamoDB reads the results in reverse order + // by sort key value, and then returns the results to the client. ScanIndexForward *bool `type:"boolean"` // The attributes to be returned in the result. You can retrieve all item attributes, @@ -3909,7 +4117,7 @@ type QueryOutput struct { // // If you used a QueryFilter in the request, then Count is the number of items // returned after the filter was applied, and ScannedCount is the number of - // matching items before> the filter was applied. + // matching items before the filter was applied. // // If you did not use a filter in the request, then Count and ScannedCount // are the same. @@ -3994,19 +4202,16 @@ type ScanInput struct { // A Boolean value that determines the read consistency model during the scan: // - // If ConsistentRead is false, then Scan will use eventually consistent reads. - // The data returned from Scan might not contain the results of other recently - // completed write operations (PutItem, UpdateItem or DeleteItem). The Scan - // response might include some stale data. + // If ConsistentRead is false, then the data returned from Scan might not + // contain the results from other recently completed write operations (PutItem, + // UpdateItem or DeleteItem). // - // If ConsistentRead is true, then Scan will use strongly consistent reads. - // All of the write operations that completed before the Scan began are guaranteed - // to be contained in the Scan response. + // If ConsistentRead is true, then all of the write operations that completed + // before the Scan began are guaranteed to be contained in the Scan response. // - // The default setting for ConsistentRead is false, meaning that eventually - // consistent reads will be used. + // The default setting for ConsistentRead is false. // - // Strongly consistent reads are not supported on global secondary indexes. + // The ConsistentRead parameter is not supported on global secondary indexes. // If you scan a global secondary index with ConsistentRead set to true, you // will receive a ValidationException. ConsistentRead *bool `type:"boolean"` @@ -4127,7 +4332,7 @@ type ScanInput struct { // Determines the level of detail about provisioned throughput consumption that // is returned in the response: // - // INDEXES - The response includes the aggregate ConsumedCapacity for the + // INDEXES - The response includes the aggregate ConsumedCapacity for the // operation, together with ConsumedCapacity for each table and secondary index // that was accessed. // @@ -4135,7 +4340,7 @@ type ScanInput struct { // any indexes at all. In these cases, specifying INDEXES will only return ConsumedCapacity // information for table(s). // - // TOTAL - The response includes only the aggregate ConsumedCapacity for the + // TOTAL - The response includes only the aggregate ConsumedCapacity for the // operation. // // NONE - No ConsumedCapacity details are included in the response. @@ -4177,7 +4382,7 @@ type ScanInput struct { // For information on specifying data types in JSON, see JSON Data Format (http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DataFormat.html) // in the Amazon DynamoDB Developer Guide. // - // ComparisonOperator - A comparator for evaluating attributes. For example, + // ComparisonOperator - A comparator for evaluating attributes. For example, // equals, greater than, less than, etc. // // The following comparison operators are available: @@ -4370,7 +4575,7 @@ type TableDescription struct { CreationDateTime *time.Time `type:"timestamp" timestampFormat:"unix"` // The global secondary indexes, if any, on the table. Each index is scoped - // to a given hash key value. Each element is composed of: + // to a given partition key value. Each element is composed of: // // Backfilling - If true, then the index is currently in the backfilling // phase. Backfilling occurs only when a new global secondary index is added @@ -4400,7 +4605,7 @@ type TableDescription struct { // // KeySchema - Specifies the complete index key schema. The attribute names // in the key schema must be between 1 and 255 characters (inclusive). The key - // schema must begin with the same hash key attribute as the table. + // schema must begin with the same partition key as the table. // // Projection - Specifies attributes that are copied (projected) from the // table into the index. These are in addition to the primary key attributes @@ -4438,7 +4643,20 @@ type TableDescription struct { // // AttributeName - The name of the attribute. // - // KeyType - The key type for the attribute. Can be either HASH or RANGE. + // KeyType - The role of the attribute: + // + // . HASH - partition key + // + // RANGE - sort key + // + // The partition key of an item is also known as its hash attribute. The + // term "hash attribute" derives from DynamoDB' usage of an internal hash function + // to evenly distribute data items across partitions, based on their partition + // key values. + // + // The sort key of an item is also known as its range attribute. The term "range + // attribute" derives from the way DynamoDB stores items with the same partition + // key physically close together, in sorted order by the sort key value. // // For more information about primary keys, see Primary Key (http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DataModel.html#DataModelPrimaryKey) // in the Amazon DynamoDB Developer Guide. @@ -4463,7 +4681,7 @@ type TableDescription struct { LatestStreamLabel *string `type:"string"` // Represents one or more local secondary indexes on the table. Each index is - // scoped to a given hash key value. Tables with one or more local secondary + // scoped to a given partition key value. Tables with one or more local secondary // indexes are subject to an item collection size limit, where the amount of // data within a given item collection cannot exceed 10 GB. Each element is // composed of: @@ -4472,7 +4690,7 @@ type TableDescription struct { // // KeySchema - Specifies the complete index key schema. The attribute names // in the key schema must be between 1 and 255 characters (inclusive). The key - // schema must begin with the same hash key attribute as the table. + // schema must begin with the same partition key as the table. // // Projection - Specifies attributes that are copied (projected) from the // table into the index. These are in addition to the primary key attributes @@ -4589,7 +4807,7 @@ type UpdateItemInput struct { // and the new value for each. If you are updating an attribute that is an index // key attribute for any indexes on that table, the attribute type must match // the index key type defined in the AttributesDefinition of the table description. - // You can use UpdateItem to update any nonkey attributes. + // You can use UpdateItem to update any non-key attributes. // // Attribute values cannot be null. String and Binary type attributes must // have lengths greater than zero. Set type attributes must not be empty. Requests @@ -4676,7 +4894,7 @@ type UpdateItemInput struct { // // These function names are case-sensitive. // - // Comparison operators: = | <> | < | > | <= | >= | BETWEEN | IN + // Comparison operators: = | | | | = | = | BETWEEN | IN // // Logical operators: AND | OR | NOT // @@ -4965,15 +5183,15 @@ type UpdateItemInput struct { // name and a value for that attribute. // // For the primary key, you must provide all of the attributes. For example, - // with a hash type primary key, you only need to provide the hash attribute. - // For a hash-and-range type primary key, you must provide both the hash attribute - // and the range attribute. + // with a simple primary key, you only need to provide a value for the partition + // key. For a composite primary key, you must provide values for both the partition + // key and the sort key. Key map[string]*AttributeValue `type:"map" required:"true"` // Determines the level of detail about provisioned throughput consumption that // is returned in the response: // - // INDEXES - The response includes the aggregate ConsumedCapacity for the + // INDEXES - The response includes the aggregate ConsumedCapacity for the // operation, together with ConsumedCapacity for each table and secondary index // that was accessed. // @@ -4981,7 +5199,7 @@ type UpdateItemInput struct { // any indexes at all. In these cases, specifying INDEXES will only return ConsumedCapacity // information for table(s). // - // TOTAL - The response includes only the aggregate ConsumedCapacity for the + // TOTAL - The response includes only the aggregate ConsumedCapacity for the // operation. // // NONE - No ConsumedCapacity details are included in the response. @@ -5008,6 +5226,12 @@ type UpdateItemInput struct { // ALL_NEW - All of the attributes of the new version of the item are returned. // // UPDATED_NEW - The new versions of only the updated attributes are returned. + // + // There is no additional cost associated with requesting a return value + // aside from the small network and processing overhead of receiving a larger + // response. No Read Capacity Units are consumed. + // + // Values returned are strongly consistent ReturnValues *string `type:"string" enum:"ReturnValue"` // The name of the table containing the item to update. @@ -5303,7 +5527,7 @@ const ( // Determines the level of detail about provisioned throughput consumption that // is returned in the response: // -// INDEXES - The response includes the aggregate ConsumedCapacity for the +// INDEXES - The response includes the aggregate ConsumedCapacity for the // operation, together with ConsumedCapacity for each table and secondary index // that was accessed. // @@ -5311,7 +5535,7 @@ const ( // any indexes at all. In these cases, specifying INDEXES will only return ConsumedCapacity // information for table(s). // -// TOTAL - The response includes only the aggregate ConsumedCapacity for the +// TOTAL - The response includes only the aggregate ConsumedCapacity for the // operation. // // NONE - No ConsumedCapacity details are included in the response. 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 719b915461ed..c7accb2cbc7b 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 @@ -11,14 +11,27 @@ import ( "github.com/aws/aws-sdk-go/private/signer/v4" ) -// Overview -// // This is the Amazon DynamoDB API Reference. This guide provides descriptions -// and samples of the low-level DynamoDB API. For information about DynamoDB -// application development, see the Amazon DynamoDB Developer Guide (http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/). +// of the low-level DynamoDB API. +// +// This guide is intended for use with the following DynamoDB documentation: +// +// Amazon DynamoDB Getting Started Guide (http://docs.aws.amazon.com/amazondynamodb/latest/gettingstartedguide/) +// - provides hands-on exercises that help you learn the basics of working with +// DynamoDB. If you are new to DynamoDB, we recommend that you begin with the +// Getting Started Guide. +// +// Amazon DynamoDB Developer Guide (http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/) +// - contains detailed information about DynamoDB concepts, usage, and best +// practices. +// +// Amazon DynamoDB Streams API Reference (http://docs.aws.amazon.com/dynamodbstreams/latest/APIReference/) +// - provides descriptions and samples of the DynamoDB Streams API. (For more +// information, see Capturing Table Activity with DynamoDB Streams (http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Streams.html) +// in the Amazon DynamoDB Developer Guide.) // -// Instead of making the requests to the low-level DynamoDB API directly from -// your application, we recommend that you use the AWS Software Development +// Instead of making the requests to the low-level DynamoDB API directly +// from your application, we recommend that you use the AWS Software Development // Kits (SDKs). The easy-to-use libraries in the AWS SDKs make it unnecessary // to call the low-level DynamoDB API directly from your application. The libraries // take care of request authentication, serialization, and connection management. @@ -36,9 +49,8 @@ import ( // Managing Tables // // CreateTable - Creates a table with user-specified provisioned throughput -// settings. You must designate one attribute as the hash primary key for the -// table; you can optionally designate a second attribute as the range primary -// key. DynamoDB creates indexes on these key attributes for fast data access. +// settings. You must define a primary key for the table - either a simple primary +// key (partition key), or a composite primary key (partition key and sort key). // Optionally, you can create one or more secondary indexes, which provide fast // data access using non-key attributes. // @@ -70,10 +82,10 @@ import ( // Both eventually consistent and strongly consistent reads can be used. // // Query - Returns one or more items from a table or a secondary index. You -// must provide a specific hash key value. You can narrow the scope of the query -// using comparison operators against a range key value, or on the index key. -// Query supports either eventual or strong consistency. A single response has -// a size limit of 1 MB. +// must provide a specific value for the partition key. You can narrow the scope +// of the query using comparison operators against a sort key value, or on the +// index key. Query supports either eventual or strong consistency. A single +// response has a size limit of 1 MB. // // Scan - Reads every item in a table; the result set is eventually consistent. // You can limit the number of items returned by filtering the data attributes, 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 f4c4fb46a4f6..8ef7f7282be4 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 @@ -2933,6 +2933,9 @@ func (c *EC2) DescribeConversionTasksRequest(input *DescribeConversionTasksInput // Using the Command Line Tools to Import Your Virtual Machine to Amazon EC2 // (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UploadingYourInstancesandVolumes.html) // in the Amazon Elastic Compute Cloud User Guide. +// +// For information about the import manifest referenced by this API action, +// see VM Import Manifest (http://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html). func (c *EC2) DescribeConversionTasks(input *DescribeConversionTasksInput) (*DescribeConversionTasksOutput, error) { req, out := c.DescribeConversionTasksRequest(input) err := req.Send() @@ -5372,6 +5375,9 @@ func (c *EC2) ImportInstanceRequest(input *ImportInstanceInput) (req *request.Re // see Using the Command Line Tools to Import Your Virtual Machine to Amazon // EC2 (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UploadingYourInstancesandVolumes.html) // in the Amazon Elastic Compute Cloud User Guide. +// +// For information about the import manifest referenced by this API action, +// see VM Import Manifest (http://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html). func (c *EC2) ImportInstance(input *ImportInstanceInput) (*ImportInstanceOutput, error) { req, out := c.ImportInstanceRequest(input) err := req.Send() @@ -5465,6 +5471,9 @@ func (c *EC2) ImportVolumeRequest(input *ImportVolumeInput) (req *request.Reques // see Using the Command Line Tools to Import Your Virtual Machine to Amazon // EC2 (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UploadingYourInstancesandVolumes.html) // in the Amazon Elastic Compute Cloud User Guide. +// +// For information about the import manifest referenced by this API action, +// see VM Import Manifest (http://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html). func (c *EC2) ImportVolume(input *ImportVolumeInput) (*ImportVolumeOutput, error) { req, out := c.ImportVolumeRequest(input) err := req.Send() @@ -5533,10 +5542,16 @@ func (c *EC2) ModifyIdFormatRequest(input *ModifyIdFormatInput) (req *request.Re // // This setting applies to the IAM user who makes the request; it does not // apply to the entire AWS account. By default, an IAM user defaults to the -// same settings as the root user, unless they explicitly override the settings -// by running this request. Resources created with longer IDs are visible to -// all IAM users, regardless of these settings and provided that they have permission -// to use the relevant Describe command for the resource type. +// same settings as the root user. If you're using this action as the root user +// or as an IAM role that has permission to use this action, then these settings +// apply to the entire account, unless an IAM user explicitly overrides these +// settings for themselves. For more information, see Controlling Access to +// Longer ID Settings (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/resource-ids.html#resource-ids-access) +// in the Amazon Elastic Compute Cloud User Guide. +// +// Resources created with longer IDs are visible to all IAM users, regardless +// of these settings and provided that they have permission to use the relevant +// Describe command for the resource type. func (c *EC2) ModifyIdFormat(input *ModifyIdFormatInput) (*ModifyIdFormatOutput, error) { req, out := c.ModifyIdFormatRequest(input) err := req.Send() @@ -6781,6 +6796,10 @@ func (c *EC2) RunInstancesRequest(input *RunInstancesInput) (req *request.Reques // is ready for you, it enters the running state. To check the state of your // instance, call DescribeInstances. // +// To ensure faster instance launches, break up large requests into smaller +// batches. For example, create five separate launch requests for 100 instances +// each instead of one launch request for 500 instances. +// // If you don't specify a security group when launching an instance, Amazon // EC2 uses the default security group. For more information, see Security Groups // (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html) @@ -6805,9 +6824,9 @@ func (c *EC2) RunInstancesRequest(input *RunInstancesInput) (req *request.Reques // If any of the AMIs have a product code attached for which the user has not // subscribed, RunInstances fails. // -// T2 instance types can only be launched into a VPC. If you do not have a -// default VPC, or if you do not specify a subnet ID in the request, RunInstances -// fails. +// Some instance types can only be launched into a VPC. If you do not have +// a default VPC, or if you do not specify a subnet ID in the request, RunInstances +// fails. For more information, see Instance Types Available Only in a VPC (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-vpc.html#vpc-only-instance-types). // // For more information about troubleshooting, see What To Do If An Instance // Immediately Terminates (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_InstanceStraightToTerminated.html), @@ -12392,7 +12411,8 @@ type DescribeInstancesInput struct { // // instance-id - The ID of the instance. // - // instance-lifecycle - Indicates whether this is a Spot Instance (spot). + // instance-lifecycle - Indicates whether this is a Spot Instance or a Scheduled + // Instance (spot | scheduled). // // instance-state-code - The state of the instance, as a 16-bit unsigned // integer. The high byte is an opaque internal value and should be ignored. @@ -13788,8 +13808,9 @@ type DescribeScheduledInstanceAvailabilityInput struct { // The time period for the first schedule to start. FirstSlotStartTimeRange *SlotDateTimeRangeRequest `type:"structure" required:"true"` - // The maximum number of results to return in a single call. To retrieve the - // remaining results, make another call with the returned NextToken value. + // The maximum number of results to return in a single call. This value can + // be between 5 and 300. The default value is 300. To retrieve the remaining + // results, make another call with the returned NextToken value. MaxResults *int64 `type:"integer"` // The maximum available duration, in hours. This value must be greater than @@ -13862,8 +13883,9 @@ type DescribeScheduledInstancesInput struct { // platform - The platform (Linux/UNIX or Windows). Filters []*Filter `locationName:"Filter" locationNameList:"Filter" type:"list"` - // The maximum number of results to return in a single call. To retrieve the - // remaining results, make another call with the returned NextToken value. + // The maximum number of results to return in a single call. This value can + // be between 5 and 300. The default value is 100. To retrieve the remaining + // results, make another call with the returned NextToken value. MaxResults *int64 `type:"integer"` // The token for the next set of results. @@ -16069,6 +16091,9 @@ type DiskImageDescription struct { // Request Authentication Alternative" section of the Authenticating REST Requests // (http://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html) // topic in the Amazon Simple Storage Service Developer Guide. + // + // For information about the import manifest referenced by this API action, + // see VM Import Manifest (http://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html). ImportManifestUrl *string `locationName:"importManifestUrl" type:"string" required:"true"` // The size of the disk image, in GiB. @@ -16100,6 +16125,9 @@ type DiskImageDetail struct { // URL for an Amazon S3 object, read the "Query String Request Authentication // Alternative" section of the Authenticating REST Requests (http://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html) // topic in the Amazon Simple Storage Service Developer Guide. + // + // For information about the import manifest referenced by this API action, + // see VM Import Manifest (http://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html). ImportManifestUrl *string `locationName:"importManifestUrl" type:"string" required:"true"` } @@ -16924,7 +16952,8 @@ type IdFormat struct { _ struct{} `type:"structure"` // The date in UTC at which you are permanently switched over to using longer - // IDs. + // IDs. If a deadline is not yet available for this resource type, this field + // is not returned. Deadline *time.Time `locationName:"deadline" type:"timestamp" timestampFormat:"iso8601"` // The type of resource. @@ -17637,7 +17666,7 @@ type Instance struct { // The ID of the instance. InstanceId *string `locationName:"instanceId" type:"string"` - // Indicates whether this is a Spot instance. + // Indicates whether this is a Spot instance or a Scheduled Instance. InstanceLifecycle *string `locationName:"instanceLifecycle" type:"string" enum:"InstanceLifecycleType"` // The instance type. @@ -19293,7 +19322,7 @@ type NatGateway struct { // If the NAT gateway could not be created, specifies the error code for the // failure. (InsufficientFreeAddressesInSubnet | Gateway.NotAttached | InvalidAllocationID.NotFound - // | Resource.AlreadyAssociated | InternalError) + // | Resource.AlreadyAssociated | InternalError | InvalidSubnetID.NotFound) FailureCode *string `locationName:"failureCode" type:"string"` // If the NAT gateway could not be created, specifies the error message for @@ -19306,6 +19335,8 @@ type NatGateway struct { // For Resource.AlreadyAssociated: Elastic IP address eipalloc-xxxxxxxx is already // associated For InternalError: Network interface eni-xxxxxxxx, created and // used internally by this NAT gateway is in an invalid state. Please try again. + // For InvalidSubnetID.NotFound: The specified subnet subnet-xxxxxxxx does not + // exist or could not be found. FailureMessage *string `locationName:"failureMessage" type:"string"` // Information about the IP addresses and network interface associated with @@ -19938,10 +19969,10 @@ type PurchaseRequest struct { _ struct{} `type:"structure"` // The number of instances. - InstanceCount *int64 `type:"integer"` + InstanceCount *int64 `type:"integer" required:"true"` // The purchase token. - PurchaseToken *string `type:"string"` + PurchaseToken *string `type:"string" required:"true"` } // String returns the string representation @@ -20008,7 +20039,7 @@ type PurchaseScheduledInstancesInput struct { // Unique, case-sensitive identifier that ensures the idempotency of the request. // For more information, see Ensuring Idempotency (http://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html). - ClientToken *string `type:"string"` + ClientToken *string `type:"string" idempotencyToken:"true"` // Checks whether you have the required permissions for the action, without // actually making the request, and provides an error response. If you have @@ -20017,7 +20048,7 @@ type PurchaseScheduledInstancesInput struct { DryRun *bool `type:"boolean"` // One or more purchase requests. - PurchaseRequests []*PurchaseRequest `locationName:"PurchaseRequest" locationNameList:"PurchaseRequest" type:"list" required:"true"` + PurchaseRequests []*PurchaseRequest `locationName:"PurchaseRequest" locationNameList:"PurchaseRequest" min:"1" type:"list" required:"true"` } // String returns the string representation @@ -20672,8 +20703,9 @@ type RequestSpotInstancesInput struct { // Default: Instances are launched in any available Availability Zone. AvailabilityZoneGroup *string `locationName:"availabilityZoneGroup" type:"string"` - // The required duration for the Spot instances, in minutes. This value must - // be a multiple of 60 (60, 120, 180, 240, 300, or 360). + // The required duration for the Spot instances (also known as Spot blocks), + // in minutes. This value must be a multiple of 60 (60, 120, 180, 240, 300, + // or 360). // // The duration period starts as soon as your Spot instance receives its instance // ID. At the end of the duration period, Amazon EC2 marks the Spot instance @@ -20835,7 +20867,7 @@ func (s RequestSpotLaunchSpecification) GoString() string { type Reservation struct { _ struct{} `type:"structure"` - // One or more security groups. + // [EC2-Classic only] One or more security groups. Groups []*GroupIdentifier `locationName:"groupSet" locationNameList:"item" type:"list"` // One or more instances. @@ -21706,7 +21738,7 @@ type RunInstancesInput struct { // Constraints: Between 1 and the maximum number you're allowed for the specified // instance type. For more information about the default limits, and how to // request an increase, see How many instances can I run in Amazon EC2 (http://aws.amazon.com/ec2/faqs/#How_many_instances_can_I_run_in_Amazon_EC2) - // in the Amazon EC2 General FAQ. + // in the Amazon EC2 FAQ. MaxCount *int64 `type:"integer" required:"true"` // The minimum number of instances to launch. If you specify a minimum that @@ -21763,8 +21795,9 @@ type RunInstancesInput struct { // For more information, see Running Commands on Your Linux Instance at Launch // (http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html) (Linux) // and Adding User Data (http://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/ec2-instance-metadata.html#instancedata-add-user-data) - // (Windows). For API calls, the text must be base64-encoded. Command line tools - // perform encoding for you. + // (Windows). For API calls, the text must be base64-encoded. For command line + // tools, the encoding is performed for you, and you can load the text from + // a file. UserData *string `type:"string"` } @@ -21802,7 +21835,7 @@ type RunScheduledInstancesInput struct { // Unique, case-sensitive identifier that ensures the idempotency of the request. // For more information, see Ensuring Idempotency (http://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html). - ClientToken *string `type:"string"` + ClientToken *string `type:"string" idempotencyToken:"true"` // Checks whether you have the required permissions for the action, without // actually making the request, and provides an error response. If you have @@ -22185,6 +22218,10 @@ func (s ScheduledInstancesIamInstanceProfile) GoString() string { } // Describes the launch specification for a Scheduled Instance. +// +// If you are launching the Scheduled Instance in EC2-VPC, you must specify +// the ID of the subnet. You can specify the subnet using either SubnetId or +// NetworkInterface. type ScheduledInstancesLaunchSpecification struct { _ struct{} `type:"structure"` @@ -22981,8 +23018,10 @@ func (s SpotInstanceStatus) GoString() string { type SpotPlacement struct { _ struct{} `type:"structure"` - // The Availability Zones. To specify multiple Availability Zones, separate - // them using commas; for example, "us-west-2a, us-west-2b". + // The Availability Zone. + // + // [Spot fleet only] To specify multiple Availability Zones, separate them + // using commas; for example, "us-west-2a, us-west-2b". AvailabilityZone *string `locationName:"availabilityZone" type:"string"` // The name of the placement group (for cluster instances). @@ -23445,7 +23484,7 @@ type UserBucket struct { // The name of the S3 bucket where the disk image is located. S3Bucket *string `type:"string"` - // The key for the disk image. + // The file name of the disk image. S3Key *string `type:"string"` } @@ -23466,7 +23505,7 @@ type UserBucketDetails struct { // The S3 bucket from which the disk image was created. S3Bucket *string `locationName:"s3Bucket" type:"string"` - // The key from which the disk image was created. + // The file name of the disk image. S3Key *string `locationName:"s3Key" type:"string"` } @@ -23510,8 +23549,17 @@ type UserIdGroupPair struct { // VPC, use GroupId. GroupName *string `locationName:"groupName" type:"string"` - // The ID of an AWS account. EC2-Classic only. + // The status of a VPC peering connection, if applicable. + PeeringStatus *string `locationName:"peeringStatus" type:"string"` + + // The ID of an AWS account. UserId *string `locationName:"userId" type:"string"` + + // The ID of the VPC for the referenced security group, if applicable. + VpcId *string `locationName:"vpcId" type:"string"` + + // The ID of the VPC peering connection, if applicable. + VpcPeeringConnectionId *string `locationName:"vpcPeeringConnectionId" type:"string"` } // String returns the string representation @@ -24471,6 +24519,8 @@ const ( const ( // @enum InstanceLifecycleType InstanceLifecycleTypeSpot = "spot" + // @enum InstanceLifecycleType + InstanceLifecycleTypeScheduled = "scheduled" ) const ( @@ -24578,6 +24628,8 @@ const ( // @enum InstanceType InstanceTypeG22xlarge = "g2.2xlarge" // @enum InstanceType + InstanceTypeG28xlarge = "g2.8xlarge" + // @enum InstanceType InstanceTypeCg14xlarge = "cg1.4xlarge" // @enum InstanceType InstanceTypeR3Large = "r3.large" diff --git a/vendor/github.com/aws/aws-sdk-go/service/ec2/waiters.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/waiters.go index 1b28317a18b7..627b2f1136ba 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ec2/waiters.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ec2/waiters.go @@ -234,9 +234,9 @@ func (c *EC2) WaitUntilInstanceExists(input *DescribeInstancesInput) error { Acceptors: []waiter.WaitAcceptor{ { State: "success", - Matcher: "status", - Argument: "", - Expected: 200, + Matcher: "path", + Argument: "length(Reservations[]) > `0`", + Expected: true, }, { State: "retry", @@ -285,6 +285,12 @@ func (c *EC2) WaitUntilInstanceRunning(input *DescribeInstancesInput) error { Argument: "Reservations[].Instances[].State.Name", Expected: "stopping", }, + { + State: "retry", + Matcher: "error", + Argument: "", + Expected: "InvalidInstanceIDNotFound", + }, }, } @@ -308,6 +314,12 @@ func (c *EC2) WaitUntilInstanceStatusOk(input *DescribeInstanceStatusInput) erro Argument: "InstanceStatuses[].InstanceStatus.Status", Expected: "ok", }, + { + State: "retry", + Matcher: "error", + Argument: "", + Expected: "InvalidInstanceIDNotFound", + }, }, } @@ -418,6 +430,53 @@ func (c *EC2) WaitUntilKeyPairExists(input *DescribeKeyPairsInput) error { return w.Wait() } +func (c *EC2) WaitUntilNatGatewayAvailable(input *DescribeNatGatewaysInput) error { + waiterCfg := waiter.Config{ + Operation: "DescribeNatGateways", + Delay: 15, + MaxAttempts: 40, + Acceptors: []waiter.WaitAcceptor{ + { + State: "success", + Matcher: "pathAll", + Argument: "NatGateways[].State", + Expected: "available", + }, + { + State: "failure", + Matcher: "pathAny", + Argument: "NatGateways[].State", + Expected: "failed", + }, + { + State: "failure", + Matcher: "pathAny", + Argument: "NatGateways[].State", + Expected: "deleting", + }, + { + State: "failure", + Matcher: "pathAny", + Argument: "NatGateways[].State", + Expected: "deleted", + }, + { + State: "retry", + Matcher: "error", + Argument: "", + Expected: "InvalidNatGatewayIDNotFound", + }, + }, + } + + w := waiter.Waiter{ + Client: c, + Input: input, + Config: waiterCfg, + } + return w.Wait() +} + func (c *EC2) WaitUntilNetworkInterfaceAvailable(input *DescribeNetworkInterfacesInput) error { waiterCfg := waiter.Config{ Operation: "DescribeNetworkInterfaces", @@ -696,6 +755,35 @@ func (c *EC2) WaitUntilVpcAvailable(input *DescribeVpcsInput) error { return w.Wait() } +func (c *EC2) WaitUntilVpcPeeringConnectionExists(input *DescribeVpcPeeringConnectionsInput) error { + waiterCfg := waiter.Config{ + Operation: "DescribeVpcPeeringConnections", + Delay: 15, + MaxAttempts: 40, + Acceptors: []waiter.WaitAcceptor{ + { + State: "success", + Matcher: "status", + Argument: "", + Expected: 200, + }, + { + State: "retry", + Matcher: "error", + Argument: "", + Expected: "InvalidVpcPeeringConnectionIDNotFound", + }, + }, + } + + w := waiter.Waiter{ + Client: c, + Input: input, + Config: waiterCfg, + } + return w.Wait() +} + func (c *EC2) WaitUntilVpnConnectionAvailable(input *DescribeVpnConnectionsInput) error { waiterCfg := waiter.Config{ Operation: "DescribeVpnConnections", diff --git a/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/api.go b/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/api.go index 906d60dcc2e9..679548289d85 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/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 opAbortEnvironmentUpdate = "AbortEnvironmentUpdate" @@ -25,6 +27,8 @@ func (c *ElasticBeanstalk) AbortEnvironmentUpdateRequest(input *AbortEnvironment } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &AbortEnvironmentUpdateOutput{} req.Data = output return @@ -263,6 +267,8 @@ func (c *ElasticBeanstalk) DeleteApplicationRequest(input *DeleteApplicationInpu } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteApplicationOutput{} req.Data = output return @@ -294,6 +300,8 @@ func (c *ElasticBeanstalk) DeleteApplicationVersionRequest(input *DeleteApplicat } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteApplicationVersionOutput{} req.Data = output return @@ -324,6 +332,8 @@ func (c *ElasticBeanstalk) DeleteConfigurationTemplateRequest(input *DeleteConfi } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteConfigurationTemplateOutput{} req.Data = output return @@ -355,6 +365,8 @@ func (c *ElasticBeanstalk) DeleteEnvironmentConfigurationRequest(input *DeleteEn } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteEnvironmentConfigurationOutput{} req.Data = output return @@ -696,6 +708,8 @@ func (c *ElasticBeanstalk) RebuildEnvironmentRequest(input *RebuildEnvironmentIn } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RebuildEnvironmentOutput{} req.Data = output return @@ -724,6 +738,8 @@ func (c *ElasticBeanstalk) RequestEnvironmentInfoRequest(input *RequestEnvironme } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RequestEnvironmentInfoOutput{} req.Data = output return @@ -765,6 +781,8 @@ func (c *ElasticBeanstalk) RestartAppServerRequest(input *RestartAppServerInput) } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RestartAppServerOutput{} req.Data = output return @@ -824,6 +842,8 @@ func (c *ElasticBeanstalk) SwapEnvironmentCNAMEsRequest(input *SwapEnvironmentCN } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(query.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &SwapEnvironmentCNAMEsOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/elasticbeanstalkiface/interface.go b/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/elasticbeanstalkiface/interface.go deleted file mode 100644 index 7af685f3366f..000000000000 --- a/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/elasticbeanstalkiface/interface.go +++ /dev/null @@ -1,148 +0,0 @@ -// THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. - -// Package elasticbeanstalkiface provides an interface for the AWS Elastic Beanstalk. -package elasticbeanstalkiface - -import ( - "github.com/aws/aws-sdk-go/aws/request" - "github.com/aws/aws-sdk-go/service/elasticbeanstalk" -) - -// ElasticBeanstalkAPI is the interface type for elasticbeanstalk.ElasticBeanstalk. -type ElasticBeanstalkAPI interface { - AbortEnvironmentUpdateRequest(*elasticbeanstalk.AbortEnvironmentUpdateInput) (*request.Request, *elasticbeanstalk.AbortEnvironmentUpdateOutput) - - AbortEnvironmentUpdate(*elasticbeanstalk.AbortEnvironmentUpdateInput) (*elasticbeanstalk.AbortEnvironmentUpdateOutput, error) - - CheckDNSAvailabilityRequest(*elasticbeanstalk.CheckDNSAvailabilityInput) (*request.Request, *elasticbeanstalk.CheckDNSAvailabilityOutput) - - CheckDNSAvailability(*elasticbeanstalk.CheckDNSAvailabilityInput) (*elasticbeanstalk.CheckDNSAvailabilityOutput, error) - - ComposeEnvironmentsRequest(*elasticbeanstalk.ComposeEnvironmentsInput) (*request.Request, *elasticbeanstalk.EnvironmentDescriptionsMessage) - - ComposeEnvironments(*elasticbeanstalk.ComposeEnvironmentsInput) (*elasticbeanstalk.EnvironmentDescriptionsMessage, error) - - CreateApplicationRequest(*elasticbeanstalk.CreateApplicationInput) (*request.Request, *elasticbeanstalk.ApplicationDescriptionMessage) - - CreateApplication(*elasticbeanstalk.CreateApplicationInput) (*elasticbeanstalk.ApplicationDescriptionMessage, error) - - CreateApplicationVersionRequest(*elasticbeanstalk.CreateApplicationVersionInput) (*request.Request, *elasticbeanstalk.ApplicationVersionDescriptionMessage) - - CreateApplicationVersion(*elasticbeanstalk.CreateApplicationVersionInput) (*elasticbeanstalk.ApplicationVersionDescriptionMessage, error) - - CreateConfigurationTemplateRequest(*elasticbeanstalk.CreateConfigurationTemplateInput) (*request.Request, *elasticbeanstalk.ConfigurationSettingsDescription) - - CreateConfigurationTemplate(*elasticbeanstalk.CreateConfigurationTemplateInput) (*elasticbeanstalk.ConfigurationSettingsDescription, error) - - CreateEnvironmentRequest(*elasticbeanstalk.CreateEnvironmentInput) (*request.Request, *elasticbeanstalk.EnvironmentDescription) - - CreateEnvironment(*elasticbeanstalk.CreateEnvironmentInput) (*elasticbeanstalk.EnvironmentDescription, error) - - CreateStorageLocationRequest(*elasticbeanstalk.CreateStorageLocationInput) (*request.Request, *elasticbeanstalk.CreateStorageLocationOutput) - - CreateStorageLocation(*elasticbeanstalk.CreateStorageLocationInput) (*elasticbeanstalk.CreateStorageLocationOutput, error) - - DeleteApplicationRequest(*elasticbeanstalk.DeleteApplicationInput) (*request.Request, *elasticbeanstalk.DeleteApplicationOutput) - - DeleteApplication(*elasticbeanstalk.DeleteApplicationInput) (*elasticbeanstalk.DeleteApplicationOutput, error) - - DeleteApplicationVersionRequest(*elasticbeanstalk.DeleteApplicationVersionInput) (*request.Request, *elasticbeanstalk.DeleteApplicationVersionOutput) - - DeleteApplicationVersion(*elasticbeanstalk.DeleteApplicationVersionInput) (*elasticbeanstalk.DeleteApplicationVersionOutput, error) - - DeleteConfigurationTemplateRequest(*elasticbeanstalk.DeleteConfigurationTemplateInput) (*request.Request, *elasticbeanstalk.DeleteConfigurationTemplateOutput) - - DeleteConfigurationTemplate(*elasticbeanstalk.DeleteConfigurationTemplateInput) (*elasticbeanstalk.DeleteConfigurationTemplateOutput, error) - - DeleteEnvironmentConfigurationRequest(*elasticbeanstalk.DeleteEnvironmentConfigurationInput) (*request.Request, *elasticbeanstalk.DeleteEnvironmentConfigurationOutput) - - DeleteEnvironmentConfiguration(*elasticbeanstalk.DeleteEnvironmentConfigurationInput) (*elasticbeanstalk.DeleteEnvironmentConfigurationOutput, error) - - DescribeApplicationVersionsRequest(*elasticbeanstalk.DescribeApplicationVersionsInput) (*request.Request, *elasticbeanstalk.DescribeApplicationVersionsOutput) - - DescribeApplicationVersions(*elasticbeanstalk.DescribeApplicationVersionsInput) (*elasticbeanstalk.DescribeApplicationVersionsOutput, error) - - DescribeApplicationsRequest(*elasticbeanstalk.DescribeApplicationsInput) (*request.Request, *elasticbeanstalk.DescribeApplicationsOutput) - - DescribeApplications(*elasticbeanstalk.DescribeApplicationsInput) (*elasticbeanstalk.DescribeApplicationsOutput, error) - - DescribeConfigurationOptionsRequest(*elasticbeanstalk.DescribeConfigurationOptionsInput) (*request.Request, *elasticbeanstalk.DescribeConfigurationOptionsOutput) - - DescribeConfigurationOptions(*elasticbeanstalk.DescribeConfigurationOptionsInput) (*elasticbeanstalk.DescribeConfigurationOptionsOutput, error) - - DescribeConfigurationSettingsRequest(*elasticbeanstalk.DescribeConfigurationSettingsInput) (*request.Request, *elasticbeanstalk.DescribeConfigurationSettingsOutput) - - DescribeConfigurationSettings(*elasticbeanstalk.DescribeConfigurationSettingsInput) (*elasticbeanstalk.DescribeConfigurationSettingsOutput, error) - - DescribeEnvironmentHealthRequest(*elasticbeanstalk.DescribeEnvironmentHealthInput) (*request.Request, *elasticbeanstalk.DescribeEnvironmentHealthOutput) - - DescribeEnvironmentHealth(*elasticbeanstalk.DescribeEnvironmentHealthInput) (*elasticbeanstalk.DescribeEnvironmentHealthOutput, error) - - DescribeEnvironmentResourcesRequest(*elasticbeanstalk.DescribeEnvironmentResourcesInput) (*request.Request, *elasticbeanstalk.DescribeEnvironmentResourcesOutput) - - DescribeEnvironmentResources(*elasticbeanstalk.DescribeEnvironmentResourcesInput) (*elasticbeanstalk.DescribeEnvironmentResourcesOutput, error) - - DescribeEnvironmentsRequest(*elasticbeanstalk.DescribeEnvironmentsInput) (*request.Request, *elasticbeanstalk.EnvironmentDescriptionsMessage) - - DescribeEnvironments(*elasticbeanstalk.DescribeEnvironmentsInput) (*elasticbeanstalk.EnvironmentDescriptionsMessage, error) - - DescribeEventsRequest(*elasticbeanstalk.DescribeEventsInput) (*request.Request, *elasticbeanstalk.DescribeEventsOutput) - - DescribeEvents(*elasticbeanstalk.DescribeEventsInput) (*elasticbeanstalk.DescribeEventsOutput, error) - - DescribeEventsPages(*elasticbeanstalk.DescribeEventsInput, func(*elasticbeanstalk.DescribeEventsOutput, bool) bool) error - - DescribeInstancesHealthRequest(*elasticbeanstalk.DescribeInstancesHealthInput) (*request.Request, *elasticbeanstalk.DescribeInstancesHealthOutput) - - DescribeInstancesHealth(*elasticbeanstalk.DescribeInstancesHealthInput) (*elasticbeanstalk.DescribeInstancesHealthOutput, error) - - ListAvailableSolutionStacksRequest(*elasticbeanstalk.ListAvailableSolutionStacksInput) (*request.Request, *elasticbeanstalk.ListAvailableSolutionStacksOutput) - - ListAvailableSolutionStacks(*elasticbeanstalk.ListAvailableSolutionStacksInput) (*elasticbeanstalk.ListAvailableSolutionStacksOutput, error) - - RebuildEnvironmentRequest(*elasticbeanstalk.RebuildEnvironmentInput) (*request.Request, *elasticbeanstalk.RebuildEnvironmentOutput) - - RebuildEnvironment(*elasticbeanstalk.RebuildEnvironmentInput) (*elasticbeanstalk.RebuildEnvironmentOutput, error) - - RequestEnvironmentInfoRequest(*elasticbeanstalk.RequestEnvironmentInfoInput) (*request.Request, *elasticbeanstalk.RequestEnvironmentInfoOutput) - - RequestEnvironmentInfo(*elasticbeanstalk.RequestEnvironmentInfoInput) (*elasticbeanstalk.RequestEnvironmentInfoOutput, error) - - RestartAppServerRequest(*elasticbeanstalk.RestartAppServerInput) (*request.Request, *elasticbeanstalk.RestartAppServerOutput) - - RestartAppServer(*elasticbeanstalk.RestartAppServerInput) (*elasticbeanstalk.RestartAppServerOutput, error) - - RetrieveEnvironmentInfoRequest(*elasticbeanstalk.RetrieveEnvironmentInfoInput) (*request.Request, *elasticbeanstalk.RetrieveEnvironmentInfoOutput) - - RetrieveEnvironmentInfo(*elasticbeanstalk.RetrieveEnvironmentInfoInput) (*elasticbeanstalk.RetrieveEnvironmentInfoOutput, error) - - SwapEnvironmentCNAMEsRequest(*elasticbeanstalk.SwapEnvironmentCNAMEsInput) (*request.Request, *elasticbeanstalk.SwapEnvironmentCNAMEsOutput) - - SwapEnvironmentCNAMEs(*elasticbeanstalk.SwapEnvironmentCNAMEsInput) (*elasticbeanstalk.SwapEnvironmentCNAMEsOutput, error) - - TerminateEnvironmentRequest(*elasticbeanstalk.TerminateEnvironmentInput) (*request.Request, *elasticbeanstalk.EnvironmentDescription) - - TerminateEnvironment(*elasticbeanstalk.TerminateEnvironmentInput) (*elasticbeanstalk.EnvironmentDescription, error) - - UpdateApplicationRequest(*elasticbeanstalk.UpdateApplicationInput) (*request.Request, *elasticbeanstalk.ApplicationDescriptionMessage) - - UpdateApplication(*elasticbeanstalk.UpdateApplicationInput) (*elasticbeanstalk.ApplicationDescriptionMessage, error) - - UpdateApplicationVersionRequest(*elasticbeanstalk.UpdateApplicationVersionInput) (*request.Request, *elasticbeanstalk.ApplicationVersionDescriptionMessage) - - UpdateApplicationVersion(*elasticbeanstalk.UpdateApplicationVersionInput) (*elasticbeanstalk.ApplicationVersionDescriptionMessage, error) - - UpdateConfigurationTemplateRequest(*elasticbeanstalk.UpdateConfigurationTemplateInput) (*request.Request, *elasticbeanstalk.ConfigurationSettingsDescription) - - UpdateConfigurationTemplate(*elasticbeanstalk.UpdateConfigurationTemplateInput) (*elasticbeanstalk.ConfigurationSettingsDescription, error) - - UpdateEnvironmentRequest(*elasticbeanstalk.UpdateEnvironmentInput) (*request.Request, *elasticbeanstalk.EnvironmentDescription) - - UpdateEnvironment(*elasticbeanstalk.UpdateEnvironmentInput) (*elasticbeanstalk.EnvironmentDescription, error) - - ValidateConfigurationSettingsRequest(*elasticbeanstalk.ValidateConfigurationSettingsInput) (*request.Request, *elasticbeanstalk.ValidateConfigurationSettingsOutput) - - ValidateConfigurationSettings(*elasticbeanstalk.ValidateConfigurationSettingsInput) (*elasticbeanstalk.ValidateConfigurationSettingsOutput, error) -} - -var _ ElasticBeanstalkAPI = (*elasticbeanstalk.ElasticBeanstalk)(nil) diff --git a/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/examples_test.go b/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/examples_test.go deleted file mode 100644 index 4884fecbd33e..000000000000 --- a/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/examples_test.go +++ /dev/null @@ -1,839 +0,0 @@ -// THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. - -package elasticbeanstalk_test - -import ( - "bytes" - "fmt" - "time" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/session" - "github.com/aws/aws-sdk-go/service/elasticbeanstalk" -) - -var _ time.Duration -var _ bytes.Buffer - -func ExampleElasticBeanstalk_AbortEnvironmentUpdate() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.AbortEnvironmentUpdateInput{ - EnvironmentId: aws.String("EnvironmentId"), - EnvironmentName: aws.String("EnvironmentName"), - } - resp, err := svc.AbortEnvironmentUpdate(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_CheckDNSAvailability() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.CheckDNSAvailabilityInput{ - CNAMEPrefix: aws.String("DNSCnamePrefix"), // Required - } - resp, err := svc.CheckDNSAvailability(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_ComposeEnvironments() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.ComposeEnvironmentsInput{ - ApplicationName: aws.String("ApplicationName"), - GroupName: aws.String("GroupName"), - VersionLabels: []*string{ - aws.String("VersionLabel"), // Required - // More values... - }, - } - resp, err := svc.ComposeEnvironments(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_CreateApplication() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.CreateApplicationInput{ - ApplicationName: aws.String("ApplicationName"), // Required - Description: aws.String("Description"), - } - resp, err := svc.CreateApplication(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_CreateApplicationVersion() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.CreateApplicationVersionInput{ - ApplicationName: aws.String("ApplicationName"), // Required - VersionLabel: aws.String("VersionLabel"), // Required - AutoCreateApplication: aws.Bool(true), - Description: aws.String("Description"), - Process: aws.Bool(true), - SourceBundle: &elasticbeanstalk.S3Location{ - S3Bucket: aws.String("S3Bucket"), - S3Key: aws.String("S3Key"), - }, - } - resp, err := svc.CreateApplicationVersion(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_CreateConfigurationTemplate() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.CreateConfigurationTemplateInput{ - ApplicationName: aws.String("ApplicationName"), // Required - TemplateName: aws.String("ConfigurationTemplateName"), // Required - Description: aws.String("Description"), - EnvironmentId: aws.String("EnvironmentId"), - OptionSettings: []*elasticbeanstalk.ConfigurationOptionSetting{ - { // Required - Namespace: aws.String("OptionNamespace"), - OptionName: aws.String("ConfigurationOptionName"), - ResourceName: aws.String("ResourceName"), - Value: aws.String("ConfigurationOptionValue"), - }, - // More values... - }, - SolutionStackName: aws.String("SolutionStackName"), - SourceConfiguration: &elasticbeanstalk.SourceConfiguration{ - ApplicationName: aws.String("ApplicationName"), - TemplateName: aws.String("ConfigurationTemplateName"), - }, - } - resp, err := svc.CreateConfigurationTemplate(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_CreateEnvironment() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.CreateEnvironmentInput{ - ApplicationName: aws.String("ApplicationName"), // Required - CNAMEPrefix: aws.String("DNSCnamePrefix"), - Description: aws.String("Description"), - EnvironmentName: aws.String("EnvironmentName"), - GroupName: aws.String("GroupName"), - OptionSettings: []*elasticbeanstalk.ConfigurationOptionSetting{ - { // Required - Namespace: aws.String("OptionNamespace"), - OptionName: aws.String("ConfigurationOptionName"), - ResourceName: aws.String("ResourceName"), - Value: aws.String("ConfigurationOptionValue"), - }, - // More values... - }, - OptionsToRemove: []*elasticbeanstalk.OptionSpecification{ - { // Required - Namespace: aws.String("OptionNamespace"), - OptionName: aws.String("ConfigurationOptionName"), - ResourceName: aws.String("ResourceName"), - }, - // More values... - }, - SolutionStackName: aws.String("SolutionStackName"), - Tags: []*elasticbeanstalk.Tag{ - { // Required - Key: aws.String("TagKey"), - Value: aws.String("TagValue"), - }, - // More values... - }, - TemplateName: aws.String("ConfigurationTemplateName"), - Tier: &elasticbeanstalk.EnvironmentTier{ - Name: aws.String("String"), - Type: aws.String("String"), - Version: aws.String("String"), - }, - VersionLabel: aws.String("VersionLabel"), - } - resp, err := svc.CreateEnvironment(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_CreateStorageLocation() { - svc := elasticbeanstalk.New(session.New()) - - var params *elasticbeanstalk.CreateStorageLocationInput - resp, err := svc.CreateStorageLocation(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_DeleteApplication() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.DeleteApplicationInput{ - ApplicationName: aws.String("ApplicationName"), // Required - TerminateEnvByForce: aws.Bool(true), - } - resp, err := svc.DeleteApplication(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_DeleteApplicationVersion() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.DeleteApplicationVersionInput{ - ApplicationName: aws.String("ApplicationName"), // Required - VersionLabel: aws.String("VersionLabel"), // Required - DeleteSourceBundle: aws.Bool(true), - } - resp, err := svc.DeleteApplicationVersion(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_DeleteConfigurationTemplate() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.DeleteConfigurationTemplateInput{ - ApplicationName: aws.String("ApplicationName"), // Required - TemplateName: aws.String("ConfigurationTemplateName"), // Required - } - resp, err := svc.DeleteConfigurationTemplate(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_DeleteEnvironmentConfiguration() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.DeleteEnvironmentConfigurationInput{ - ApplicationName: aws.String("ApplicationName"), // Required - EnvironmentName: aws.String("EnvironmentName"), // Required - } - resp, err := svc.DeleteEnvironmentConfiguration(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_DescribeApplicationVersions() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.DescribeApplicationVersionsInput{ - ApplicationName: aws.String("ApplicationName"), - VersionLabels: []*string{ - aws.String("VersionLabel"), // Required - // More values... - }, - } - resp, err := svc.DescribeApplicationVersions(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_DescribeApplications() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.DescribeApplicationsInput{ - ApplicationNames: []*string{ - aws.String("ApplicationName"), // Required - // More values... - }, - } - resp, err := svc.DescribeApplications(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_DescribeConfigurationOptions() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.DescribeConfigurationOptionsInput{ - ApplicationName: aws.String("ApplicationName"), - EnvironmentName: aws.String("EnvironmentName"), - Options: []*elasticbeanstalk.OptionSpecification{ - { // Required - Namespace: aws.String("OptionNamespace"), - OptionName: aws.String("ConfigurationOptionName"), - ResourceName: aws.String("ResourceName"), - }, - // More values... - }, - SolutionStackName: aws.String("SolutionStackName"), - TemplateName: aws.String("ConfigurationTemplateName"), - } - resp, err := svc.DescribeConfigurationOptions(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_DescribeConfigurationSettings() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.DescribeConfigurationSettingsInput{ - ApplicationName: aws.String("ApplicationName"), // Required - EnvironmentName: aws.String("EnvironmentName"), - TemplateName: aws.String("ConfigurationTemplateName"), - } - resp, err := svc.DescribeConfigurationSettings(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_DescribeEnvironmentHealth() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.DescribeEnvironmentHealthInput{ - AttributeNames: []*string{ - aws.String("EnvironmentHealthAttribute"), // Required - // More values... - }, - EnvironmentId: aws.String("EnvironmentId"), - EnvironmentName: aws.String("EnvironmentName"), - } - resp, err := svc.DescribeEnvironmentHealth(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_DescribeEnvironmentResources() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.DescribeEnvironmentResourcesInput{ - EnvironmentId: aws.String("EnvironmentId"), - EnvironmentName: aws.String("EnvironmentName"), - } - resp, err := svc.DescribeEnvironmentResources(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_DescribeEnvironments() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.DescribeEnvironmentsInput{ - ApplicationName: aws.String("ApplicationName"), - EnvironmentIds: []*string{ - aws.String("EnvironmentId"), // Required - // More values... - }, - EnvironmentNames: []*string{ - aws.String("EnvironmentName"), // Required - // More values... - }, - IncludeDeleted: aws.Bool(true), - IncludedDeletedBackTo: aws.Time(time.Now()), - VersionLabel: aws.String("VersionLabel"), - } - resp, err := svc.DescribeEnvironments(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_DescribeEvents() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.DescribeEventsInput{ - ApplicationName: aws.String("ApplicationName"), - EndTime: aws.Time(time.Now()), - EnvironmentId: aws.String("EnvironmentId"), - EnvironmentName: aws.String("EnvironmentName"), - MaxRecords: aws.Int64(1), - NextToken: aws.String("Token"), - RequestId: aws.String("RequestId"), - Severity: aws.String("EventSeverity"), - StartTime: aws.Time(time.Now()), - TemplateName: aws.String("ConfigurationTemplateName"), - VersionLabel: aws.String("VersionLabel"), - } - resp, err := svc.DescribeEvents(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_DescribeInstancesHealth() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.DescribeInstancesHealthInput{ - AttributeNames: []*string{ - aws.String("InstancesHealthAttribute"), // Required - // More values... - }, - EnvironmentId: aws.String("EnvironmentId"), - EnvironmentName: aws.String("EnvironmentName"), - NextToken: aws.String("NextToken"), - } - resp, err := svc.DescribeInstancesHealth(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_ListAvailableSolutionStacks() { - svc := elasticbeanstalk.New(session.New()) - - var params *elasticbeanstalk.ListAvailableSolutionStacksInput - resp, err := svc.ListAvailableSolutionStacks(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_RebuildEnvironment() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.RebuildEnvironmentInput{ - EnvironmentId: aws.String("EnvironmentId"), - EnvironmentName: aws.String("EnvironmentName"), - } - resp, err := svc.RebuildEnvironment(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_RequestEnvironmentInfo() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.RequestEnvironmentInfoInput{ - InfoType: aws.String("EnvironmentInfoType"), // Required - EnvironmentId: aws.String("EnvironmentId"), - EnvironmentName: aws.String("EnvironmentName"), - } - resp, err := svc.RequestEnvironmentInfo(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_RestartAppServer() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.RestartAppServerInput{ - EnvironmentId: aws.String("EnvironmentId"), - EnvironmentName: aws.String("EnvironmentName"), - } - resp, err := svc.RestartAppServer(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_RetrieveEnvironmentInfo() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.RetrieveEnvironmentInfoInput{ - InfoType: aws.String("EnvironmentInfoType"), // Required - EnvironmentId: aws.String("EnvironmentId"), - EnvironmentName: aws.String("EnvironmentName"), - } - resp, err := svc.RetrieveEnvironmentInfo(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_SwapEnvironmentCNAMEs() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.SwapEnvironmentCNAMEsInput{ - DestinationEnvironmentId: aws.String("EnvironmentId"), - DestinationEnvironmentName: aws.String("EnvironmentName"), - SourceEnvironmentId: aws.String("EnvironmentId"), - SourceEnvironmentName: aws.String("EnvironmentName"), - } - resp, err := svc.SwapEnvironmentCNAMEs(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_TerminateEnvironment() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.TerminateEnvironmentInput{ - EnvironmentId: aws.String("EnvironmentId"), - EnvironmentName: aws.String("EnvironmentName"), - ForceTerminate: aws.Bool(true), - TerminateResources: aws.Bool(true), - } - resp, err := svc.TerminateEnvironment(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_UpdateApplication() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.UpdateApplicationInput{ - ApplicationName: aws.String("ApplicationName"), // Required - Description: aws.String("Description"), - } - resp, err := svc.UpdateApplication(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_UpdateApplicationVersion() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.UpdateApplicationVersionInput{ - ApplicationName: aws.String("ApplicationName"), // Required - VersionLabel: aws.String("VersionLabel"), // Required - Description: aws.String("Description"), - } - resp, err := svc.UpdateApplicationVersion(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_UpdateConfigurationTemplate() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.UpdateConfigurationTemplateInput{ - ApplicationName: aws.String("ApplicationName"), // Required - TemplateName: aws.String("ConfigurationTemplateName"), // Required - Description: aws.String("Description"), - OptionSettings: []*elasticbeanstalk.ConfigurationOptionSetting{ - { // Required - Namespace: aws.String("OptionNamespace"), - OptionName: aws.String("ConfigurationOptionName"), - ResourceName: aws.String("ResourceName"), - Value: aws.String("ConfigurationOptionValue"), - }, - // More values... - }, - OptionsToRemove: []*elasticbeanstalk.OptionSpecification{ - { // Required - Namespace: aws.String("OptionNamespace"), - OptionName: aws.String("ConfigurationOptionName"), - ResourceName: aws.String("ResourceName"), - }, - // More values... - }, - } - resp, err := svc.UpdateConfigurationTemplate(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_UpdateEnvironment() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.UpdateEnvironmentInput{ - ApplicationName: aws.String("ApplicationName"), - Description: aws.String("Description"), - EnvironmentId: aws.String("EnvironmentId"), - EnvironmentName: aws.String("EnvironmentName"), - GroupName: aws.String("GroupName"), - OptionSettings: []*elasticbeanstalk.ConfigurationOptionSetting{ - { // Required - Namespace: aws.String("OptionNamespace"), - OptionName: aws.String("ConfigurationOptionName"), - ResourceName: aws.String("ResourceName"), - Value: aws.String("ConfigurationOptionValue"), - }, - // More values... - }, - OptionsToRemove: []*elasticbeanstalk.OptionSpecification{ - { // Required - Namespace: aws.String("OptionNamespace"), - OptionName: aws.String("ConfigurationOptionName"), - ResourceName: aws.String("ResourceName"), - }, - // More values... - }, - SolutionStackName: aws.String("SolutionStackName"), - TemplateName: aws.String("ConfigurationTemplateName"), - Tier: &elasticbeanstalk.EnvironmentTier{ - Name: aws.String("String"), - Type: aws.String("String"), - Version: aws.String("String"), - }, - VersionLabel: aws.String("VersionLabel"), - } - resp, err := svc.UpdateEnvironment(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} - -func ExampleElasticBeanstalk_ValidateConfigurationSettings() { - svc := elasticbeanstalk.New(session.New()) - - params := &elasticbeanstalk.ValidateConfigurationSettingsInput{ - ApplicationName: aws.String("ApplicationName"), // Required - OptionSettings: []*elasticbeanstalk.ConfigurationOptionSetting{ // Required - { // Required - Namespace: aws.String("OptionNamespace"), - OptionName: aws.String("ConfigurationOptionName"), - ResourceName: aws.String("ResourceName"), - Value: aws.String("ConfigurationOptionValue"), - }, - // More values... - }, - EnvironmentName: aws.String("EnvironmentName"), - TemplateName: aws.String("ConfigurationTemplateName"), - } - resp, err := svc.ValidateConfigurationSettings(params) - - if err != nil { - // Print the error, cast err to awserr.Error to get the Code and - // Message from an error. - fmt.Println(err.Error()) - return - } - - // Pretty-print the response data. - fmt.Println(resp) -} diff --git a/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/service.go b/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/service.go index dd71e05142e8..2ec7ef227364 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elasticbeanstalk/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(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/kms/api.go b/vendor/github.com/aws/aws-sdk-go/service/kms/api.go index 27bc06e17b0c..2a11a3554173 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/kms/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/kms/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 opCancelKeyDeletion = "CancelKeyDeletion" @@ -58,6 +60,8 @@ func (c *KMS) CreateAliasRequest(input *CreateAliasInput) (req *request.Request, } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &CreateAliasOutput{} req.Data = output return @@ -195,6 +199,8 @@ func (c *KMS) DeleteAliasRequest(input *DeleteAliasInput) (req *request.Request, } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DeleteAliasOutput{} req.Data = output return @@ -249,6 +255,8 @@ func (c *KMS) DisableKeyRequest(input *DisableKeyInput) (req *request.Request, o } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DisableKeyOutput{} req.Data = output return @@ -280,6 +288,8 @@ func (c *KMS) DisableKeyRotationRequest(input *DisableKeyRotationInput) (req *re } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &DisableKeyRotationOutput{} req.Data = output return @@ -307,6 +317,8 @@ func (c *KMS) EnableKeyRequest(input *EnableKeyInput) (req *request.Request, out } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &EnableKeyOutput{} req.Data = output return @@ -334,6 +346,8 @@ func (c *KMS) EnableKeyRotationRequest(input *EnableKeyRotationInput) (req *requ } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &EnableKeyRotationOutput{} req.Data = output return @@ -768,6 +782,8 @@ func (c *KMS) PutKeyPolicyRequest(input *PutKeyPolicyInput) (req *request.Reques } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &PutKeyPolicyOutput{} req.Data = output return @@ -833,6 +849,8 @@ func (c *KMS) RetireGrantRequest(input *RetireGrantInput) (req *request.Request, } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RetireGrantOutput{} req.Data = output return @@ -868,6 +886,8 @@ func (c *KMS) RevokeGrantRequest(input *RevokeGrantInput) (req *request.Request, } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &RevokeGrantOutput{} req.Data = output return @@ -938,6 +958,8 @@ func (c *KMS) UpdateAliasRequest(input *UpdateAliasInput) (req *request.Request, } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateAliasOutput{} req.Data = output return @@ -977,6 +999,8 @@ func (c *KMS) UpdateKeyDescriptionRequest(input *UpdateKeyDescriptionInput) (req } req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Remove(jsonrpc.UnmarshalHandler) + req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler) output = &UpdateKeyDescriptionOutput{} req.Data = output return diff --git a/vendor/github.com/aws/aws-sdk-go/service/kms/kmsiface/interface.go b/vendor/github.com/aws/aws-sdk-go/service/kms/kmsiface/interface.go deleted file mode 100644 index 34628c02b116..000000000000 --- a/vendor/github.com/aws/aws-sdk-go/service/kms/kmsiface/interface.go +++ /dev/null @@ -1,138 +0,0 @@ -// THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. - -// Package kmsiface provides an interface for the AWS Key Management Service. -package kmsiface - -import ( - "github.com/aws/aws-sdk-go/aws/request" - "github.com/aws/aws-sdk-go/service/kms" -) - -// KMSAPI is the interface type for kms.KMS. -type KMSAPI interface { - CancelKeyDeletionRequest(*kms.CancelKeyDeletionInput) (*request.Request, *kms.CancelKeyDeletionOutput) - - CancelKeyDeletion(*kms.CancelKeyDeletionInput) (*kms.CancelKeyDeletionOutput, error) - - CreateAliasRequest(*kms.CreateAliasInput) (*request.Request, *kms.CreateAliasOutput) - - CreateAlias(*kms.CreateAliasInput) (*kms.CreateAliasOutput, error) - - CreateGrantRequest(*kms.CreateGrantInput) (*request.Request, *kms.CreateGrantOutput) - - CreateGrant(*kms.CreateGrantInput) (*kms.CreateGrantOutput, error) - - CreateKeyRequest(*kms.CreateKeyInput) (*request.Request, *kms.CreateKeyOutput) - - CreateKey(*kms.CreateKeyInput) (*kms.CreateKeyOutput, error) - - DecryptRequest(*kms.DecryptInput) (*request.Request, *kms.DecryptOutput) - - Decrypt(*kms.DecryptInput) (*kms.DecryptOutput, error) - - DeleteAliasRequest(*kms.DeleteAliasInput) (*request.Request, *kms.DeleteAliasOutput) - - DeleteAlias(*kms.DeleteAliasInput) (*kms.DeleteAliasOutput, error) - - DescribeKeyRequest(*kms.DescribeKeyInput) (*request.Request, *kms.DescribeKeyOutput) - - DescribeKey(*kms.DescribeKeyInput) (*kms.DescribeKeyOutput, error) - - DisableKeyRequest(*kms.DisableKeyInput) (*request.Request, *kms.DisableKeyOutput) - - DisableKey(*kms.DisableKeyInput) (*kms.DisableKeyOutput, error) - - DisableKeyRotationRequest(*kms.DisableKeyRotationInput) (*request.Request, *kms.DisableKeyRotationOutput) - - DisableKeyRotation(*kms.DisableKeyRotationInput) (*kms.DisableKeyRotationOutput, error) - - EnableKeyRequest(*kms.EnableKeyInput) (*request.Request, *kms.EnableKeyOutput) - - EnableKey(*kms.EnableKeyInput) (*kms.EnableKeyOutput, error) - - EnableKeyRotationRequest(*kms.EnableKeyRotationInput) (*request.Request, *kms.EnableKeyRotationOutput) - - EnableKeyRotation(*kms.EnableKeyRotationInput) (*kms.EnableKeyRotationOutput, error) - - EncryptRequest(*kms.EncryptInput) (*request.Request, *kms.EncryptOutput) - - Encrypt(*kms.EncryptInput) (*kms.EncryptOutput, error) - - GenerateDataKeyRequest(*kms.GenerateDataKeyInput) (*request.Request, *kms.GenerateDataKeyOutput) - - GenerateDataKey(*kms.GenerateDataKeyInput) (*kms.GenerateDataKeyOutput, error) - - GenerateDataKeyWithoutPlaintextRequest(*kms.GenerateDataKeyWithoutPlaintextInput) (*request.Request, *kms.GenerateDataKeyWithoutPlaintextOutput) - - GenerateDataKeyWithoutPlaintext(*kms.GenerateDataKeyWithoutPlaintextInput) (*kms.GenerateDataKeyWithoutPlaintextOutput, error) - - GenerateRandomRequest(*kms.GenerateRandomInput) (*request.Request, *kms.GenerateRandomOutput) - - GenerateRandom(*kms.GenerateRandomInput) (*kms.GenerateRandomOutput, error) - - GetKeyPolicyRequest(*kms.GetKeyPolicyInput) (*request.Request, *kms.GetKeyPolicyOutput) - - GetKeyPolicy(*kms.GetKeyPolicyInput) (*kms.GetKeyPolicyOutput, error) - - GetKeyRotationStatusRequest(*kms.GetKeyRotationStatusInput) (*request.Request, *kms.GetKeyRotationStatusOutput) - - GetKeyRotationStatus(*kms.GetKeyRotationStatusInput) (*kms.GetKeyRotationStatusOutput, error) - - ListAliasesRequest(*kms.ListAliasesInput) (*request.Request, *kms.ListAliasesOutput) - - ListAliases(*kms.ListAliasesInput) (*kms.ListAliasesOutput, error) - - ListAliasesPages(*kms.ListAliasesInput, func(*kms.ListAliasesOutput, bool) bool) error - - ListGrantsRequest(*kms.ListGrantsInput) (*request.Request, *kms.ListGrantsResponse) - - ListGrants(*kms.ListGrantsInput) (*kms.ListGrantsResponse, error) - - ListGrantsPages(*kms.ListGrantsInput, func(*kms.ListGrantsResponse, bool) bool) error - - ListKeyPoliciesRequest(*kms.ListKeyPoliciesInput) (*request.Request, *kms.ListKeyPoliciesOutput) - - ListKeyPolicies(*kms.ListKeyPoliciesInput) (*kms.ListKeyPoliciesOutput, error) - - ListKeyPoliciesPages(*kms.ListKeyPoliciesInput, func(*kms.ListKeyPoliciesOutput, bool) bool) error - - ListKeysRequest(*kms.ListKeysInput) (*request.Request, *kms.ListKeysOutput) - - ListKeys(*kms.ListKeysInput) (*kms.ListKeysOutput, error) - - ListKeysPages(*kms.ListKeysInput, func(*kms.ListKeysOutput, bool) bool) error - - ListRetirableGrantsRequest(*kms.ListRetirableGrantsInput) (*request.Request, *kms.ListGrantsResponse) - - ListRetirableGrants(*kms.ListRetirableGrantsInput) (*kms.ListGrantsResponse, error) - - PutKeyPolicyRequest(*kms.PutKeyPolicyInput) (*request.Request, *kms.PutKeyPolicyOutput) - - PutKeyPolicy(*kms.PutKeyPolicyInput) (*kms.PutKeyPolicyOutput, error) - - ReEncryptRequest(*kms.ReEncryptInput) (*request.Request, *kms.ReEncryptOutput) - - ReEncrypt(*kms.ReEncryptInput) (*kms.ReEncryptOutput, error) - - RetireGrantRequest(*kms.RetireGrantInput) (*request.Request, *kms.RetireGrantOutput) - - RetireGrant(*kms.RetireGrantInput) (*kms.RetireGrantOutput, error) - - RevokeGrantRequest(*kms.RevokeGrantInput) (*request.Request, *kms.RevokeGrantOutput) - - RevokeGrant(*kms.RevokeGrantInput) (*kms.RevokeGrantOutput, error) - - ScheduleKeyDeletionRequest(*kms.ScheduleKeyDeletionInput) (*request.Request, *kms.ScheduleKeyDeletionOutput) - - ScheduleKeyDeletion(*kms.ScheduleKeyDeletionInput) (*kms.ScheduleKeyDeletionOutput, error) - - UpdateAliasRequest(*kms.UpdateAliasInput) (*request.Request, *kms.UpdateAliasOutput) - - UpdateAlias(*kms.UpdateAliasInput) (*kms.UpdateAliasOutput, error) - - UpdateKeyDescriptionRequest(*kms.UpdateKeyDescriptionInput) (*request.Request, *kms.UpdateKeyDescriptionOutput) - - UpdateKeyDescription(*kms.UpdateKeyDescriptionInput) (*kms.UpdateKeyDescriptionOutput, error) -} - -var _ KMSAPI = (*kms.KMS)(nil) diff --git a/vendor/github.com/aws/aws-sdk-go/service/kms/service.go b/vendor/github.com/aws/aws-sdk-go/service/kms/service.go index 46d6cd2c0556..3dc53b429761 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/kms/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/kms/service.go @@ -119,10 +119,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 a23f7533ea29..cf47fa688caa 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 @@ -2645,9 +2645,8 @@ func (c *RDS) RestoreDBInstanceFromDBSnapshotRequest(input *RestoreDBInstanceFro } // Creates a new DB instance from a DB snapshot. The target database is created -// from the source database restore point with the most of original configuration, -// but in a system chosen availability zone with the default security group, -// the default subnet group, and the default DB parameter group. By default, +// from the source database restore point with the most of original configuration +// with the default security group and the default DB parameter group. By default, // the new DB instance is created as a single-AZ deployment except when the // instance is a SQL Server instance that has an option group that is associated // with mirroring; in this case, the instance becomes a mirrored AZ deployment @@ -2690,10 +2689,13 @@ func (c *RDS) RestoreDBInstanceToPointInTimeRequest(input *RestoreDBInstanceToPo return } -// Restores a DB instance to an arbitrary point-in-time. Users can restore to -// any point in time before the LatestRestorableTime for up to BackupRetentionPeriod -// days. The target database is created with the most of original configuration, -// but in a system chosen availability zone with the default security group, +// Restores a DB instance to an arbitrary point in time. You can restore to +// any point in time before the time identified by the LatestRestorableTime +// property. You can restore to a point up to the number of days specified by +// the BackupRetentionPeriod property. +// +// The target database is created with most of the original configuration, +// but in a system-selected availability zone, with the default security group, // the default subnet group, and the default DB parameter group. By default, // the new DB instance is created as a single-AZ deployment except when the // instance is a SQL Server instance that has an option group that is associated @@ -3150,6 +3152,23 @@ type CopyDBSnapshotInput struct { // otherwise false. The default is false. CopyTags *bool `type:"boolean"` + // The AWS Key Management Service (AWS KMS) key identifier for an encrypted + // DB snapshot. The KMS key identifier is the Amazon Resource Name (ARN) or + // the KMS key alias for the KMS encryption key. + // + // If you copy an unencrypted DB snapshot and specify a value for the KmsKeyId + // parameter, Amazon RDS encrypts the target DB snapshot using the specified + // KMS encryption key. + // + // If you copy an encrypted DB snapshot from your AWS account, you can specify + // a value for KmsKeyId to encrypt the copy with a new KMS encryption key. If + // you don't specify a value for KmsKeyId then the copy of the DB snapshot is + // encrypted with the same KMS key as the source DB snapshot. + // + // If you copy an encrypted DB snapshot that is shared from another AWS account, + // then you must specify a value for KmsKeyId. + KmsKeyId *string `type:"string"` + // The identifier for the source DB snapshot. // // If you are copying from a shared manual DB snapshot, this must be the ARN @@ -3802,7 +3821,10 @@ type CreateDBInstanceInput struct { // The amount of Provisioned IOPS (input/output operations per second) to be // initially allocated for the DB instance. // - // Constraints: To use PIOPS, this value must be an integer greater than 1000. + // Constraints: Must be a multiple between 3 and 10 of the storage amount for + // the DB instance. Must also be an integer multiple of 1000. For example, if + // the size of your DB instance is 500 GB, then your Iops value can be 2000, + // 3000, 4000, or 5000. Iops *int64 `type:"integer"` // The KMS key identifier for an encrypted DB instance. @@ -4622,9 +4644,9 @@ type DBCluster struct { // same name is returned for the life of the DB cluster. DatabaseName *string `type:"string"` - // If StorageEncrypted is true, the region-unique, immutable identifier for - // the encrypted DB cluster. This identifier is found in AWS CloudTrail log - // entries whenever the KMS key for the DB cluster is accessed. + // The region-unique, immutable identifier for the DB cluster. This identifier + // is found in AWS CloudTrail log entries whenever the KMS key for the DB cluster + // is accessed. DbClusterResourceId *string `type:"string"` // Specifies the earliest time to which a database can be restored with point-in-time @@ -4984,9 +5006,9 @@ type DBInstance struct { // part of a DB cluster, this can be a different port than the DB cluster port. DbInstancePort *int64 `type:"integer"` - // If StorageEncrypted is true, the region-unique, immutable identifier for - // the encrypted DB instance. This identifier is found in AWS CloudTrail log - // entries whenever the KMS key for the DB instance is accessed. + // The region-unique, immutable identifier for the DB instance. This identifier + // is found in AWS CloudTrail log entries whenever the KMS key for the DB instance + // is accessed. DbiResourceId *string `type:"string"` // Specifies the connection endpoint. @@ -8990,8 +9012,9 @@ type OptionGroupMembership struct { // The name of the option group that the instance belongs to. OptionGroupName *string `type:"string"` - // The status of the DB instance's option group membership (e.g. in-sync, pending, - // pending-maintenance, applying). + // The status of the DB instance's option group membership. Valid values are: + // in-sync, pending-apply, pending-removal, pending-maintenance-apply, pending-maintenance-removal, + // applying, removing, and failed. Status *string `type:"string"` } diff --git a/vendor/github.com/aws/aws-sdk-go/service/route53/api.go b/vendor/github.com/aws/aws-sdk-go/service/route53/api.go index ee93d72ba9f7..04747eae32f8 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/route53/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/route53/api.go @@ -32,12 +32,12 @@ func (c *Route53) AssociateVPCWithHostedZoneRequest(input *AssociateVPCWithHoste // This action associates a VPC with an hosted zone. // -// To associate a VPC with an hosted zone, send a POST request to the 2013-04-01/hostedzone/hosted -// zone ID/associatevpc resource. The request body must include an XML document -// with a AssociateVPCWithHostedZoneRequest element. The response returns the -// AssociateVPCWithHostedZoneResponse element that contains ChangeInfo for you -// to track the progress of the AssociateVPCWithHostedZoneRequest you made. -// See GetChange operation for how to track the progress of your change. +// To associate a VPC with an hosted zone, send a POST request to the /Route +// 53 API version/hostedzone/hosted zone ID/associatevpc resource. The request +// body must include a document with a AssociateVPCWithHostedZoneRequest element. +// The response returns the AssociateVPCWithHostedZoneResponse element that +// contains ChangeInfo for you to track the progress of the AssociateVPCWithHostedZoneRequest +// you made. See GetChange operation for how to track the progress of your change. func (c *Route53) AssociateVPCWithHostedZone(input *AssociateVPCWithHostedZoneInput) (*AssociateVPCWithHostedZoneOutput, error) { req, out := c.AssociateVPCWithHostedZoneRequest(input) err := req.Send() @@ -65,13 +65,13 @@ func (c *Route53) ChangeResourceRecordSetsRequest(input *ChangeResourceRecordSet } // Use this action to create or change your authoritative DNS information. To -// use this action, send a POST request to the 2013-04-01/hostedzone/hosted -// Zone ID/rrset resource. The request body must include an XML document with -// a ChangeResourceRecordSetsRequest element. +// use this action, send a POST request to the /Route 53 API version/hostedzone/hosted +// Zone ID/rrset resource. The request body must include a document with a ChangeResourceRecordSetsRequest +// element. // // Changes are a list of change items and are considered transactional. For // more information on transactional changes, also known as change batches, -// see POST ChangeResourceRecordSets (http://docs.aws.amazon.com/Route53/latest/APIReference/) +// see POST ChangeResourceRecordSets (http://docs.aws.amazon.com/Route53/latest/APIReference/API_ChangeResourceRecordSets.html) // in the Amazon Route 53 API Reference. // // Due to the nature of transactional changes, you cannot delete the same resource @@ -143,8 +143,8 @@ func (c *Route53) CreateHealthCheckRequest(input *CreateHealthCheckInput) (req * // This action creates a new health check. // -// To create a new health check, send a POST request to the 2013-04-01/healthcheck -// resource. The request body must include an XML document with a CreateHealthCheckRequest +// To create a new health check, send a POST request to the /Route 53 API version/healthcheck +// resource. The request body must include a document with a CreateHealthCheckRequest // element. The response returns the CreateHealthCheckResponse element that // contains metadata about the health check. func (c *Route53) CreateHealthCheck(input *CreateHealthCheckInput) (*CreateHealthCheckOutput, error) { @@ -175,8 +175,8 @@ func (c *Route53) CreateHostedZoneRequest(input *CreateHostedZoneInput) (req *re // This action creates a new hosted zone. // -// To create a new hosted zone, send a POST request to the 2013-04-01/hostedzone -// resource. The request body must include an XML document with a CreateHostedZoneRequest +// To create a new hosted zone, send a POST request to the /Route 53 API version/hostedzone +// resource. The request body must include a document with a CreateHostedZoneRequest // element. The response returns the CreateHostedZoneResponse element that contains // metadata about the hosted zone. // @@ -223,10 +223,11 @@ func (c *Route53) CreateReusableDelegationSetRequest(input *CreateReusableDelega // This action creates a reusable delegationSet. // -// To create a new reusable delegationSet, send a POST request to the 2013-04-01/delegationset -// resource. The request body must include an XML document with a CreateReusableDelegationSetRequest -// element. The response returns the CreateReusableDelegationSetResponse element -// that contains metadata about the delegationSet. +// To create a new reusable delegationSet, send a POST request to the /Route +// 53 API version/delegationset resource. The request body must include a document +// with a CreateReusableDelegationSetRequest element. The response returns the +// CreateReusableDelegationSetResponse element that contains metadata about +// the delegationSet. // // If the optional parameter HostedZoneId is specified, it marks the delegationSet // associated with that particular hosted zone as reusable. @@ -260,8 +261,8 @@ func (c *Route53) CreateTrafficPolicyRequest(input *CreateTrafficPolicyInput) (r // sets for one domain name (such as example.com) or one subdomain name (such // as www.example.com). // -// To create a traffic policy, send a POST request to the 2013-04-01/trafficpolicy -// resource. The request body must include an XML document with a CreateTrafficPolicyRequest +// To create a traffic policy, send a POST request to the /Route 53 API version/trafficpolicy +// resource. The request body must include a document with a CreateTrafficPolicyRequest // element. The response includes the CreateTrafficPolicyResponse element, which // contains information about the new traffic policy. func (c *Route53) CreateTrafficPolicy(input *CreateTrafficPolicyInput) (*CreateTrafficPolicyOutput, error) { @@ -297,10 +298,11 @@ func (c *Route53) CreateTrafficPolicyInstanceRequest(input *CreateTrafficPolicyI // responds to DNS queries for the domain or subdomain name by using the resource // record sets that CreateTrafficPolicyInstance created. // -// To create a traffic policy instance, send a POST request to the 2013-04-01/trafficpolicyinstance -// resource. The request body must include an XML document with a CreateTrafficPolicyRequest -// element. The response returns the CreateTrafficPolicyInstanceResponse element, -// which contains information about the traffic policy instance. +// To create a traffic policy instance, send a POST request to the /Route 53 +// API version/trafficpolicyinstance resource. The request body must include +// a document with a CreateTrafficPolicyRequest element. The response returns +// the CreateTrafficPolicyInstanceResponse element, which contains information +// about the traffic policy instance. func (c *Route53) CreateTrafficPolicyInstance(input *CreateTrafficPolicyInstanceInput) (*CreateTrafficPolicyInstanceOutput, error) { req, out := c.CreateTrafficPolicyInstanceRequest(input) err := req.Send() @@ -334,8 +336,8 @@ func (c *Route53) CreateTrafficPolicyVersionRequest(input *CreateTrafficPolicyVe // You use traffic policies to create multiple DNS resource record sets for // one domain name (such as example.com) or one subdomain name (such as www.example.com). // -// To create a new version, send a POST request to the 2013-04-01/trafficpolicy/ -// resource. The request body includes an XML document with a CreateTrafficPolicyVersionRequest +// To create a new version, send a POST request to the /Route 53 API version/trafficpolicy/ +// resource. The request body includes a document with a CreateTrafficPolicyVersionRequest // element. The response returns the CreateTrafficPolicyVersionResponse element, // which contains information about the new version of the traffic policy. func (c *Route53) CreateTrafficPolicyVersion(input *CreateTrafficPolicyVersionInput) (*CreateTrafficPolicyVersionOutput, error) { @@ -365,7 +367,7 @@ func (c *Route53) DeleteHealthCheckRequest(input *DeleteHealthCheckInput) (req * } // This action deletes a health check. To delete a health check, send a DELETE -// request to the 2013-04-01/healthcheck/health check ID resource. +// request to the /Route 53 API version/healthcheck/health check ID resource. // // You can delete a health check only if there are no resource record sets // associated with this health check. If resource record sets are associated @@ -401,7 +403,7 @@ func (c *Route53) DeleteHostedZoneRequest(input *DeleteHostedZoneInput) (req *re } // This action deletes a hosted zone. To delete a hosted zone, send a DELETE -// request to the 2013-04-01/hostedzone/hosted zone ID resource. +// request to the /Route 53 API version/hostedzone/hosted zone ID resource. // // For more information about deleting a hosted zone, see Deleting a Hosted // Zone (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DeleteHostedZone.html) @@ -441,8 +443,8 @@ func (c *Route53) DeleteReusableDelegationSetRequest(input *DeleteReusableDelega } // This action deletes a reusable delegation set. To delete a reusable delegation -// set, send a DELETE request to the 2013-04-01/delegationset/delegation set -// ID resource. +// set, send a DELETE request to the /Route 53 API version/delegationset/delegation +// set ID resource. // // You can delete a reusable delegation set only if there are no associated // hosted zones. If your reusable delegation set contains associated hosted @@ -477,7 +479,7 @@ func (c *Route53) DeleteTrafficPolicyRequest(input *DeleteTrafficPolicyInput) (r } // Deletes a traffic policy. To delete a traffic policy, send a DELETE request -// to the 2013-04-01/trafficpolicy resource. +// to the /Route 53 API version/trafficpolicy resource. func (c *Route53) DeleteTrafficPolicy(input *DeleteTrafficPolicyInput) (*DeleteTrafficPolicyOutput, error) { req, out := c.DeleteTrafficPolicyRequest(input) err := req.Send() @@ -507,8 +509,8 @@ func (c *Route53) DeleteTrafficPolicyInstanceRequest(input *DeleteTrafficPolicyI // Deletes a traffic policy instance and all of the resource record sets that // Amazon Route 53 created when you created the instance. // -// To delete a traffic policy instance, send a DELETE request to the 2013-04-01/trafficpolicy/traffic -// policy instance ID resource. +// To delete a traffic policy instance, send a DELETE request to the /Route +// 53 API version/trafficpolicy/traffic policy instance ID resource. // // When you delete a traffic policy instance, Amazon Route 53 also deletes // all of the resource record sets that were created when you created the traffic @@ -541,11 +543,11 @@ func (c *Route53) DisassociateVPCFromHostedZoneRequest(input *DisassociateVPCFro // This action disassociates a VPC from an hosted zone. // -// To disassociate a VPC to a hosted zone, send a POST request to the 2013-04-01/hostedzone/hosted -// zone ID/disassociatevpc resource. The request body must include an XML document -// with a DisassociateVPCFromHostedZoneRequest element. The response returns -// the DisassociateVPCFromHostedZoneResponse element that contains ChangeInfo -// for you to track the progress of the DisassociateVPCFromHostedZoneRequest +// To disassociate a VPC to a hosted zone, send a POST request to the /Route +// 53 API version/hostedzone/hosted zone ID/disassociatevpc resource. The request +// body must include a document with a DisassociateVPCFromHostedZoneRequest +// element. The response returns the DisassociateVPCFromHostedZoneResponse element +// that contains ChangeInfo for you to track the progress of the DisassociateVPCFromHostedZoneRequest // you made. See GetChange operation for how to track the progress of your change. func (c *Route53) DisassociateVPCFromHostedZone(input *DisassociateVPCFromHostedZoneInput) (*DisassociateVPCFromHostedZoneOutput, error) { req, out := c.DisassociateVPCFromHostedZoneRequest(input) @@ -592,6 +594,9 @@ const opGetChangeDetails = "GetChangeDetails" // GetChangeDetailsRequest generates a request for the GetChangeDetails operation. func (c *Route53) GetChangeDetailsRequest(input *GetChangeDetailsInput) (req *request.Request, output *GetChangeDetailsOutput) { + if c.Client.Config.Logger != nil { + c.Client.Config.Logger.Log("This operation, GetChangeDetails, has been deprecated") + } op := &request.Operation{ Name: opGetChangeDetails, HTTPMethod: "GET", @@ -636,9 +641,10 @@ func (c *Route53) GetCheckerIpRangesRequest(input *GetCheckerIpRangesInput) (req } // To retrieve a list of the IP ranges used by Amazon Route 53 health checkers -// to check the health of your resources, send a GET request to the 2013-04-01/checkeripranges -// resource. You can use these IP addresses to configure router and firewall -// rules to allow health checkers to check the health of your resources. +// to check the health of your resources, send a GET request to the /Route 53 +// API version/checkeripranges resource. You can use these IP addresses to configure +// router and firewall rules to allow health checkers to check the health of +// your resources. func (c *Route53) GetCheckerIpRanges(input *GetCheckerIpRangesInput) (*GetCheckerIpRangesOutput, error) { req, out := c.GetCheckerIpRangesRequest(input) err := req.Send() @@ -665,9 +671,9 @@ func (c *Route53) GetGeoLocationRequest(input *GetGeoLocationInput) (req *reques return } -// To retrieve a single geo location, send a GET request to the 2013-04-01/geolocation -// resource with one of these options: continentcode | countrycode | countrycode -// and subdivisioncode. +// To retrieve a single geo location, send a GET request to the /Route 53 API +// version/geolocation resource with one of these options: continentcode | countrycode +// | countrycode and subdivisioncode. func (c *Route53) GetGeoLocation(input *GetGeoLocationInput) (*GetGeoLocationOutput, error) { req, out := c.GetGeoLocationRequest(input) err := req.Send() @@ -694,7 +700,7 @@ func (c *Route53) GetHealthCheckRequest(input *GetHealthCheckInput) (req *reques return } -// To retrieve the health check, send a GET request to the 2013-04-01/healthcheck/health +// To retrieve the health check, send a GET request to the /Route 53 API version/healthcheck/health // check ID resource. func (c *Route53) GetHealthCheck(input *GetHealthCheckInput) (*GetHealthCheckOutput, error) { req, out := c.GetHealthCheckRequest(input) @@ -723,7 +729,7 @@ func (c *Route53) GetHealthCheckCountRequest(input *GetHealthCheckCountInput) (r } // To retrieve a count of all your health checks, send a GET request to the -// 2013-04-01/healthcheckcount resource. +// /Route 53 API version/healthcheckcount resource. func (c *Route53) GetHealthCheckCount(input *GetHealthCheckCountInput) (*GetHealthCheckCountOutput, error) { req, out := c.GetHealthCheckCountRequest(input) err := req.Send() @@ -752,8 +758,8 @@ func (c *Route53) GetHealthCheckLastFailureReasonRequest(input *GetHealthCheckLa // If you want to learn why a health check is currently failing or why it failed // most recently (if at all), you can get the failure reason for the most recent -// failure. Send a GET request to the 2013-04-01/healthcheck/health check ID/lastfailurereason -// resource. +// failure. Send a GET request to the /Route 53 API version/healthcheck/health +// check ID/lastfailurereason resource. func (c *Route53) GetHealthCheckLastFailureReason(input *GetHealthCheckLastFailureReasonInput) (*GetHealthCheckLastFailureReasonOutput, error) { req, out := c.GetHealthCheckLastFailureReasonRequest(input) err := req.Send() @@ -780,9 +786,9 @@ func (c *Route53) GetHealthCheckStatusRequest(input *GetHealthCheckStatusInput) return } -// To retrieve the health check status, send a GET request to the 2013-04-01/healthcheck/health -// check ID/status resource. You can use this call to get a health check's current -// status. +// To retrieve the health check status, send a GET request to the /Route 53 +// API version/healthcheck/health check ID/status resource. You can use this +// call to get a health check's current status. func (c *Route53) GetHealthCheckStatus(input *GetHealthCheckStatusInput) (*GetHealthCheckStatusOutput, error) { req, out := c.GetHealthCheckStatusRequest(input) err := req.Send() @@ -810,9 +816,9 @@ func (c *Route53) GetHostedZoneRequest(input *GetHostedZoneInput) (req *request. } // To retrieve the delegation set for a hosted zone, send a GET request to the -// 2013-04-01/hostedzone/hosted zone ID resource. The delegation set is the -// four Amazon Route 53 name servers that were assigned to the hosted zone when -// you created it. +// /Route 53 API version/hostedzone/hosted zone ID resource. The delegation +// set is the four Amazon Route 53 name servers that were assigned to the hosted +// zone when you created it. func (c *Route53) GetHostedZone(input *GetHostedZoneInput) (*GetHostedZoneOutput, error) { req, out := c.GetHostedZoneRequest(input) err := req.Send() @@ -839,8 +845,8 @@ func (c *Route53) GetHostedZoneCountRequest(input *GetHostedZoneCountInput) (req return } -// To retrieve a count of all your hosted zones, send a GET request to the 2013-04-01/hostedzonecount -// resource. +// To retrieve a count of all your hosted zones, send a GET request to the /Route +// 53 API version/hostedzonecount resource. func (c *Route53) GetHostedZoneCount(input *GetHostedZoneCountInput) (*GetHostedZoneCountOutput, error) { req, out := c.GetHostedZoneCountRequest(input) err := req.Send() @@ -867,8 +873,8 @@ func (c *Route53) GetReusableDelegationSetRequest(input *GetReusableDelegationSe return } -// To retrieve the reusable delegation set, send a GET request to the 2013-04-01/delegationset/delegation -// set ID resource. +// To retrieve the reusable delegation set, send a GET request to the /Route +// 53 API version/delegationset/delegation set ID resource. func (c *Route53) GetReusableDelegationSet(input *GetReusableDelegationSetInput) (*GetReusableDelegationSetOutput, error) { req, out := c.GetReusableDelegationSetRequest(input) err := req.Send() @@ -896,7 +902,7 @@ func (c *Route53) GetTrafficPolicyRequest(input *GetTrafficPolicyInput) (req *re } // Gets information about a specific traffic policy version. To get the information, -// send a GET request to the 2013-04-01/trafficpolicy resource. +// send a GET request to the /Route 53 API version/trafficpolicy resource. func (c *Route53) GetTrafficPolicy(input *GetTrafficPolicyInput) (*GetTrafficPolicyOutput, error) { req, out := c.GetTrafficPolicyRequest(input) err := req.Send() @@ -926,7 +932,7 @@ func (c *Route53) GetTrafficPolicyInstanceRequest(input *GetTrafficPolicyInstanc // Gets information about a specified traffic policy instance. // // To get information about the traffic policy instance, send a GET request -// to the 2013-04-01/trafficpolicyinstance resource. +// to the /Route 53 API version/trafficpolicyinstance resource. // // After you submit a CreateTrafficPolicyInstance or an UpdateTrafficPolicyInstance // request, there's a brief delay while Amazon Route 53 creates the resource @@ -962,7 +968,7 @@ func (c *Route53) GetTrafficPolicyInstanceCountRequest(input *GetTrafficPolicyIn // current AWS account. // // To get the number of traffic policy instances, send a GET request to the -// 2013-04-01/trafficpolicyinstancecount resource. +// /Route 53 API version/trafficpolicyinstancecount resource. func (c *Route53) GetTrafficPolicyInstanceCount(input *GetTrafficPolicyInstanceCountInput) (*GetTrafficPolicyInstanceCountOutput, error) { req, out := c.GetTrafficPolicyInstanceCountRequest(input) err := req.Send() @@ -973,6 +979,9 @@ const opListChangeBatchesByHostedZone = "ListChangeBatchesByHostedZone" // ListChangeBatchesByHostedZoneRequest generates a request for the ListChangeBatchesByHostedZone operation. func (c *Route53) ListChangeBatchesByHostedZoneRequest(input *ListChangeBatchesByHostedZoneInput) (req *request.Request, output *ListChangeBatchesByHostedZoneOutput) { + if c.Client.Config.Logger != nil { + c.Client.Config.Logger.Log("This operation, ListChangeBatchesByHostedZone, has been deprecated") + } op := &request.Operation{ Name: opListChangeBatchesByHostedZone, HTTPMethod: "GET", @@ -1001,6 +1010,9 @@ const opListChangeBatchesByRRSet = "ListChangeBatchesByRRSet" // ListChangeBatchesByRRSetRequest generates a request for the ListChangeBatchesByRRSet operation. func (c *Route53) ListChangeBatchesByRRSetRequest(input *ListChangeBatchesByRRSetInput) (req *request.Request, output *ListChangeBatchesByRRSetOutput) { + if c.Client.Config.Logger != nil { + c.Client.Config.Logger.Log("This operation, ListChangeBatchesByRRSet, has been deprecated") + } op := &request.Operation{ Name: opListChangeBatchesByRRSet, HTTPMethod: "GET", @@ -1046,8 +1058,8 @@ func (c *Route53) ListGeoLocationsRequest(input *ListGeoLocationsInput) (req *re } // To retrieve a list of supported geo locations, send a GET request to the -// 2013-04-01/geolocations resource. The response to this request includes a -// GeoLocationDetailsList element with zero, one, or multiple GeoLocationDetails +// /Route 53 API version/geolocations resource. The response to this request +// includes a GeoLocationDetailsList element with zero, one, or multiple GeoLocationDetails // child elements. The list is sorted by country code, and then subdivision // code, followed by continents at the end of the list. // @@ -1090,12 +1102,13 @@ func (c *Route53) ListHealthChecksRequest(input *ListHealthChecksInput) (req *re return } -// To retrieve a list of your health checks, send a GET request to the 2013-04-01/healthcheck -// resource. The response to this request includes a HealthChecks element with -// zero, one, or multiple HealthCheck child elements. By default, the list of -// health checks is displayed on a single page. You can control the length of -// the page that is displayed by using the MaxItems parameter. You can use the -// Marker parameter to control the health check that the list begins with. +// To retrieve a list of your health checks, send a GET request to the /Route +// 53 API version/healthcheck resource. The response to this request includes +// a HealthChecks element with zero, one, or multiple HealthCheck child elements. +// By default, the list of health checks is displayed on a single page. You +// can control the length of the page that is displayed by using the MaxItems +// parameter. You can use the Marker parameter to control the health check that +// the list begins with. // // Amazon Route 53 returns a maximum of 100 items. If you set MaxItems to // a value greater than 100, Amazon Route 53 returns only the first 100. @@ -1139,12 +1152,13 @@ func (c *Route53) ListHostedZonesRequest(input *ListHostedZonesInput) (req *requ return } -// To retrieve a list of your hosted zones, send a GET request to the 2013-04-01/hostedzone -// resource. The response to this request includes a HostedZones element with -// zero, one, or multiple HostedZone child elements. By default, the list of -// hosted zones is displayed on a single page. You can control the length of -// the page that is displayed by using the MaxItems parameter. You can use the -// Marker parameter to control the hosted zone that the list begins with. +// To retrieve a list of your hosted zones, send a GET request to the /Route +// 53 API version/hostedzone resource. The response to this request includes +// a HostedZones element with zero, one, or multiple HostedZone child elements. +// By default, the list of hosted zones is displayed on a single page. You can +// control the length of the page that is displayed by using the MaxItems parameter. +// You can use the Marker parameter to control the hosted zone that the list +// begins with. // // Amazon Route 53 returns a maximum of 100 items. If you set MaxItems to // a value greater than 100, Amazon Route 53 returns only the first 100. @@ -1183,13 +1197,13 @@ func (c *Route53) ListHostedZonesByNameRequest(input *ListHostedZonesByNameInput } // To retrieve a list of your hosted zones in lexicographic order, send a GET -// request to the 2013-04-01/hostedzonesbyname resource. The response to this -// request includes a HostedZones element with zero or more HostedZone child -// elements lexicographically ordered by DNS name. By default, the list of hosted -// zones is displayed on a single page. You can control the length of the page -// that is displayed by using the MaxItems parameter. You can use the DNSName -// and HostedZoneId parameters to control the hosted zone that the list begins -// with. +// request to the /Route 53 API version/hostedzonesbyname resource. The response +// to this request includes a HostedZones element with zero or more HostedZone +// child elements lexicographically ordered by DNS name. By default, the list +// of hosted zones is displayed on a single page. You can control the length +// of the page that is displayed by using the MaxItems parameter. You can use +// the DNSName and HostedZoneId parameters to control the hosted zone that the +// list begins with. // // Amazon Route 53 returns a maximum of 100 items. If you set MaxItems to // a value greater than 100, Amazon Route 53 returns only the first 100. @@ -1298,12 +1312,12 @@ func (c *Route53) ListReusableDelegationSetsRequest(input *ListReusableDelegatio } // To retrieve a list of your reusable delegation sets, send a GET request to -// the 2013-04-01/delegationset resource. The response to this request includes -// a DelegationSets element with zero, one, or multiple DelegationSet child -// elements. By default, the list of delegation sets is displayed on a single -// page. You can control the length of the page that is displayed by using the -// MaxItems parameter. You can use the Marker parameter to control the delegation -// set that the list begins with. +// the /Route 53 API version/delegationset resource. The response to this request +// includes a DelegationSets element with zero, one, or multiple DelegationSet +// child elements. By default, the list of delegation sets is displayed on a +// single page. You can control the length of the page that is displayed by +// using the MaxItems parameter. You can use the Marker parameter to control +// the delegation set that the list begins with. // // Amazon Route 53 returns a maximum of 100 items. If you set MaxItems to // a value greater than 100, Amazon Route 53 returns only the first 100. @@ -1387,7 +1401,7 @@ func (c *Route53) ListTrafficPoliciesRequest(input *ListTrafficPoliciesInput) (r // Gets information about the latest version for every traffic policy that is // associated with the current AWS account. To get the information, send a GET -// request to the 2013-04-01/trafficpolicy resource. +// request to the /Route 53 API version/trafficpolicy resource. // // Amazon Route 53 returns a maximum of 100 items in each response. If you // have a lot of traffic policies, you can use the maxitems parameter to list @@ -1446,7 +1460,7 @@ func (c *Route53) ListTrafficPolicyInstancesRequest(input *ListTrafficPolicyInst // delay while Amazon Route 53 creates the resource record sets that are specified // in the traffic policy definition. For more information, see the State response // element. To get information about the traffic policy instances that are associated -// with the current AWS account, send a GET request to the 2013-04-01/trafficpolicyinstance +// with the current AWS account, send a GET request to the /Route 53 API version/trafficpolicyinstance // resource. // // Amazon Route 53 returns a maximum of 100 items in each response. If you @@ -1505,7 +1519,7 @@ func (c *Route53) ListTrafficPolicyInstancesByHostedZoneRequest(input *ListTraff // delay while Amazon Route 53 creates the resource record sets that are specified // in the traffic policy definition. For more information, see the State response // element. To get information about the traffic policy instances that you created -// in a specified hosted zone, send a GET request to the 2013-04-01/trafficpolicyinstance +// in a specified hosted zone, send a GET request to the /Route 53 API version/trafficpolicyinstance // resource and include the ID of the hosted zone. // // Amazon Route 53 returns a maximum of 100 items in each response. If you @@ -1565,8 +1579,8 @@ func (c *Route53) ListTrafficPolicyInstancesByPolicyRequest(input *ListTrafficPo // record sets that are specified in the traffic policy definition. For more // information, see the State response element. To get information about the // traffic policy instances that you created by using a specify traffic policy -// version, send a GET request to the 2013-04-01/trafficpolicyinstance resource -// and include the ID and version of the traffic policy. +// version, send a GET request to the /Route 53 API version/trafficpolicyinstance +// resource and include the ID and version of the traffic policy. // // Amazon Route 53 returns a maximum of 100 items in each response. If you // have a lot of traffic policy instances, you can use the MaxItems parameter @@ -1672,10 +1686,10 @@ func (c *Route53) UpdateHealthCheckRequest(input *UpdateHealthCheckInput) (req * // This action updates an existing health check. // -// To update a health check, send a POST request to the 2013-04-01/healthcheck/health -// check ID resource. The request body must include an XML document with an -// UpdateHealthCheckRequest element. The response returns an UpdateHealthCheckResponse -// element, which contains metadata about the health check. +// To update a health check, send a POST request to the /Route 53 API version/healthcheck/health +// check ID resource. The request body must include a document with an UpdateHealthCheckRequest +// element. The response returns an UpdateHealthCheckResponse element, which +// contains metadata about the health check. func (c *Route53) UpdateHealthCheck(input *UpdateHealthCheckInput) (*UpdateHealthCheckOutput, error) { req, out := c.UpdateHealthCheckRequest(input) err := req.Send() @@ -1702,9 +1716,10 @@ func (c *Route53) UpdateHostedZoneCommentRequest(input *UpdateHostedZoneCommentI return } -// To update the hosted zone comment, send a POST request to the 2013-04-01/hostedzone/hosted -// zone ID resource. The request body must include an XML document with a UpdateHostedZoneCommentRequest -// element. The response to this request includes the modified HostedZone element. +// To update the hosted zone comment, send a POST request to the /Route 53 API +// version/hostedzone/hosted zone ID resource. The request body must include +// a document with a UpdateHostedZoneCommentRequest element. The response to +// this request includes the modified HostedZone element. // // The comment can have a maximum length of 256 characters. func (c *Route53) UpdateHostedZoneComment(input *UpdateHostedZoneCommentInput) (*UpdateHostedZoneCommentOutput, error) { @@ -1735,10 +1750,10 @@ func (c *Route53) UpdateTrafficPolicyCommentRequest(input *UpdateTrafficPolicyCo // Updates the comment for a specified traffic policy version. // -// To update the comment, send a POST request to the /2013-04-01/trafficpolicy/ +// To update the comment, send a POST request to the /Route 53 API version/trafficpolicy/ // resource. // -// The request body must include an XML document with an UpdateTrafficPolicyCommentRequest +// The request body must include a document with an UpdateTrafficPolicyCommentRequest // element. func (c *Route53) UpdateTrafficPolicyComment(input *UpdateTrafficPolicyCommentInput) (*UpdateTrafficPolicyCommentOutput, error) { req, out := c.UpdateTrafficPolicyCommentRequest(input) @@ -1785,8 +1800,8 @@ func (c *Route53) UpdateTrafficPolicyInstanceRequest(input *UpdateTrafficPolicyI // set name (such as example.com) by using the new resource record sets. Amazon // Route 53 deletes the old group of resource record sets that are associated // with the root resource record set name. To update a traffic policy instance, -// send a POST request to the /2013-04-01/trafficpolicyinstance/traffic policy -// ID resource. The request body must include an XML document with an UpdateTrafficPolicyInstanceRequest +// send a POST request to the /Route 53 API version/trafficpolicyinstance/traffic +// policy ID resource. The request body must include a document with an UpdateTrafficPolicyInstanceRequest // element. func (c *Route53) UpdateTrafficPolicyInstance(input *UpdateTrafficPolicyInstanceInput) (*UpdateTrafficPolicyInstanceOutput, error) { req, out := c.UpdateTrafficPolicyInstanceRequest(input) @@ -1828,16 +1843,20 @@ type AliasTarget struct { // the AWS Management Console, the ELB API, or the AWS CLI. Use the same method // to get values for HostedZoneId and DNSName. If you get one value from the // console and the other value from the API or the CLI, creating the resource - // record set will fail. An Amazon S3 bucket that is configured as a static - // website: Specify the domain name of the Amazon S3 website endpoint in which - // you created the bucket; for example, s3-website-us-east-1.amazonaws.com. - // For more information about valid values, see the table Amazon Simple Storage - // Service (S3) Website Endpoints (http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region) + // record set will fail. An Elastic Beanstalk environment: Specify the CNAME + // attribute for the environment. (The environment must have a regionalized + // domain name.) An Amazon S3 bucket that is configured as a static website: + // Specify the domain name of the Amazon S3 website endpoint in which you created + // the bucket; for example, s3-website-us-east-1.amazonaws.com. For more information + // about valid values, see the table Amazon Simple Storage Service (S3) Website + // Endpoints (http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region) // in the Amazon Web Services General Reference. For more information about // using Amazon S3 buckets for websites, see Hosting a Static Website on Amazon // S3 (http://docs.aws.amazon.com/AmazonS3/latest/dev/WebsiteHosting.html) in - // the Amazon Simple Storage Service Developer Guide. For more information - // and an example, see Example: Creating Alias Resource Record Sets (http://docs.aws.amazon.com/Route53/latest/APIReference/CreateAliasRRSAPI.html) + // the Amazon Simple Storage Service Developer Guide. Another Amazon Route 53 + // resource record set: Specify the value of the Name element for a resource + // record set in the current hosted zone. For more information and an example, + // see Example: Creating Alias Resource Record Sets (http://docs.aws.amazon.com/Route53/latest/APIReference/CreateAliasRRSAPI.html) // in the Amazon Route 53 API Reference. DNSName *string `type:"string" required:"true"` @@ -2031,7 +2050,7 @@ func (s ChangeBatch) GoString() string { // A complex type that lists the changes and information for a ChangeBatch. type ChangeBatchRecord struct { - _ struct{} `type:"structure"` + _ struct{} `deprecated:"true" type:"structure"` // A list of changes made in the ChangeBatch. Changes []*Change `locationNameList:"Change" min:"1" type:"list"` @@ -2869,7 +2888,7 @@ func (s GeoLocationDetails) GoString() string { // The input for a GetChangeDetails request. type GetChangeDetailsInput struct { - _ struct{} `type:"structure"` + _ struct{} `deprecated:"true" type:"structure"` // The ID of the change batch request. The value that you specify here is the // value that ChangeResourceRecordSets returned in the Id element when you submitted @@ -2889,12 +2908,12 @@ func (s GetChangeDetailsInput) GoString() string { // A complex type that contains the ChangeBatchRecord element. type GetChangeDetailsOutput struct { - _ struct{} `type:"structure"` + _ struct{} `deprecated:"true" type:"structure"` // A complex type that contains information about the specified change batch, // including the change batch ID, the status of the change, and the contained // changes. - ChangeBatchRecord *ChangeBatchRecord `type:"structure" required:"true"` + ChangeBatchRecord *ChangeBatchRecord `deprecated:"true" type:"structure" required:"true"` } // String returns the string representation @@ -3038,7 +3057,7 @@ func (s GetGeoLocationOutput) GoString() string { } // To retrieve a count of all your health checks, send a GET request to the -// 2013-04-01/healthcheckcount resource. +// /Route 53 API version/healthcheckcount resource. type GetHealthCheckCountInput struct { _ struct{} `type:"structure"` } @@ -3242,8 +3261,8 @@ func (s GetHealthCheckStatusOutput) GoString() string { return s.String() } -// To retrieve a count of all your hosted zones, send a GET request to the 2013-04-01/hostedzonecount -// resource. +// To retrieve a count of all your hosted zones, send a GET request to the /Route +// 53 API version/hostedzonecount resource. type GetHostedZoneCountInput struct { _ struct{} `type:"structure"` } @@ -3362,8 +3381,8 @@ func (s GetReusableDelegationSetOutput) GoString() string { } // Gets information about a specific traffic policy version. To get the information, -// send a GET request to the 2013-04-01/trafficpolicy resource, and specify -// the ID and the version of the traffic policy. +// send a GET request to the /Route 53 API version/trafficpolicy resource, and +// specify the ID and the version of the traffic policy. type GetTrafficPolicyInput struct { _ struct{} `type:"structure"` @@ -3386,7 +3405,7 @@ func (s GetTrafficPolicyInput) GoString() string { } // To retrieve a count of all your traffic policy instances, send a GET request -// to the 2013-04-01/trafficpolicyinstancecount resource. +// to the /Route 53 API version/trafficpolicyinstancecount resource. type GetTrafficPolicyInstanceCountInput struct { _ struct{} `type:"structure"` } @@ -3424,7 +3443,7 @@ func (s GetTrafficPolicyInstanceCountOutput) GoString() string { // Gets information about a specified traffic policy instance. // // To get information about a traffic policy instance, send a GET request to -// the 2013-04-01/trafficpolicyinstance/Id resource. +// the /Route 53 API version/trafficpolicyinstance/Id resource. type GetTrafficPolicyInstanceInput struct { _ struct{} `type:"structure"` @@ -3516,6 +3535,13 @@ type HealthCheckConfig struct { // associated child health checks. ChildHealthChecks []*string `locationNameList:"ChildHealthCheck" type:"list"` + // Specify whether you want Amazon Route 53 to send the value of FullyQualifiedDomainName + // to the endpoint in the client_hello message during TLS negotiation. If you + // don't specify a value for EnableSNI, Amazon Route 53 defaults to true when + // Type is HTTPS or HTTPS_STR_MATCH and defaults to false when Type is any other + // value. + EnableSNI *bool `type:"boolean"` + // The number of consecutive health checks that an endpoint must pass or fail // for Amazon Route 53 to change the current status of the endpoint from unhealthy // to healthy or vice versa. @@ -3564,7 +3590,8 @@ type HealthCheckConfig struct { ResourcePath *string `type:"string"` // A string to search for in the body of a health check response. Required for - // HTTP_STR_MATCH and HTTPS_STR_MATCH health checks. + // HTTP_STR_MATCH and HTTPS_STR_MATCH health checks. Amazon Route 53 considers + // case when searching for SearchString in the response body. SearchString *string `type:"string"` // The type of health check to be performed. Currently supported types are TCP, @@ -3670,10 +3697,10 @@ func (s HostedZoneConfig) GoString() string { // The input for a ListChangeBatchesByHostedZone request. type ListChangeBatchesByHostedZoneInput struct { - _ struct{} `type:"structure"` + _ struct{} `deprecated:"true" type:"structure"` // The end of the time period you want to see changes for. - EndDate *string `location:"querystring" locationName:"endDate" type:"string" required:"true"` + EndDate *string `location:"querystring" locationName:"endDate" deprecated:"true" type:"string" required:"true"` // The ID of the hosted zone that you want to see changes for. HostedZoneId *string `location:"uri" locationName:"Id" type:"string" required:"true"` @@ -3685,7 +3712,7 @@ type ListChangeBatchesByHostedZoneInput struct { MaxItems *string `location:"querystring" locationName:"maxItems" type:"string"` // The start of the time period you want to see changes for. - StartDate *string `location:"querystring" locationName:"startDate" type:"string" required:"true"` + StartDate *string `location:"querystring" locationName:"startDate" deprecated:"true" type:"string" required:"true"` } // String returns the string representation @@ -3700,10 +3727,10 @@ func (s ListChangeBatchesByHostedZoneInput) GoString() string { // The input for a ListChangeBatchesByHostedZone request. type ListChangeBatchesByHostedZoneOutput struct { - _ struct{} `type:"structure"` + _ struct{} `deprecated:"true" type:"structure"` // The change batches within the given hosted zone and time period. - ChangeBatchRecords []*ChangeBatchRecord `locationNameList:"ChangeBatchRecord" min:"1" type:"list" required:"true"` + ChangeBatchRecords []*ChangeBatchRecord `locationNameList:"ChangeBatchRecord" min:"1" deprecated:"true" type:"list" required:"true"` // A flag that indicates if there are more change batches to list. IsTruncated *bool `type:"boolean"` @@ -3730,10 +3757,10 @@ func (s ListChangeBatchesByHostedZoneOutput) GoString() string { // The input for a ListChangeBatchesByRRSet request. type ListChangeBatchesByRRSetInput struct { - _ struct{} `type:"structure"` + _ struct{} `deprecated:"true" type:"structure"` // The end of the time period you want to see changes for. - EndDate *string `location:"querystring" locationName:"endDate" type:"string" required:"true"` + EndDate *string `location:"querystring" locationName:"endDate" deprecated:"true" type:"string" required:"true"` // The ID of the hosted zone that you want to see changes for. HostedZoneId *string `location:"uri" locationName:"Id" type:"string" required:"true"` @@ -3751,7 +3778,7 @@ type ListChangeBatchesByRRSetInput struct { SetIdentifier *string `location:"querystring" locationName:"identifier" min:"1" type:"string"` // The start of the time period you want to see changes for. - StartDate *string `location:"querystring" locationName:"startDate" type:"string" required:"true"` + StartDate *string `location:"querystring" locationName:"startDate" deprecated:"true" type:"string" required:"true"` // The type of the RRSet that you want to see changes for. Type *string `location:"querystring" locationName:"type" type:"string" required:"true" enum:"RRType"` @@ -3769,10 +3796,10 @@ func (s ListChangeBatchesByRRSetInput) GoString() string { // The input for a ListChangeBatchesByRRSet request. type ListChangeBatchesByRRSetOutput struct { - _ struct{} `type:"structure"` + _ struct{} `deprecated:"true" type:"structure"` // The change batches within the given hosted zone and time period. - ChangeBatchRecords []*ChangeBatchRecord `locationNameList:"ChangeBatchRecord" min:"1" type:"list" required:"true"` + ChangeBatchRecords []*ChangeBatchRecord `locationNameList:"ChangeBatchRecord" min:"1" deprecated:"true" type:"list" required:"true"` // A flag that indicates if there are more change batches to list. IsTruncated *bool `type:"boolean"` @@ -3887,12 +3914,13 @@ func (s ListGeoLocationsOutput) GoString() string { return s.String() } -// To retrieve a list of your health checks, send a GET request to the 2013-04-01/healthcheck -// resource. The response to this request includes a HealthChecks element with -// zero or more HealthCheck child elements. By default, the list of health checks -// is displayed on a single page. You can control the length of the page that -// is displayed by using the MaxItems parameter. You can use the Marker parameter -// to control the health check that the list begins with. +// To retrieve a list of your health checks, send a GET request to the /Route +// 53 API version/healthcheck resource. The response to this request includes +// a HealthChecks element with zero or more HealthCheck child elements. By default, +// the list of health checks is displayed on a single page. You can control +// the length of the page that is displayed by using the MaxItems parameter. +// You can use the Marker parameter to control the health check that the list +// begins with. // // Amazon Route 53 returns a maximum of 100 items. If you set MaxItems to // a value greater than 100, Amazon Route 53 returns only the first 100. @@ -3962,13 +3990,13 @@ func (s ListHealthChecksOutput) GoString() string { } // To retrieve a list of your hosted zones in lexicographic order, send a GET -// request to the 2013-04-01/hostedzonesbyname resource. The response to this -// request includes a HostedZones element with zero or more HostedZone child -// elements lexicographically ordered by DNS name. By default, the list of hosted -// zones is displayed on a single page. You can control the length of the page -// that is displayed by using the MaxItems parameter. You can use the DNSName -// and HostedZoneId parameters to control the hosted zone that the list begins -// with. +// request to the /Route 53 API version/hostedzonesbyname resource. The response +// to this request includes a HostedZones element with zero or more HostedZone +// child elements lexicographically ordered by DNS name. By default, the list +// of hosted zones is displayed on a single page. You can control the length +// of the page that is displayed by using the MaxItems parameter. You can use +// the DNSName and HostedZoneId parameters to control the hosted zone that the +// list begins with. // // For more information about listing hosted zones, see Listing the Hosted // Zones for an AWS Account (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/ListInfoOnHostedZone.html) @@ -4057,14 +4085,14 @@ func (s ListHostedZonesByNameOutput) GoString() string { return s.String() } -// To retrieve a list of your hosted zones, send a GET request to the 2013-04-01/hostedzone -// resource. The response to this request includes a HostedZones element with -// zero or more HostedZone child elements. By default, the list of hosted zones -// is displayed on a single page. You can control the length of the page that -// is displayed by using the MaxItems parameter. You can use the Marker parameter -// to control the hosted zone that the list begins with. For more information -// about listing hosted zones, see Listing the Hosted Zones for an AWS Account -// (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/ListInfoOnHostedZone.html) +// To retrieve a list of your hosted zones, send a GET request to the /Route +// 53 API version/hostedzone resource. The response to this request includes +// a HostedZones element with zero or more HostedZone child elements. By default, +// the list of hosted zones is displayed on a single page. You can control the +// length of the page that is displayed by using the MaxItems parameter. You +// can use the Marker parameter to control the hosted zone that the list begins +// with. For more information about listing hosted zones, see Listing the Hosted +// Zones for an AWS Account (http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/ListInfoOnHostedZone.html) // in the Amazon Route 53 Developer Guide. // // Amazon Route 53 returns a maximum of 100 items. If you set MaxItems to @@ -4230,8 +4258,8 @@ func (s ListResourceRecordSetsOutput) GoString() string { } // To retrieve a list of your reusable delegation sets, send a GET request to -// the 2013-04-01/delegationset resource. The response to this request includes -// a DelegationSets element with zero or more DelegationSet child elements. +// the /Route 53 API version/delegationset resource. The response to this request +// includes a DelegationSets element with zero or more DelegationSet child elements. // By default, the list of reusable delegation sets is displayed on a single // page. You can control the length of the page that is displayed by using the // MaxItems parameter. You can use the Marker parameter to control the delegation @@ -5283,6 +5311,15 @@ type UpdateHealthCheckInput struct { // Specify this value only if you want to change it. ChildHealthChecks []*string `locationNameList:"ChildHealthCheck" type:"list"` + // Specify whether you want Amazon Route 53 to send the value of FullyQualifiedDomainName + // to the endpoint in the client_hello message during TLS negotiation. If you + // don't specify a value for EnableSNI, Amazon Route 53 defaults to true when + // Type is HTTPS or HTTPS_STR_MATCH and defaults to false when Type is any other + // value. + // + // Specify this value only if you want to change it. + EnableSNI *bool `type:"boolean"` + // The number of consecutive health checks that an endpoint must pass or fail // for Amazon Route 53 to change the current status of the endpoint from unhealthy // to healthy or vice versa. @@ -5344,7 +5381,8 @@ type UpdateHealthCheckInput struct { // If the value of Type is HTTP_STR_MATCH or HTTP_STR_MATCH, the string that // you want Amazon Route 53 to search for in the response body from the specified // resource. If the string appears in the response body, Amazon Route 53 considers - // the resource healthy. + // the resource healthy. Amazon Route 53 considers case when searching for SearchString + // in the response body. // // Specify this value only if you want to change it. SearchString *string `type:"string"` @@ -5610,6 +5648,8 @@ const ( // @enum ResourceRecordSetRegion ResourceRecordSetRegionApNortheast1 = "ap-northeast-1" // @enum ResourceRecordSetRegion + ResourceRecordSetRegionApNortheast2 = "ap-northeast-2" + // @enum ResourceRecordSetRegion ResourceRecordSetRegionSaEast1 = "sa-east-1" // @enum ResourceRecordSetRegion ResourceRecordSetRegionCnNorth1 = "cn-north-1" @@ -5640,6 +5680,8 @@ const ( // @enum VPCRegion VPCRegionApNortheast1 = "ap-northeast-1" // @enum VPCRegion + VPCRegionApNortheast2 = "ap-northeast-2" + // @enum VPCRegion VPCRegionSaEast1 = "sa-east-1" // @enum VPCRegion VPCRegionCnNorth1 = "cn-north-1"