From 43341e41ffc2b62da6d57dcc707f23e53c03d0ff Mon Sep 17 00:00:00 2001 From: James Nugent Date: Thu, 24 Mar 2016 15:52:51 -0700 Subject: [PATCH] deps: Update github.com/aws/aws-sdk-go --- Godeps/Godeps.json | 230 +++++++++--------- .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../private/endpoints/endpoints.json | 9 +- .../private/endpoints/endpoints_map.go | 9 +- .../private/protocol/ec2query/unmarshal.go | 2 +- .../aws/aws-sdk-go/service/ec2/waiters.go | 41 +++- .../aws/aws-sdk-go/service/elasticache/api.go | 197 +++++++++++++-- .../service/elasticbeanstalk/api.go | 45 ++-- .../aws/aws-sdk-go/service/rds/api.go | 177 ++++++++++++-- .../aws/aws-sdk-go/service/rds/service.go | 50 ++-- .../aws/aws-sdk-go/service/rds/waiters.go | 6 + 11 files changed, 565 insertions(+), 203 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index dad48356a..885d040c0 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -226,288 +226,288 @@ }, { "ImportPath": "github.com/aws/aws-sdk-go/aws", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/awserr", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/awsutil", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/client", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/client/metadata", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/corehandlers", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/credentials", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/defaults", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/ec2metadata", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/request", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/aws/session", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/endpoints", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/ec2query", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/json/jsonutil", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/jsonrpc", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/query", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/query/queryutil", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/rest", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/restjson", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/restxml", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/signer/v4", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/private/waiter", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/apigateway", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/autoscaling", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudformation", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudtrail", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudwatch", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudwatchevents", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/cloudwatchlogs", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/codecommit", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/codedeploy", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/directoryservice", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/dynamodb", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/ec2", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/ecr", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/ecs", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/efs", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/elasticache", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/elasticbeanstalk", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/elasticsearchservice", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/elb", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/firehose", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/glacier", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/iam", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/kinesis", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/kms", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/lambda", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/opsworks", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/rds", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/redshift", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/route53", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/s3", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/sns", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/aws/aws-sdk-go/service/sqs", - "Comment": "v1.1.12", - "Rev": "4da0bec8953a0a540f391930a946917b12a95671" + "Comment": "v1.1.14", + "Rev": "6876e9922ff299adf36e43e04c94820077968b3b" }, { "ImportPath": "github.com/bgentry/speakeasy", @@ -1386,5 +1386,3 @@ } ] } - - 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 3dd511819..458620f88 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.12" +const SDKVersion = "1.1.14" 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 0cb6917ba..5f4991c2b 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 @@ -8,6 +8,9 @@ "endpoint": "{service}.{region}.amazonaws.com.cn", "signatureVersion": "v4" }, + "cn-north-1/ec2metadata": { + "endpoint": "http://169.254.169.254/latest" + }, "us-gov-west-1/iam": { "endpoint": "iam.us-gov.amazonaws.com" }, @@ -17,6 +20,9 @@ "us-gov-west-1/s3": { "endpoint": "s3-{region}.amazonaws.com" }, + "us-gov-west-1/ec2metadata": { + "endpoint": "http://169.254.169.254/latest" + }, "*/cloudfront": { "endpoint": "cloudfront.amazonaws.com", "signingRegion": "us-east-1" @@ -30,8 +36,7 @@ "signingRegion": "us-east-1" }, "*/ec2metadata": { - "endpoint": "http://169.254.169.254/latest", - "signingRegion": "us-east-1" + "endpoint": "http://169.254.169.254/latest" }, "*/iam": { "endpoint": "iam.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 6183dcd3d..e995315ab 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 @@ -31,8 +31,7 @@ var endpointsMap = endpointStruct{ SigningRegion: "us-east-1", }, "*/ec2metadata": { - Endpoint: "http://169.254.169.254/latest", - SigningRegion: "us-east-1", + Endpoint: "http://169.254.169.254/latest", }, "*/iam": { Endpoint: "iam.amazonaws.com", @@ -60,6 +59,9 @@ var endpointsMap = endpointStruct{ "cn-north-1/*": { Endpoint: "{service}.{region}.amazonaws.com.cn", }, + "cn-north-1/ec2metadata": { + Endpoint: "http://169.254.169.254/latest", + }, "eu-central-1/s3": { Endpoint: "{service}.{region}.amazonaws.com", }, @@ -70,6 +72,9 @@ var endpointsMap = endpointStruct{ Endpoint: "sdb.amazonaws.com", SigningRegion: "us-east-1", }, + "us-gov-west-1/ec2metadata": { + Endpoint: "http://169.254.169.254/latest", + }, "us-gov-west-1/iam": { Endpoint: "iam.us-gov.amazonaws.com", }, diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go index 9223e8422..631e63c0b 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/ec2query/unmarshal.go @@ -42,7 +42,7 @@ type xmlErrorResponse struct { XMLName xml.Name `xml:"Response"` Code string `xml:"Errors>Error>Code"` Message string `xml:"Errors>Error>Message"` - RequestID string `xml:"RequestId"` + RequestID string `xml:"RequestID"` } // UnmarshalError unmarshals a response error for the EC2 protocol. 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 627b2f113..a9118a208 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 @@ -226,6 +226,35 @@ func (c *EC2) WaitUntilImageAvailable(input *DescribeImagesInput) error { return w.Wait() } +func (c *EC2) WaitUntilImageExists(input *DescribeImagesInput) error { + waiterCfg := waiter.Config{ + Operation: "DescribeImages", + Delay: 15, + MaxAttempts: 40, + Acceptors: []waiter.WaitAcceptor{ + { + State: "success", + Matcher: "path", + Argument: "length(Images[]) > `0`", + Expected: true, + }, + { + State: "retry", + Matcher: "error", + Argument: "", + Expected: "InvalidAMIID.NotFound", + }, + }, + } + + w := waiter.Waiter{ + Client: c, + Input: input, + Config: waiterCfg, + } + return w.Wait() +} + func (c *EC2) WaitUntilInstanceExists(input *DescribeInstancesInput) error { waiterCfg := waiter.Config{ Operation: "DescribeInstances", @@ -242,7 +271,7 @@ func (c *EC2) WaitUntilInstanceExists(input *DescribeInstancesInput) error { State: "retry", Matcher: "error", Argument: "", - Expected: "InvalidInstanceIDNotFound", + Expected: "InvalidInstanceID.NotFound", }, }, } @@ -289,7 +318,7 @@ func (c *EC2) WaitUntilInstanceRunning(input *DescribeInstancesInput) error { State: "retry", Matcher: "error", Argument: "", - Expected: "InvalidInstanceIDNotFound", + Expected: "InvalidInstanceID.NotFound", }, }, } @@ -318,7 +347,7 @@ func (c *EC2) WaitUntilInstanceStatusOk(input *DescribeInstanceStatusInput) erro State: "retry", Matcher: "error", Argument: "", - Expected: "InvalidInstanceIDNotFound", + Expected: "InvalidInstanceID.NotFound", }, }, } @@ -417,7 +446,7 @@ func (c *EC2) WaitUntilKeyPairExists(input *DescribeKeyPairsInput) error { State: "retry", Matcher: "error", Argument: "", - Expected: "InvalidKeyPairNotFound", + Expected: "InvalidKeyPair.NotFound", }, }, } @@ -690,7 +719,7 @@ func (c *EC2) WaitUntilVolumeDeleted(input *DescribeVolumesInput) error { State: "success", Matcher: "error", Argument: "", - Expected: "InvalidVolumeNotFound", + Expected: "InvalidVolume.NotFound", }, }, } @@ -771,7 +800,7 @@ func (c *EC2) WaitUntilVpcPeeringConnectionExists(input *DescribeVpcPeeringConne State: "retry", Matcher: "error", Argument: "", - Expected: "InvalidVpcPeeringConnectionIDNotFound", + Expected: "InvalidVpcPeeringConnectionID.NotFound", }, }, } diff --git a/vendor/github.com/aws/aws-sdk-go/service/elasticache/api.go b/vendor/github.com/aws/aws-sdk-go/service/elasticache/api.go index b8d806b81..c381d3381 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/elasticache/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/elasticache/api.go @@ -1021,6 +1021,39 @@ func (c *ElastiCache) DescribeSnapshotsPages(input *DescribeSnapshotsInput, fn f }) } +const opListAllowedNodeTypeModifications = "ListAllowedNodeTypeModifications" + +// ListAllowedNodeTypeModificationsRequest generates a request for the ListAllowedNodeTypeModifications operation. +func (c *ElastiCache) ListAllowedNodeTypeModificationsRequest(input *ListAllowedNodeTypeModificationsInput) (req *request.Request, output *ListAllowedNodeTypeModificationsOutput) { + op := &request.Operation{ + Name: opListAllowedNodeTypeModifications, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ListAllowedNodeTypeModificationsInput{} + } + + req = c.newRequest(op, input, output) + output = &ListAllowedNodeTypeModificationsOutput{} + req.Data = output + return +} + +// The ListAllowedNodeTypeModifications action lists all available node types +// that you can scale your Redis cluster's or replication group's current node +// type up to. +// +// When you use the ModifyCacheCluster or ModifyReplicationGroup APIs to scale +// up your cluster or replication group, the value of the CacheNodeType parameter +// must be one of the node types returned by this action. +func (c *ElastiCache) ListAllowedNodeTypeModifications(input *ListAllowedNodeTypeModificationsInput) (*ListAllowedNodeTypeModificationsOutput, error) { + req, out := c.ListAllowedNodeTypeModificationsRequest(input) + err := req.Send() + return out, err +} + const opListTagsForResource = "ListTagsForResource" // ListTagsForResourceRequest generates a request for the ListTagsForResource operation. @@ -1323,7 +1356,12 @@ func (c *ElastiCache) RevokeCacheSecurityGroupIngress(input *RevokeCacheSecurity type AddTagsToResourceInput struct { _ struct{} `type:"structure"` - // The name of the resource to which the tags are to be added, for example arn:aws:elasticache:us-west-2:0123456789:cluster:myCluster. + // The Amazon Resource Name (ARN) of the resource to which the tags are to be + // added, for example arn:aws:elasticache:us-west-2:0123456789:cluster:myCluster + // or arn:aws:elasticache:us-west-2:0123456789:snapshot:mySnapshot. + // + // For more information on ARNs, go to Amazon Resource Names (ARNs) and AWS + // Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html). ResourceName *string `type:"string" required:"true"` // A list of cost allocation tags to be added to this resource. A tag is a key-value @@ -1469,7 +1507,7 @@ type CacheCluster struct { // cluster. Engine *string `type:"string"` - // The version of the cache engine version that is used in this cache cluster. + // The version of the cache engine that is used in this cache cluster. EngineVersion *string `type:"string"` // Describes a notification topic and its status. Notification topics are used @@ -1846,6 +1884,8 @@ type CopySnapshotInput struct { // The name of an existing snapshot from which to copy. SourceSnapshotName *string `type:"string" required:"true"` + TargetBucket *string `type:"string"` + // A name for the copied snapshot. TargetSnapshotName *string `type:"string" required:"true"` } @@ -1952,6 +1992,12 @@ type CreateCacheClusterInput struct { // The version number of the cache engine to be used for this cache cluster. // To view the supported cache engine versions, use the DescribeCacheEngineVersions // action. + // + // Important: You can upgrade to a newer engine version (see Selecting a Cache + // Engine and Version (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/SelectEngine.html#VersionManagement)), + // but you cannot downgrade to an earlier engine version. If you want to use + // an earlier engine version, you must delete the existing cache cluster or + // replication group and create it anew with the earlier engine version. EngineVersion *string `type:"string"` // The Amazon Resource Name (ARN) of the Amazon Simple Notification Service @@ -1999,9 +2045,8 @@ type CreateCacheClusterInput struct { // Default: System chosen Availability Zones. // // Example: One Memcached node in each of three different Availability Zones: - // PreferredAvailabilityZones.member.1=us-west-2a&PreferredAvailabilityZones.member.2=us-west-2b&PreferredAvailabilityZones.member.3=us-west-2c // - // Example: All three Memcached nodes in one Availability Zone: PreferredAvailabilityZones.member.1=us-west-2a&PreferredAvailabilityZones.member.2=us-west-2a&PreferredAvailabilityZones.member.3=us-west-2a + // Example: All three Memcached nodes in one Availability Zone: PreferredAvailabilityZones []*string `locationNameList:"PreferredAvailabilityZone" type:"list"` // Specifies the weekly time range during which maintenance on the cache cluster @@ -2298,6 +2343,12 @@ type CreateReplicationGroupInput struct { // The version number of the cache engine to be used for the cache clusters // in this replication group. To view the supported cache engine versions, use // the DescribeCacheEngineVersions action. + // + // Important: You can upgrade to a newer engine version (see Selecting a Cache + // Engine and Version (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/SelectEngine.html#VersionManagement)), + // but you cannot downgrade to an earlier engine version. If you want to use + // an earlier engine version, you must delete the existing cache cluster or + // replication group and create it anew with the earlier engine version. EngineVersion *string `type:"string"` // The Amazon Resource Name (ARN) of the Amazon Simple Notification Service @@ -2330,8 +2381,7 @@ type CreateReplicationGroupInput struct { // // Default: system chosen availability zones. // - // Example: One Redis cache cluster in each of three availability zones. PreferredAvailabilityZones.member.1=us-west-2a - // PreferredAvailabilityZones.member.2=us-west-2c PreferredAvailabilityZones.member.3=us-west-2c + // Example: One Redis cache cluster in each of three availability zones. PreferredCacheClusterAZs []*string `locationNameList:"AvailabilityZone" type:"list"` // Specifies the weekly time range during which maintenance on the cache cluster @@ -3606,12 +3656,73 @@ func (s Event) GoString() string { return s.String() } +// The input parameters for the ListAllowedNodeTypeModifications action. +type ListAllowedNodeTypeModificationsInput struct { + _ struct{} `type:"structure"` + + // The name of the cache cluster you want to scale up to a larger node instanced + // type. ElastiCache uses the cluster id to identify the current node type of + // this cluster and from that to to create a list of node types you can scale + // up to. + // + // Important: You must provide a value for either the CacheClusterId or the + // ReplicationGroupId. + CacheClusterId *string `type:"string"` + + // The name of the replication group want to scale up to a larger node type. + // ElastiCache uses the replication group id to identify the current node type + // being used by this replication group, and from that to create a list of node + // types you can scale up to. + // + // Important: You must provide a value for either the CacheClusterId or the + // ReplicationGroupId. + ReplicationGroupId *string `type:"string"` +} + +// String returns the string representation +func (s ListAllowedNodeTypeModificationsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListAllowedNodeTypeModificationsInput) GoString() string { + return s.String() +} + +// Represents the allowed node types you can use to modify your cache cluster +// or replication group. +type ListAllowedNodeTypeModificationsOutput struct { + _ struct{} `type:"structure"` + + // A string list, each element of which specifies a cache node type which you + // can use to scale your cache cluster or replication group. + // + // When scaling up a Redis cluster or replication group using ModifyCacheCluster + // or ModifyReplicationGroup, use a value from this list for the CacheNodeType + // parameter. + ScaleUpModifications []*string `type:"list"` +} + +// String returns the string representation +func (s ListAllowedNodeTypeModificationsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ListAllowedNodeTypeModificationsOutput) GoString() string { + return s.String() +} + // The input parameters for the ListTagsForResource action. type ListTagsForResourceInput struct { _ struct{} `type:"structure"` - // The name of the resource for which you want the list of tags, for example - // arn:aws:elasticache:us-west-2:0123456789:cluster:myCluster. + // The Amazon Resource Name (ARN) of the resource for which you want the list + // of tags, for example arn:aws:elasticache:us-west-2:0123456789:cluster:myCluster + // or arn:aws:elasticache:us-west-2:0123456789:snapshot:mySnapshot. + // + // For more information on ARNs, go to Amazon Resource Names (ARNs) and AWS + // Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html). ResourceName *string `type:"string" required:"true"` } @@ -3678,6 +3789,11 @@ type ModifyCacheClusterInput struct { // 2 (7 - 5) cache node IDs to remove. CacheNodeIdsToRemove []*string `locationNameList:"CacheNodeId" type:"list"` + // A valid cache node type that you want to scale this cache cluster to. The + // value of this parameter must be one of the ScaleUpModifications values returned + // by the ListAllowedCacheNodeTypeModification action. + CacheNodeType *string `type:"string"` + // The name of the cache parameter group to apply to this cache cluster. This // change is asynchronously applied as soon as possible for parameters when // the ApplyImmediately parameter is specified as true for this request. @@ -3694,6 +3810,12 @@ type ModifyCacheClusterInput struct { CacheSecurityGroupNames []*string `locationNameList:"CacheSecurityGroupName" type:"list"` // The upgraded version of the cache engine to be run on the cache nodes. + // + // Important: You can upgrade to a newer engine version (see Selecting a Cache + // Engine and Version (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/SelectEngine.html#VersionManagement)), + // but you cannot downgrade to an earlier engine version. If you want to use + // an earlier engine version, you must delete the existing cache cluster and + // create it anew with the earlier engine version. EngineVersion *string `type:"string"` // The list of Availability Zones where the new Memcached cache nodes will be @@ -3706,12 +3828,12 @@ type ModifyCacheClusterInput struct { // // This option is only supported on Memcached clusters. // - // Scenarios: Scenario 1: You have 3 active nodes and wish to add 2 nodes. + // Scenarios: Scenario 1: You have 3 active nodes and wish to add 2 nodes. // Specify NumCacheNodes=5 (3 + 2) and optionally specify two Availability Zones - // for the two new nodes. Scenario 2: You have 3 active nodes and 2 nodes pending + // for the two new nodes. Scenario 2: You have 3 active nodes and 2 nodes pending // creation (from the scenario 1 call) and want to add 1 more node. Specify // NumCacheNodes=6 ((3 + 2) + 1) and optionally specify an Availability Zone - // for the new node. Scenario 3: You want to cancel all pending actions. Specify + // for the new node. Scenario 3: You want to cancel all pending actions. Specify // NumCacheNodes=3 to cancel all pending actions. // // The Availability Zone placement of nodes pending creation cannot be modified. @@ -3726,14 +3848,16 @@ type ModifyCacheClusterInput struct { // // Impact of new add/remove requests upon pending requests // - // Scenarios Pending action New Request Results Scenario-1 Delete Delete - // The new delete, pending or immediate, replaces the pending delete. Scenario-2 - // Delete Create The new create, pending or immediate, replaces the pending - // delete. Scenario-3 Create Delete The new delete, pending or immediate, - // replaces the pending create. Scenario-4 Create Create The new create is - // added to the pending create. Important:If the new create request is Apply - // Immediately - Yes, all creates are performed immediately. If the new create - // request is Apply Immediately - No, all creates are pending. Example: NewAvailabilityZones.member.1=us-west-2a&NewAvailabilityZones.member.2=us-west-2b&NewAvailabilityZones.member.3=us-west-2c + // Scenario-1 Pending Action: Delete New Request: Delete Result: The new + // delete, pending or immediate, replaces the pending delete. Scenario-2 Pending + // Action: Delete New Request: Create Result: The new create, pending or immediate, + // replaces the pending delete. Scenario-3 Pending Action: Create New Request: + // Delete Result: The new delete, pending or immediate, replaces the pending + // create. Scenario-4 Pending Action: Create New Request: Create Result: The + // new create is added to the pending create. Important:If the new create request + // is Apply Immediately - Yes, all creates are performed immediately. If the + // new create request is Apply Immediately - No, all creates are pending. + // Example: NewAvailabilityZones []*string `locationNameList:"PreferredAvailabilityZone" type:"list"` // The Amazon Resource Name (ARN) of the Amazon SNS topic to which notifications @@ -3937,6 +4061,11 @@ type ModifyReplicationGroupInput struct { // Redis versions earlier than 2.8.6. T1 and T2 cache node types. AutomaticFailoverEnabled *bool `type:"boolean"` + // A valid cache node type that you want to scale this replication group to. + // The value of this parameter must be one of the ScaleUpModifications values + // returned by the ListAllowedCacheNodeTypeModification action. + CacheNodeType *string `type:"string"` + // The name of the cache parameter group to apply to all of the clusters in // this replication group. This change is asynchronously applied as soon as // possible for parameters when the ApplyImmediately parameter is specified @@ -3955,6 +4084,12 @@ type ModifyReplicationGroupInput struct { // The upgraded version of the cache engine to be run on the cache clusters // in the replication group. + // + // Important: You can upgrade to a newer engine version (see Selecting a Cache + // Engine and Version (http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/SelectEngine.html#VersionManagement)), + // but you cannot downgrade to an earlier engine version. If you want to use + // an earlier engine version, you must delete the existing replication group + // and create it anew with the earlier engine version. EngineVersion *string `type:"string"` // The Amazon Resource Name (ARN) of the Amazon SNS topic to which notifications @@ -3977,9 +4112,9 @@ type ModifyReplicationGroupInput struct { // sun mon tue wed thu fri sat Example: sun:05:00-sun:09:00 PreferredMaintenanceWindow *string `type:"string"` - // If this parameter is specified, ElastiCache will promote each of the cache - // clusters in the specified replication group to the primary role. The nodes - // of all other cache clusters in the replication group will be read replicas. + // If this parameter is specified, ElastiCache will promote the specified cluster + // in the specified replication group to the primary role. The nodes of all + // other clusters in the replication group will be read replicas. PrimaryClusterId *string `type:"string"` // A description for the replication group. Maximum length is 255 characters. @@ -4229,6 +4364,10 @@ type PendingModifiedValues struct { // the cache cluster. A node ID is a numeric identifier (0001, 0002, etc.). CacheNodeIdsToRemove []*string `locationNameList:"CacheNodeId" type:"list"` + // The cache node type that this cache cluster or replication group will be + // scaled to. + CacheNodeType *string `type:"string"` + // The new cache engine version that the cache cluster will run. EngineVersion *string `type:"string"` @@ -4260,6 +4399,10 @@ type PurchaseReservedCacheNodesOfferingInput struct { // A customer-specified identifier to track this reservation. // + // Note:The Reserved Cache Node ID is an unique customer-specified identifier + // to track this reservation. If this parameter is not specified, ElastiCache + // automatically generates an identifier for the reservation. + // // Example: myreservationID ReservedCacheNodeId *string `type:"string"` @@ -4362,8 +4505,12 @@ func (s RecurringCharge) GoString() string { type RemoveTagsFromResourceInput struct { _ struct{} `type:"structure"` - // The name of the ElastiCache resource from which you want the listed tags - // removed, for example arn:aws:elasticache:us-west-2:0123456789:cluster:myCluster. + // The Amazon Resource Name (ARN) of the resource from which you want the tags + // removed, for example arn:aws:elasticache:us-west-2:0123456789:cluster:myCluster + // or arn:aws:elasticache:us-west-2:0123456789:snapshot:mySnapshot. + // + // For more information on ARNs, go to Amazon Resource Names (ARNs) and AWS + // Service Namespaces (http://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html). ResourceName *string `type:"string" required:"true"` // A list of TagKeys identifying the tags you want removed from the named resource. @@ -4590,7 +4737,7 @@ type ResetCacheParameterGroupInput struct { // An array of parameter names to be reset. If you are not resetting the entire // cache parameter group, you must specify at least one parameter name. - ParameterNameValues []*ParameterNameValue `locationNameList:"ParameterNameValue" type:"list" required:"true"` + ParameterNameValues []*ParameterNameValue `locationNameList:"ParameterNameValue" type:"list"` // If true, all parameters in the cache parameter group will be reset to default // values. If false, no such action occurs. 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 679548289..20b4afb26 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 @@ -374,7 +374,7 @@ func (c *ElasticBeanstalk) DeleteEnvironmentConfigurationRequest(input *DeleteEn // Deletes the draft configuration associated with the running environment. // -// Updating a running environment with any configuration changes creates a +// Updating a running environment with any configuration changes creates a // draft configuration set. You can get the draft configuration using DescribeConfigurationSettings // while the update is in progress or if the update fails. The DeploymentStatus // for the draft configuration indicates whether the deployment is in process @@ -622,7 +622,7 @@ func (c *ElasticBeanstalk) DescribeEventsRequest(input *DescribeEventsInput) (re // Returns list of event descriptions matching criteria up to the last 6 weeks. // -// This action returns the most recent 1,000 events from the specified NextToken. +// This action returns the most recent 1,000 events from the specified NextToken. func (c *ElasticBeanstalk) DescribeEvents(input *DescribeEventsInput) (*DescribeEventsOutput, error) { req, out := c.DescribeEventsRequest(input) err := req.Send() @@ -1323,6 +1323,7 @@ func (s CheckDNSAvailabilityOutput) GoString() string { return s.String() } +// Request to create or update a group of environments. type ComposeEnvironmentsInput struct { _ struct{} `type:"structure"` @@ -1332,7 +1333,7 @@ type ComposeEnvironmentsInput struct { // The name of the group to which the target environments belong. Specify a // group name only if the environment name defined in each target environment's // manifest ends with a + (plus) character. See Environment Manifest (env.yaml) - // (http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/environment-mgmt-compose.html#environment-mgmt-compose-envyaml) + // (http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/environment-cfg-manifest.html) // for details. GroupName *string `min:"1" type:"string"` @@ -1512,12 +1513,13 @@ func (s ConfigurationSettingsDescription) GoString() string { return s.String() } +// Request to create an application. type CreateApplicationInput struct { _ struct{} `type:"structure"` // The name of the application. // - // Constraint: This name must be unique within your account. If the specified + // Constraint: This name must be unique within your account. If the specified // name already exists, the action returns an InvalidParameterValue error. ApplicationName *string `min:"1" type:"string" required:"true"` @@ -1592,6 +1594,7 @@ func (s CreateApplicationVersionInput) GoString() string { return s.String() } +// Request to create a configuration template. type CreateConfigurationTemplateInput struct { _ struct{} `type:"structure"` @@ -1692,7 +1695,7 @@ type CreateEnvironmentInput struct { // The name of the group to which the target environment belongs. Specify a // group name only if the environment's name is specified in an environment // manifest and not with the environment name parameter. See Environment Manifest - // (env.yaml) (http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/environment-mgmt-compose.html#environment-mgmt-compose-envyaml) + // (env.yaml) (http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/environment-cfg-manifest.html) // for details. GroupName *string `min:"1" type:"string"` @@ -1784,6 +1787,7 @@ func (s CreateStorageLocationOutput) GoString() string { return s.String() } +// Request to delete an application. type DeleteApplicationInput struct { _ struct{} `type:"structure"` @@ -1819,6 +1823,7 @@ func (s DeleteApplicationOutput) GoString() string { return s.String() } +// Request to delete an application version. type DeleteApplicationVersionInput struct { _ struct{} `type:"structure"` @@ -1860,6 +1865,7 @@ func (s DeleteApplicationVersionOutput) GoString() string { return s.String() } +// Request to delete a configuration template. type DeleteConfigurationTemplateInput struct { _ struct{} `type:"structure"` @@ -1894,6 +1900,7 @@ func (s DeleteConfigurationTemplateOutput) GoString() string { return s.String() } +// Request to delete a draft environment configuration. type DeleteEnvironmentConfigurationInput struct { _ struct{} `type:"structure"` @@ -1969,6 +1976,7 @@ func (s DescribeApplicationVersionsOutput) GoString() string { return s.String() } +// Request to describe one or more applications. type DescribeApplicationsInput struct { _ struct{} `type:"structure"` @@ -2187,6 +2195,7 @@ func (s DescribeEnvironmentHealthOutput) GoString() string { return s.String() } +// Request to describe the resources in an environment. type DescribeEnvironmentResourcesInput struct { _ struct{} `type:"structure"` @@ -2233,6 +2242,7 @@ func (s DescribeEnvironmentResourcesOutput) GoString() string { return s.String() } +// Request to describe one or more environments. type DescribeEnvironmentsInput struct { _ struct{} `type:"structure"` @@ -2275,6 +2285,7 @@ func (s DescribeEnvironmentsInput) GoString() string { return s.String() } +// Request to retrieve a list of events for an environment. type DescribeEventsInput struct { _ struct{} `type:"structure"` @@ -2545,7 +2556,7 @@ func (s EnvironmentInfoDescription) GoString() string { // A link to another environment, defined in the environment's manifest. Links // provide connection information in system properties that can be used to connect // to another environment in the same group. See Environment Manifest (env.yaml) -// (http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/environment-mgmt-compose.html#environment-mgmt-compose-envyaml) +// (http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/environment-cfg-manifest.html) // for details. type EnvironmentLink struct { _ struct{} `type:"structure"` @@ -3023,25 +3034,27 @@ func (s RebuildEnvironmentOutput) GoString() string { return s.String() } +// Request to retrieve logs from an environment and store them in your Elastic +// Beanstalk storage bucket. type RequestEnvironmentInfoInput struct { _ struct{} `type:"structure"` // The ID of the environment of the requested data. // - // If no such environment is found, RequestEnvironmentInfo returns an InvalidParameterValue + // If no such environment is found, RequestEnvironmentInfo returns an InvalidParameterValue // error. // - // Condition: You must specify either this or an EnvironmentName, or both. + // Condition: You must specify either this or an EnvironmentName, or both. // If you do not specify either, AWS Elastic Beanstalk returns MissingRequiredParameter // error. EnvironmentId *string `type:"string"` // The name of the environment of the requested data. // - // If no such environment is found, RequestEnvironmentInfo returns an InvalidParameterValue + // If no such environment is found, RequestEnvironmentInfo returns an InvalidParameterValue // error. // - // Condition: You must specify either this or an EnvironmentId, or both. If + // Condition: You must specify either this or an EnvironmentId, or both. If // you do not specify either, AWS Elastic Beanstalk returns MissingRequiredParameter // error. EnvironmentName *string `min:"4" type:"string"` @@ -3116,14 +3129,15 @@ func (s RestartAppServerOutput) GoString() string { return s.String() } +// Request to download logs retrieved with RequestEnvironmentInfo. type RetrieveEnvironmentInfoInput struct { _ struct{} `type:"structure"` // The ID of the data's environment. // - // If no such environment is found, returns an InvalidParameterValue error. + // If no such environment is found, returns an InvalidParameterValue error. // - // Condition: You must specify either this or an EnvironmentName, or both. + // Condition: You must specify either this or an EnvironmentName, or both. // If you do not specify either, AWS Elastic Beanstalk returns MissingRequiredParameter // error. EnvironmentId *string `type:"string"` @@ -3411,6 +3425,7 @@ func (s Tag) GoString() string { return s.String() } +// Request to terminate an environment. type TerminateEnvironmentInput struct { _ struct{} `type:"structure"` @@ -3475,6 +3490,7 @@ func (s Trigger) GoString() string { return s.String() } +// Request to update an application. type UpdateApplicationInput struct { _ struct{} `type:"structure"` @@ -3567,6 +3583,7 @@ func (s UpdateConfigurationTemplateInput) GoString() string { return s.String() } +// Request to update an environment. type UpdateEnvironmentInput struct { _ struct{} `type:"structure"` @@ -3579,7 +3596,7 @@ type UpdateEnvironmentInput struct { // The ID of the environment to update. // - // If no environment with this ID exists, AWS Elastic Beanstalk returns an + // If no environment with this ID exists, AWS Elastic Beanstalk returns an // InvalidParameterValue error. // // Condition: You must specify either this or an EnvironmentName, or both. @@ -3598,7 +3615,7 @@ type UpdateEnvironmentInput struct { // The name of the group to which the target environment belongs. Specify a // group name only if the environment's name is specified in an environment // manifest and not with the environment name or environment ID parameters. - // See Environment Manifest (env.yaml) (http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/environment-mgmt-compose.html#environment-mgmt-compose-envyaml) + // See Environment Manifest (env.yaml) (http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/environment-cfg-manifest.html) // for details. GroupName *string `min:"1" type:"string"` 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 cf47fa688..422b5f547 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 @@ -131,8 +131,9 @@ func (c *RDS) AuthorizeDBSecurityGroupIngressRequest(input *AuthorizeDBSecurityG // // You cannot authorize ingress from an EC2 security group in one region to // an Amazon RDS DB instance in another. You cannot authorize ingress from a -// VPC security group in one VPC to an Amazon RDS DB instance in another. For -// an overview of CIDR ranges, go to the Wikipedia Tutorial (http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing). +// VPC security group in one VPC to an Amazon RDS DB instance in another. +// +// For an overview of CIDR ranges, go to the Wikipedia Tutorial (http://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing). func (c *RDS) AuthorizeDBSecurityGroupIngress(input *AuthorizeDBSecurityGroupIngressInput) (*AuthorizeDBSecurityGroupIngressOutput, error) { req, out := c.AuthorizeDBSecurityGroupIngressRequest(input) err := req.Send() @@ -215,7 +216,7 @@ func (c *RDS) CopyDBSnapshotRequest(input *CopyDBSnapshotInput) (req *request.Re return } -// Copies the specified DBSnapshot. The source DB snapshot must be in the "available" +// Copies the specified DB snapshot. The source DB snapshot must be in the "available" // state. // // If you are copying from a shared manual DB snapshot, the SourceDBSnapshotIdentifier @@ -2217,7 +2218,7 @@ func (c *RDS) ModifyDBSnapshotAttributeRequest(input *ModifyDBSnapshotAttributeI // // To share a manual DB snapshot with other AWS accounts, specify restore as // the AttributeName and use the ValuesToAdd parameter to add a list of the -// AWS account ids that are authorized to retore the manual DB snapshot. Uses +// AWS account ids that are authorized to restore the manual DB snapshot. Uses // the value all to make the manual DB snapshot public and can by copied or // restored by all AWS accounts. Do not add the all value for any manual DB // snapshots that contain private information that you do not want to be available @@ -2851,6 +2852,8 @@ type ApplyPendingMaintenanceActionInput struct { _ struct{} `type:"structure"` // The pending maintenance action to apply to this resource. + // + // Valid values: system-update, db-upgrade ApplyAction *string `type:"string" required:"true"` // A value that specifies the type of opt-in request, or undoes an opt-in request. @@ -3327,6 +3330,11 @@ type CreateDBClusterInput struct { DBClusterParameterGroupName *string `type:"string"` // A DB subnet group to associate with this DB cluster. + // + // Constraints: Must contain no more than 255 alphanumeric characters, periods, + // underscores, spaces, or hyphens. Must not be default. + // + // Example: mySubnetgroup DBSubnetGroupName *string `type:"string"` // The name for your database of up to 8 alpha-numeric characters. If you do @@ -3740,6 +3748,13 @@ type CreateDBInstanceInput struct { // If there is no DB subnet group, then it is a non-VPC DB instance. DBSubnetGroupName *string `type:"string"` + // Specify the Active Directory Domain to create the instance in. + Domain *string `type:"string"` + + // Specify the name of the IAM role to be used when making API calls to the + // Directory Service. + DomainIAMRoleName *string `type:"string"` + // The name of the database engine to be used for this instance. // // Valid Values: MySQL | mariadb | oracle-se1 | oracle-se | oracle-ee | sqlserver-ee @@ -3762,7 +3777,7 @@ type CreateDBInstanceInput struct { // ap-southeast-2, eu-west-1, sa-east-1, us-west-1, us-west-2): 5.5.40 | 5.5.40a // Version 5.5 (Available in all regions): 5.5.40b | 5.5.41 | 5.5.42 Version // 5.6 (Available in all regions): 5.6.19a | 5.6.19b | 5.6.21 | 5.6.21b | 5.6.22 - // | 5.6.23 MariaDB + // | 5.6.23 | 5.6.27 Version 5.7 (Available in all regions): 5.7.10 MariaDB // // Version 10.0 (Available in all regions except AWS GovCloud (US) Region // (us-gov-west-1)): 10.0.17 Oracle Database Enterprise Edition (oracle-ee) @@ -4020,6 +4035,15 @@ type CreateDBInstanceInput struct { // Constraints: Minimum 30-minute window. PreferredMaintenanceWindow *string `type:"string"` + // A value that specifies the order in which an Aurora Replica is promoted to + // the primary instance after a failure of the existing primary instance. For + // more information, see Fault Tolerance for an Aurora DB Cluster (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Managing.html#Aurora.Managing.FaultTolerance). + // + // Default: 1 + // + // Valid Values: 0 - 15 + PromotionTier *int64 `type:"integer"` + // Specifies the accessibility options for the DB instance. A value of true // specifies an Internet-facing instance with a publicly resolvable DNS name, // which resolves to a public IP address. A value of false specifies an internal @@ -4144,7 +4168,11 @@ type CreateDBInstanceReadReplicaInput struct { // region that are created from the same source DB instance must either: Specify // DB subnet groups from the same VPC. All these Read Replicas will be created // in the same VPC.Not specify a DB subnet group. All these Read Replicas will - // be created outside of any VPC. + // be created outside of any VPC. Constraints: Must contain no more than 255 + // alphanumeric characters, periods, underscores, spaces, or hyphens. Must not + // be default. + // + // Example: mySubnetgroup DBSubnetGroupName *string `type:"string"` // The amount of Provisioned IOPS (input/output operations per second) to be @@ -4425,7 +4453,7 @@ type CreateDBSubnetGroupInput struct { // The name for the DB subnet group. This value is stored as a lowercase string. // // Constraints: Must contain no more than 255 alphanumeric characters, periods, - // underscores, or hyphens. Must not be default. + // underscores, spaces, or hyphens. Must not be default. // // Example: mySubnetgroup DBSubnetGroupName *string `type:"string" required:"true"` @@ -4724,6 +4752,11 @@ type DBClusterMember struct { // Value that is true if the cluster member is the primary instance for the // DB cluster and false otherwise. IsClusterWriter *bool `type:"boolean"` + + // A value that specifies the order in which an Aurora Replica is promoted to + // the primary instance after a failure of the existing primary instance. For + // more information, see Fault Tolerance for an Aurora DB Cluster (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Managing.html#Aurora.Managing.FaultTolerance). + PromotionTier *int64 `type:"integer"` } // String returns the string representation @@ -5011,6 +5044,9 @@ type DBInstance struct { // is accessed. DbiResourceId *string `type:"string"` + // The Active Directory Domain membership records associated with the DB instance. + DomainMemberships []*DomainMembership `locationNameList:"DomainMembership" type:"list"` + // Specifies the connection endpoint. Endpoint *Endpoint `type:"structure"` @@ -5070,6 +5106,11 @@ type DBInstance struct { // in Universal Coordinated Time (UTC). PreferredMaintenanceWindow *string `type:"string"` + // A value that specifies the order in which an Aurora Replica is promoted to + // the primary instance after a failure of the existing primary instance. For + // more information, see Fault Tolerance for an Aurora DB Cluster (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Managing.html#Aurora.Managing.FaultTolerance). + PromotionTier *int64 `type:"integer"` + // Specifies the accessibility options for the DB instance. A value of true // specifies an Internet-facing instance with a publicly resolvable DNS name, // which resolves to a public IP address. A value of false specifies an internal @@ -5455,7 +5496,7 @@ type DBSubnetGroup struct { // Provides the description of the DB subnet group. DBSubnetGroupDescription *string `type:"string"` - // Specifies the name of the DB subnet group. + // The name of the DB subnet group. DBSubnetGroupName *string `type:"string"` // Provides the status of the DB subnet group. @@ -5805,8 +5846,10 @@ type DeleteDBSubnetGroupInput struct { // // You cannot delete the default subnet group. Constraints: // - // Must be 1 to 255 alphanumeric characters First character must be a letter - // Cannot end with a hyphen or contain two consecutive hyphens + // Constraints: Must contain no more than 255 alphanumeric characters, periods, + // underscores, spaces, or hyphens. Must not be default. + // + // Example: mySubnetgroup DBSubnetGroupName *string `type:"string" required:"true"` } @@ -7643,6 +7686,35 @@ func (s DescribeReservedDBInstancesOutput) GoString() string { return s.String() } +// An Active Directory Domain membership record associated with the DB instance. +type DomainMembership struct { + _ struct{} `type:"structure"` + + // The identifier of the Active Directory Domain. + Domain *string `type:"string"` + + // The fully qualified domain name of the Active Directory Domain. + FQDN *string `type:"string"` + + // The name of the IAM role to be used when making API calls to the Directory + // Service. + IAMRoleName *string `type:"string"` + + // The status of the DB instance's Active Directory Domain membership, such + // as joined, pending-join, failed etc). + Status *string `type:"string"` +} + +// String returns the string representation +func (s DomainMembership) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DomainMembership) GoString() string { + return s.String() +} + type DownloadDBLogFilePortionInput struct { _ struct{} `type:"structure"` @@ -7669,7 +7741,8 @@ type DownloadDBLogFilePortionInput struct { // If the NumberOfLines parameter is specified, then the block of lines returned // can be from the beginning or the end of the log file, depending on the value // of the Marker parameter. If neither Marker or NumberOfLines are specified, - // the entire log file is returned. + // the entire log file is returned up to a maximum of 10000 lines, starting + // with the most recent log entries first. // // If NumberOfLines is specified and Marker is not specified, then the most // recent lines from the end of the log file are returned. @@ -8040,10 +8113,16 @@ type ModifyDBClusterInput struct { // A value that specifies whether the modifications in this request and any // pending modifications are asynchronously applied as soon as possible, regardless - // of the PreferredMaintenanceWindow setting for the DB cluster. + // of the PreferredMaintenanceWindow setting for the DB cluster. If this parameter + // is set to false, changes to the DB cluster are applied during the next maintenance + // window. // - // If this parameter is set to false, changes to the DB cluster are applied - // during the next maintenance window. + // The ApplyImmediately parameter only affects the NewDBClusterIdentifier and + // MasterUserPassword values. If you set the ApplyImmediately parameter value + // to false, then changes to the NewDBClusterIdentifier and MasterUserPassword + // values are applied during the next maintenance window. All other changes + // are applied immediately, regardless of the value of the ApplyImmediately + // parameter. // // Default: false ApplyImmediately *bool `type:"boolean"` @@ -8389,6 +8468,8 @@ type ModifyDBInstanceInput struct { // // Valid Values: 1150-65535 // + // Type: Integer + // // Oracle // // Default: 1521 @@ -8419,6 +8500,17 @@ type ModifyDBInstanceInput struct { // Cannot end with a hyphen or contain two consecutive hyphens DBSecurityGroups []*string `locationNameList:"DBSecurityGroupName" type:"list"` + // Specify the Active Directory Domain to move the instance to. + // + // The specified Active Directory Domain must be created prior to this operation. + // Currently only a SQL Server instance can be created in a Active Directory + // Domain. + Domain *string `type:"string"` + + // Specify the name of the IAM role to be used when making API calls to the + // Directory Service. + DomainIAMRoleName *string `type:"string"` + // The version number of the database engine to upgrade to. Changing this parameter // results in an outage and the change is applied during the next maintenance // window unless the ApplyImmediately parameter is set to true for this request. @@ -8569,9 +8661,20 @@ type ModifyDBInstanceInput struct { // Constraints: Must be at least 30 minutes PreferredMaintenanceWindow *string `type:"string"` - // True to make the DB instance Internet-facing with a publicly resolvable DNS - // name, which resolves to a public IP address. False to make the DB instance - // internal with a DNS name that resolves to a private IP address. + // A value that specifies the order in which an Aurora Replica is promoted to + // the primary instance after a failure of the existing primary instance. For + // more information, see Fault Tolerance for an Aurora DB Cluster (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Managing.html#Aurora.Managing.FaultTolerance). + // + // Default: 1 + // + // Valid Values: 0 - 15 + PromotionTier *int64 `type:"integer"` + + // Boolean value that indicates if the DB instance has a publicly resolvable + // DNS name. Set to True to make the DB instance Internet-facing with a publicly + // resolvable DNS name, which resolves to a public IP address. Set to False + // to make the DB instance internal with a DNS name that resolves to a private + // IP address. // // PubliclyAccessible only applies to DB instances in a VPC. The DB instance // must be part of a public subnet and PubliclyAccessible must be true in order @@ -8746,8 +8849,8 @@ type ModifyDBSubnetGroupInput struct { // The name for the DB subnet group. This value is stored as a lowercase string. // - // Constraints: Must contain no more than 255 alphanumeric characters or hyphens. - // Must not be "Default". + // Constraints: Must contain no more than 255 alphanumeric characters, periods, + // underscores, spaces, or hyphens. Must not be default. // // Example: mySubnetgroup DBSubnetGroupName *string `type:"string" required:"true"` @@ -9857,6 +9960,11 @@ type RestoreDBClusterFromSnapshotInput struct { DBClusterIdentifier *string `type:"string" required:"true"` // The name of the DB subnet group to use for the new DB cluster. + // + // Constraints: Must contain no more than 255 alphanumeric characters, periods, + // underscores, spaces, or hyphens. Must not be default. + // + // Example: mySubnetgroup DBSubnetGroupName *string `type:"string"` // The database name for the restored DB cluster. @@ -9959,6 +10067,11 @@ type RestoreDBClusterToPointInTimeInput struct { DBClusterIdentifier *string `type:"string" required:"true"` // The DB subnet group name to use for the new DB cluster. + // + // Constraints: Must contain no more than 255 alphanumeric characters, periods, + // underscores, spaces, or hyphens. Must not be default. + // + // Example: mySubnetgroup DBSubnetGroupName *string `type:"string"` // The KMS key identifier to use when restoring an encrypted DB cluster from @@ -10115,8 +10228,20 @@ type RestoreDBInstanceFromDBSnapshotInput struct { DBSnapshotIdentifier *string `type:"string" required:"true"` // The DB subnet group name to use for the new instance. + // + // Constraints: Must contain no more than 255 alphanumeric characters, periods, + // underscores, spaces, or hyphens. Must not be default. + // + // Example: mySubnetgroup DBSubnetGroupName *string `type:"string"` + // Specify the Active Directory Domain to restore the instance in. + Domain *string `type:"string"` + + // Specify the name of the IAM role to be used when making API calls to the + // Directory Service. + DomainIAMRoleName *string `type:"string"` + // The database engine to use for the new instance. // // Default: The same as source @@ -10271,8 +10396,20 @@ type RestoreDBInstanceToPointInTimeInput struct { DBName *string `type:"string"` // The DB subnet group name to use for the new instance. + // + // Constraints: Must contain no more than 255 alphanumeric characters, periods, + // underscores, spaces, or hyphens. Must not be default. + // + // Example: mySubnetgroup DBSubnetGroupName *string `type:"string"` + // Specify the Active Directory Domain to restore the instance in. + Domain *string `type:"string"` + + // Specify the name of the IAM role to be used when making API calls to the + // Directory Service. + DomainIAMRoleName *string `type:"string"` + // The database engine to use for the new instance. // // Default: The same as source @@ -10280,7 +10417,7 @@ type RestoreDBInstanceToPointInTimeInput struct { // Constraint: Must be compatible with the engine of the source // // Valid Values: MySQL | mariadb | oracle-se1 | oracle-se | oracle-ee | sqlserver-ee - // | sqlserver-se | sqlserver-ex | sqlserver-web | postgres| aurora + // | sqlserver-se | sqlserver-ex | sqlserver-web | postgres | aurora Engine *string `type:"string"` // The amount of Provisioned IOPS (input/output operations per second) to be diff --git a/vendor/github.com/aws/aws-sdk-go/service/rds/service.go b/vendor/github.com/aws/aws-sdk-go/service/rds/service.go index 3769bba44..e07795efa 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/rds/service.go +++ b/vendor/github.com/aws/aws-sdk-go/service/rds/service.go @@ -18,23 +18,41 @@ import ( // up developers to focus on what makes their applications and businesses unique. // // Amazon RDS gives you access to the capabilities of a MySQL, MariaDB, PostgreSQL, -// Microsoft SQL Server, Oracle, or Aurora database server. This means the code, -// applications, and tools you already use today with your existing databases -// work with Amazon RDS without modification. Amazon RDS automatically backs -// up your database and maintains the database software that powers your DB -// instance. Amazon RDS is flexible: you can scale your database instance's -// compute resources and storage capacity to meet your application's demand. -// As with all Amazon Web Services, there are no up-front investments, and you -// pay only for the resources you use. +// Microsoft SQL Server, Oracle, or Amazon Aurora database server. These capabilities +// mean that the code, applications, and tools you already use today with your +// existing databases work with Amazon RDS without modification. Amazon RDS +// automatically backs up your database and maintains the database software +// that powers your DB instance. Amazon RDS is flexible: you can scale your +// database instance's compute resources and storage capacity to meet your application's +// demand. As with all Amazon Web Services, there are no up-front investments, +// and you pay only for the resources you use. // -// This is an interface reference for Amazon RDS. It contains documentation -// for a programming or command line interface you can use to manage Amazon -// RDS. Note that Amazon RDS is asynchronous, which means that some interfaces -// might require techniques such as polling or callback functions to determine -// when a command has been applied. In this reference, the parameter descriptions -// indicate whether a command is applied immediately, on the next instance reboot, -// or during the maintenance window. For a summary of the Amazon RDS interfaces, -// go to Available RDS Interfaces (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Welcome.html#Welcome.Interfaces). +// This interface reference for Amazon RDS contains documentation for a programming +// or command line interface you can use to manage Amazon RDS. Note that Amazon +// RDS is asynchronous, which means that some interfaces might require techniques +// such as polling or callback functions to determine when a command has been +// applied. In this reference, the parameter descriptions indicate whether a +// command is applied immediately, on the next instance reboot, or during the +// maintenance window. The reference structure is as follows, and we list following +// some related topics from the user guide. +// +// Amazon RDS API Reference +// +// For the alphabetical list of API actions, see API Actions (http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Operations.html). +// +// For the alphabetical list of data types, see Data Types (http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_Types.html). +// +// For a list of common query parameters, see Common Parameters (http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/CommonParameters.html). +// +// For descriptions of the error codes, see Common Errors (http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/CommonErrors.html). +// +// Amazon RDS User Guide +// +// For a summary of the Amazon RDS interfaces, see Available RDS Interfaces +// (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Welcome.html#Welcome.Interfaces). +// +// For more information about how to use the Query API, see Using the Query +// API (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Using_the_Query_API.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 RDS struct { diff --git a/vendor/github.com/aws/aws-sdk-go/service/rds/waiters.go b/vendor/github.com/aws/aws-sdk-go/service/rds/waiters.go index 3c24ea392..b73b51bda 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/rds/waiters.go +++ b/vendor/github.com/aws/aws-sdk-go/service/rds/waiters.go @@ -48,6 +48,12 @@ func (c *RDS) WaitUntilDBInstanceAvailable(input *DescribeDBInstancesInput) erro Argument: "DBInstances[].DBInstanceStatus", Expected: "incompatible-parameters", }, + { + State: "failure", + Matcher: "pathAny", + Argument: "DBInstances[].DBInstanceStatus", + Expected: "incompatible-parameters", + }, { State: "failure", Matcher: "pathAny",