diff --git a/data.go b/data.go index 1360be28d..c722ca053 100644 --- a/data.go +++ b/data.go @@ -254,7 +254,7 @@ func readFile(source *Source, args ...string) ([]byte, error) { return nil, err } - f, err := source.FS.OpenFile(source.URL.Path, os.O_RDWR, 0) + f, err := source.FS.OpenFile(source.URL.Path, os.O_RDONLY, 0) if err != nil { log.Fatalf("Can't open %s: %#v", source.URL.Path, err) return nil, err diff --git a/glide.lock b/glide.lock index 515c2b27b..33122d3ad 100644 --- a/glide.lock +++ b/glide.lock @@ -1,8 +1,8 @@ -hash: 01c19d423d90e790bc9d99bb469f318dc4d04f66d4464ba1b3276d746c994901 -updated: 2017-04-20T19:20:59.31591402-05:00 +hash: 12829fee44ade4851c3077fb86defcc4442634ca4fd9fd52d1be6527312dff47 +updated: 2017-04-27T20:02:42.097718656-04:00 imports: - name: github.com/aws/aws-sdk-go - version: ccc54a4047c1470fdf5af9badadfd60a8a7f82bf + version: 8cab5437f896c3048506422a6fb9f5a7f2df9944 subpackages: - aws - aws/awserr diff --git a/glide.yaml b/glide.yaml index cd8f18f54..7cc806f7f 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,7 +1,7 @@ package: github.com/hairyhenderson/gomplate import: - package: github.com/aws/aws-sdk-go - version: ^1.6.21 + version: ^1.8.17 subpackages: - aws - aws/session diff --git a/vendor/github.com/aws/aws-sdk-go/CHANGELOG.md b/vendor/github.com/aws/aws-sdk-go/CHANGELOG.md index 084374803..f3f434ea2 100644 --- a/vendor/github.com/aws/aws-sdk-go/CHANGELOG.md +++ b/vendor/github.com/aws/aws-sdk-go/CHANGELOG.md @@ -1,3 +1,29 @@ +Release v1.8.17 (2017-04-26) +=== + +### Service Client Updates +* `aws/endpoints`: Updated Regions and Endpoints metadata. +* `service/rds`: Updates service API and documentation + * With Amazon Relational Database Service (Amazon RDS) running MySQL or Amazon Aurora, you can now authenticate to your DB instance using IAM database authentication. + +Release v1.8.16 (2017-04-21) +=== + +### Service Client Updates +* `service/appstream`: Updates service API, documentation, and paginators + * The new feature named "Default Internet Access" will enable Internet access from AppStream 2.0 instances - image builders and fleet instances. Admins will check a flag either through AWS management console for AppStream 2.0 or through API while creating an image builder or while creating/updating a fleet. +* `service/kinesis`: Updates service API, documentation, waiters, and paginators + * Adds a new waiter, StreamNotExists, to Kinesis. + +### SDK Enhancements +* `aws/endpoints`: Add utilities improving endpoints lookup (#1218) + * Adds several utilities to the endpoints packages to make looking up partitions, regions, and services easier. + * Fixes #994 + +### SDK Bugs +* `private/protocol/xml/xmlutil`: Fix unmarshaling dropping errors (#1219) + * The XML unmarshaler would drop any serialization or body read error that occurred on the floor effectively hiding any errors that would occur. + * Fixes #1205 Release v1.8.15 (2017-04-20) === @@ -22,6 +48,7 @@ Release v1.8.15 (2017-04-20) * `service/s3`: Fix HeadObject's incorrect documented error codes (#1213) * The HeadObject's model incorrectly states that the operation can return the NoSuchKey error code. * Fixes #1208 + Release v1.8.14 (2017-04-19) === diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go index b84062332..4108e433e 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go @@ -12,7 +12,7 @@ between multiple Credentials, Sessions or service clients. Assume Role To assume an IAM role using STS with the SDK you can create a new Credentials -with the SDKs's stscreds package. +with the SDKs's stscreds package. // Initial credentials loaded from SDK's default credential chain. Such as // the environment, shared credentials (~/.aws/credentials), or EC2 Instance diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go index 4adca3a7f..90558c44b 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go @@ -103,6 +103,7 @@ const ( MarketplacecommerceanalyticsServiceID = "marketplacecommerceanalytics" // Marketplacecommerceanalytics. MeteringMarketplaceServiceID = "metering.marketplace" // MeteringMarketplace. MobileanalyticsServiceID = "mobileanalytics" // Mobileanalytics. + ModelsLexServiceID = "models.lex" // ModelsLex. MonitoringServiceID = "monitoring" // Monitoring. MturkRequesterServiceID = "mturk-requester" // MturkRequester. OpsworksServiceID = "opsworks" // Opsworks. @@ -142,17 +143,20 @@ const ( // DefaultResolver returns an Endpoint resolver that will be able // to resolve endpoints for: AWS Standard, AWS China, and AWS GovCloud (US). // -// Casting the return value of this func to a EnumPartitions will -// allow you to get a list of the partitions in the order the endpoints -// will be resolved in. +// Use DefaultPartitions() to get the list of the default partitions. +func DefaultResolver() Resolver { + return defaultPartitions +} + +// DefaultPartitions returns a list of the partitions the SDK is bundled +// with. The available partitions are: AWS Standard, AWS China, and AWS GovCloud (US). // -// resolver := endpoints.DefaultResolver() -// partitions := resolver.(endpoints.EnumPartitions).Partitions() +// partitions := endpoints.DefaultPartitions // for _, p := range partitions { // // ... inspect partitions // } -func DefaultResolver() Resolver { - return defaultPartitions +func DefaultPartitions() []Partition { + return defaultPartitions.Partitions() } var defaultPartitions = partitions{ @@ -347,6 +351,7 @@ var awsPartition = partition{ "ap-southeast-1": endpoint{}, "ap-southeast-2": endpoint{}, "eu-west-1": endpoint{}, + "eu-west-2": endpoint{}, "us-east-1": endpoint{}, "us-east-2": endpoint{}, "us-west-2": endpoint{}, @@ -844,8 +849,10 @@ var awsPartition = partition{ "ap-south-1": endpoint{}, "ap-southeast-1": endpoint{}, "ap-southeast-2": endpoint{}, + "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-west-1": endpoint{}, + "eu-west-2": endpoint{}, "sa-east-1": endpoint{}, "us-east-1": endpoint{}, "us-east-2": endpoint{}, @@ -1108,6 +1115,16 @@ var awsPartition = partition{ "us-east-1": endpoint{}, }, }, + "models.lex": service{ + Defaults: endpoint{ + CredentialScope: credentialScope{ + Service: "lex", + }, + }, + Endpoints: endpoints{ + "us-east-1": endpoint{}, + }, + }, "monitoring": service{ Defaults: endpoint{ Protocols: []string{"http", "https"}, diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints.go index 37e19ab00..64dccea43 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints.go @@ -124,6 +124,49 @@ type EnumPartitions interface { Partitions() []Partition } +// RegionsForService returns a map of regions for the partition and service. +// If either the partition or service does not exist false will be returned +// as the second parameter. +// +// This example shows how to get the regions for DynamoDB in the AWS partition. +// rs := RegionsForService(endpoints.DefaultPartitions(), endpoints.AwsPartitionID, endpoints.DynamoDBServiceID) +// +// This is equivalent to using the partition directly. +// rs := endpoints.AwsPartition().Services()[endpoints.DynamoDBServiceID].Regions() +func RegionsForService(ps []Partition, partitionID, serviceID string) (map[string]Region, bool) { + for _, p := range ps { + if p.ID() != partitionID { + continue + } + if _, ok := p.p.Services[serviceID]; !ok { + break + } + + s := Service{ + id: serviceID, + p: p.p, + } + return s.Regions(), true + } + + return map[string]Region{}, false +} + +// PartitionForRegion returns the first partition which includes the region +// passed in. This includes both known regions and regions which match +// a pattern supported by the partition which may include regions that are +// not explicitly known by the partition. Use the Regions method of the +// returned Partition if explicit support is needed. +func PartitionForRegion(ps []Partition, regionID string) (Partition, bool) { + for _, p := range ps { + if _, ok := p.p.Regions[regionID]; ok || p.p.RegionRegex.MatchString(regionID) { + return p, true + } + } + + return Partition{}, false +} + // A Partition provides the ability to enumerate the partition's regions // and services. type Partition struct { @@ -132,7 +175,7 @@ type Partition struct { } // ID returns the identifier of the partition. -func (p *Partition) ID() string { return p.id } +func (p Partition) ID() string { return p.id } // EndpointFor attempts to resolve the endpoint based on service and region. // See Options for information on configuring how the endpoint is resolved. @@ -155,13 +198,13 @@ func (p *Partition) ID() string { return p.id } // Errors that can be returned. // * UnknownServiceError // * UnknownEndpointError -func (p *Partition) EndpointFor(service, region string, opts ...func(*Options)) (ResolvedEndpoint, error) { +func (p Partition) EndpointFor(service, region string, opts ...func(*Options)) (ResolvedEndpoint, error) { return p.p.EndpointFor(service, region, opts...) } // Regions returns a map of Regions indexed by their ID. This is useful for // enumerating over the regions in a partition. -func (p *Partition) Regions() map[string]Region { +func (p Partition) Regions() map[string]Region { rs := map[string]Region{} for id := range p.p.Regions { rs[id] = Region{ @@ -175,7 +218,7 @@ func (p *Partition) Regions() map[string]Region { // Services returns a map of Service indexed by their ID. This is useful for // enumerating over the services in a partition. -func (p *Partition) Services() map[string]Service { +func (p Partition) Services() map[string]Service { ss := map[string]Service{} for id := range p.p.Services { ss[id] = Service{ @@ -195,16 +238,16 @@ type Region struct { } // ID returns the region's identifier. -func (r *Region) ID() string { return r.id } +func (r Region) ID() string { return r.id } // ResolveEndpoint resolves an endpoint from the context of the region given // a service. See Partition.EndpointFor for usage and errors that can be returned. -func (r *Region) ResolveEndpoint(service string, opts ...func(*Options)) (ResolvedEndpoint, error) { +func (r Region) ResolveEndpoint(service string, opts ...func(*Options)) (ResolvedEndpoint, error) { return r.p.EndpointFor(service, r.id, opts...) } // Services returns a list of all services that are known to be in this region. -func (r *Region) Services() map[string]Service { +func (r Region) Services() map[string]Service { ss := map[string]Service{} for id, s := range r.p.Services { if _, ok := s.Endpoints[r.id]; ok { @@ -226,17 +269,38 @@ type Service struct { } // ID returns the identifier for the service. -func (s *Service) ID() string { return s.id } +func (s Service) ID() string { return s.id } // ResolveEndpoint resolves an endpoint from the context of a service given // a region. See Partition.EndpointFor for usage and errors that can be returned. -func (s *Service) ResolveEndpoint(region string, opts ...func(*Options)) (ResolvedEndpoint, error) { +func (s Service) ResolveEndpoint(region string, opts ...func(*Options)) (ResolvedEndpoint, error) { return s.p.EndpointFor(s.id, region, opts...) } +// Regions returns a map of Regions that the service is present in. +// +// A region is the AWS region the service exists in. Whereas a Endpoint is +// an URL that can be resolved to a instance of a service. +func (s Service) Regions() map[string]Region { + rs := map[string]Region{} + for id := range s.p.Services[s.id].Endpoints { + if _, ok := s.p.Regions[id]; ok { + rs[id] = Region{ + id: id, + p: s.p, + } + } + } + + return rs +} + // Endpoints returns a map of Endpoints indexed by their ID for all known // endpoints for a service. -func (s *Service) Endpoints() map[string]Endpoint { +// +// A region is the AWS region the service exists in. Whereas a Endpoint is +// an URL that can be resolved to a instance of a service. +func (s Service) Endpoints() map[string]Endpoint { es := map[string]Endpoint{} for id := range s.p.Services[s.id].Endpoints { es[id] = Endpoint{ @@ -259,15 +323,15 @@ type Endpoint struct { } // ID returns the identifier for an endpoint. -func (e *Endpoint) ID() string { return e.id } +func (e Endpoint) ID() string { return e.id } // ServiceID returns the identifier the endpoint belongs to. -func (e *Endpoint) ServiceID() string { return e.serviceID } +func (e Endpoint) ServiceID() string { return e.serviceID } // ResolveEndpoint resolves an endpoint from the context of a service and // region the endpoint represents. See Partition.EndpointFor for usage and // errors that can be returned. -func (e *Endpoint) ResolveEndpoint(opts ...func(*Options)) (ResolvedEndpoint, error) { +func (e Endpoint) ResolveEndpoint(opts ...func(*Options)) (ResolvedEndpoint, error) { return e.p.EndpointFor(e.serviceID, e.id, opts...) } @@ -300,28 +364,6 @@ type EndpointNotFoundError struct { Region string } -//// NewEndpointNotFoundError builds and returns NewEndpointNotFoundError. -//func NewEndpointNotFoundError(p, s, r string) EndpointNotFoundError { -// return EndpointNotFoundError{ -// awsError: awserr.New("EndpointNotFoundError", "unable to find endpoint", nil), -// Partition: p, -// Service: s, -// Region: r, -// } -//} -// -//// Error returns string representation of the error. -//func (e EndpointNotFoundError) Error() string { -// extra := fmt.Sprintf("partition: %q, service: %q, region: %q", -// e.Partition, e.Service, e.Region) -// return awserr.SprintError(e.Code(), e.Message(), extra, e.OrigErr()) -//} -// -//// String returns the string representation of the error. -//func (e EndpointNotFoundError) String() string { -// return e.Error() -//} - // A UnknownServiceError is returned when the service does not resolve to an // endpoint. Includes a list of all known services for the partition. Returned // when a partition does not support the service. diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints_test.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints_test.go index 8877d7bd4..9c0e09db6 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints_test.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints_test.go @@ -84,6 +84,22 @@ func TestEnumRegionServices(t *testing.T) { } } +func TestEnumServiceRegions(t *testing.T) { + p := testPartitions[0].Partition() + + rs := p.Services()["service1"].Regions() + if e, a := 2, len(rs); e != a { + t.Errorf("expect %d regions, got %d", e, a) + } + + if _, ok := rs["us-east-1"]; !ok { + t.Errorf("expect region to be found") + } + if _, ok := rs["us-west-2"]; !ok { + t.Errorf("expect region to be found") + } +} + func TestEnumServicesEndpoints(t *testing.T) { p := testPartitions[0].Partition() @@ -242,3 +258,78 @@ func TestOptionsSet(t *testing.T) { t.Errorf("expect %v options got %v", expect, actual) } } + +func TestRegionsForService(t *testing.T) { + ps := DefaultPartitions() + + var expect map[string]Region + var serviceID string + for _, s := range ps[0].Services() { + expect = s.Regions() + serviceID = s.ID() + if len(expect) > 0 { + break + } + } + + actual, ok := RegionsForService(ps, ps[0].ID(), serviceID) + if !ok { + t.Fatalf("expect regions to be found, was not") + } + + if len(actual) == 0 { + t.Fatalf("expect service %s to have regions", serviceID) + } + if e, a := len(expect), len(actual); e != a { + t.Fatalf("expect %d regions, got %d", e, a) + } + + for id, r := range actual { + if e, a := id, r.ID(); e != a { + t.Errorf("expect %s region id, got %s", e, a) + } + if _, ok := expect[id]; !ok { + t.Errorf("expect %s region to be found", id) + } + } +} + +func TestRegionsForService_NotFound(t *testing.T) { + ps := testPartitions.Partitions() + + actual, ok := RegionsForService(ps, ps[0].ID(), "service-not-exists") + if ok { + t.Fatalf("expect no regions to be found, but were") + } + if len(actual) != 0 { + t.Errorf("expect no regions, got %v", actual) + } +} + +func TestPartitionForRegion(t *testing.T) { + ps := DefaultPartitions() + expect := ps[len(ps)%2] + + var regionID string + for id := range expect.Regions() { + regionID = id + break + } + + actual, ok := PartitionForRegion(ps, regionID) + if !ok { + t.Fatalf("expect partition to be found") + } + if e, a := expect.ID(), actual.ID(); e != a { + t.Errorf("expect %s partition, got %s", e, a) + } +} + +func TestPartitionForRegion_NotFound(t *testing.T) { + ps := DefaultPartitions() + + actual, ok := PartitionForRegion(ps, "regionNotExists") + if ok { + t.Errorf("expect no partition to be found, got %v", actual) + } +} diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/v3model_codegen.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/v3model_codegen.go index fc7eada77..05e92df22 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/v3model_codegen.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/v3model_codegen.go @@ -209,17 +209,20 @@ import ( // DefaultResolver returns an Endpoint resolver that will be able // to resolve endpoints for: {{ ListPartitionNames . }}. // - // Casting the return value of this func to a EnumPartitions will - // allow you to get a list of the partitions in the order the endpoints - // will be resolved in. + // Use DefaultPartitions() to get the list of the default partitions. + func DefaultResolver() Resolver { + return defaultPartitions + } + + // DefaultPartitions returns a list of the partitions the SDK is bundled + // with. The available partitions are: {{ ListPartitionNames . }}. // - // resolver := endpoints.DefaultResolver() - // partitions := resolver.(endpoints.EnumPartitions).Partitions() + // partitions := endpoints.DefaultPartitions // for _, p := range partitions { // // ... inspect partitions // } - func DefaultResolver() Resolver { - return defaultPartitions + func DefaultPartitions() []Partition { + return defaultPartitions.Partitions() } var defaultPartitions = partitions{ 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 ad47b5980..ffec984eb 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.8.15" +const SDKVersion = "1.8.17" diff --git a/vendor/github.com/aws/aws-sdk-go/doc-src/aws-godoc/templates/package_service.html b/vendor/github.com/aws/aws-sdk-go/doc-src/aws-godoc/templates/package_service.html index ff35832e3..83b260cf3 100644 --- a/vendor/github.com/aws/aws-sdk-go/doc-src/aws-godoc/templates/package_service.html +++ b/vendor/github.com/aws/aws-sdk-go/doc-src/aws-godoc/templates/package_service.html @@ -77,7 +77,9 @@

Operations ▾

{{ if (not (is_paginator .)) }} {{ if (ne .Name "Validate") }} {{$name_html := html .Name}} + {{ if not (is_op_deprecated $.PDoc.Name .Name) -}}
{{client_html $ .Decl false | sanitize}}
+ {{ end -}} {{end}} {{end}} {{end}} @@ -254,7 +256,11 @@

func {{$name_html}}func ({{html .Recv}}) {{$name_html}}
Deprecated

+ {{ else }}

func ({{html .Recv}}) {{$name_html}}

+ {{ end -}} 
{{node_html $ .Decl true}}
{{comment_html .Doc}} {{$name := printf "%s_%s" $tname .Name}} diff --git a/vendor/github.com/aws/aws-sdk-go/doc-src/aws-godoc/templates/style.css b/vendor/github.com/aws/aws-sdk-go/doc-src/aws-godoc/templates/style.css index baea871e5..fb3c356b3 100644 --- a/vendor/github.com/aws/aws-sdk-go/doc-src/aws-godoc/templates/style.css +++ b/vendor/github.com/aws/aws-sdk-go/doc-src/aws-godoc/templates/style.css @@ -3,6 +3,20 @@ overflow:hidden; } +div.deprecated { + background-color: #a39f9f; + border-radius: 5px; + font-weight: bold; + display: inline; + padding: 2px; + overflow: auto; + color: #ffffff; + font-family: "Georgia", Times, serif; + text-align: center; + font-size: small; + margin-left: 5px; +} + a > img { max-height:70%; float:left; diff --git a/vendor/github.com/aws/aws-sdk-go/models/apis/appstream/2016-12-01/api-2.json b/vendor/github.com/aws/aws-sdk-go/models/apis/appstream/2016-12-01/api-2.json index 563a31fa7..0560c4bcd 100644 --- a/vendor/github.com/aws/aws-sdk-go/models/apis/appstream/2016-12-01/api-2.json +++ b/vendor/github.com/aws/aws-sdk-go/models/apis/appstream/2016-12-01/api-2.json @@ -22,7 +22,8 @@ "output":{"shape":"AssociateFleetResult"}, "errors":[ {"shape":"LimitExceededException"}, - {"shape":"ResourceNotFoundException"} + {"shape":"ResourceNotFoundException"}, + {"shape":"ConcurrentModificationException"} ] }, "CreateFleet":{ @@ -38,7 +39,8 @@ {"shape":"ResourceNotAvailableException"}, {"shape":"ResourceNotFoundException"}, {"shape":"LimitExceededException"}, - {"shape":"InvalidRoleException"} + {"shape":"InvalidRoleException"}, + {"shape":"ConcurrentModificationException"} ] }, "CreateStack":{ @@ -51,7 +53,8 @@ "output":{"shape":"CreateStackResult"}, "errors":[ {"shape":"LimitExceededException"}, - {"shape":"ResourceAlreadyExistsException"} + {"shape":"ResourceAlreadyExistsException"}, + {"shape":"ConcurrentModificationException"} ] }, "CreateStreamingURL":{ @@ -65,7 +68,8 @@ "errors":[ {"shape":"ResourceNotFoundException"}, {"shape":"ResourceNotAvailableException"}, - {"shape":"OperationNotPermittedException"} + {"shape":"OperationNotPermittedException"}, + {"shape":"InvalidParameterCombinationException"} ] }, "DeleteFleet":{ @@ -78,7 +82,8 @@ "output":{"shape":"DeleteFleetResult"}, "errors":[ {"shape":"ResourceInUseException"}, - {"shape":"ResourceNotFoundException"} + {"shape":"ResourceNotFoundException"}, + {"shape":"ConcurrentModificationException"} ] }, "DeleteStack":{ @@ -91,7 +96,8 @@ "output":{"shape":"DeleteStackResult"}, "errors":[ {"shape":"ResourceInUseException"}, - {"shape":"ResourceNotFoundException"} + {"shape":"ResourceNotFoundException"}, + {"shape":"ConcurrentModificationException"} ] }, "DescribeFleets":{ @@ -125,7 +131,10 @@ "requestUri":"/" }, "input":{"shape":"DescribeSessionsRequest"}, - "output":{"shape":"DescribeSessionsResult"} + "output":{"shape":"DescribeSessionsResult"}, + "errors":[ + {"shape":"InvalidParameterCombinationException"} + ] }, "DescribeStacks":{ "name":"DescribeStacks", @@ -149,7 +158,8 @@ "output":{"shape":"DisassociateFleetResult"}, "errors":[ {"shape":"ResourceInUseException"}, - {"shape":"ResourceNotFoundException"} + {"shape":"ResourceNotFoundException"}, + {"shape":"ConcurrentModificationException"} ] }, "ExpireSession":{ @@ -189,7 +199,9 @@ "output":{"shape":"StartFleetResult"}, "errors":[ {"shape":"ResourceNotFoundException"}, - {"shape":"LimitExceededException"} + {"shape":"OperationNotPermittedException"}, + {"shape":"LimitExceededException"}, + {"shape":"ConcurrentModificationException"} ] }, "StopFleet":{ @@ -201,7 +213,8 @@ "input":{"shape":"StopFleetRequest"}, "output":{"shape":"StopFleetResult"}, "errors":[ - {"shape":"ResourceNotFoundException"} + {"shape":"ResourceNotFoundException"}, + {"shape":"ConcurrentModificationException"} ] }, "UpdateFleet":{ @@ -216,7 +229,10 @@ {"shape":"ResourceInUseException"}, {"shape":"LimitExceededException"}, {"shape":"InvalidRoleException"}, - {"shape":"ResourceNotFoundException"} + {"shape":"ResourceNotFoundException"}, + {"shape":"ResourceNotAvailableException"}, + {"shape":"InvalidParameterCombinationException"}, + {"shape":"ConcurrentModificationException"} ] }, "UpdateStack":{ @@ -270,7 +286,15 @@ "members":{ } }, + "AuthenticationType":{ + "type":"string", + "enum":[ + "API", + "SAML" + ] + }, "Boolean":{"type":"boolean"}, + "BooleanObject":{"type":"boolean"}, "ComputeCapacity":{ "type":"structure", "required":["DesiredInstances"], @@ -288,6 +312,13 @@ "Available":{"shape":"Integer"} } }, + "ConcurrentModificationException":{ + "type":"structure", + "members":{ + "Message":{"shape":"ErrorMessage"} + }, + "exception":true + }, "CreateFleetRequest":{ "type":"structure", "required":[ @@ -305,7 +336,8 @@ "MaxUserDurationInSeconds":{"shape":"Integer"}, "DisconnectTimeoutInSeconds":{"shape":"Integer"}, "Description":{"shape":"Description"}, - "DisplayName":{"shape":"DisplayName"} + "DisplayName":{"shape":"DisplayName"}, + "EnableDefaultInternetAccess":{"shape":"BooleanObject"} } }, "CreateFleetResult":{ @@ -413,7 +445,8 @@ "FleetName":{"shape":"String"}, "UserId":{"shape":"UserId"}, "NextToken":{"shape":"String"}, - "Limit":{"shape":"Integer"} + "Limit":{"shape":"Integer"}, + "AuthenticationType":{"shape":"AuthenticationType"} } }, "DescribeSessionsResult":{ @@ -497,7 +530,8 @@ "State":{"shape":"FleetState"}, "VpcConfig":{"shape":"VpcConfig"}, "CreatedTime":{"shape":"Timestamp"}, - "FleetErrors":{"shape":"FleetErrors"} + "FleetErrors":{"shape":"FleetErrors"}, + "EnableDefaultInternetAccess":{"shape":"BooleanObject"} } }, "FleetError":{ @@ -550,6 +584,7 @@ "DisplayName":{"shape":"String"}, "State":{"shape":"ImageState"}, "Visibility":{"shape":"VisibilityType"}, + "ImageBuilderSupported":{"shape":"Boolean"}, "Platform":{"shape":"PlatformType"}, "Description":{"shape":"String"}, "StateChangeReason":{"shape":"ImageStateChangeReason"}, @@ -585,6 +620,13 @@ ] }, "Integer":{"type":"integer"}, + "InvalidParameterCombinationException":{ + "type":"structure", + "members":{ + "Message":{"shape":"ErrorMessage"} + }, + "exception":true + }, "InvalidRoleException":{ "type":"structure", "members":{ @@ -692,7 +734,8 @@ "UserId":{"shape":"UserId"}, "StackName":{"shape":"String"}, "FleetName":{"shape":"String"}, - "State":{"shape":"SessionState"} + "State":{"shape":"SessionState"}, + "AuthenticationType":{"shape":"AuthenticationType"} } }, "SessionList":{ @@ -773,7 +816,8 @@ "DisconnectTimeoutInSeconds":{"shape":"Integer"}, "DeleteVpcConfig":{"shape":"Boolean"}, "Description":{"shape":"Description"}, - "DisplayName":{"shape":"DisplayName"} + "DisplayName":{"shape":"DisplayName"}, + "EnableDefaultInternetAccess":{"shape":"BooleanObject"} } }, "UpdateFleetResult":{ diff --git a/vendor/github.com/aws/aws-sdk-go/models/apis/appstream/2016-12-01/docs-2.json b/vendor/github.com/aws/aws-sdk-go/models/apis/appstream/2016-12-01/docs-2.json index 24c800321..264e90cba 100644 --- a/vendor/github.com/aws/aws-sdk-go/models/apis/appstream/2016-12-01/docs-2.json +++ b/vendor/github.com/aws/aws-sdk-go/models/apis/appstream/2016-12-01/docs-2.json @@ -10,7 +10,7 @@ "DeleteStack": "

Deletes the stack. After this operation completes, the environment can no longer be activated, and any reservations made for the stack are released.

", "DescribeFleets": "

If fleet names are provided, this operation describes the specified fleets; otherwise, all the fleets in the account are described.

", "DescribeImages": "

Describes the images. If a list of names is not provided, all images in your account are returned. This operation does not return a paginated result.

", - "DescribeSessions": "

Describes the streaming sessions for a stack and a fleet. If a user ID is provided, this operation returns streaming sessions for only that user. Pass this value for the nextToken parameter in a subsequent call to this operation to retrieve the next set of items.

", + "DescribeSessions": "

Describes the streaming sessions for a stack and a fleet. If a user ID is provided, this operation returns streaming sessions for only that user. Pass this value for the nextToken parameter in a subsequent call to this operation to retrieve the next set of items. If an authentication type is not provided, the operation defaults to users authenticated using a streaming url.

", "DescribeStacks": "

If stack names are not provided, this operation describes the specified stacks; otherwise, all stacks in the account are described. Pass the nextToken value in a subsequent call to this operation to retrieve the next set of items.

", "DisassociateFleet": "

Disassociates a fleet from a stack.

", "ExpireSession": "

This operation immediately stops a streaming session.

", @@ -18,7 +18,7 @@ "ListAssociatedStacks": "

Lists all stacks to which the specified fleet is associated.

", "StartFleet": "

Starts a fleet.

", "StopFleet": "

Stops a fleet.

", - "UpdateFleet": "

Updates an existing fleet. All the attributes except the fleet name can be updated in the STOPPED state. Only ComputeCapacity and ImageName can be updated in any other state.

", + "UpdateFleet": "

Updates an existing fleet. All the attributes except the fleet name can be updated in the STOPPED state. When a fleet is in the RUNNING state, only DisplayName and ComputeCapacity can be updated. A fleet cannot be updated in a status of STARTING or STOPPING.

", "UpdateStack": "

Updates the specified fields in the stack with the specified name.

" }, "shapes": { @@ -53,13 +53,29 @@ "refs": { } }, + "AuthenticationType": { + "base": null, + "refs": { + "DescribeSessionsRequest$AuthenticationType": "

The authentication method of the user. It can be API for a user authenticated using a streaming url or SAML for a SAML federated user. If an authentication type is not provided, the operation defaults to users authenticated using a streaming url.

", + "Session$AuthenticationType": "

The authentication method of the user for whom the session was created. It can be API for a user authenticated using a streaming url or SAML for a SAML federated user.

" + } + }, "Boolean": { "base": null, "refs": { "Application$Enabled": "

An application can be disabled after image creation if there is a problem.

", + "Image$ImageBuilderSupported": "

Indicates whether an image builder can be launched from this image.

", "UpdateFleetRequest$DeleteVpcConfig": "

Delete the VPC association for the specified fleet.

" } }, + "BooleanObject": { + "base": null, + "refs": { + "CreateFleetRequest$EnableDefaultInternetAccess": "

Enable/Disable default Internet access from fleet.

", + "Fleet$EnableDefaultInternetAccess": "

Default Internet access from the fleet. True (Enabled), False (Disabled).

", + "UpdateFleetRequest$EnableDefaultInternetAccess": "

Enable/Disable default Internet access from fleet.

" + } + }, "ComputeCapacity": { "base": "

The capacity configuration for the fleet.

", "refs": { @@ -73,6 +89,11 @@ "Fleet$ComputeCapacityStatus": "

The capacity information for the fleet.

" } }, + "ConcurrentModificationException": { + "base": "

An API error occurred, please try again.

", + "refs": { + } + }, "CreateFleetRequest": { "base": "

Contains the parameters for the new fleet to create.

", "refs": { @@ -192,8 +213,10 @@ } }, "ErrorMessage": { - "base": null, + "base": "

The error message in the exception.

", "refs": { + "ConcurrentModificationException$Message": null, + "InvalidParameterCombinationException$Message": null, "InvalidRoleException$Message": null, "LimitExceededException$Message": null, "OperationNotPermittedException$Message": null, @@ -298,6 +321,11 @@ "UpdateFleetRequest$DisconnectTimeoutInSeconds": "

The time after disconnection when a session is considered to have ended. When the user reconnects after a disconnection, the user is connected to the same instance within this time interval.

" } }, + "InvalidParameterCombinationException": { + "base": "

Indicates an incorrect combination of parameters, or a missing parameter.

", + "refs": { + } + }, "InvalidRoleException": { "base": "

The specified role is invalid.

", "refs": { @@ -554,7 +582,7 @@ } }, "VpcConfig": { - "base": "

The VPC in which the fleet is launched.

", + "base": "

VPC configuration information.

", "refs": { "CreateFleetRequest$VpcConfig": "

The VPC configuration for the fleet.

", "Fleet$VpcConfig": "

The VPC configuration for the fleet.

", diff --git a/vendor/github.com/aws/aws-sdk-go/models/apis/appstream/2016-12-01/paginators-1.json b/vendor/github.com/aws/aws-sdk-go/models/apis/appstream/2016-12-01/paginators-1.json new file mode 100644 index 000000000..5677bd8e4 --- /dev/null +++ b/vendor/github.com/aws/aws-sdk-go/models/apis/appstream/2016-12-01/paginators-1.json @@ -0,0 +1,4 @@ +{ + "pagination": { + } +} diff --git a/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/api-2.json b/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/api-2.json index b34a9a937..31eaf9519 100644 --- a/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/api-2.json +++ b/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/api-2.json @@ -1,7 +1,6 @@ { "version":"2.0", "metadata":{ - "uid":"kinesis-2013-12-02", "apiVersion":"2013-12-02", "endpointPrefix":"kinesis", "jsonVersion":"1.1", @@ -9,7 +8,8 @@ "serviceAbbreviation":"Kinesis", "serviceFullName":"Amazon Kinesis", "signatureVersion":"v4", - "targetPrefix":"Kinesis_20131202" + "targetPrefix":"Kinesis_20131202", + "uid":"kinesis-2013-12-02" }, "operations":{ "AddTagsToStream":{ diff --git a/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/docs-2.json b/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/docs-2.json index f95340ed9..c81ef01da 100644 --- a/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/docs-2.json +++ b/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/docs-2.json @@ -3,7 +3,7 @@ "service": "Amazon Kinesis Streams Service API Reference

Amazon Kinesis Streams is a managed service that scales elastically for real time processing of streaming big data.

", "operations": { "AddTagsToStream": "

Adds or updates tags for the specified Amazon Kinesis stream. Each stream can have up to 10 tags.

If tags have already been assigned to the stream, AddTagsToStream overwrites any existing tags that correspond to the specified tag keys.

", - "CreateStream": "

Creates an Amazon Kinesis stream. A stream captures and transports data records that are continuously emitted from different data sources or producers. Scale-out within a stream is explicitly supported by means of shards, which are uniquely identified groups of data records in a stream.

You specify and control the number of shards that a stream is composed of. Each shard can support reads up to 5 transactions per second, up to a maximum data read total of 2 MB per second. Each shard can support writes up to 1,000 records per second, up to a maximum data write total of 1 MB per second. You can add shards to a stream if the amount of data input increases and you can remove shards if the amount of data input decreases.

The stream name identifies the stream. The name is scoped to the AWS account used by the application. It is also scoped by region. That is, two streams in two different accounts can have the same name, and two streams in the same account, but in two different regions, can have the same name.

CreateStream is an asynchronous operation. Upon receiving a CreateStream request, Amazon Kinesis immediately returns and sets the stream status to CREATING. After the stream is created, Amazon Kinesis sets the stream status to ACTIVE. You should perform read and write operations only on an ACTIVE stream.

You receive a LimitExceededException when making a CreateStream request if you try to do one of the following:

For the default shard limit for an AWS account, see Streams Limits in the Amazon Kinesis Streams Developer Guide. If you need to increase this limit, contact AWS Support.

You can use DescribeStream to check the stream status, which is returned in StreamStatus.

CreateStream has a limit of 5 transactions per second per account.

", + "CreateStream": "

Creates an Amazon Kinesis stream. A stream captures and transports data records that are continuously emitted from different data sources or producers. Scale-out within a stream is explicitly supported by means of shards, which are uniquely identified groups of data records in a stream.

You specify and control the number of shards that a stream is composed of. Each shard can support reads up to 5 transactions per second, up to a maximum data read total of 2 MB per second. Each shard can support writes up to 1,000 records per second, up to a maximum data write total of 1 MB per second. You can add shards to a stream if the amount of data input increases and you can remove shards if the amount of data input decreases.

The stream name identifies the stream. The name is scoped to the AWS account used by the application. It is also scoped by region. That is, two streams in two different accounts can have the same name, and two streams in the same account, but in two different regions, can have the same name.

CreateStream is an asynchronous operation. Upon receiving a CreateStream request, Amazon Kinesis immediately returns and sets the stream status to CREATING. After the stream is created, Amazon Kinesis sets the stream status to ACTIVE. You should perform read and write operations only on an ACTIVE stream.

You receive a LimitExceededException when making a CreateStream request if you try to do one of the following:

For the default shard limit for an AWS account, see Streams Limits in the Amazon Kinesis Streams Developer Guide. If you need to increase this limit, contact AWS Support.

You can use DescribeStream to check the stream status, which is returned in StreamStatus.

CreateStream has a limit of 5 transactions per second per account.

", "DecreaseStreamRetentionPeriod": "

Decreases the Amazon Kinesis stream's retention period, which is the length of time data records are accessible after they are added to the stream. The minimum value of a stream's retention period is 24 hours.

This operation may result in lost data. For example, if the stream's retention period is 48 hours and is decreased to 24 hours, any data already in the stream that is older than 24 hours is inaccessible.

", "DeleteStream": "

Deletes an Amazon Kinesis stream and all its shards and data. You must shut down any applications that are operating on the stream before you delete the stream. If an application attempts to operate on a deleted stream, it will receive the exception ResourceNotFoundException.

If the stream is in the ACTIVE state, you can delete it. After a DeleteStream request, the specified stream is in the DELETING state until Amazon Kinesis completes the deletion.

Note: Amazon Kinesis might continue to accept data read and write operations, such as PutRecord, PutRecords, and GetRecords, on a stream in the DELETING state until the stream deletion is complete.

When you delete a stream, any shards in that stream are also deleted, and any tags are dissociated from the stream.

You can use the DescribeStream operation to check the state of the stream, which is returned in StreamStatus.

DeleteStream has a limit of 5 transactions per second per account.

", "DescribeLimits": "

Describes the shard limits and usage for the account.

If you update your account limits, the old limits might be returned for a few minutes.

This operation has a limit of 1 transaction per second per account.

", @@ -411,7 +411,7 @@ "ShardIteratorType": { "base": null, "refs": { - "GetShardIteratorInput$ShardIteratorType": "

Determines how the shard iterator is used to start reading data records from the shard.

The following are the valid Amazon Kinesis shard iterator types:

" + "GetShardIteratorInput$ShardIteratorType": "

Determines how the shard iterator is used to start reading data records from the shard.

The following are the valid Amazon Kinesis shard iterator types:

" } }, "ShardList": { diff --git a/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/paginators-1.json b/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/paginators-1.json index 007f563b4..118a59005 100644 --- a/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/paginators-1.json +++ b/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/paginators-1.json @@ -15,4 +15,4 @@ "result_key": "StreamNames" } } -} +} \ No newline at end of file diff --git a/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/waiters-2.json b/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/waiters-2.json index 8e3162ffa..d61efe435 100644 --- a/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/waiters-2.json +++ b/vendor/github.com/aws/aws-sdk-go/models/apis/kinesis/2013-12-02/waiters-2.json @@ -13,6 +13,18 @@ "argument": "StreamDescription.StreamStatus" } ] + }, + "StreamNotExists": { + "delay": 10, + "operation": "DescribeStream", + "maxAttempts": 18, + "acceptors": [ + { + "expected": "ResourceNotFoundException", + "matcher": "error", + "state": "success" + } + ] } } } diff --git a/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2013-01-10/docs-2.json b/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2013-01-10/docs-2.json index 808bdea85..811c7bd7a 100644 --- a/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2013-01-10/docs-2.json +++ b/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2013-01-10/docs-2.json @@ -836,7 +836,7 @@ } }, "InvalidDBParameterGroupStateFault": { - "base": "

The DB parameter group cannot be deleted because it is in use.

", + "base": "

The DB parameter group is in use or is in an invalid state. If you are attempting to delete the parameter group, you cannot delete it when the parameter group is in this state.

", "refs": { } }, diff --git a/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2013-02-12/docs-2.json b/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2013-02-12/docs-2.json index 4b1c6bc25..695558b0b 100644 --- a/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2013-02-12/docs-2.json +++ b/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2013-02-12/docs-2.json @@ -883,7 +883,7 @@ } }, "InvalidDBParameterGroupStateFault": { - "base": "

The DB parameter group cannot be deleted because it is in use.

", + "base": "

The DB parameter group is in use or is in an invalid state. If you are attempting to delete the parameter group, you cannot delete it when the parameter group is in this state.

", "refs": { } }, diff --git a/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2013-09-09/docs-2.json b/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2013-09-09/docs-2.json index 111ed16d5..2058250be 100644 --- a/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2013-09-09/docs-2.json +++ b/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2013-09-09/docs-2.json @@ -939,7 +939,7 @@ } }, "InvalidDBParameterGroupStateFault": { - "base": "

The DB parameter group cannot be deleted because it is in use.

", + "base": "

The DB parameter group is in use or is in an invalid state. If you are attempting to delete the parameter group, you cannot delete it when the parameter group is in this state.

", "refs": { } }, diff --git a/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2014-09-01/docs-2.json b/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2014-09-01/docs-2.json index c326bd7bd..66e4ff988 100644 --- a/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2014-09-01/docs-2.json +++ b/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2014-09-01/docs-2.json @@ -962,7 +962,7 @@ } }, "InvalidDBParameterGroupStateFault": { - "base": "

The DB parameter group cannot be deleted because it is in use.

", + "base": "

The DB parameter group is in use or is in an invalid state. If you are attempting to delete the parameter group, you cannot delete it when the parameter group is in this state.

", "refs": { } }, diff --git a/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2014-10-31/api-2.json b/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2014-10-31/api-2.json index f5ad4601b..186a47e1b 100644 --- a/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2014-10-31/api-2.json +++ b/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2014-10-31/api-2.json @@ -1403,22 +1403,21 @@ }, "errors":[ {"shape":"DBClusterAlreadyExistsFault"}, - {"shape":"DBClusterQuotaExceededFault"}, - {"shape":"StorageQuotaExceededFault"}, - {"shape":"DBSubnetGroupNotFoundFault"}, {"shape":"DBClusterNotFoundFault"}, + {"shape":"DBClusterQuotaExceededFault"}, {"shape":"DBClusterSnapshotNotFoundFault"}, + {"shape":"DBSubnetGroupNotFoundFault"}, {"shape":"InsufficientDBClusterCapacityFault"}, {"shape":"InsufficientStorageClusterCapacityFault"}, - {"shape":"InvalidDBSnapshotStateFault"}, {"shape":"InvalidDBClusterSnapshotStateFault"}, - {"shape":"StorageQuotaExceededFault"}, - {"shape":"InvalidVPCNetworkStateFault"}, + {"shape":"InvalidDBClusterStateFault"}, + {"shape":"InvalidDBSnapshotStateFault"}, {"shape":"InvalidRestoreFault"}, - {"shape":"DBSubnetGroupNotFoundFault"}, {"shape":"InvalidSubnet"}, + {"shape":"InvalidVPCNetworkStateFault"}, + {"shape":"KMSKeyNotAccessibleFault"}, {"shape":"OptionGroupNotFoundFault"}, - {"shape":"KMSKeyNotAccessibleFault"} + {"shape":"StorageQuotaExceededFault"} ] }, "RestoreDBInstanceFromDBSnapshot":{ @@ -1845,7 +1844,8 @@ "Tags":{"shape":"TagList"}, "StorageEncrypted":{"shape":"BooleanOptional"}, "KmsKeyId":{"shape":"String"}, - "PreSignedUrl":{"shape":"String"} + "PreSignedUrl":{"shape":"String"}, + "EnableIAMDatabaseAuthentication":{"shape":"BooleanOptional"} } }, "CreateDBClusterParameterGroupMessage":{ @@ -1937,7 +1937,8 @@ "MonitoringRoleArn":{"shape":"String"}, "DomainIAMRoleName":{"shape":"String"}, "PromotionTier":{"shape":"IntegerOptional"}, - "Timezone":{"shape":"String"} + "Timezone":{"shape":"String"}, + "EnableIAMDatabaseAuthentication":{"shape":"BooleanOptional"} } }, "CreateDBInstanceReadReplicaMessage":{ @@ -1963,7 +1964,8 @@ "MonitoringInterval":{"shape":"IntegerOptional"}, "MonitoringRoleArn":{"shape":"String"}, "KmsKeyId":{"shape":"String"}, - "PreSignedUrl":{"shape":"String"} + "PreSignedUrl":{"shape":"String"}, + "EnableIAMDatabaseAuthentication":{"shape":"BooleanOptional"} } }, "CreateDBInstanceReadReplicaResult":{ @@ -2133,6 +2135,7 @@ "DbClusterResourceId":{"shape":"String"}, "DBClusterArn":{"shape":"String"}, "AssociatedRoles":{"shape":"DBClusterRoles"}, + "IAMDatabaseAuthenticationEnabled":{"shape":"Boolean"}, "ClusterCreateTime":{"shape":"TStamp"} }, "wrapper":true @@ -2330,7 +2333,8 @@ "PercentProgress":{"shape":"Integer"}, "StorageEncrypted":{"shape":"Boolean"}, "KmsKeyId":{"shape":"String"}, - "DBClusterSnapshotArn":{"shape":"String"} + "DBClusterSnapshotArn":{"shape":"String"}, + "IAMDatabaseAuthenticationEnabled":{"shape":"Boolean"} }, "wrapper":true }, @@ -2470,7 +2474,8 @@ "MonitoringRoleArn":{"shape":"String"}, "PromotionTier":{"shape":"IntegerOptional"}, "DBInstanceArn":{"shape":"String"}, - "Timezone":{"shape":"String"} + "Timezone":{"shape":"String"}, + "IAMDatabaseAuthenticationEnabled":{"shape":"Boolean"} }, "wrapper":true }, @@ -2740,7 +2745,8 @@ "Encrypted":{"shape":"Boolean"}, "KmsKeyId":{"shape":"String"}, "DBSnapshotArn":{"shape":"String"}, - "Timezone":{"shape":"String"} + "Timezone":{"shape":"String"}, + "IAMDatabaseAuthenticationEnabled":{"shape":"Boolean"} }, "wrapper":true }, @@ -3823,7 +3829,8 @@ "MasterUserPassword":{"shape":"String"}, "OptionGroupName":{"shape":"String"}, "PreferredBackupWindow":{"shape":"String"}, - "PreferredMaintenanceWindow":{"shape":"String"} + "PreferredMaintenanceWindow":{"shape":"String"}, + "EnableIAMDatabaseAuthentication":{"shape":"BooleanOptional"} } }, "ModifyDBClusterParameterGroupMessage":{ @@ -3897,7 +3904,8 @@ "PubliclyAccessible":{"shape":"BooleanOptional"}, "MonitoringRoleArn":{"shape":"String"}, "DomainIAMRoleName":{"shape":"String"}, - "PromotionTier":{"shape":"IntegerOptional"} + "PromotionTier":{"shape":"IntegerOptional"}, + "EnableIAMDatabaseAuthentication":{"shape":"BooleanOptional"} } }, "ModifyDBInstanceResult":{ @@ -4240,7 +4248,8 @@ "SupportsStorageEncryption":{"shape":"Boolean"}, "StorageType":{"shape":"String"}, "SupportsIops":{"shape":"Boolean"}, - "SupportsEnhancedMonitoring":{"shape":"Boolean"} + "SupportsEnhancedMonitoring":{"shape":"Boolean"}, + "SupportsIAMDatabaseAuthentication":{"shape":"Boolean"} }, "wrapper":true }, @@ -4663,6 +4672,7 @@ "Tags":{"shape":"TagList"}, "StorageEncrypted":{"shape":"BooleanOptional"}, "KmsKeyId":{"shape":"String"}, + "EnableIAMDatabaseAuthentication":{"shape":"BooleanOptional"}, "SourceEngine":{"shape":"String"}, "SourceEngineVersion":{"shape":"String"}, "S3BucketName":{"shape":"String"}, @@ -4695,7 +4705,8 @@ "OptionGroupName":{"shape":"String"}, "VpcSecurityGroupIds":{"shape":"VpcSecurityGroupIdList"}, "Tags":{"shape":"TagList"}, - "KmsKeyId":{"shape":"String"} + "KmsKeyId":{"shape":"String"}, + "EnableIAMDatabaseAuthentication":{"shape":"BooleanOptional"} } }, "RestoreDBClusterFromSnapshotResult":{ @@ -4720,7 +4731,8 @@ "OptionGroupName":{"shape":"String"}, "VpcSecurityGroupIds":{"shape":"VpcSecurityGroupIdList"}, "Tags":{"shape":"TagList"}, - "KmsKeyId":{"shape":"String"} + "KmsKeyId":{"shape":"String"}, + "EnableIAMDatabaseAuthentication":{"shape":"BooleanOptional"} } }, "RestoreDBClusterToPointInTimeResult":{ @@ -4756,7 +4768,8 @@ "TdeCredentialPassword":{"shape":"String"}, "Domain":{"shape":"String"}, "CopyTagsToSnapshot":{"shape":"BooleanOptional"}, - "DomainIAMRoleName":{"shape":"String"} + "DomainIAMRoleName":{"shape":"String"}, + "EnableIAMDatabaseAuthentication":{"shape":"BooleanOptional"} } }, "RestoreDBInstanceFromDBSnapshotResult":{ @@ -4794,7 +4807,8 @@ "TdeCredentialArn":{"shape":"String"}, "TdeCredentialPassword":{"shape":"String"}, "Domain":{"shape":"String"}, - "DomainIAMRoleName":{"shape":"String"} + "DomainIAMRoleName":{"shape":"String"}, + "EnableIAMDatabaseAuthentication":{"shape":"BooleanOptional"} } }, "RestoreDBInstanceToPointInTimeResult":{ diff --git a/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2014-10-31/docs-2.json b/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2014-10-31/docs-2.json index 49ff272d3..ce4f065e1 100644 --- a/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2014-10-31/docs-2.json +++ b/vendor/github.com/aws/aws-sdk-go/models/apis/rds/2014-10-31/docs-2.json @@ -1,6 +1,6 @@ { "version": "2.0", - "service": "Amazon Relational Database Service

Amazon Relational Database Service (Amazon RDS) is a web service that makes it easier to set up, operate, and scale a relational database in the cloud. It provides cost-efficient, resizeable capacity for an industry-standard relational database and manages common database administration tasks, freeing 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 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 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

Amazon RDS User Guide

", + "service": "Amazon Relational Database Service

Amazon Relational Database Service (Amazon RDS) is a web service that makes it easier to set up, operate, and scale a relational database in the cloud. It provides cost-efficient, resizable capacity for an industry-standard relational database and manages common database administration tasks, freeing 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 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 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

Amazon RDS User Guide

", "operations": { "AddRoleToDBCluster": "

Associates an Identity and Access Management (IAM) role from an Aurora DB cluster. For more information, see Authorizing Amazon Aurora to Access Other AWS Services On Your Behalf.

", "AddSourceIdentifierToSubscription": "

Adds a source identifier to an existing RDS event notification subscription.

", @@ -10,13 +10,13 @@ "CopyDBClusterParameterGroup": "

Copies the specified DB cluster parameter group.

", "CopyDBClusterSnapshot": "

Copies a snapshot of a DB cluster.

To copy a DB cluster snapshot from a shared manual DB cluster snapshot, SourceDBClusterSnapshotIdentifier must be the Amazon Resource Name (ARN) of the shared DB cluster snapshot.

You can copy an encrypted DB cluster snapshot from another AWS region. In that case, the region where you call the CopyDBClusterSnapshot action is the destination region for the encrypted DB cluster snapshot to be copied to. To copy an encrypted DB cluster snapshot from another region, you must provide the following values:

To cancel the copy operation once it is in progress, delete the target DB cluster snapshot identified by TargetDBClusterSnapshotIdentifier while that DB cluster snapshot is in \"copying\" status.

For more information on copying encrypted DB cluster snapshots from one region to another, see Copying a DB Cluster Snapshot in the Same Account, Either in the Same Region or Across Regions in the Amazon RDS User Guide.

For more information on Amazon Aurora, see Aurora on Amazon RDS in the Amazon RDS User Guide.

", "CopyDBParameterGroup": "

Copies the specified DB parameter group.

", - "CopyDBSnapshot": "

Copies the specified DB snapshot. The source DB snapshot must be in the \"available\" state.

To copy a DB snapshot from a shared manual DB snapshot, SourceDBSnapshotIdentifier must be the Amazon Resource Name (ARN) of the shared DB snapshot.

You can copy an encrypted DB snapshot from another AWS Region. In that case, the region where you call the CopyDBSnapshot action is the destination region for the encrypted DB snapshot to be copied to. To copy an encrypted DB snapshot from another region, you must provide the following values:

For more information on copying encrypted snapshots from one region to another, see Copying an Encrypted DB Snapshot to Another Region in the Amazon RDS User Guide.

", + "CopyDBSnapshot": "

Copies the specified DB snapshot. The source DB snapshot must be in the \"available\" state.

To copy a DB snapshot from a shared manual DB snapshot, SourceDBSnapshotIdentifier must be the Amazon Resource Name (ARN) of the shared DB snapshot.

You can copy an encrypted DB snapshot from another AWS region. In that case, the region where you call the CopyDBSnapshot action is the destination region for the encrypted DB snapshot to be copied to. To copy an encrypted DB snapshot from another region, you must provide the following values:

For more information on copying encrypted snapshots from one region to another, see Copying a DB Snapshot in the Amazon RDS User Guide.

", "CopyOptionGroup": "

Copies the specified option group.

", "CreateDBCluster": "

Creates a new Amazon Aurora DB cluster.

You can use the ReplicationSourceIdentifier parameter to create the DB cluster as a Read Replica of another DB cluster or Amazon RDS MySQL DB instance. For cross-region replication where the DB cluster identified by ReplicationSourceIdentifier is encrypted, you must also specify the PreSignedUrl parameter.

For more information on Amazon Aurora, see Aurora on Amazon RDS in the Amazon RDS User Guide.

", "CreateDBClusterParameterGroup": "

Creates a new DB cluster parameter group.

Parameters in a DB cluster parameter group apply to all of the instances in a DB cluster.

A DB cluster parameter group is initially created with the default parameters for the database engine used by instances in the DB cluster. To provide custom values for any of the parameters, you must modify the group after creating it using ModifyDBClusterParameterGroup. Once you've created a DB cluster parameter group, you need to associate it with your DB cluster using ModifyDBCluster. When you associate a new DB cluster parameter group with a running DB cluster, you need to reboot the DB instances in the DB cluster without failover for the new DB cluster parameter group and associated settings to take effect.

After you create a DB cluster parameter group, you should wait at least 5 minutes before creating your first DB cluster that uses that DB cluster parameter group as the default parameter group. This allows Amazon RDS to fully complete the create action before the DB cluster parameter group is used as the default for a new DB cluster. This is especially important for parameters that are critical when creating the default database for a DB cluster, such as the character set for the default database defined by the character_set_database parameter. You can use the Parameter Groups option of the Amazon RDS console or the DescribeDBClusterParameters command to verify that your DB cluster parameter group has been created or modified.

For more information on Amazon Aurora, see Aurora on Amazon RDS in the Amazon RDS User Guide.

", "CreateDBClusterSnapshot": "

Creates a snapshot of a DB cluster. For more information on Amazon Aurora, see Aurora on Amazon RDS in the Amazon RDS User Guide.

", "CreateDBInstance": "

Creates a new DB instance.

", - "CreateDBInstanceReadReplica": "

Creates a DB instance for a DB instance running MySQL, MariaDB, or PostgreSQL that acts as a Read Replica of a source DB instance.

All Read Replica DB instances are created as Single-AZ deployments with backups disabled. All other DB instance attributes (including DB security groups and DB parameter groups) are inherited from the source DB instance, except as specified below.

The source DB instance must have backup retention enabled.

You can create an encrypted Read Replica in a different AWS Region than the source DB instance. In that case, the region where you call the CreateDBInstanceReadReplica action is the destination region of the encrypted Read Replica. The source DB instance must be encrypted.

To create an encrypted Read Replica in another AWS Region, you must provide the following values:

", + "CreateDBInstanceReadReplica": "

Creates a DB instance for a DB instance running MySQL, MariaDB, or PostgreSQL that acts as a Read Replica of a source DB instance.

Amazon Aurora does not support this action. You must call the CreateDBInstance action to create a DB instance for an Aurora DB cluster.

All Read Replica DB instances are created as Single-AZ deployments with backups disabled. All other DB instance attributes (including DB security groups and DB parameter groups) are inherited from the source DB instance, except as specified below.

The source DB instance must have backup retention enabled.

You can create an encrypted Read Replica in a different AWS Region than the source DB instance. In that case, the region where you call the CreateDBInstanceReadReplica action is the destination region of the encrypted Read Replica. The source DB instance must be encrypted.

To create an encrypted Read Replica in another AWS Region, you must provide the following values:

", "CreateDBParameterGroup": "

Creates a new DB parameter group.

A DB parameter group is initially created with the default parameters for the database engine used by the DB instance. To provide custom values for any of the parameters, you must modify the group after creating it using ModifyDBParameterGroup. Once you've created a DB parameter group, you need to associate it with your DB instance using ModifyDBInstance. When you associate a new DB parameter group with a running DB instance, you need to reboot the DB instance without failover for the new DB parameter group and associated settings to take effect.

After you create a DB parameter group, you should wait at least 5 minutes before creating your first DB instance that uses that DB parameter group as the default parameter group. This allows Amazon RDS to fully complete the create action before the parameter group is used as the default for a new DB instance. This is especially important for parameters that are critical when creating the default database for a DB instance, such as the character set for the default database defined by the character_set_database parameter. You can use the Parameter Groups option of the Amazon RDS console or the DescribeDBParameters command to verify that your DB parameter group has been created or modified.

", "CreateDBSecurityGroup": "

Creates a new DB security group. DB security groups control access to a DB instance.

", "CreateDBSnapshot": "

Creates a DBSnapshot. The source DBInstance must be in \"available\" state.

", @@ -66,11 +66,11 @@ "ListTagsForResource": "

Lists all tags on an Amazon RDS resource.

For an overview on tagging an Amazon RDS resource, see Tagging Amazon RDS Resources.

", "ModifyDBCluster": "

Modify a setting for an Amazon Aurora DB cluster. You can change one or more database configuration parameters by specifying these parameters and the new values in the request. For more information on Amazon Aurora, see Aurora on Amazon RDS in the Amazon RDS User Guide.

", "ModifyDBClusterParameterGroup": "

Modifies the parameters of a DB cluster parameter group. To modify more than one parameter, submit a list of the following: ParameterName, ParameterValue, and ApplyMethod. A maximum of 20 parameters can be modified in a single request.

For more information on Amazon Aurora, see Aurora on Amazon RDS in the Amazon RDS User Guide.

Changes to dynamic parameters are applied immediately. Changes to static parameters require a reboot without failover to the DB cluster associated with the parameter group before the change can take effect.

After you create a DB cluster parameter group, you should wait at least 5 minutes before creating your first DB cluster that uses that DB cluster parameter group as the default parameter group. This allows Amazon RDS to fully complete the create action before the parameter group is used as the default for a new DB cluster. This is especially important for parameters that are critical when creating the default database for a DB cluster, such as the character set for the default database defined by the character_set_database parameter. You can use the Parameter Groups option of the Amazon RDS console or the DescribeDBClusterParameters command to verify that your DB cluster parameter group has been created or modified.

", - "ModifyDBClusterSnapshotAttribute": "

Adds an attribute and values to, or removes an attribute and values from, a manual DB cluster snapshot.

To share a manual DB cluster snapshot with other AWS accounts, specify restore as the AttributeName and use the ValuesToAdd parameter to add a list of IDs of the AWS accounts that are authorized to restore the manual DB cluster snapshot. Use the value all to make the manual DB cluster snapshot public, which means that it can be copied or restored by all AWS accounts. Do not add the all value for any manual DB cluster snapshots that contain private information that you don't want available to all AWS accounts.

To view which AWS accounts have access to copy or restore a manual DB cluster snapshot, or whether a manual DB cluster snapshot public or private, use the DescribeDBClusterSnapshotAttributes API action.

If a manual DB cluster snapshot is encrypted, it cannot be shared.

", + "ModifyDBClusterSnapshotAttribute": "

Adds an attribute and values to, or removes an attribute and values from, a manual DB cluster snapshot.

To share a manual DB cluster snapshot with other AWS accounts, specify restore as the AttributeName and use the ValuesToAdd parameter to add a list of IDs of the AWS accounts that are authorized to restore the manual DB cluster snapshot. Use the value all to make the manual DB cluster snapshot public, which means that it can be copied or restored by all AWS accounts. Do not add the all value for any manual DB cluster snapshots that contain private information that you don't want available to all AWS accounts. If a manual DB cluster snapshot is encrypted, it can be shared, but only by specifying a list of authorized AWS account IDs for the ValuesToAdd parameter. You can't use all as a value for that parameter in this case.

To view which AWS accounts have access to copy or restore a manual DB cluster snapshot, or whether a manual DB cluster snapshot public or private, use the DescribeDBClusterSnapshotAttributes API action.

", "ModifyDBInstance": "

Modifies settings for a DB instance. You can change one or more database configuration parameters by specifying these parameters and the new values in the request.

", "ModifyDBParameterGroup": "

Modifies the parameters of a DB parameter group. To modify more than one parameter, submit a list of the following: ParameterName, ParameterValue, and ApplyMethod. A maximum of 20 parameters can be modified in a single request.

Changes to dynamic parameters are applied immediately. Changes to static parameters require a reboot without failover to the DB instance associated with the parameter group before the change can take effect.

After you modify a DB parameter group, you should wait at least 5 minutes before creating your first DB instance that uses that DB parameter group as the default parameter group. This allows Amazon RDS to fully complete the modify action before the parameter group is used as the default for a new DB instance. This is especially important for parameters that are critical when creating the default database for a DB instance, such as the character set for the default database defined by the character_set_database parameter. You can use the Parameter Groups option of the Amazon RDS console or the DescribeDBParameters command to verify that your DB parameter group has been created or modified.

", "ModifyDBSnapshot": "

Updates a manual DB snapshot, which can be encrypted or not encrypted, with a new engine version. You can update the engine version to either a new major or minor engine version.

Amazon RDS supports upgrading a MySQL DB snapshot from MySQL 5.1 to MySQL 5.5.

", - "ModifyDBSnapshotAttribute": "

Adds an attribute and values to, or removes an attribute and values from, a manual DB snapshot.

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 IDs of the AWS accounts that are authorized to restore the manual DB snapshot. Uses the value all to make the manual DB snapshot public, which means it can be copied or restored by all AWS accounts. Do not add the all value for any manual DB snapshots that contain private information that you don't want available to all AWS accounts.

To view which AWS accounts have access to copy or restore a manual DB snapshot, or whether a manual DB snapshot public or private, use the DescribeDBSnapshotAttributes API action.

If the manual DB snapshot is encrypted, it cannot be shared.

", + "ModifyDBSnapshotAttribute": "

Adds an attribute and values to, or removes an attribute and values from, a manual DB snapshot.

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 IDs of the AWS accounts that are authorized to restore the manual DB snapshot. Uses the value all to make the manual DB snapshot public, which means it can be copied or restored by all AWS accounts. Do not add the all value for any manual DB snapshots that contain private information that you don't want available to all AWS accounts. If the manual DB snapshot is encrypted, it can be shared, but only by specifying a list of authorized AWS account IDs for the ValuesToAdd parameter. You can't use all as a value for that parameter in this case.

To view which AWS accounts have access to copy or restore a manual DB snapshot, or whether a manual DB snapshot public or private, use the DescribeDBSnapshotAttributes API action.

", "ModifyDBSubnetGroup": "

Modifies an existing DB subnet group. DB subnet groups must contain at least one subnet in at least two AZs in the region.

", "ModifyEventSubscription": "

Modifies an existing RDS event notification subscription. Note that you cannot modify the source identifiers using this call; to change source identifiers for a subscription, use the AddSourceIdentifierToSubscription and RemoveSourceIdentifierFromSubscription calls.

You can see a list of the event categories for a given SourceType in the Events topic in the Amazon RDS User Guide or by using the DescribeEventCategories action.

", "ModifyOptionGroup": "

Modifies an existing option group.

", @@ -82,8 +82,8 @@ "RemoveSourceIdentifierFromSubscription": "

Removes a source identifier from an existing RDS event notification subscription.

", "RemoveTagsFromResource": "

Removes metadata tags from an Amazon RDS resource.

For an overview on tagging an Amazon RDS resource, see Tagging Amazon RDS Resources.

", "ResetDBClusterParameterGroup": "

Modifies the parameters of a DB cluster parameter group to the default value. To reset specific parameters submit a list of the following: ParameterName and ApplyMethod. To reset the entire DB cluster parameter group, specify the DBClusterParameterGroupName and ResetAllParameters parameters.

When resetting the entire group, dynamic parameters are updated immediately and static parameters are set to pending-reboot to take effect on the next DB instance restart or RebootDBInstance request. You must call RebootDBInstance for every DB instance in your DB cluster that you want the updated static parameter to apply to.

For more information on Amazon Aurora, see Aurora on Amazon RDS in the Amazon RDS User Guide.

", - "ResetDBParameterGroup": "

Modifies the parameters of a DB parameter group to the engine/system default value. To reset specific parameters submit a list of the following: ParameterName and ApplyMethod. To reset the entire DB parameter group, specify the DBParameterGroup name and ResetAllParameters parameters. When resetting the entire group, dynamic parameters are updated immediately and static parameters are set to pending-reboot to take effect on the next DB instance restart or RebootDBInstance request.

", - "RestoreDBClusterFromS3": "

Creates an Amazon Aurora DB cluster from data stored in an Amazon S3 bucket. Amazon RDS must be authorized to access the Amazon S3 bucket and the data must be created using the Percona XtraBackup utility as described in Migrating Data from MySQL by Using an Amazon S3 Bucket.

", + "ResetDBParameterGroup": "

Modifies the parameters of a DB parameter group to the engine/system default value. To reset specific parameters, provide a list of the following: ParameterName and ApplyMethod. To reset the entire DB parameter group, specify the DBParameterGroup name and ResetAllParameters parameters. When resetting the entire group, dynamic parameters are updated immediately and static parameters are set to pending-reboot to take effect on the next DB instance restart or RebootDBInstance request.

", + "RestoreDBClusterFromS3": "

Creates an Amazon Aurora DB cluster from data stored in an Amazon S3 bucket. Amazon RDS must be authorized to access the Amazon S3 bucket and the data must be created using the Percona XtraBackup utility as described in Migrating Data from MySQL by Using an Amazon S3 Bucket.

", "RestoreDBClusterFromSnapshot": "

Creates a new DB cluster from a DB cluster snapshot. The target DB cluster is created from the source DB cluster restore point with the same configuration as the original source DB cluster, except that the new DB cluster is created with the default security group.

For more information on Amazon Aurora, see Aurora on Amazon RDS in the Amazon RDS User Guide.

", "RestoreDBClusterToPointInTime": "

Restores a DB cluster to an arbitrary point in time. Users can restore to any point in time before LatestRestorableTime for up to BackupRetentionPeriod days. The target DB cluster is created from the source DB cluster with the same configuration as the original DB cluster, except that the new DB cluster is created with the default DB security group.

For more information on Amazon Aurora, see Aurora on Amazon RDS in the Amazon RDS User Guide.

", "RestoreDBInstanceFromDBSnapshot": "

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 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 and not a single-AZ deployment.

If your intent is to replace your original DB instance with the new, restored DB instance, then rename your original DB instance before you call the RestoreDBInstanceFromDBSnapshot action. RDS does not allow two DB instances with the same name. Once you have renamed your original DB instance with a different identifier, then you can pass the original name of the DB instance as the DBInstanceIdentifier in the call to the RestoreDBInstanceFromDBSnapshot action. The result is that you will replace the original DB instance with the DB instance created from the snapshot.

If you are restoring from a shared manual DB snapshot, the DBSnapshotIdentifier must be the ARN of the shared DB snapshot.

", @@ -208,15 +208,19 @@ "refs": { "DBCluster$MultiAZ": "

Specifies whether the DB cluster has instances in multiple Availability Zones.

", "DBCluster$StorageEncrypted": "

Specifies whether the DB cluster is encrypted.

", + "DBCluster$IAMDatabaseAuthenticationEnabled": "

True if mapping of AWS Identity and Access Management (IAM) accounts to database accounts is enabled; otherwise false.

", "DBClusterMember$IsClusterWriter": "

Value that is true if the cluster member is the primary instance for the DB cluster and false otherwise.

", "DBClusterSnapshot$StorageEncrypted": "

Specifies whether the DB cluster snapshot is encrypted.

", + "DBClusterSnapshot$IAMDatabaseAuthenticationEnabled": "

True if mapping of AWS Identity and Access Management (IAM) accounts to database accounts is enabled; otherwise false.

", "DBInstance$MultiAZ": "

Specifies if the DB instance is a Multi-AZ deployment.

", "DBInstance$AutoMinorVersionUpgrade": "

Indicates that minor version patches are applied automatically.

", "DBInstance$PubliclyAccessible": "

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 instance with a DNS name that resolves to a private IP address.

Default: The default behavior varies depending on whether a VPC has been requested or not. The following list shows the default behavior in each case.

If no DB subnet group has been specified as part of the request and the PubliclyAccessible value has not been set, the DB instance will be publicly accessible. If a specific DB subnet group has been specified as part of the request and the PubliclyAccessible value has not been set, the DB instance will be private.

", "DBInstance$StorageEncrypted": "

Specifies whether the DB instance is encrypted.

", "DBInstance$CopyTagsToSnapshot": "

Specifies whether tags are copied from the DB instance to snapshots of the DB instance.

", + "DBInstance$IAMDatabaseAuthenticationEnabled": "

True if mapping of AWS Identity and Access Management (IAM) accounts to database accounts is enabled; otherwise false.

IAM database authentication can be enabled for the following database engines

", "DBInstanceStatusInfo$Normal": "

Boolean value that is true if the instance is operating normally, or false if the instance is in an error state.

", "DBSnapshot$Encrypted": "

Specifies whether the DB snapshot is encrypted.

", + "DBSnapshot$IAMDatabaseAuthenticationEnabled": "

True if mapping of AWS Identity and Access Management (IAM) accounts to database accounts is enabled; otherwise false.

", "DeleteDBClusterMessage$SkipFinalSnapshot": "

Determines whether a final DB cluster snapshot is created before the DB cluster is deleted. If true is specified, no DB cluster snapshot is created. If false is specified, a DB cluster snapshot is created before the DB cluster is deleted.

You must specify a FinalDBSnapshotIdentifier parameter if SkipFinalSnapshot is false.

Default: false

", "DeleteDBInstanceMessage$SkipFinalSnapshot": "

Determines whether a final DB snapshot is created before the DB instance is deleted. If true is specified, no DBSnapshot is created. If false is specified, a DB snapshot is created before the DB instance is deleted.

Note that when a DB instance is in a failure state and has a status of 'failed', 'incompatible-restore', or 'incompatible-network', it can only be deleted when the SkipFinalSnapshot parameter is set to \"true\".

Specify true when deleting a Read Replica.

The FinalDBSnapshotIdentifier parameter must be specified if SkipFinalSnapshot is false.

Default: false

", "DescribeDBClusterSnapshotsMessage$IncludeShared": "

Set this value to true to include shared manual DB cluster snapshots from other AWS accounts that this AWS account has been given permission to copy or restore, otherwise set this value to false. The default is false.

You can give an AWS account permission to restore a manual DB cluster snapshot from another AWS account by the ModifyDBClusterSnapshotAttribute API action.

", @@ -246,6 +250,7 @@ "OrderableDBInstanceOption$SupportsStorageEncryption": "

Indicates whether this orderable DB instance supports encrypted storage.

", "OrderableDBInstanceOption$SupportsIops": "

Indicates whether this orderable DB instance supports provisioned IOPS.

", "OrderableDBInstanceOption$SupportsEnhancedMonitoring": "

Indicates whether the DB instance supports enhanced monitoring at intervals from 1 to 60 seconds.

", + "OrderableDBInstanceOption$SupportsIAMDatabaseAuthentication": "

Indicates whether this orderable DB instance supports IAM database authentication.

", "Parameter$IsModifiable": "

Indicates whether (true) or not (false) the parameter can be modified. Some parameters have security or operational implications that prevent them from being changed.

", "ReservedDBInstance$MultiAZ": "

Indicates if the reservation applies to Multi-AZ deployments.

", "ReservedDBInstancesOffering$MultiAZ": "

Indicates if the offering applies to Multi-AZ deployments.

", @@ -260,39 +265,49 @@ "BooleanOptional": { "base": null, "refs": { - "CopyDBClusterSnapshotMessage$CopyTags": null, + "CopyDBClusterSnapshotMessage$CopyTags": "

True to copy all tags from the source DB cluster snapshot to the target DB cluster snapshot; otherwise false. The default is false.

", "CopyDBSnapshotMessage$CopyTags": "

True to copy all tags from the source DB snapshot to the target DB snapshot; otherwise false. The default is false.

", "CreateDBClusterMessage$StorageEncrypted": "

Specifies whether the DB cluster is encrypted.

", + "CreateDBClusterMessage$EnableIAMDatabaseAuthentication": "

A Boolean value that is true to enable mapping of AWS Identity and Access Management (IAM) accounts to database accounts, and otherwise false.

Default: false

", "CreateDBInstanceMessage$MultiAZ": "

Specifies if the DB instance is a Multi-AZ deployment. You cannot set the AvailabilityZone parameter if the MultiAZ parameter is set to true.

", "CreateDBInstanceMessage$AutoMinorVersionUpgrade": "

Indicates that minor engine upgrades will be applied automatically to the DB instance during the maintenance window.

Default: true

", "CreateDBInstanceMessage$PubliclyAccessible": "

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 instance with a DNS name that resolves to a private IP address.

Default: The default behavior varies depending on whether a VPC has been requested or not. The following list shows the default behavior in each case.

If no DB subnet group has been specified as part of the request and the PubliclyAccessible value has not been set, the DB instance will be publicly accessible. If a specific DB subnet group has been specified as part of the request and the PubliclyAccessible value has not been set, the DB instance will be private.

", "CreateDBInstanceMessage$StorageEncrypted": "

Specifies whether the DB instance is encrypted.

Default: false

", "CreateDBInstanceMessage$CopyTagsToSnapshot": "

True to copy all tags from the DB instance to snapshots of the DB instance; otherwise false. The default is false.

", + "CreateDBInstanceMessage$EnableIAMDatabaseAuthentication": "

True to enable mapping of AWS Identity and Access Management (IAM) accounts to database accounts; otherwise false.

You can enable IAM database authentication for the following database engines

Default: false

", "CreateDBInstanceReadReplicaMessage$AutoMinorVersionUpgrade": "

Indicates that minor engine upgrades will be applied automatically to the Read Replica during the maintenance window.

Default: Inherits from the source DB instance

", "CreateDBInstanceReadReplicaMessage$PubliclyAccessible": "

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 instance with a DNS name that resolves to a private IP address.

Default: The default behavior varies depending on whether a VPC has been requested or not. The following list shows the default behavior in each case.

If no DB subnet group has been specified as part of the request and the PubliclyAccessible value has not been set, the DB instance will be publicly accessible. If a specific DB subnet group has been specified as part of the request and the PubliclyAccessible value has not been set, the DB instance will be private.

", "CreateDBInstanceReadReplicaMessage$CopyTagsToSnapshot": "

True to copy all tags from the Read Replica to snapshots of the Read Replica; otherwise false. The default is false.

", + "CreateDBInstanceReadReplicaMessage$EnableIAMDatabaseAuthentication": "

True to enable mapping of AWS Identity and Access Management (IAM) accounts to database accounts; otherwise false.

You can enable IAM database authentication for the following database engines

Default: false

", "CreateEventSubscriptionMessage$Enabled": "

A Boolean value; set to true to activate the subscription, set to false to create the subscription but not active it.

", "DescribeDBEngineVersionsMessage$ListSupportedCharacterSets": "

If this parameter is specified and the requested engine supports the CharacterSetName parameter for CreateDBInstance, the response includes a list of supported character sets for each engine version.

", "DescribeDBEngineVersionsMessage$ListSupportedTimezones": "

If this parameter is specified and the requested engine supports the TimeZone parameter for CreateDBInstance, the response includes a list of supported time zones for each engine version.

", "DescribeOrderableDBInstanceOptionsMessage$Vpc": "

The VPC filter value. Specify this parameter to show only the available VPC or non-VPC offerings.

", "DescribeReservedDBInstancesMessage$MultiAZ": "

The Multi-AZ filter value. Specify this parameter to show only those reservations matching the specified Multi-AZ parameter.

", "DescribeReservedDBInstancesOfferingsMessage$MultiAZ": "

The Multi-AZ filter value. Specify this parameter to show only the available offerings matching the specified Multi-AZ parameter.

", + "ModifyDBClusterMessage$EnableIAMDatabaseAuthentication": "

A Boolean value that is true to enable mapping of AWS Identity and Access Management (IAM) accounts to database accounts, and otherwise false.

Default: false

", "ModifyDBInstanceMessage$MultiAZ": "

Specifies if the DB instance is a Multi-AZ deployment. Changing this parameter does not result in an outage and the change is applied during the next maintenance window unless the ApplyImmediately parameter is set to true for this request.

Constraints: Cannot be specified if the DB instance is a Read Replica.

", "ModifyDBInstanceMessage$AutoMinorVersionUpgrade": "

Indicates that minor version upgrades will be applied automatically to the DB instance during the maintenance window. Changing this parameter does not result in an outage except in the following case and the change is asynchronously applied as soon as possible. An outage will result if this parameter is set to true during the maintenance window, and a newer minor version is available, and RDS has enabled auto patching for that engine version.

", "ModifyDBInstanceMessage$CopyTagsToSnapshot": "

True to copy all tags from the DB instance to snapshots of the DB instance; otherwise false. The default is false.

", "ModifyDBInstanceMessage$PubliclyAccessible": "

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 for it to be publicly accessible.

Changes to the PubliclyAccessible parameter are applied immediately regardless of the value of the ApplyImmediately parameter.

Default: false

", + "ModifyDBInstanceMessage$EnableIAMDatabaseAuthentication": "

True to enable mapping of AWS Identity and Access Management (IAM) accounts to database accounts; otherwise false.

You can enable IAM database authentication for the following database engines

Default: false

", "ModifyEventSubscriptionMessage$Enabled": "

A Boolean value; set to true to activate the subscription.

", "PendingModifiedValues$MultiAZ": "

Indicates that the Single-AZ DB instance is to change to a Multi-AZ deployment.

", "RebootDBInstanceMessage$ForceFailover": "

When true, the reboot will be conducted through a MultiAZ failover.

Constraint: You cannot specify true if the instance is not configured for MultiAZ.

", "RestoreDBClusterFromS3Message$StorageEncrypted": "

Specifies whether the restored DB cluster is encrypted.

", + "RestoreDBClusterFromS3Message$EnableIAMDatabaseAuthentication": "

A Boolean value that is true to enable mapping of AWS Identity and Access Management (IAM) accounts to database accounts, and otherwise false.

Default: false

", + "RestoreDBClusterFromSnapshotMessage$EnableIAMDatabaseAuthentication": "

A Boolean value that is true to enable mapping of AWS Identity and Access Management (IAM) accounts to database accounts, and otherwise false.

Default: false

", + "RestoreDBClusterToPointInTimeMessage$EnableIAMDatabaseAuthentication": "

A Boolean value that is true to enable mapping of AWS Identity and Access Management (IAM) accounts to database accounts, and otherwise false.

Default: false

", "RestoreDBInstanceFromDBSnapshotMessage$MultiAZ": "

Specifies if the DB instance is a Multi-AZ deployment.

Constraint: You cannot specify the AvailabilityZone parameter if the MultiAZ parameter is set to true.

", "RestoreDBInstanceFromDBSnapshotMessage$PubliclyAccessible": "

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 instance with a DNS name that resolves to a private IP address.

Default: The default behavior varies depending on whether a VPC has been requested or not. The following list shows the default behavior in each case.

If no DB subnet group has been specified as part of the request and the PubliclyAccessible value has not been set, the DB instance will be publicly accessible. If a specific DB subnet group has been specified as part of the request and the PubliclyAccessible value has not been set, the DB instance will be private.

", "RestoreDBInstanceFromDBSnapshotMessage$AutoMinorVersionUpgrade": "

Indicates that minor version upgrades will be applied automatically to the DB instance during the maintenance window.

", "RestoreDBInstanceFromDBSnapshotMessage$CopyTagsToSnapshot": "

True to copy all tags from the restored DB instance to snapshots of the DB instance; otherwise false. The default is false.

", + "RestoreDBInstanceFromDBSnapshotMessage$EnableIAMDatabaseAuthentication": "

True to enable mapping of AWS Identity and Access Management (IAM) accounts to database accounts; otherwise false.

You can enable IAM database authentication for the following database engines

Default: false

", "RestoreDBInstanceToPointInTimeMessage$MultiAZ": "

Specifies if the DB instance is a Multi-AZ deployment.

Constraint: You cannot specify the AvailabilityZone parameter if the MultiAZ parameter is set to true.

", "RestoreDBInstanceToPointInTimeMessage$PubliclyAccessible": "

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 instance with a DNS name that resolves to a private IP address.

Default: The default behavior varies depending on whether a VPC has been requested or not. The following list shows the default behavior in each case.

If no DB subnet group has been specified as part of the request and the PubliclyAccessible value has not been set, the DB instance will be publicly accessible. If a specific DB subnet group has been specified as part of the request and the PubliclyAccessible value has not been set, the DB instance will be private.

", "RestoreDBInstanceToPointInTimeMessage$AutoMinorVersionUpgrade": "

Indicates that minor version upgrades will be applied automatically to the DB instance during the maintenance window.

", - "RestoreDBInstanceToPointInTimeMessage$CopyTagsToSnapshot": "

True to copy all tags from the restored DB instance to snapshots of the DB instance; otherwise false. The default is false.

" + "RestoreDBInstanceToPointInTimeMessage$CopyTagsToSnapshot": "

True to copy all tags from the restored DB instance to snapshots of the DB instance; otherwise false. The default is false.

", + "RestoreDBInstanceToPointInTimeMessage$EnableIAMDatabaseAuthentication": "

True to enable mapping of AWS Identity and Access Management (IAM) accounts to database accounts; otherwise false.

You can enable IAM database authentication for the following database engines

Default: false

" } }, "Certificate": { @@ -1444,7 +1459,7 @@ "refs": { "CreateDBClusterMessage$BackupRetentionPeriod": "

The number of days for which automated backups are retained. You must specify a minimum value of 1.

Default: 1

Constraints:

", "CreateDBClusterMessage$Port": "

The port number on which the instances in the DB cluster accept connections.

Default: 3306

", - "CreateDBInstanceMessage$AllocatedStorage": "

The amount of storage (in gigabytes) to be initially allocated for the database instance.

Type: Integer

MySQL

Constraints: Must be an integer from 5 to 6144.

MariaDB

Constraints: Must be an integer from 5 to 6144.

PostgreSQL

Constraints: Must be an integer from 5 to 6144.

Oracle

Constraints: Must be an integer from 10 to 6144.

SQL Server

Constraints: Must be an integer from 200 to 4096 (Standard Edition and Enterprise Edition) or from 20 to 4096 (Express Edition and Web Edition)

", + "CreateDBInstanceMessage$AllocatedStorage": "

The amount of storage (in gigabytes) to be initially allocated for the database instance.

Type: Integer

Amazon Aurora

Not applicable. Aurora cluster volumes automatically grow as the amount of data in your database increases, though you are only charged for the space that you use in an Aurora cluster volume.

MySQL

Constraints: Must be an integer from 5 to 6144.

MariaDB

Constraints: Must be an integer from 5 to 6144.

PostgreSQL

Constraints: Must be an integer from 5 to 6144.

Oracle

Constraints: Must be an integer from 10 to 6144.

SQL Server

Constraints: Must be an integer from 200 to 4096 (Standard Edition and Enterprise Edition) or from 20 to 4096 (Express Edition and Web Edition)

", "CreateDBInstanceMessage$BackupRetentionPeriod": "

The number of days for which automated backups are retained. Setting this parameter to a positive number enables backups. Setting this parameter to 0 disables automated backups.

Default: 1

Constraints:

", "CreateDBInstanceMessage$Port": "

The port number on which the database accepts connections.

MySQL

Default: 3306

Valid Values: 1150-65535

Type: Integer

MariaDB

Default: 3306

Valid Values: 1150-65535

Type: Integer

PostgreSQL

Default: 5432

Valid Values: 1150-65535

Type: Integer

Oracle

Default: 1521

Valid Values: 1150-65535

SQL Server

Default: 1433

Valid Values: 1150-65535 except for 1434, 3389, 47001, 49152, and 49152 through 49156.

Amazon Aurora

Default: 3306

Valid Values: 1150-65535

Type: Integer

", "CreateDBInstanceMessage$Iops": "

The amount of Provisioned IOPS (input/output operations per second) to be initially allocated for the DB instance.

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.

", @@ -1453,7 +1468,7 @@ "CreateDBInstanceReadReplicaMessage$Port": "

The port number that the DB instance uses for connections.

Default: Inherits from the source DB instance

Valid Values: 1150-65535

", "CreateDBInstanceReadReplicaMessage$Iops": "

The amount of Provisioned IOPS (input/output operations per second) to be initially allocated for the DB instance.

", "CreateDBInstanceReadReplicaMessage$MonitoringInterval": "

The interval, in seconds, between points when Enhanced Monitoring metrics are collected for the Read Replica. To disable collecting Enhanced Monitoring metrics, specify 0. The default is 0.

If MonitoringRoleArn is specified, then you must also set MonitoringInterval to a value other than 0.

Valid Values: 0, 1, 5, 10, 15, 30, 60

", - "DBCluster$AllocatedStorage": "

Specifies the allocated storage size in gigabytes (GB).

", + "DBCluster$AllocatedStorage": "

For all database engines except Amazon Aurora, AllocatedStorage specifies the allocated storage size in gigabytes (GB). For Aurora, AllocatedStorage always returns 1, because Aurora DB cluster storage size is not fixed, but instead automatically adjusts as needed.

", "DBCluster$BackupRetentionPeriod": "

Specifies the number of days for which automatic DB snapshots are retained.

", "DBCluster$Port": "

Specifies the port that the database engine is listening on.

", "DBClusterMember$PromotionTier": "

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.

", @@ -1529,7 +1544,7 @@ } }, "InvalidDBParameterGroupStateFault": { - "base": "

The DB parameter group cannot be deleted because it is in use.

", + "base": "

The DB parameter group is in use or is in an invalid state. If you are attempting to delete the parameter group, you cannot delete it when the parameter group is in this state.

", "refs": { } }, @@ -1886,7 +1901,7 @@ "ModifyDBClusterParameterGroupMessage$Parameters": "

A list of parameters in the DB cluster parameter group to modify.

", "ModifyDBParameterGroupMessage$Parameters": "

An array of parameter names, values, and the apply method for the parameter update. At least one parameter name, value, and apply method must be supplied; subsequent arguments are optional. A maximum of 20 parameters can be modified in a single request.

Valid Values (for the application method): immediate | pending-reboot

You can use the immediate value with dynamic parameters only. You can use the pending-reboot value for both dynamic and static parameters, and changes are applied when you reboot the DB instance without failover.

", "ResetDBClusterParameterGroupMessage$Parameters": "

A list of parameter names in the DB cluster parameter group to reset to the default values. You cannot use this parameter if the ResetAllParameters parameter is set to true.

", - "ResetDBParameterGroupMessage$Parameters": "

An array of parameter names, values, and the apply method for the parameter update. At least one parameter name, value, and apply method must be supplied; subsequent arguments are optional. A maximum of 20 parameters can be modified in a single request.

MySQL

Valid Values (for Apply method): immediate | pending-reboot

You can use the immediate value with dynamic parameters only. You can use the pending-reboot value for both dynamic and static parameters, and changes are applied when DB instance reboots.

MariaDB

Valid Values (for Apply method): immediate | pending-reboot

You can use the immediate value with dynamic parameters only. You can use the pending-reboot value for both dynamic and static parameters, and changes are applied when DB instance reboots.

Oracle

Valid Values (for Apply method): pending-reboot

" + "ResetDBParameterGroupMessage$Parameters": "

To reset the entire DB parameter group, specify the DBParameterGroup name and ResetAllParameters parameters. To reset specific parameters, provide a list of the following: ParameterName and ApplyMethod. A maximum of 20 parameters can be modified in a single request.

MySQL

Valid Values (for Apply method): immediate | pending-reboot

You can use the immediate value with dynamic parameters only. You can use the pending-reboot value for both dynamic and static parameters, and changes are applied when DB instance reboots.

MariaDB

Valid Values (for Apply method): immediate | pending-reboot

You can use the immediate value with dynamic parameters only. You can use the pending-reboot value for both dynamic and static parameters, and changes are applied when DB instance reboots.

Oracle

Valid Values (for Apply method): pending-reboot

" } }, "PendingMaintenanceAction": { @@ -2257,17 +2272,17 @@ "CopyDBClusterParameterGroupMessage$SourceDBClusterParameterGroupIdentifier": "

The identifier or Amazon Resource Name (ARN) for the source DB cluster parameter group. For information about creating an ARN, see Constructing an RDS Amazon Resource Name (ARN).

Constraints:

", "CopyDBClusterParameterGroupMessage$TargetDBClusterParameterGroupIdentifier": "

The identifier for the copied DB cluster parameter group.

Constraints:

Example: my-cluster-param-group1

", "CopyDBClusterParameterGroupMessage$TargetDBClusterParameterGroupDescription": "

A description for the copied DB cluster parameter group.

", - "CopyDBClusterSnapshotMessage$SourceDBClusterSnapshotIdentifier": "

The identifier of the DB cluster snapshot to copy. This parameter is not case-sensitive.

Constraints:

Example: my-cluster-snapshot1

", + "CopyDBClusterSnapshotMessage$SourceDBClusterSnapshotIdentifier": "

The identifier of the DB cluster snapshot to copy. This parameter is not case-sensitive.

You cannot copy an encrypted, shared DB cluster snapshot from one AWS region to another.

Constraints:

Example: my-cluster-snapshot1

", "CopyDBClusterSnapshotMessage$TargetDBClusterSnapshotIdentifier": "

The identifier of the new DB cluster snapshot to create from the source DB cluster snapshot. This parameter is not case-sensitive.

Constraints:

Example: my-cluster-snapshot2

", "CopyDBClusterSnapshotMessage$KmsKeyId": "

The AWS KMS key ID for an encrypted DB cluster snapshot. The KMS key ID is the Amazon Resource Name (ARN), KMS key identifier, or the KMS key alias for the KMS encryption key.

If you copy an unencrypted DB cluster snapshot and specify a value for the KmsKeyId parameter, Amazon RDS encrypts the target DB cluster snapshot using the specified KMS encryption key.

If you copy an encrypted DB cluster 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 cluster snapshot is encrypted with the same KMS key as the source DB cluster snapshot.

If you copy an encrypted DB cluster snapshot that is shared from another AWS account, then you must specify a value for KmsKeyId.

To copy an encrypted DB cluster snapshot to another region, you must set KmsKeyId to the KMS key ID you want to use to encrypt the copy of the DB cluster snapshot in the destination region. KMS encryption keys are specific to the region that they are created in, and you cannot use encryption keys from one region in another region.

", "CopyDBClusterSnapshotMessage$PreSignedUrl": "

The URL that contains a Signature Version 4 signed request for the CopyDBClusterSnapshot API action in the AWS region that contains the source DB cluster snapshot to copy. The PreSignedUrl parameter must be used when copying an encrypted DB cluster snapshot from another AWS region.

The pre-signed URL must be a valid request for the CopyDBSClusterSnapshot API action that can be executed in the source region that contains the encrypted DB cluster snapshot to be copied. The pre-signed URL request must contain the following parameter values:

To learn how to generate a Signature Version 4 signed request, see Authenticating Requests: Using Query Parameters (AWS Signature Version 4) and Signature Version 4 Signing Process.

", "CopyDBParameterGroupMessage$SourceDBParameterGroupIdentifier": "

The identifier or ARN for the source DB parameter group. For information about creating an ARN, see Constructing an RDS Amazon Resource Name (ARN).

Constraints:

", "CopyDBParameterGroupMessage$TargetDBParameterGroupIdentifier": "

The identifier for the copied DB parameter group.

Constraints:

Example: my-db-parameter-group

", "CopyDBParameterGroupMessage$TargetDBParameterGroupDescription": "

A description for the copied DB parameter group.

", - "CopyDBSnapshotMessage$SourceDBSnapshotIdentifier": "

The identifier for the source DB snapshot.

If you are copying from a shared manual DB snapshot, this must be the ARN of the shared DB snapshot.

You cannot copy an encrypted, shared DB snapshot from one AWS region to another.

Constraints:

Example: rds:mydb-2012-04-02-00-01

Example: arn:aws:rds:us-west-2:123456789012:snapshot:mysql-instance1-snapshot-20130805

", + "CopyDBSnapshotMessage$SourceDBSnapshotIdentifier": "

The identifier for the source DB snapshot.

If you are copying from a shared manual DB snapshot, this must be the ARN of the shared DB snapshot.

You cannot copy an encrypted, shared DB snapshot from one AWS region to another.

Constraints:

Example: rds:mydb-2012-04-02-00-01

Example: arn:aws:rds:us-west-2:123456789012:snapshot:mysql-instance1-snapshot-20130805

", "CopyDBSnapshotMessage$TargetDBSnapshotIdentifier": "

The identifier for the copied snapshot.

Constraints:

Example: my-db-snapshot

", "CopyDBSnapshotMessage$KmsKeyId": "

The AWS KMS key ID for an encrypted DB snapshot. The KMS key ID is the Amazon Resource Name (ARN), KMS key identifier, 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 snapshot to a different AWS region, then you must specify a KMS key for the destination AWS region.

If you copy an encrypted DB snapshot that is shared from another AWS account, then you must specify a value for KmsKeyId.

To copy an encrypted DB snapshot to another region, you must set KmsKeyId to the KMS key ID used to encrypt the copy of the DB snapshot in the destination region. KMS encryption keys are specific to the region that they are created in, and you cannot use encryption keys from one region in another region.

", - "CopyDBSnapshotMessage$PreSignedUrl": "

The URL that contains a Signature Version 4 signed request for the CopyDBSnapshot API action in the AWS region that contains the source DB snapshot to copy. The PreSignedUrl parameter must be used when copying an encrypted DB snapshot from another AWS region.

The presigned URL must be a valid request for the CopyDBSnapshot API action that can be executed in the source region that contains the encrypted DB snapshot to be copied. The presigned URL request must contain the following parameter values:

To learn how to generate a Signature Version 4 signed request, see Authenticating Requests: Using Query Parameters (AWS Signature Version 4) and Signature Version 4 Signing Process.

", + "CopyDBSnapshotMessage$PreSignedUrl": "

The URL that contains a Signature Version 4 signed request for the CopyDBSnapshot API action in the AWS region that contains the source DB snapshot to copy. The PreSignedUrl parameter must be used when copying an encrypted DB snapshot from another AWS region.

The presigned URL must be a valid request for the CopyDBSnapshot API action that can be executed in the source region that contains the encrypted DB snapshot to be copied. The presigned URL request must contain the following parameter values:

To learn how to generate a Signature Version 4 signed request, see Authenticating Requests: Using Query Parameters (AWS Signature Version 4) and Signature Version 4 Signing Process.

", "CopyOptionGroupMessage$SourceOptionGroupIdentifier": "

The identifier or ARN for the source option group. For information about creating an ARN, see Constructing an RDS Amazon Resource Name (ARN).

Constraints:

", "CopyOptionGroupMessage$TargetOptionGroupIdentifier": "

The identifier for the copied option group.

Constraints:

Example: my-option-group

", "CopyOptionGroupMessage$TargetOptionGroupDescription": "

The description for the copied option group.

", @@ -2295,14 +2310,14 @@ "CreateDBInstanceMessage$DBInstanceIdentifier": "

The DB instance identifier. This parameter is stored as a lowercase string.

Constraints:

Example: mydbinstance

", "CreateDBInstanceMessage$DBInstanceClass": "

The compute and memory capacity of the DB instance. Note that not all instance classes are available in all regions for all DB engines.

Valid Values: db.t1.micro | db.m1.small | db.m1.medium | db.m1.large | db.m1.xlarge | db.m2.xlarge |db.m2.2xlarge | db.m2.4xlarge | db.m3.medium | db.m3.large | db.m3.xlarge | db.m3.2xlarge | db.m4.large | db.m4.xlarge | db.m4.2xlarge | db.m4.4xlarge | db.m4.10xlarge | db.r3.large | db.r3.xlarge | db.r3.2xlarge | db.r3.4xlarge | db.r3.8xlarge | db.t2.micro | db.t2.small | db.t2.medium | db.t2.large

", "CreateDBInstanceMessage$Engine": "

The name of the database engine to be used for this instance.

Valid Values: mysql | mariadb | oracle-se1 | oracle-se2 | oracle-se | oracle-ee | sqlserver-ee | sqlserver-se | sqlserver-ex | sqlserver-web | postgres | aurora

Not every database engine is available for every AWS region.

", - "CreateDBInstanceMessage$MasterUsername": "

The name of master user for the client DB instance.

MySQL

Constraints:

MariaDB

Constraints:

Type: String

Oracle

Constraints:

SQL Server

Constraints:

PostgreSQL

Constraints:

", - "CreateDBInstanceMessage$MasterUserPassword": "

The password for the master database user. Can be any printable ASCII character except \"/\", \"\"\", or \"@\".

Type: String

MySQL

Constraints: Must contain from 8 to 41 characters.

MariaDB

Constraints: Must contain from 8 to 41 characters.

Oracle

Constraints: Must contain from 8 to 30 characters.

SQL Server

Constraints: Must contain from 8 to 128 characters.

PostgreSQL

Constraints: Must contain from 8 to 128 characters.

Amazon Aurora

Constraints: Must contain from 8 to 41 characters.

", + "CreateDBInstanceMessage$MasterUsername": "

The name for the master database user.

Amazon Aurora

Not applicable. You specify the name for the master database user when you create your DB cluster.

MariaDB

Constraints:

Microsoft SQL Server

Constraints:

MySQL

Constraints:

Oracle

Constraints:

PostgreSQL

Constraints:

", + "CreateDBInstanceMessage$MasterUserPassword": "

The password for the master database user. Can be any printable ASCII character except \"/\", \"\"\", or \"@\".

Amazon Aurora

Not applicable. You specify the password for the master database user when you create your DB cluster.

MariaDB

Constraints: Must contain from 8 to 41 characters.

Microsoft SQL Server

Constraints: Must contain from 8 to 128 characters.

MySQL

Constraints: Must contain from 8 to 41 characters.

Oracle

Constraints: Must contain from 8 to 30 characters.

PostgreSQL

Constraints: Must contain from 8 to 128 characters.

", "CreateDBInstanceMessage$AvailabilityZone": "

The EC2 Availability Zone that the database instance will be created in. For information on regions and Availability Zones, see Regions and Availability Zones.

Default: A random, system-chosen Availability Zone in the endpoint's region.

Example: us-east-1d

Constraint: The AvailabilityZone parameter cannot be specified if the MultiAZ parameter is set to true. The specified Availability Zone must be in the same region as the current endpoint.

", "CreateDBInstanceMessage$DBSubnetGroupName": "

A DB subnet group to associate with this DB instance.

If there is no DB subnet group, then it is a non-VPC DB instance.

", "CreateDBInstanceMessage$PreferredMaintenanceWindow": "

The weekly time range during which system maintenance can occur, in Universal Coordinated Time (UTC). For more information, see DB Instance Maintenance.

Format: ddd:hh24:mi-ddd:hh24:mi

Default: A 30-minute window selected at random from an 8-hour block of time per region, occurring on a random day of the week. To see the time blocks available, see Adjusting the Preferred Maintenance Window in the Amazon RDS User Guide.

Valid Days: Mon, Tue, Wed, Thu, Fri, Sat, Sun

Constraints: Minimum 30-minute window.

", "CreateDBInstanceMessage$DBParameterGroupName": "

The name of the DB parameter group to associate with this DB instance. If this argument is omitted, the default DBParameterGroup for the specified engine will be used.

Constraints:

", - "CreateDBInstanceMessage$PreferredBackupWindow": "

The daily time range during which automated backups are created if automated backups are enabled, using the BackupRetentionPeriod parameter. For more information, see DB Instance Backups.

Default: A 30-minute window selected at random from an 8-hour block of time per region. To see the time blocks available, see Adjusting the Preferred Maintenance Window in the Amazon RDS User Guide.

Constraints:

", - "CreateDBInstanceMessage$EngineVersion": "

The version number of the database engine to use.

The following are the database engines and major and minor versions that are available with Amazon RDS. Not every database engine is available for every AWS region.

Amazon Aurora

MariaDB

Microsoft SQL Server 2016

Microsoft SQL Server 2014

Microsoft SQL Server 2012

Microsoft SQL Server 2008 R2

MySQL

Oracle Database Enterprise Edition (oracle-ee)

Oracle Database Standard Edition (oracle-se)

Oracle Database Standard Edition One (oracle-se1)

Oracle Database Standard Edition Two (oracle-se2)

PostgreSQL

Oracle 12c

Oracle 11g

PostgreSQL

", + "CreateDBInstanceMessage$PreferredBackupWindow": "

The daily time range during which automated backups are created if automated backups are enabled, using the BackupRetentionPeriod parameter. For more information, see DB Instance Backups.

Default: A 30-minute window selected at random from an 8-hour block of time per region. To see the time blocks available, see Adjusting the Preferred DB Instance Maintenance Window.

Constraints:

", + "CreateDBInstanceMessage$EngineVersion": "

The version number of the database engine to use.

The following are the database engines and major and minor versions that are available with Amazon RDS. Not every database engine is available for every AWS region.

Amazon Aurora

MariaDB

Microsoft SQL Server 2016

Microsoft SQL Server 2014

Microsoft SQL Server 2012

Microsoft SQL Server 2008 R2

MySQL

Oracle 12c

Oracle 11g

PostgreSQL

", "CreateDBInstanceMessage$LicenseModel": "

License model information for this DB instance.

Valid values: license-included | bring-your-own-license | general-public-license

", "CreateDBInstanceMessage$OptionGroupName": "

Indicates that the DB instance should be associated with the specified option group.

Permanent options, such as the TDE option for Oracle Advanced Security TDE, cannot be removed from an option group, and that option group cannot be removed from a DB instance once it is associated with a DB instance

", "CreateDBInstanceMessage$CharacterSetName": "

For supported engines, indicates that the DB instance should be associated with the specified CharacterSet.

", @@ -2312,7 +2327,7 @@ "CreateDBInstanceMessage$TdeCredentialPassword": "

The password for the given ARN from the Key Store in order to access the device.

", "CreateDBInstanceMessage$KmsKeyId": "

The KMS key identifier for an encrypted DB instance.

The KMS key identifier is the Amazon Resource Name (ARN) for the KMS encryption key. If you are creating a DB instance with the same AWS account that owns the KMS encryption key used to encrypt the new DB instance, then you can use the KMS key alias instead of the ARN for the KM encryption key.

If the StorageEncrypted parameter is true, and you do not specify a value for the KmsKeyId parameter, then Amazon RDS will use your default encryption key. AWS KMS creates the default encryption key for your AWS account. Your AWS account has a different default encryption key for each AWS region.

", "CreateDBInstanceMessage$Domain": "

Specify the Active Directory Domain to create the instance in.

", - "CreateDBInstanceMessage$MonitoringRoleArn": "

The ARN for the IAM role that permits RDS to send enhanced monitoring metrics to CloudWatch Logs. For example, arn:aws:iam:123456789012:role/emaccess. For information on creating a monitoring role, go to To create an IAM role for Amazon RDS Enhanced Monitoring.

If MonitoringInterval is set to a value other than 0, then you must supply a MonitoringRoleArn value.

", + "CreateDBInstanceMessage$MonitoringRoleArn": "

The ARN for the IAM role that permits RDS to send enhanced monitoring metrics to CloudWatch Logs. For example, arn:aws:iam:123456789012:role/emaccess. For information on creating a monitoring role, go to Setting Up and Enabling Enhanced Monitoring.

If MonitoringInterval is set to a value other than 0, then you must supply a MonitoringRoleArn value.

", "CreateDBInstanceMessage$DomainIAMRoleName": "

Specify the name of the IAM role to be used when making API calls to the Directory Service.

", "CreateDBInstanceMessage$Timezone": "

The time zone of the DB instance. The time zone parameter is currently supported only by Microsoft SQL Server.

", "CreateDBInstanceReadReplicaMessage$DBInstanceIdentifier": "

The DB instance identifier of the Read Replica. This identifier is the unique key that identifies a DB instance. This parameter is stored as a lowercase string.

", @@ -2349,7 +2364,7 @@ "DBCluster$Status": "

Specifies the current state of this DB cluster.

", "DBCluster$PercentProgress": "

Specifies the progress of the operation as a percentage.

", "DBCluster$Endpoint": "

Specifies the connection endpoint for the primary instance of the DB cluster.

", - "DBCluster$ReaderEndpoint": "

The reader endpoint for the DB cluster. The reader endpoint for a DB cluster load-balances connections across the Aurora Replicas that are available in a DB cluster. As clients request new connections to the reader endpoint, Aurora distributes the connection requests among the Aurora Replicas in the DB cluster. This functionality can help balance your read workload across multiple Aurora Replicas in your DB cluster.

If a failover occurs, and the Aurora Replica that you are connected to is promoted to be the primary instance, your connection will be dropped. To continue sending your read workload to other Aurora Replicas in the cluster, you can then recoonect to the reader endpoint.

", + "DBCluster$ReaderEndpoint": "

The reader endpoint for the DB cluster. The reader endpoint for a DB cluster load-balances connections across the Aurora Replicas that are available in a DB cluster. As clients request new connections to the reader endpoint, Aurora distributes the connection requests among the Aurora Replicas in the DB cluster. This functionality can help balance your read workload across multiple Aurora Replicas in your DB cluster.

If a failover occurs, and the Aurora Replica that you are connected to is promoted to be the primary instance, your connection will be dropped. To continue sending your read workload to other Aurora Replicas in the cluster, you can then reconnect to the reader endpoint.

", "DBCluster$Engine": "

Provides the name of the database engine to be used for this DB cluster.

", "DBCluster$EngineVersion": "

Indicates the database engine version.

", "DBCluster$MasterUsername": "

Contains the master username for the DB cluster.

", @@ -2399,7 +2414,7 @@ "DBInstance$Engine": "

Provides the name of the database engine to be used for this DB instance.

", "DBInstance$DBInstanceStatus": "

Specifies the current state of this database.

", "DBInstance$MasterUsername": "

Contains the master username for the DB instance.

", - "DBInstance$DBName": "

The meaning of this parameter differs according to the database engine you use. For example, this value returns MySQL, MariaDB, or PostgreSQL information when returning values from CreateDBInstanceReadReplica since Read Replicas are only supported for these engines.

MySQL, MariaDB, SQL Server, PostgreSQL, Amazon Aurora

Contains the name of the initial database of this instance that was provided at create time, if one was specified when the DB instance was created. This same name is returned for the life of the DB instance.

Type: String

Oracle

Contains the Oracle System ID (SID) of the created DB instance. Not shown when the returned parameters do not apply to an Oracle DB instance.

", + "DBInstance$DBName": "

The meaning of this parameter differs according to the database engine you use. For example, this value returns MySQL, MariaDB, or PostgreSQL information when returning values from CreateDBInstanceReadReplica since Read Replicas are only supported for these engines.

MySQL, MariaDB, SQL Server, PostgreSQL

Contains the name of the initial database of this instance that was provided at create time, if one was specified when the DB instance was created. This same name is returned for the life of the DB instance.

Type: String

Oracle

Contains the Oracle System ID (SID) of the created DB instance. Not shown when the returned parameters do not apply to an Oracle DB instance.

", "DBInstance$PreferredBackupWindow": "

Specifies the daily time range during which automated backups are created if automated backups are enabled, as determined by the BackupRetentionPeriod.

", "DBInstance$AvailabilityZone": "

Specifies the name of the Availability Zone the DB instance is located in.

", "DBInstance$PreferredMaintenanceWindow": "

Specifies the weekly time range during which system maintenance can occur, in Universal Coordinated Time (UTC).

", @@ -2706,7 +2721,7 @@ "ReadReplicaIdentifierList$member": null, "RebootDBInstanceMessage$DBInstanceIdentifier": "

The DB instance identifier. This parameter is stored as a lowercase string.

Constraints:

", "RecurringCharge$RecurringChargeFrequency": "

The frequency of the recurring charge.

", - "RemoveRoleFromDBClusterMessage$DBClusterIdentifier": "

The name of the DB cluster to disassociate the IAM role rom.

", + "RemoveRoleFromDBClusterMessage$DBClusterIdentifier": "

The name of the DB cluster to disassociate the IAM role from.

", "RemoveRoleFromDBClusterMessage$RoleArn": "

The Amazon Resource Name (ARN) of the IAM role to disassociate from the Aurora DB cluster, for example arn:aws:iam::123456789012:role/AuroraAccessRole.

", "RemoveSourceIdentifierFromSubscriptionMessage$SubscriptionName": "

The name of the RDS event notification subscription you want to remove a source identifier from.

", "RemoveSourceIdentifierFromSubscriptionMessage$SourceIdentifier": "

The source identifier to be removed from the subscription, such as the DB instance identifier for a DB instance or the name of a security group.

", @@ -2951,7 +2966,7 @@ "refs": { "CreateDBClusterMessage$VpcSecurityGroupIds": "

A list of EC2 VPC security groups to associate with this DB cluster.

", "CreateDBInstanceMessage$VpcSecurityGroupIds": "

A list of EC2 VPC security groups to associate with this DB instance.

Default: The default EC2 VPC security group for the DB subnet group's VPC.

", - "ModifyDBClusterMessage$VpcSecurityGroupIds": "

A lst of VPC security groups that the DB cluster will belong to.

", + "ModifyDBClusterMessage$VpcSecurityGroupIds": "

A list of VPC security groups that the DB cluster will belong to.

", "ModifyDBInstanceMessage$VpcSecurityGroupIds": "

A list of EC2 VPC security groups to authorize on this DB instance. This change is asynchronously applied as soon as possible.

Constraints:

", "OptionConfiguration$VpcSecurityGroupMemberships": "

A list of VpcSecurityGroupMemebrship name strings used for this option.

", "RestoreDBClusterFromS3Message$VpcSecurityGroupIds": "

A list of EC2 VPC security groups to associate with the restored DB cluster.

", diff --git a/vendor/github.com/aws/aws-sdk-go/models/endpoints/endpoints.json b/vendor/github.com/aws/aws-sdk-go/models/endpoints/endpoints.json index 4ca6f582d..1fa6acd73 100644 --- a/vendor/github.com/aws/aws-sdk-go/models/endpoints/endpoints.json +++ b/vendor/github.com/aws/aws-sdk-go/models/endpoints/endpoints.json @@ -183,6 +183,7 @@ "ap-southeast-1": {}, "ap-southeast-2": {}, "eu-west-1": {}, + "eu-west-2": {}, "us-east-1": {}, "us-east-2": {}, "us-west-2": {} @@ -678,8 +679,10 @@ "ap-south-1": {}, "ap-southeast-1": {}, "ap-southeast-2": {}, + "ca-central-1": {}, "eu-central-1": {}, "eu-west-1": {}, + "eu-west-2": {}, "sa-east-1": {}, "us-east-1": {}, "us-east-2": {}, @@ -932,6 +935,16 @@ "us-east-1": {} } }, + "models.lex": { + "defaults": { + "credentialScope": { + "service": "lex" + } + }, + "endpoints": { + "us-east-1": {} + } + }, "monitoring": { "defaults": { "protocols": [ diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/protocol_test.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/protocol_test.go index 6ba44124a..eb2e155be 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/protocol_test.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/protocol_test.go @@ -1,7 +1,6 @@ package protocol_test import ( - "fmt" "net/http" "net/url" "testing" @@ -21,11 +20,13 @@ import ( ) func xmlData(set bool, b []byte, size, delta int) { + const openingTags = "" + const closingTags = "" if !set { - copy(b, []byte("")) + copy(b, []byte(openingTags)) } if size == 0 { - copy(b[delta-len(""):], []byte("")) + copy(b[delta-len(closingTags):], []byte(closingTags)) } } @@ -118,7 +119,6 @@ func checkForLeak(data interface{}, build, fn func(*request.Request), t *testing if result.errExists { assert.NotNil(t, req.Error) } else { - fmt.Println(req.Error) assert.Nil(t, req.Error) } diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go index c74c19196..7091b456d 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go @@ -131,7 +131,6 @@ func (b *xmlBuilder) buildStruct(value reflect.Value, current *XMLNode, tag refl continue } - mTag := field.Tag if mTag.Get("location") != "" { // skip non-body members continue diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go index 64b6ddd3e..87584628a 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go @@ -15,7 +15,10 @@ import ( // needs to match the shape of the XML expected to be decoded. // If the shape doesn't match unmarshaling will fail. func UnmarshalXML(v interface{}, d *xml.Decoder, wrapper string) error { - n, _ := XMLToStruct(d, nil) + n, err := XMLToStruct(d, nil) + if err != nil { + return err + } if n.Children != nil { for _, root := range n.Children { for _, c := range root { @@ -23,7 +26,7 @@ func UnmarshalXML(v interface{}, d *xml.Decoder, wrapper string) error { c = wrappedChild[0] // pull out wrapped element } - err := parse(reflect.ValueOf(v), c, "") + err = parse(reflect.ValueOf(v), c, "") if err != nil { if err == io.EOF { return nil diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal_test.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal_test.go new file mode 100644 index 000000000..1185d2328 --- /dev/null +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal_test.go @@ -0,0 +1,142 @@ +package xmlutil + +import ( + "encoding/xml" + "fmt" + "io" + "reflect" + "strings" + "testing" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awsutil" +) + +type mockBody struct { + DoneErr error + Body io.Reader +} + +func (m *mockBody) Read(p []byte) (int, error) { + n, err := m.Body.Read(p) + if (n == 0 || err == io.EOF) && m.DoneErr != nil { + return n, m.DoneErr + } + + return n, err +} + +type mockOutput struct { + _ struct{} `type:"structure"` + String *string `type:"string"` + Integer *int64 `type:"integer"` + Nested *mockNestedStruct `type:"structure"` + List []*mockListElem `locationName:"List" locationNameList:"Elem" type:"list"` + Closed *mockClosedTags `type:"structure"` +} +type mockNestedStruct struct { + _ struct{} `type:"structure"` + NestedString *string `type:"string"` + NestedInt *int64 `type:"integer"` +} +type mockClosedTags struct { + _ struct{} `type:"structure" xmlPrefix:"xsi" xmlURI:"http://www.w3.org/2001/XMLSchema-instance"` + Attr *string `locationName:"xsi:attrval" type:"string" xmlAttribute:"true"` +} +type mockListElem struct { + _ struct{} `type:"structure" xmlPrefix:"xsi" xmlURI:"http://www.w3.org/2001/XMLSchema-instance"` + String *string `type:"string"` + NestedElem *mockNestedListElem `type:"structure"` +} +type mockNestedListElem struct { + _ struct{} `type:"structure" xmlPrefix:"xsi" xmlURI:"http://www.w3.org/2001/XMLSchema-instance"` + + String *string `type:"string"` + Type *string `locationName:"xsi:type" type:"string" xmlAttribute:"true"` +} + +func TestUnmarshal(t *testing.T) { + const xmlBodyStr = ` + + string value + 123 + + + nested string value + 321 + + + + + nested elem string value + + elem string value + + +` + + expect := mockOutput{ + String: aws.String("string value"), + Integer: aws.Int64(123), + Closed: &mockClosedTags{ + Attr: aws.String("attr value"), + }, + Nested: &mockNestedStruct{ + NestedString: aws.String("nested string value"), + NestedInt: aws.Int64(321), + }, + List: []*mockListElem{ + { + String: aws.String("elem string value"), + NestedElem: &mockNestedListElem{ + String: aws.String("nested elem string value"), + Type: aws.String("type"), + }, + }, + }, + } + + actual := mockOutput{} + decoder := xml.NewDecoder(strings.NewReader(xmlBodyStr)) + err := UnmarshalXML(&actual, decoder, "") + if err != nil { + t.Fatalf("expect no error, got %v", err) + } + + if !reflect.DeepEqual(expect, actual) { + t.Errorf("expect unmarshal to match\nExpect: %s\nActual: %s", + awsutil.Prettify(expect), awsutil.Prettify(actual)) + } +} + +func TestUnmarshal_UnexpectedEOF(t *testing.T) { + const partialXMLBody = ` + first value + Second val` + + out := struct { + First *string `locationName:"First" type:"string"` + Second *string `locationName:"Second" type:"string"` + }{} + + expect := out + expect.First = aws.String("first") + expect.Second = aws.String("second") + + expectErr := fmt.Errorf("expected read error") + + body := &mockBody{ + DoneErr: expectErr, + Body: strings.NewReader(partialXMLBody), + } + + decoder := xml.NewDecoder(body) + err := UnmarshalXML(&out, decoder, "") + + if err == nil { + t.Fatalf("expect error, got none") + } + if e, a := expectErr, err; e != a { + t.Errorf("expect %v error in %v, but was not", e, a) + } +} diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go index 3112512a2..3e970b629 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go @@ -40,11 +40,16 @@ func XMLToStruct(d *xml.Decoder, s *xml.StartElement) (*XMLNode, error) { out := &XMLNode{} for { tok, err := d.Token() - if tok == nil || err == io.EOF { - break - } if err != nil { - return out, err + if err == io.EOF { + break + } else { + return out, err + } + } + + if tok == nil { + break } switch typed := tok.(type) { diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct_test.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct_test.go index d1fd21f44..77d12bb79 100644 --- a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct_test.go +++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct_test.go @@ -14,8 +14,21 @@ import ( func TestUnmarshal(t *testing.T) { xmlVal := []byte(` - foo-iduserfoo-iduserFULL_CONTROL< - /AccessControlPolicy>`) + + + foo-id + user + + + + + foo-id + user + + FULL_CONTROL + + +`) var server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.Write(xmlVal) diff --git a/vendor/github.com/aws/aws-sdk-go/service/appstream/api.go b/vendor/github.com/aws/aws-sdk-go/service/appstream/api.go index 8df2130e4..16f939359 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/appstream/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/appstream/api.go @@ -72,6 +72,9 @@ func (c *AppStream) AssociateFleetRequest(input *AssociateFleetInput) (req *requ // * ErrCodeResourceNotFoundException "ResourceNotFoundException" // The specified resource was not found. // +// * ErrCodeConcurrentModificationException "ConcurrentModificationException" +// An API error occurred, please try again. +// // Please also see https://docs.aws.amazon.com/goto/WebAPI/appstream-2016-12-01/AssociateFleet func (c *AppStream) AssociateFleet(input *AssociateFleetInput) (*AssociateFleetOutput, error) { req, out := c.AssociateFleetRequest(input) @@ -164,6 +167,9 @@ func (c *AppStream) CreateFleetRequest(input *CreateFleetInput) (req *request.Re // * ErrCodeInvalidRoleException "InvalidRoleException" // The specified role is invalid. // +// * ErrCodeConcurrentModificationException "ConcurrentModificationException" +// An API error occurred, please try again. +// // Please also see https://docs.aws.amazon.com/goto/WebAPI/appstream-2016-12-01/CreateFleet func (c *AppStream) CreateFleet(input *CreateFleetInput) (*CreateFleetOutput, error) { req, out := c.CreateFleetRequest(input) @@ -247,6 +253,9 @@ func (c *AppStream) CreateStackRequest(input *CreateStackInput) (req *request.Re // * ErrCodeResourceAlreadyExistsException "ResourceAlreadyExistsException" // The specified resource already exists. // +// * ErrCodeConcurrentModificationException "ConcurrentModificationException" +// An API error occurred, please try again. +// // Please also see https://docs.aws.amazon.com/goto/WebAPI/appstream-2016-12-01/CreateStack func (c *AppStream) CreateStack(input *CreateStackInput) (*CreateStackOutput, error) { req, out := c.CreateStackRequest(input) @@ -334,6 +343,9 @@ func (c *AppStream) CreateStreamingURLRequest(input *CreateStreamingURLInput) (r // * ErrCodeOperationNotPermittedException "OperationNotPermittedException" // The attempted operation is not permitted. // +// * ErrCodeInvalidParameterCombinationException "InvalidParameterCombinationException" +// Indicates an incorrect combination of parameters, or a missing parameter. +// // Please also see https://docs.aws.amazon.com/goto/WebAPI/appstream-2016-12-01/CreateStreamingURL func (c *AppStream) CreateStreamingURL(input *CreateStreamingURLInput) (*CreateStreamingURLOutput, error) { req, out := c.CreateStreamingURLRequest(input) @@ -417,6 +429,9 @@ func (c *AppStream) DeleteFleetRequest(input *DeleteFleetInput) (req *request.Re // * ErrCodeResourceNotFoundException "ResourceNotFoundException" // The specified resource was not found. // +// * ErrCodeConcurrentModificationException "ConcurrentModificationException" +// An API error occurred, please try again. +// // Please also see https://docs.aws.amazon.com/goto/WebAPI/appstream-2016-12-01/DeleteFleet func (c *AppStream) DeleteFleet(input *DeleteFleetInput) (*DeleteFleetOutput, error) { req, out := c.DeleteFleetRequest(input) @@ -501,6 +516,9 @@ func (c *AppStream) DeleteStackRequest(input *DeleteStackInput) (req *request.Re // * ErrCodeResourceNotFoundException "ResourceNotFoundException" // The specified resource was not found. // +// * ErrCodeConcurrentModificationException "ConcurrentModificationException" +// An API error occurred, please try again. +// // Please also see https://docs.aws.amazon.com/goto/WebAPI/appstream-2016-12-01/DeleteStack func (c *AppStream) DeleteStack(input *DeleteStackInput) (*DeleteStackOutput, error) { req, out := c.DeleteStackRequest(input) @@ -733,7 +751,8 @@ func (c *AppStream) DescribeSessionsRequest(input *DescribeSessionsInput) (req * // Describes the streaming sessions for a stack and a fleet. If a user ID is // provided, this operation returns streaming sessions for only that user. Pass // this value for the nextToken parameter in a subsequent call to this operation -// to retrieve the next set of items. +// to retrieve the next set of items. If an authentication type is not provided, +// the operation defaults to users authenticated using a streaming url. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -741,6 +760,11 @@ func (c *AppStream) DescribeSessionsRequest(input *DescribeSessionsInput) (req * // // See the AWS API reference guide for Amazon AppStream's // API operation DescribeSessions for usage and error information. +// +// Returned Error Codes: +// * ErrCodeInvalidParameterCombinationException "InvalidParameterCombinationException" +// Indicates an incorrect combination of parameters, or a missing parameter. +// // Please also see https://docs.aws.amazon.com/goto/WebAPI/appstream-2016-12-01/DescribeSessions func (c *AppStream) DescribeSessions(input *DescribeSessionsInput) (*DescribeSessionsOutput, error) { req, out := c.DescribeSessionsRequest(input) @@ -906,6 +930,9 @@ func (c *AppStream) DisassociateFleetRequest(input *DisassociateFleetInput) (req // * ErrCodeResourceNotFoundException "ResourceNotFoundException" // The specified resource was not found. // +// * ErrCodeConcurrentModificationException "ConcurrentModificationException" +// An API error occurred, please try again. +// // Please also see https://docs.aws.amazon.com/goto/WebAPI/appstream-2016-12-01/DisassociateFleet func (c *AppStream) DisassociateFleet(input *DisassociateFleetInput) (*DisassociateFleetOutput, error) { req, out := c.DisassociateFleetRequest(input) @@ -1211,9 +1238,15 @@ func (c *AppStream) StartFleetRequest(input *StartFleetInput) (req *request.Requ // * ErrCodeResourceNotFoundException "ResourceNotFoundException" // The specified resource was not found. // +// * ErrCodeOperationNotPermittedException "OperationNotPermittedException" +// The attempted operation is not permitted. +// // * ErrCodeLimitExceededException "LimitExceededException" // The requested limit exceeds the permitted limit for an account. // +// * ErrCodeConcurrentModificationException "ConcurrentModificationException" +// An API error occurred, please try again. +// // Please also see https://docs.aws.amazon.com/goto/WebAPI/appstream-2016-12-01/StartFleet func (c *AppStream) StartFleet(input *StartFleetInput) (*StartFleetOutput, error) { req, out := c.StartFleetRequest(input) @@ -1294,6 +1327,9 @@ func (c *AppStream) StopFleetRequest(input *StopFleetInput) (req *request.Reques // * ErrCodeResourceNotFoundException "ResourceNotFoundException" // The specified resource was not found. // +// * ErrCodeConcurrentModificationException "ConcurrentModificationException" +// An API error occurred, please try again. +// // Please also see https://docs.aws.amazon.com/goto/WebAPI/appstream-2016-12-01/StopFleet func (c *AppStream) StopFleet(input *StopFleetInput) (*StopFleetOutput, error) { req, out := c.StopFleetRequest(input) @@ -1362,8 +1398,9 @@ func (c *AppStream) UpdateFleetRequest(input *UpdateFleetInput) (req *request.Re // UpdateFleet API operation for Amazon AppStream. // // Updates an existing fleet. All the attributes except the fleet name can be -// updated in the STOPPED state. Only ComputeCapacity and ImageName can be updated -// in any other state. +// updated in the STOPPED state. When a fleet is in the RUNNING state, only +// DisplayName and ComputeCapacity can be updated. A fleet cannot be updated +// in a status of STARTING or STOPPING. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -1385,6 +1422,15 @@ func (c *AppStream) UpdateFleetRequest(input *UpdateFleetInput) (req *request.Re // * ErrCodeResourceNotFoundException "ResourceNotFoundException" // The specified resource was not found. // +// * ErrCodeResourceNotAvailableException "ResourceNotAvailableException" +// The specified resource exists and is not in use, but isn't available. +// +// * ErrCodeInvalidParameterCombinationException "InvalidParameterCombinationException" +// Indicates an incorrect combination of parameters, or a missing parameter. +// +// * ErrCodeConcurrentModificationException "ConcurrentModificationException" +// An API error occurred, please try again. +// // Please also see https://docs.aws.amazon.com/goto/WebAPI/appstream-2016-12-01/UpdateFleet func (c *AppStream) UpdateFleet(input *UpdateFleetInput) (*UpdateFleetOutput, error) { req, out := c.UpdateFleetRequest(input) @@ -1758,6 +1804,9 @@ type CreateFleetInput struct { // The display name of the fleet. DisplayName *string `type:"string"` + // Enable/Disable default Internet access from fleet. + EnableDefaultInternetAccess *bool `type:"boolean"` + // Unique name of the image used by the fleet. // // ImageName is a required field @@ -1853,6 +1902,12 @@ func (s *CreateFleetInput) SetDisplayName(v string) *CreateFleetInput { return s } +// SetEnableDefaultInternetAccess sets the EnableDefaultInternetAccess field's value. +func (s *CreateFleetInput) SetEnableDefaultInternetAccess(v bool) *CreateFleetInput { + s.EnableDefaultInternetAccess = &v + return s +} + // SetImageName sets the ImageName field's value. func (s *CreateFleetInput) SetImageName(v string) *CreateFleetInput { s.ImageName = &v @@ -2382,6 +2437,12 @@ func (s *DescribeImagesOutput) SetImages(v []*Image) *DescribeImagesOutput { type DescribeSessionsInput struct { _ struct{} `type:"structure"` + // The authentication method of the user. It can be API for a user authenticated + // using a streaming url or SAML for a SAML federated user. If an authentication + // type is not provided, the operation defaults to users authenticated using + // a streaming url. + AuthenticationType *string `type:"string" enum:"AuthenticationType"` + // The name of the fleet for which to list sessions. // // FleetName is a required field @@ -2443,6 +2504,12 @@ func (s *DescribeSessionsInput) Validate() error { return nil } +// SetAuthenticationType sets the AuthenticationType field's value. +func (s *DescribeSessionsInput) SetAuthenticationType(v string) *DescribeSessionsInput { + s.AuthenticationType = &v + return s +} + // SetFleetName sets the FleetName field's value. func (s *DescribeSessionsInput) SetFleetName(v string) *DescribeSessionsInput { s.FleetName = &v @@ -2749,6 +2816,9 @@ type Fleet struct { // The name displayed to end users on the AppStream 2.0 portal. DisplayName *string `min:"1" type:"string"` + // Default Internet access from the fleet. True (Enabled), False (Disabled). + EnableDefaultInternetAccess *bool `type:"boolean"` + // The list of fleet errors is appended to this list. FleetErrors []*FleetError `type:"list"` @@ -2826,6 +2896,12 @@ func (s *Fleet) SetDisplayName(v string) *Fleet { return s } +// SetEnableDefaultInternetAccess sets the EnableDefaultInternetAccess field's value. +func (s *Fleet) SetEnableDefaultInternetAccess(v bool) *Fleet { + s.EnableDefaultInternetAccess = &v + return s +} + // SetFleetErrors sets the FleetErrors field's value. func (s *Fleet) SetFleetErrors(v []*FleetError) *Fleet { s.FleetErrors = v @@ -2926,6 +3002,9 @@ type Image struct { // The display name for the image. DisplayName *string `min:"1" type:"string"` + // Indicates whether an image builder can be launched from this image. + ImageBuilderSupported *bool `type:"boolean"` + // The unique identifier for the image. // // Name is a required field @@ -2991,6 +3070,12 @@ func (s *Image) SetDisplayName(v string) *Image { return s } +// SetImageBuilderSupported sets the ImageBuilderSupported field's value. +func (s *Image) SetImageBuilderSupported(v bool) *Image { + s.ImageBuilderSupported = &v + return s +} + // SetName sets the Name field's value. func (s *Image) SetName(v string) *Image { s.Name = &v @@ -3240,6 +3325,11 @@ func (s *ListAssociatedStacksOutput) SetNextToken(v string) *ListAssociatedStack type Session struct { _ struct{} `type:"structure"` + // The authentication method of the user for whom the session was created. It + // can be API for a user authenticated using a streaming url or SAML for a SAML + // federated user. + AuthenticationType *string `type:"string" enum:"AuthenticationType"` + // The name of the fleet for which the streaming session was created. // // FleetName is a required field @@ -3276,6 +3366,12 @@ func (s Session) GoString() string { return s.String() } +// SetAuthenticationType sets the AuthenticationType field's value. +func (s *Session) SetAuthenticationType(v string) *Session { + s.AuthenticationType = &v + return s +} + // SetFleetName sets the FleetName field's value. func (s *Session) SetFleetName(v string) *Session { s.FleetName = &v @@ -3504,6 +3600,9 @@ type UpdateFleetInput struct { // The name displayed to end users on the AppStream 2.0 portal. DisplayName *string `type:"string"` + // Enable/Disable default Internet access from fleet. + EnableDefaultInternetAccess *bool `type:"boolean"` + // The image name from which a fleet is created. ImageName *string `min:"1" type:"string"` @@ -3595,6 +3694,12 @@ func (s *UpdateFleetInput) SetDisplayName(v string) *UpdateFleetInput { return s } +// SetEnableDefaultInternetAccess sets the EnableDefaultInternetAccess field's value. +func (s *UpdateFleetInput) SetEnableDefaultInternetAccess(v bool) *UpdateFleetInput { + s.EnableDefaultInternetAccess = &v + return s +} + // SetImageName sets the ImageName field's value. func (s *UpdateFleetInput) SetImageName(v string) *UpdateFleetInput { s.ImageName = &v @@ -3733,7 +3838,7 @@ func (s *UpdateStackOutput) SetStack(v *Stack) *UpdateStackOutput { return s } -// The VPC in which the fleet is launched. +// VPC configuration information. // Please also see https://docs.aws.amazon.com/goto/WebAPI/appstream-2016-12-01/VpcConfig type VpcConfig struct { _ struct{} `type:"structure"` @@ -3777,6 +3882,14 @@ func (s *VpcConfig) SetSubnetIds(v []*string) *VpcConfig { return s } +const ( + // AuthenticationTypeApi is a AuthenticationType enum value + AuthenticationTypeApi = "API" + + // AuthenticationTypeSaml is a AuthenticationType enum value + AuthenticationTypeSaml = "SAML" +) + const ( // FleetErrorCodeIamServiceRoleMissingEniDescribeAction is a FleetErrorCode enum value FleetErrorCodeIamServiceRoleMissingEniDescribeAction = "IAM_SERVICE_ROLE_MISSING_ENI_DESCRIBE_ACTION" diff --git a/vendor/github.com/aws/aws-sdk-go/service/appstream/errors.go b/vendor/github.com/aws/aws-sdk-go/service/appstream/errors.go index 1a04dbc78..83623bb36 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/appstream/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/appstream/errors.go @@ -4,6 +4,18 @@ package appstream const ( + // ErrCodeConcurrentModificationException for service response error code + // "ConcurrentModificationException". + // + // An API error occurred, please try again. + ErrCodeConcurrentModificationException = "ConcurrentModificationException" + + // ErrCodeInvalidParameterCombinationException for service response error code + // "InvalidParameterCombinationException". + // + // Indicates an incorrect combination of parameters, or a missing parameter. + ErrCodeInvalidParameterCombinationException = "InvalidParameterCombinationException" + // ErrCodeInvalidRoleException for service response error code // "InvalidRoleException". // diff --git a/vendor/github.com/aws/aws-sdk-go/service/appstream/examples_test.go b/vendor/github.com/aws/aws-sdk-go/service/appstream/examples_test.go index 942df2ce0..af215328f 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/appstream/examples_test.go +++ b/vendor/github.com/aws/aws-sdk-go/service/appstream/examples_test.go @@ -46,13 +46,14 @@ func ExampleAppStream_CreateFleet() { ComputeCapacity: &appstream.ComputeCapacity{ // Required DesiredInstances: aws.Int64(1), // Required }, - ImageName: aws.String("String"), // Required - InstanceType: aws.String("String"), // Required - Name: aws.String("Name"), // Required - Description: aws.String("Description"), - DisconnectTimeoutInSeconds: aws.Int64(1), - DisplayName: aws.String("DisplayName"), - MaxUserDurationInSeconds: aws.Int64(1), + ImageName: aws.String("String"), // Required + InstanceType: aws.String("String"), // Required + Name: aws.String("Name"), // Required + Description: aws.String("Description"), + DisconnectTimeoutInSeconds: aws.Int64(1), + DisplayName: aws.String("DisplayName"), + EnableDefaultInternetAccess: aws.Bool(true), + MaxUserDurationInSeconds: aws.Int64(1), VpcConfig: &appstream.VpcConfig{ SubnetIds: []*string{ // Required aws.String("String"), // Required @@ -219,11 +220,12 @@ func ExampleAppStream_DescribeSessions() { svc := appstream.New(sess) params := &appstream.DescribeSessionsInput{ - FleetName: aws.String("String"), // Required - StackName: aws.String("String"), // Required - Limit: aws.Int64(1), - NextToken: aws.String("String"), - UserId: aws.String("UserId"), + FleetName: aws.String("String"), // Required + StackName: aws.String("String"), // Required + AuthenticationType: aws.String("AuthenticationType"), + Limit: aws.Int64(1), + NextToken: aws.String("String"), + UserId: aws.String("UserId"), } resp, err := svc.DescribeSessions(params) @@ -402,13 +404,14 @@ func ExampleAppStream_UpdateFleet() { ComputeCapacity: &appstream.ComputeCapacity{ DesiredInstances: aws.Int64(1), // Required }, - DeleteVpcConfig: aws.Bool(true), - Description: aws.String("Description"), - DisconnectTimeoutInSeconds: aws.Int64(1), - DisplayName: aws.String("DisplayName"), - ImageName: aws.String("String"), - InstanceType: aws.String("String"), - MaxUserDurationInSeconds: aws.Int64(1), + DeleteVpcConfig: aws.Bool(true), + Description: aws.String("Description"), + DisconnectTimeoutInSeconds: aws.Int64(1), + DisplayName: aws.String("DisplayName"), + EnableDefaultInternetAccess: aws.Bool(true), + ImageName: aws.String("String"), + InstanceType: aws.String("String"), + MaxUserDurationInSeconds: aws.Int64(1), VpcConfig: &appstream.VpcConfig{ SubnetIds: []*string{ // Required aws.String("String"), // Required diff --git a/vendor/github.com/aws/aws-sdk-go/service/kinesis/kinesisiface/interface.go b/vendor/github.com/aws/aws-sdk-go/service/kinesis/kinesisiface/interface.go index d1be878c3..e9644f00d 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/kinesis/kinesisiface/interface.go +++ b/vendor/github.com/aws/aws-sdk-go/service/kinesis/kinesisiface/interface.go @@ -144,6 +144,9 @@ type KinesisAPI interface { WaitUntilStreamExists(*kinesis.DescribeStreamInput) error WaitUntilStreamExistsWithContext(aws.Context, *kinesis.DescribeStreamInput, ...request.WaiterOption) error + + WaitUntilStreamNotExists(*kinesis.DescribeStreamInput) error + WaitUntilStreamNotExistsWithContext(aws.Context, *kinesis.DescribeStreamInput, ...request.WaiterOption) error } var _ KinesisAPI = (*kinesis.Kinesis)(nil) diff --git a/vendor/github.com/aws/aws-sdk-go/service/kinesis/waiters.go b/vendor/github.com/aws/aws-sdk-go/service/kinesis/waiters.go index 14e2ba9e2..a64a77af6 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/kinesis/waiters.go +++ b/vendor/github.com/aws/aws-sdk-go/service/kinesis/waiters.go @@ -54,3 +54,49 @@ func (c *Kinesis) WaitUntilStreamExistsWithContext(ctx aws.Context, input *Descr return w.WaitWithContext(ctx) } + +// WaitUntilStreamNotExists uses the Kinesis API operation +// DescribeStream to wait for a condition to be met before returning. +// If the condition is not meet within the max attempt window an error will +// be returned. +func (c *Kinesis) WaitUntilStreamNotExists(input *DescribeStreamInput) error { + return c.WaitUntilStreamNotExistsWithContext(aws.BackgroundContext(), input) +} + +// WaitUntilStreamNotExistsWithContext is an extended version of WaitUntilStreamNotExists. +// With the support for passing in a context and options to configure the +// Waiter and the underlying request options. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *Kinesis) WaitUntilStreamNotExistsWithContext(ctx aws.Context, input *DescribeStreamInput, opts ...request.WaiterOption) error { + w := request.Waiter{ + Name: "WaitUntilStreamNotExists", + MaxAttempts: 18, + Delay: request.ConstantWaiterDelay(10 * time.Second), + Acceptors: []request.WaiterAcceptor{ + { + State: request.SuccessWaiterState, + Matcher: request.ErrorWaiterMatch, + Expected: "ResourceNotFoundException", + }, + }, + Logger: c.Config.Logger, + NewRequest: func(opts []request.Option) (*request.Request, error) { + var inCpy *DescribeStreamInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.DescribeStreamRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + w.ApplyOptions(opts...) + + return w.WaitWithContext(ctx) +} 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 0477c7471..606191fbb 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 @@ -849,7 +849,7 @@ func (c *RDS) CopyDBSnapshotRequest(input *CopyDBSnapshotInput) (req *request.Re // To copy a DB snapshot from a shared manual DB snapshot, SourceDBSnapshotIdentifier // must be the Amazon Resource Name (ARN) of the shared DB snapshot. // -// You can copy an encrypted DB snapshot from another AWS Region. In that case, +// You can copy an encrypted DB snapshot from another AWS region. In that case, // the region where you call the CopyDBSnapshot action is the destination region // for the encrypted DB snapshot to be copied to. To copy an encrypted DB snapshot // from another region, you must provide the following values: @@ -900,7 +900,7 @@ func (c *RDS) CopyDBSnapshotRequest(input *CopyDBSnapshotInput) (req *request.Re // in the presigned URL. // // For more information on copying encrypted snapshots from one region to another, -// see Copying an Encrypted DB Snapshot to Another Region (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_CopySnapshot.html#USER_CopySnapshot.Encrypted.CrossRegion) +// see Copying a DB Snapshot (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_CopySnapshot.html#USER_CopyDBSnapshot) // in the Amazon RDS User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -1565,6 +1565,9 @@ func (c *RDS) CreateDBInstanceReadReplicaRequest(input *CreateDBInstanceReadRepl // Creates a DB instance for a DB instance running MySQL, MariaDB, or PostgreSQL // that acts as a Read Replica of a source DB instance. // +// Amazon Aurora does not support this action. You must call the CreateDBInstance +// action to create a DB instance for an Aurora DB cluster. +// // All Read Replica DB instances are created as Single-AZ deployments with backups // disabled. All other DB instance attributes (including DB security groups // and DB parameter groups) are inherited from the source DB instance, except @@ -2453,7 +2456,9 @@ func (c *RDS) DeleteDBClusterParameterGroupRequest(input *DeleteDBClusterParamet // // Returned Error Codes: // * ErrCodeInvalidDBParameterGroupStateFault "InvalidDBParameterGroupState" -// The DB parameter group cannot be deleted because it is in use. +// The DB parameter group is in use or is in an invalid state. If you are attempting +// to delete the parameter group, you cannot delete it when the parameter group +// is in this state. // // * ErrCodeDBParameterGroupNotFoundFault "DBParameterGroupNotFound" // DBParameterGroupName does not refer to an existing DB parameter group. @@ -2744,7 +2749,9 @@ func (c *RDS) DeleteDBParameterGroupRequest(input *DeleteDBParameterGroupInput) // // Returned Error Codes: // * ErrCodeInvalidDBParameterGroupStateFault "InvalidDBParameterGroupState" -// The DB parameter group cannot be deleted because it is in use. +// The DB parameter group is in use or is in an invalid state. If you are attempting +// to delete the parameter group, you cannot delete it when the parameter group +// is in this state. // // * ErrCodeDBParameterGroupNotFoundFault "DBParameterGroupNotFound" // DBParameterGroupName does not refer to an existing DB parameter group. @@ -6889,7 +6896,9 @@ func (c *RDS) ModifyDBClusterParameterGroupRequest(input *ModifyDBClusterParamet // DBParameterGroupName does not refer to an existing DB parameter group. // // * ErrCodeInvalidDBParameterGroupStateFault "InvalidDBParameterGroupState" -// The DB parameter group cannot be deleted because it is in use. +// The DB parameter group is in use or is in an invalid state. If you are attempting +// to delete the parameter group, you cannot delete it when the parameter group +// is in this state. // // Please also see https://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/ModifyDBClusterParameterGroup func (c *RDS) ModifyDBClusterParameterGroup(input *ModifyDBClusterParameterGroupInput) (*DBClusterParameterGroupNameMessage, error) { @@ -6967,14 +6976,15 @@ func (c *RDS) ModifyDBClusterSnapshotAttributeRequest(input *ModifyDBClusterSnap // snapshot. Use the value all to make the manual DB cluster snapshot public, // which means that it can be copied or restored by all AWS accounts. Do not // add the all value for any manual DB cluster snapshots that contain private -// information that you don't want available to all AWS accounts. +// information that you don't want available to all AWS accounts. If a manual +// DB cluster snapshot is encrypted, it can be shared, but only by specifying +// a list of authorized AWS account IDs for the ValuesToAdd parameter. You can't +// use all as a value for that parameter in this case. // // To view which AWS accounts have access to copy or restore a manual DB cluster // snapshot, or whether a manual DB cluster snapshot public or private, use // the DescribeDBClusterSnapshotAttributes API action. // -// If a manual DB cluster snapshot is encrypted, it cannot be shared. -// // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. @@ -7225,7 +7235,9 @@ func (c *RDS) ModifyDBParameterGroupRequest(input *ModifyDBParameterGroupInput) // DBParameterGroupName does not refer to an existing DB parameter group. // // * ErrCodeInvalidDBParameterGroupStateFault "InvalidDBParameterGroupState" -// The DB parameter group cannot be deleted because it is in use. +// The DB parameter group is in use or is in an invalid state. If you are attempting +// to delete the parameter group, you cannot delete it when the parameter group +// is in this state. // // Please also see https://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/ModifyDBParameterGroup func (c *RDS) ModifyDBParameterGroup(input *ModifyDBParameterGroupInput) (*DBParameterGroupNameMessage, error) { @@ -7388,14 +7400,15 @@ func (c *RDS) ModifyDBSnapshotAttributeRequest(input *ModifyDBSnapshotAttributeI // Uses the value all to make the manual DB snapshot public, which means it // can be copied or restored by all AWS accounts. Do not add the all value for // any manual DB snapshots that contain private information that you don't want -// available to all AWS accounts. +// available to all AWS accounts. If the manual DB snapshot is encrypted, it +// can be shared, but only by specifying a list of authorized AWS account IDs +// for the ValuesToAdd parameter. You can't use all as a value for that parameter +// in this case. // // To view which AWS accounts have access to copy or restore a manual DB snapshot, // or whether a manual DB snapshot public or private, use the DescribeDBSnapshotAttributes // API action. // -// If the manual DB snapshot is encrypted, it cannot be shared. -// // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. @@ -8407,7 +8420,9 @@ func (c *RDS) ResetDBClusterParameterGroupRequest(input *ResetDBClusterParameter // // Returned Error Codes: // * ErrCodeInvalidDBParameterGroupStateFault "InvalidDBParameterGroupState" -// The DB parameter group cannot be deleted because it is in use. +// The DB parameter group is in use or is in an invalid state. If you are attempting +// to delete the parameter group, you cannot delete it when the parameter group +// is in this state. // // * ErrCodeDBParameterGroupNotFoundFault "DBParameterGroupNotFound" // DBParameterGroupName does not refer to an existing DB parameter group. @@ -8480,7 +8495,7 @@ func (c *RDS) ResetDBParameterGroupRequest(input *ResetDBParameterGroupInput) (r // ResetDBParameterGroup API operation for Amazon Relational Database Service. // // Modifies the parameters of a DB parameter group to the engine/system default -// value. To reset specific parameters submit a list of the following: ParameterName +// value. To reset specific parameters, provide a list of the following: ParameterName // and ApplyMethod. To reset the entire DB parameter group, specify the DBParameterGroup // name and ResetAllParameters parameters. When resetting the entire group, // dynamic parameters are updated immediately and static parameters are set @@ -8496,7 +8511,9 @@ func (c *RDS) ResetDBParameterGroupRequest(input *ResetDBParameterGroupInput) (r // // Returned Error Codes: // * ErrCodeInvalidDBParameterGroupStateFault "InvalidDBParameterGroupState" -// The DB parameter group cannot be deleted because it is in use. +// The DB parameter group is in use or is in an invalid state. If you are attempting +// to delete the parameter group, you cannot delete it when the parameter group +// is in this state. // // * ErrCodeDBParameterGroupNotFoundFault "DBParameterGroupNotFound" // DBParameterGroupName does not refer to an existing DB parameter group. @@ -8571,7 +8588,7 @@ func (c *RDS) RestoreDBClusterFromS3Request(input *RestoreDBClusterFromS3Input) // Creates an Amazon Aurora DB cluster from data stored in an Amazon S3 bucket. // Amazon RDS must be authorized to access the Amazon S3 bucket and the data // must be created using the Percona XtraBackup utility as described in Migrating -// Data from MySQL by Using an Amazon S3 Bucket (AmazonRDS/latest/UserGuide/Aurora.Migrate.MySQL.html#Aurora.Migrate.MySQL.S3). +// Data from MySQL by Using an Amazon S3 Bucket (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Migrate.MySQL.html#Aurora.Migrate.MySQL.S3). // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -8857,23 +8874,19 @@ func (c *RDS) RestoreDBClusterToPointInTimeRequest(input *RestoreDBClusterToPoin // * ErrCodeDBClusterAlreadyExistsFault "DBClusterAlreadyExistsFault" // User already has a DB cluster with the given identifier. // +// * ErrCodeDBClusterNotFoundFault "DBClusterNotFoundFault" +// DBClusterIdentifier does not refer to an existing DB cluster. +// // * ErrCodeDBClusterQuotaExceededFault "DBClusterQuotaExceededFault" // User attempted to create a new DB cluster and the user has already reached // the maximum allowed DB cluster quota. // -// * ErrCodeStorageQuotaExceededFault "StorageQuotaExceeded" -// Request would result in user exceeding the allowed amount of storage available -// across all DB instances. +// * ErrCodeDBClusterSnapshotNotFoundFault "DBClusterSnapshotNotFoundFault" +// DBClusterSnapshotIdentifier does not refer to an existing DB cluster snapshot. // // * ErrCodeDBSubnetGroupNotFoundFault "DBSubnetGroupNotFoundFault" // DBSubnetGroupName does not refer to an existing DB subnet group. // -// * ErrCodeDBClusterNotFoundFault "DBClusterNotFoundFault" -// DBClusterIdentifier does not refer to an existing DB cluster. -// -// * ErrCodeDBClusterSnapshotNotFoundFault "DBClusterSnapshotNotFoundFault" -// DBClusterSnapshotIdentifier does not refer to an existing DB cluster snapshot. -// // * ErrCodeInsufficientDBClusterCapacityFault "InsufficientDBClusterCapacityFault" // The DB cluster does not have enough capacity for the current operation. // @@ -8882,36 +8895,36 @@ func (c *RDS) RestoreDBClusterToPointInTimeRequest(input *RestoreDBClusterToPoin // able to resolve this error by updating your subnet group to use different // Availability Zones that have more storage available. // -// * ErrCodeInvalidDBSnapshotStateFault "InvalidDBSnapshotState" -// The state of the DB snapshot does not allow deletion. -// // * ErrCodeInvalidDBClusterSnapshotStateFault "InvalidDBClusterSnapshotStateFault" // The supplied value is not a valid DB cluster snapshot state. // -// * ErrCodeStorageQuotaExceededFault "StorageQuotaExceeded" -// Request would result in user exceeding the allowed amount of storage available -// across all DB instances. +// * ErrCodeInvalidDBClusterStateFault "InvalidDBClusterStateFault" +// The DB cluster is not in a valid state. // -// * ErrCodeInvalidVPCNetworkStateFault "InvalidVPCNetworkStateFault" -// DB subnet group does not cover all Availability Zones after it is created -// because users' change. +// * ErrCodeInvalidDBSnapshotStateFault "InvalidDBSnapshotState" +// The state of the DB snapshot does not allow deletion. // // * ErrCodeInvalidRestoreFault "InvalidRestoreFault" // Cannot restore from vpc backup to non-vpc DB instance. // -// * ErrCodeDBSubnetGroupNotFoundFault "DBSubnetGroupNotFoundFault" -// DBSubnetGroupName does not refer to an existing DB subnet group. -// // * ErrCodeInvalidSubnet "InvalidSubnet" // The requested subnet is invalid, or multiple subnets were requested that // are not all in a common VPC. // -// * ErrCodeOptionGroupNotFoundFault "OptionGroupNotFoundFault" -// The specified option group could not be found. +// * ErrCodeInvalidVPCNetworkStateFault "InvalidVPCNetworkStateFault" +// DB subnet group does not cover all Availability Zones after it is created +// because users' change. // // * ErrCodeKMSKeyNotAccessibleFault "KMSKeyNotAccessibleFault" // Error accessing KMS key. // +// * ErrCodeOptionGroupNotFoundFault "OptionGroupNotFoundFault" +// The specified option group could not be found. +// +// * ErrCodeStorageQuotaExceededFault "StorageQuotaExceeded" +// Request would result in user exceeding the allowed amount of storage available +// across all DB instances. +// // Please also see https://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/RestoreDBClusterToPointInTime func (c *RDS) RestoreDBClusterToPointInTime(input *RestoreDBClusterToPointInTimeInput) (*RestoreDBClusterToPointInTimeOutput, error) { req, out := c.RestoreDBClusterToPointInTimeRequest(input) @@ -10108,6 +10121,8 @@ func (s *CopyDBClusterParameterGroupOutput) SetDBClusterParameterGroup(v *DBClus type CopyDBClusterSnapshotInput struct { _ struct{} `type:"structure"` + // True to copy all tags from the source DB cluster snapshot to the target DB + // cluster snapshot; otherwise false. The default is false. CopyTags *bool `type:"boolean"` // DestinationRegion is used for presigning the request to a given region. @@ -10170,6 +10185,9 @@ type CopyDBClusterSnapshotInput struct { // The identifier of the DB cluster snapshot to copy. This parameter is not // case-sensitive. // + // You cannot copy an encrypted, shared DB cluster snapshot from one AWS region + // to another. + // // Constraints: // // * Must contain from 1 to 63 alphanumeric characters or hyphens. @@ -10178,6 +10196,15 @@ type CopyDBClusterSnapshotInput struct { // // * Cannot end with a hyphen or contain two consecutive hyphens. // + // * Must specify a valid system snapshot in the "available" state. + // + // * If the source snapshot is in the same region as the copy, specify a + // valid DB snapshot identifier. + // + // * If the source snapshot is in a different region than the copy, specify + // a valid DB cluster snapshot ARN. For more information, go to Copying + // a DB Snapshot or DB Cluster Snapshot (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_CopySnapshot.html). + // // Example: my-cluster-snapshot1 // // SourceDBClusterSnapshotIdentifier is a required field @@ -10504,7 +10531,7 @@ type CopyDBSnapshotInput struct { // snapshot to be copied. This identifier must be in the Amazon Resource // Name (ARN) format for the source region. For example, if you are copying // an encrypted DB snapshot from the us-west-2 region, then your SourceDBSnapshotIdentifier - // would look like Example: arn:aws:rds:us-west-2:123456789012:snapshot:mysql-instance1-snapshot-20161115. + // looks like the following example: arn:aws:rds:us-west-2:123456789012:snapshot:mysql-instance1-snapshot-20161115. // // To learn how to generate a Signature Version 4 signed request, see Authenticating // Requests: Using Query Parameters (AWS Signature Version 4) (http://docs.aws.amazon.com/AmazonS3/latest/API/sigv4-query-string-auth.html) @@ -10527,7 +10554,7 @@ type CopyDBSnapshotInput struct { // // * If the source snapshot is in a different region than the copy, specify // a valid DB snapshot ARN. For more information, go to Copying a DB Snapshot - // (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_CopySnapshot.html). + // or DB Cluster Snapshot (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_CopySnapshot.html). // // Example: rds:mydb-2012-04-02-00-01 // @@ -10855,6 +10882,12 @@ type CreateDBClusterInput struct { // DestinationRegion is used for presigning the request to a given region. DestinationRegion *string `type:"string"` + // A Boolean value that is true to enable mapping of AWS Identity and Access + // Management (IAM) accounts to database accounts, and otherwise false. + // + // Default: false + EnableIAMDatabaseAuthentication *bool `type:"boolean"` + // The name of the database engine to be used for this DB cluster. // // Valid Values: aurora @@ -11072,6 +11105,12 @@ func (s *CreateDBClusterInput) SetDestinationRegion(v string) *CreateDBClusterIn return s } +// SetEnableIAMDatabaseAuthentication sets the EnableIAMDatabaseAuthentication field's value. +func (s *CreateDBClusterInput) SetEnableIAMDatabaseAuthentication(v bool) *CreateDBClusterInput { + s.EnableIAMDatabaseAuthentication = &v + return s +} + // SetEngine sets the Engine field's value. func (s *CreateDBClusterInput) SetEngine(v string) *CreateDBClusterInput { s.Engine = &v @@ -11442,6 +11481,12 @@ type CreateDBInstanceInput struct { // // Type: Integer // + // Amazon Aurora + // + // Not applicable. Aurora cluster volumes automatically grow as the amount of + // data in your database increases, though you are only charged for the space + // that you use in an Aurora cluster volume. + // // MySQL // // Constraints: Must be an integer from 5 to 6144. @@ -11639,6 +11684,18 @@ type CreateDBInstanceInput struct { // Directory Service. DomainIAMRoleName *string `type:"string"` + // True to enable mapping of AWS Identity and Access Management (IAM) accounts + // to database accounts; otherwise false. + // + // You can enable IAM database authentication for the following database engines + // + // * For MySQL 5.6, minor version 5.6.34 or higher + // + // * For MySQL 5.7, minor version 5.7.16 or higher + // + // Default: false + EnableIAMDatabaseAuthentication *bool `type:"boolean"` + // The name of the database engine to be used for this instance. // // Valid Values: mysql | mariadb | oracle-se1 | oracle-se2 | oracle-se | oracle-ee @@ -11737,109 +11794,13 @@ type CreateDBInstanceInput struct { // ap-southeast-2, eu-west-1, sa-east-1, us-east-1, us-gov-west-1, us-west-1, // us-west-2): 5.1.73a | 5.1.73b // - // Oracle Database Enterprise Edition (oracle-ee) - // - // * Version 12.1 (available in all AWS regions except ap-south-1, ap-northeast-2): - // 12.1.0.1.v1 | 12.1.0.1.v2 - // - // * Version 12.1 (only available in AWS regions ap-northeast-1, ap-southeast-1, - // ap-southeast-2, eu-central-1, eu-west-1, sa-east-1, us-east-1, us-west-1, - // us-west-2): 12.1.0.1.v3 | 12.1.0.1.v4 | 12.1.0.1.v5 - // - // * Version 12.1 (available in all AWS regions): 12.1.0.2.v1 - // - // * Version 12.1 (available in all AWS regions except us-gov-west-1): 12.1.0.2.v2 - // | 12.1.0.2.v3 | 12.1.0.2.v4 - // - // * Version 11.2 (only available in AWS regions ap-northeast-1, ap-southeast-1, - // ap-southeast-2, eu-west-1, sa-east-1, us-east-1, us-gov-west-1, us-west-1, - // us-west-2): 11.2.0.2.v3 | 11.2.0.2.v4 | 11.2.0.2.v5 | 11.2.0.2.v6 | 11.2.0.2.v7 - // - // * Version 11.2 (available in all AWS regions except ap-south-1, ap-northeast-2): - // 11.2.0.3.v1 | 11.2.0.3.v2 | 11.2.0.3.v3 - // - // * Version 11.2 (only available in AWS regions ap-northeast-1, ap-southeast-1, - // ap-southeast-2, eu-central-1, eu-west-1, sa-east-1, us-east-1, us-west-1, - // us-west-2): 11.2.0.3.v4 - // - // * Version 11.2 (available in all AWS regions): 11.2.0.4.v1 | 11.2.0.4.v3 - // | 11.2.0.4.v4 - // - // * Version 11.2 (available in all AWS regions except us-gov-west-1): 11.2.0.4.v5 - // | 11.2.0.4.v6 | 11.2.0.4.v7 | 11.2.0.4.v8 - // - // Oracle Database Standard Edition (oracle-se) - // - // * Version 12.1 (available in all AWS regions except ap-south-1, ap-northeast-2): - // 12.1.0.1.v1 | 12.1.0.1.v2 - // - // * Version 12.1 (only available in AWS regions ap-northeast-1, ap-southeast-1, - // ap-southeast-2, eu-central-1, eu-west-1, sa-east-1, us-east-1, us-west-1, - // us-west-2): 12.1.0.1.v3 | 12.1.0.1.v4 | 12.1.0.1.v5 - // - // * Version 11.2 (only available in AWS regions ap-northeast-1, ap-southeast-1, - // ap-southeast-2, eu-west-1, sa-east-1, us-east-1, us-gov-west-1, us-west-1, - // us-west-2): 11.2.0.2.v3 | 11.2.0.2.v4 | 11.2.0.2.v5 | 11.2.0.2.v6 | 11.2.0.2.v7 - // - // * Version 11.2 (available in all AWS regions except ap-south-1, ap-northeast-2): - // 11.2.0.3.v1 | 11.2.0.3.v2 | 11.2.0.3.v3 - // - // * Version 11.2 (only available in AWS regions ap-northeast-1, ap-southeast-1, - // ap-southeast-2, eu-central-1, eu-west-1, sa-east-1, us-east-1, us-west-1, - // us-west-2): 11.2.0.3.v4 - // - // * Version 11.2 (available in all AWS regions): 11.2.0.4.v1 | 11.2.0.4.v3 - // | 11.2.0.4.v4 - // - // * Version 11.2 (available in all AWS regions except us-gov-west-1): 11.2.0.4.v5 - // | 11.2.0.4.v6 | 11.2.0.4.v7 | 11.2.0.4.v8 - // - // Oracle Database Standard Edition One (oracle-se1) - // - // * Version 12.1 (available in all AWS regions except ap-south-1, ap-northeast-2): - // 12.1.0.1.v1 | 12.1.0.1.v2 - // - // * Version 12.1 (only available in AWS regions ap-northeast-1, ap-southeast-1, - // ap-southeast-2, eu-central-1, eu-west-1, sa-east-1, us-east-1, us-west-1, - // us-west-2): 12.1.0.1.v3 | 12.1.0.1.v4 | 12.1.0.1.v5 - // - // * Version 11.2 (only available in AWS regions ap-northeast-1, ap-southeast-1, - // ap-southeast-2, eu-west-1, sa-east-1, us-east-1, us-gov-west-1, us-west-1, - // us-west-2): 11.2.0.2.v3 | 11.2.0.2.v4 | 11.2.0.2.v5 | 11.2.0.2.v6 | 11.2.0.2.v7 - // - // * Version 11.2 (available in all AWS regions except ap-south-1, ap-northeast-2): - // 11.2.0.3.v1 | 11.2.0.3.v2 | 11.2.0.3.v3 - // - // * Version 11.2 (only available in AWS regions ap-northeast-1, ap-southeast-1, - // ap-southeast-2, eu-central-1, eu-west-1, sa-east-1, us-east-1, us-west-1, - // us-west-2): 11.2.0.3.v4 - // - // * Version 11.2 (available in all AWS regions): 11.2.0.4.v1 | 11.2.0.4.v3 - // | 11.2.0.4.v4 - // - // * Version 11.2 (available in all AWS regions except us-gov-west-1): 11.2.0.4.v5 - // | 11.2.0.4.v6 | 11.2.0.4.v7 | 11.2.0.4.v8 - // - // Oracle Database Standard Edition Two (oracle-se2) - // - // * Version 12.1 (available in all AWS regions except us-gov-west-1): 12.1.0.2.v2 - // | 12.1.0.2.v3 | 12.1.0.2.v4 - // - // PostgreSQL - // - // * Version 9.6: 9.6.1 - // - // * Version 9.5:9.5.4 | 9.5.2 - // - // * Version 9.4: 9.4.9 | 9.4.7 | 9.4.5 | 9.4.4 | 9.4.1 - // - // * Version 9.3: 9.3.14 | 9.3.12 | 9.3.10 | 9.3.9 | 9.3.6 | 9.3.5 | 9.3.3 - // | 9.3.2 | 9.3.1 - // // Oracle 12c // - // 12.1.0.2.v6 (supported for EE in all AWS regions, and SE2 in all AWS regions - // except us-gov-west-1) + // * 12.1.0.2.v7 (supported for EE in all AWS regions, and SE2 in all AWS + // regions except us-gov-west-1) + // + // * 12.1.0.2.v6 (supported for EE in all AWS regions, and SE2 in all AWS + // regions except us-gov-west-1) // // * 12.1.0.2.v5 (supported for EE in all AWS regions, and SE2 in all AWS // regions except us-gov-west-1) @@ -11856,26 +11817,10 @@ type CreateDBInstanceInput struct { // * 12.1.0.2.v1 (supported for EE in all AWS regions, and SE2 in all AWS // regions except us-gov-west-1) // - // * 12.1.0.1.v6 (supported for EE, SE1, and SE, in all AWS regions except - // ap-south-1, ap-northeast-2) - // - // * 12.1.0.1.v5 (supported for EE, SE1, and SE, in all AWS regions except - // ap-south-1, ap-northeast-2) - // - // * 12.1.0.1.v4 (supported for EE, SE1, and SE, in all AWS regions except - // ap-south-1, ap-northeast-2) - // - // * 12.1.0.1.v3 (supported for EE, SE1, and SE, in all AWS regions except - // ap-south-1, ap-northeast-2) - // - // * 12.1.0.1.v2 (supported for EE, SE1, and SE, in all AWS regions except - // ap-south-1, ap-northeast-2) - // - // * 12.1.0.1.v1 (supported for EE, SE1, and SE, in all AWS regions except - // ap-south-1, ap-northeast-2) - // // Oracle 11g // + // * 11.2.0.4.v11 (supported for EE, SE1, and SE, in all AWS regions) + // // * 11.2.0.4.v10 (supported for EE, SE1, and SE, in all AWS regions) // // * 11.2.0.4.v9 (supported for EE, SE1, and SE, in all AWS regions) @@ -11896,43 +11841,14 @@ type CreateDBInstanceInput struct { // // PostgreSQL // - // * Version 9.5 (available in these AWS regions: ap-northeast-1, ap-northeast-2, - // ap-south-1, ap-southeast-1, ap-southeast-2, eu-central-1, eu-west-1, sa-east-1, - // us-east-1, us-west-1, us-west-2): * 9.5.4 - // - // * Version 9.5 (available in these AWS regions: ap-northeast-1, ap-northeast-2, - // ap-south-1, ap-southeast-1, ap-southeast-2, eu-central-1, eu-west-1, sa-east-1, - // us-east-1, us-east-2, us-west-1, us-west-2): * 9.5.2 - // - // * Version 9.4 (available in these AWS regions: ap-northeast-1, ap-northeast-2, - // ap-south-1, ap-southeast-1, ap-southeast-2, eu-central-1, eu-west-1, sa-east-1, - // us-east-1, us-west-1, us-west-2): * 9.4.9 - // - // * Version 9.4 (available in these AWS regions: ap-northeast-1, ap-northeast-2, - // ap-south-1, ap-southeast-1, ap-southeast-2, eu-central-1, eu-west-1, sa-east-1, - // us-east-1, us-east-2, us-west-1, us-west-2): * 9.4.7 - // - // * Version 9.4 (available in all AWS regions): * 9.4.5 - // - // * Version 9.4 (available in these AWS regions: ap-northeast-1, ap-northeast-2, - // ap-southeast-1, ap-southeast-2, eu-central-1, eu-west-1, sa-east-1, us-east-1, - // us-gov-west-1, us-west-1, us-west-2): * 9.4.4 - // - // * Version 9.4 (available in these AWS regions: ap-northeast-1, ap-northeast-2, - // ap-southeast-1, ap-southeast-2, eu-central-1, eu-west-1, sa-east-1, us-east-1, - // us-east-2, us-gov-west-1, us-west-1, us-west-2): * 9.4.1 + // * Version 9.6: 9.6.1 // - // * Version 9.3 (available in these AWS regions: ap-northeast-1, ap-southeast-1, - // ap-southeast-2, eu-central-1, eu-west-1, sa-east-1, us-east-1, us-gov-west-1, - // us-west-1, us-west-2): * 9.3.10 | 9.3.3 | 9.3.5 | 9.3.6 | 9.3.9 + // * Version 9.5:9.5.4 | 9.5.2 // - // * Version 9.3 (available in these AWS regions: ap-northeast-1, ap-southeast-1, - // ap-southeast-2, eu-west-1, sa-east-1, us-east-1, us-gov-west-1, us-west-1, - // us-west-2): * 9.3.1 | 9.3.2 + // * Version 9.4: 9.4.9 | 9.4.7 | 9.4.5 | 9.4.4 | 9.4.1 // - // * Version 9.3 (available in these AWS regions: ap-northeast-1, ap-southeast-1, - // ap-southeast-2, eu-central-1, eu-west-1, sa-east-1, us-east-1, us-west-1, - // us-west-2): * 9.3.12 | 9.3.14 + // * Version 9.3: 9.3.14 | 9.3.12 | 9.3.10 | 9.3.9 | 9.3.6 | 9.3.5 | 9.3.3 + // | 9.3.2 | 9.3.1 EngineVersion *string `type:"string"` // The amount of Provisioned IOPS (input/output operations per second) to be @@ -11965,13 +11881,20 @@ type CreateDBInstanceInput struct { // The password for the master database user. Can be any printable ASCII character // except "/", """, or "@". // - // Type: String + // Amazon Aurora // - // MySQL + // Not applicable. You specify the password for the master database user when + // you create your DB cluster. + // + // MariaDB // // Constraints: Must contain from 8 to 41 characters. // - // MariaDB + // Microsoft SQL Server + // + // Constraints: Must contain from 8 to 128 characters. + // + // MySQL // // Constraints: Must contain from 8 to 41 characters. // @@ -11979,56 +11902,51 @@ type CreateDBInstanceInput struct { // // Constraints: Must contain from 8 to 30 characters. // - // SQL Server - // - // Constraints: Must contain from 8 to 128 characters. - // // PostgreSQL // // Constraints: Must contain from 8 to 128 characters. + MasterUserPassword *string `type:"string"` + + // The name for the master database user. // // Amazon Aurora // - // Constraints: Must contain from 8 to 41 characters. - MasterUserPassword *string `type:"string"` - - // The name of master user for the client DB instance. + // Not applicable. You specify the name for the master database user when you + // create your DB cluster. // - // MySQL + // MariaDB // // Constraints: // // * Must be 1 to 16 alphanumeric characters. // - // * First character must be a letter. - // // * Cannot be a reserved word for the chosen database engine. // - // MariaDB + // Microsoft SQL Server // // Constraints: // - // * Must be 1 to 16 alphanumeric characters. + // * Must be 1 to 128 alphanumeric characters. // - // * Cannot be a reserved word for the chosen database engine. + // * First character must be a letter. // - // Type: String + // * Cannot be a reserved word for the chosen database engine. // - // Oracle + // MySQL // // Constraints: // - // * Must be 1 to 30 alphanumeric characters. + // * Must be 1 to 16 alphanumeric characters. // // * First character must be a letter. // // * Cannot be a reserved word for the chosen database engine. // - // SQL Server + // Oracle // // Constraints: // - // * Must be 1 to 128 alphanumeric characters. + // * Must be 1 to 30 alphanumeric characters. // // * First character must be a letter. // @@ -12057,8 +11975,8 @@ type CreateDBInstanceInput struct { // The ARN for the IAM role that permits RDS to send enhanced monitoring metrics // to CloudWatch Logs. For example, arn:aws:iam:123456789012:role/emaccess. - // For information on creating a monitoring role, go to To create an IAM role - // for Amazon RDS Enhanced Monitoring (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.html#USER_Monitoring.OS.IAMRole). + // For information on creating a monitoring role, go to Setting Up and Enabling + // Enhanced Monitoring (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Monitoring.OS.html#USER_Monitoring.OS.Enabling). // // If MonitoringInterval is set to a value other than 0, then you must supply // a MonitoringRoleArn value. @@ -12130,8 +12048,7 @@ type CreateDBInstanceInput struct { // // Default: A 30-minute window selected at random from an 8-hour block of time // per region. To see the time blocks available, see Adjusting the Preferred - // Maintenance Window (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/AdjustingTheMaintenanceWindow.html) - // in the Amazon RDS User Guide. + // DB Instance Maintenance Window (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Maintenance.html#AdjustingTheMaintenanceWindow). // // Constraints: // @@ -12340,6 +12257,12 @@ func (s *CreateDBInstanceInput) SetDomainIAMRoleName(v string) *CreateDBInstance return s } +// SetEnableIAMDatabaseAuthentication sets the EnableIAMDatabaseAuthentication field's value. +func (s *CreateDBInstanceInput) SetEnableIAMDatabaseAuthentication(v bool) *CreateDBInstanceInput { + s.EnableIAMDatabaseAuthentication = &v + return s +} + // SetEngine sets the Engine field's value. func (s *CreateDBInstanceInput) SetEngine(v string) *CreateDBInstanceInput { s.Engine = &v @@ -12580,6 +12503,20 @@ type CreateDBInstanceReadReplicaInput struct { // DestinationRegion is used for presigning the request to a given region. DestinationRegion *string `type:"string"` + // True to enable mapping of AWS Identity and Access Management (IAM) accounts + // to database accounts; otherwise false. + // + // You can enable IAM database authentication for the following database engines + // + // * For MySQL 5.6, minor version 5.6.34 or higher + // + // * For MySQL 5.7, minor version 5.7.16 or higher + // + // * Aurora 5.6 or higher. + // + // Default: false + EnableIAMDatabaseAuthentication *bool `type:"boolean"` + // The amount of Provisioned IOPS (input/output operations per second) to be // initially allocated for the DB instance. Iops *int64 `type:"integer"` @@ -12800,6 +12737,12 @@ func (s *CreateDBInstanceReadReplicaInput) SetDestinationRegion(v string) *Creat return s } +// SetEnableIAMDatabaseAuthentication sets the EnableIAMDatabaseAuthentication field's value. +func (s *CreateDBInstanceReadReplicaInput) SetEnableIAMDatabaseAuthentication(v bool) *CreateDBInstanceReadReplicaInput { + s.EnableIAMDatabaseAuthentication = &v + return s +} + // SetIops sets the Iops field's value. func (s *CreateDBInstanceReadReplicaInput) SetIops(v int64) *CreateDBInstanceReadReplicaInput { s.Iops = &v @@ -13659,7 +13602,10 @@ func (s *CreateOptionGroupOutput) SetOptionGroup(v *OptionGroup) *CreateOptionGr type DBCluster struct { _ struct{} `type:"structure"` - // Specifies the allocated storage size in gigabytes (GB). + // For all database engines except Amazon Aurora, AllocatedStorage specifies + // the allocated storage size in gigabytes (GB). For Aurora, AllocatedStorage + // always returns 1, because Aurora DB cluster storage size is not fixed, but + // instead automatically adjusts as needed. AllocatedStorage *int64 `type:"integer"` // Provides a list of the AWS Identity and Access Management (IAM) roles that @@ -13729,6 +13675,10 @@ type DBCluster struct { // Specifies the ID that Amazon Route 53 assigns when you create a hosted zone. HostedZoneId *string `type:"string"` + // True if mapping of AWS Identity and Access Management (IAM) accounts to database + // accounts is enabled; otherwise false. + IAMDatabaseAuthenticationEnabled *bool `type:"boolean"` + // If StorageEncrypted is true, the KMS key identifier for the encrypted DB // cluster. KmsKeyId *string `type:"string"` @@ -13771,7 +13721,7 @@ type DBCluster struct { // If a failover occurs, and the Aurora Replica that you are connected to is // promoted to be the primary instance, your connection will be dropped. To // continue sending your read workload to other Aurora Replicas in the cluster, - // you can then recoonect to the reader endpoint. + // you can then reconnect to the reader endpoint. ReaderEndpoint *string `type:"string"` // Contains the identifier of the source DB cluster if this DB cluster is a @@ -13912,6 +13862,12 @@ func (s *DBCluster) SetHostedZoneId(v string) *DBCluster { return s } +// SetIAMDatabaseAuthenticationEnabled sets the IAMDatabaseAuthenticationEnabled field's value. +func (s *DBCluster) SetIAMDatabaseAuthenticationEnabled(v bool) *DBCluster { + s.IAMDatabaseAuthenticationEnabled = &v + return s +} + // SetKmsKeyId sets the KmsKeyId field's value. func (s *DBCluster) SetKmsKeyId(v string) *DBCluster { s.KmsKeyId = &v @@ -14264,6 +14220,10 @@ type DBClusterSnapshot struct { // Provides the version of the database engine for this DB cluster snapshot. EngineVersion *string `type:"string"` + // True if mapping of AWS Identity and Access Management (IAM) accounts to database + // accounts is enabled; otherwise false. + IAMDatabaseAuthenticationEnabled *bool `type:"boolean"` + // If StorageEncrypted is true, the KMS key identifier for the encrypted DB // cluster snapshot. KmsKeyId *string `type:"string"` @@ -14356,6 +14316,12 @@ func (s *DBClusterSnapshot) SetEngineVersion(v string) *DBClusterSnapshot { return s } +// SetIAMDatabaseAuthenticationEnabled sets the IAMDatabaseAuthenticationEnabled field's value. +func (s *DBClusterSnapshot) SetIAMDatabaseAuthenticationEnabled(v bool) *DBClusterSnapshot { + s.IAMDatabaseAuthenticationEnabled = &v + return s +} + // SetKmsKeyId sets the KmsKeyId field's value. func (s *DBClusterSnapshot) SetKmsKeyId(v string) *DBClusterSnapshot { s.KmsKeyId = &v @@ -14663,7 +14629,7 @@ type DBInstance struct { // when returning values from CreateDBInstanceReadReplica since Read Replicas // are only supported for these engines. // - // MySQL, MariaDB, SQL Server, PostgreSQL, Amazon Aurora + // MySQL, MariaDB, SQL Server, PostgreSQL // // Contains the name of the initial database of this instance that was provided // at create time, if one was specified when the DB instance was created. This @@ -14713,6 +14679,19 @@ type DBInstance struct { // receives the Enhanced Monitoring metrics data for the DB instance. EnhancedMonitoringResourceArn *string `type:"string"` + // True if mapping of AWS Identity and Access Management (IAM) accounts to database + // accounts is enabled; otherwise false. + // + // IAM database authentication can be enabled for the following database engines + // + // * For MySQL 5.6, minor version 5.6.34 or higher + // + // * For MySQL 5.7, minor version 5.7.16 or higher + // + // * Aurora 5.6 or higher. To enable IAM database authentication for Aurora, + // see DBCluster Type. + IAMDatabaseAuthenticationEnabled *bool `type:"boolean"` + // Provides the date and time the DB instance was created. InstanceCreateTime *time.Time `type:"timestamp" timestampFormat:"iso8601"` @@ -14970,6 +14949,12 @@ func (s *DBInstance) SetEnhancedMonitoringResourceArn(v string) *DBInstance { return s } +// SetIAMDatabaseAuthenticationEnabled sets the IAMDatabaseAuthenticationEnabled field's value. +func (s *DBInstance) SetIAMDatabaseAuthenticationEnabled(v bool) *DBInstance { + s.IAMDatabaseAuthenticationEnabled = &v + return s +} + // SetInstanceCreateTime sets the InstanceCreateTime field's value. func (s *DBInstance) SetInstanceCreateTime(v time.Time) *DBInstance { s.InstanceCreateTime = &v @@ -15475,6 +15460,10 @@ type DBSnapshot struct { // Specifies the version of the database engine. EngineVersion *string `type:"string"` + // True if mapping of AWS Identity and Access Management (IAM) accounts to database + // accounts is enabled; otherwise false. + IAMDatabaseAuthenticationEnabled *bool `type:"boolean"` + // Specifies the time when the snapshot was taken, in Universal Coordinated // Time (UTC). InstanceCreateTime *time.Time `type:"timestamp" timestampFormat:"iso8601"` @@ -15592,6 +15581,12 @@ func (s *DBSnapshot) SetEngineVersion(v string) *DBSnapshot { return s } +// SetIAMDatabaseAuthenticationEnabled sets the IAMDatabaseAuthenticationEnabled field's value. +func (s *DBSnapshot) SetIAMDatabaseAuthenticationEnabled(v bool) *DBSnapshot { + s.IAMDatabaseAuthenticationEnabled = &v + return s +} + // SetInstanceCreateTime sets the InstanceCreateTime field's value. func (s *DBSnapshot) SetInstanceCreateTime(v time.Time) *DBSnapshot { s.InstanceCreateTime = &v @@ -21259,6 +21254,12 @@ type ModifyDBClusterInput struct { // The name of the DB cluster parameter group to use for the DB cluster. DBClusterParameterGroupName *string `type:"string"` + // A Boolean value that is true to enable mapping of AWS Identity and Access + // Management (IAM) accounts to database accounts, and otherwise false. + // + // Default: false + EnableIAMDatabaseAuthentication *bool `type:"boolean"` + // The new password for the master database user. This password can contain // any printable ASCII character except "/", """, or "@". // @@ -21332,7 +21333,7 @@ type ModifyDBClusterInput struct { // Constraints: Minimum 30-minute window. PreferredMaintenanceWindow *string `type:"string"` - // A lst of VPC security groups that the DB cluster will belong to. + // A list of VPC security groups that the DB cluster will belong to. VpcSecurityGroupIds []*string `locationNameList:"VpcSecurityGroupId" type:"list"` } @@ -21383,6 +21384,12 @@ func (s *ModifyDBClusterInput) SetDBClusterParameterGroupName(v string) *ModifyD return s } +// SetEnableIAMDatabaseAuthentication sets the EnableIAMDatabaseAuthentication field's value. +func (s *ModifyDBClusterInput) SetEnableIAMDatabaseAuthentication(v bool) *ModifyDBClusterInput { + s.EnableIAMDatabaseAuthentication = &v + return s +} + // SetMasterUserPassword sets the MasterUserPassword field's value. func (s *ModifyDBClusterInput) SetMasterUserPassword(v string) *ModifyDBClusterInput { s.MasterUserPassword = &v @@ -21904,6 +21911,18 @@ type ModifyDBInstanceInput struct { // The name of the IAM role to use when making API calls to the Directory Service. DomainIAMRoleName *string `type:"string"` + // True to enable mapping of AWS Identity and Access Management (IAM) accounts + // to database accounts; otherwise false. + // + // You can enable IAM database authentication for the following database engines + // + // * For MySQL 5.6, minor version 5.6.34 or higher + // + // * For MySQL 5.7, minor version 5.7.16 or higher + // + // Default: false + EnableIAMDatabaseAuthentication *bool `type:"boolean"` + // 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. @@ -22230,6 +22249,12 @@ func (s *ModifyDBInstanceInput) SetDomainIAMRoleName(v string) *ModifyDBInstance return s } +// SetEnableIAMDatabaseAuthentication sets the EnableIAMDatabaseAuthentication field's value. +func (s *ModifyDBInstanceInput) SetEnableIAMDatabaseAuthentication(v bool) *ModifyDBInstanceInput { + s.EnableIAMDatabaseAuthentication = &v + return s +} + // SetEngineVersion sets the EngineVersion field's value. func (s *ModifyDBInstanceInput) SetEngineVersion(v string) *ModifyDBInstanceInput { s.EngineVersion = &v @@ -23644,6 +23669,9 @@ type OrderableDBInstanceOption struct { // from 1 to 60 seconds. SupportsEnhancedMonitoring *bool `type:"boolean"` + // Indicates whether this orderable DB instance supports IAM database authentication. + SupportsIAMDatabaseAuthentication *bool `type:"boolean"` + // Indicates whether this orderable DB instance supports provisioned IOPS. SupportsIops *bool `type:"boolean"` @@ -23718,6 +23746,12 @@ func (s *OrderableDBInstanceOption) SetSupportsEnhancedMonitoring(v bool) *Order return s } +// SetSupportsIAMDatabaseAuthentication sets the SupportsIAMDatabaseAuthentication field's value. +func (s *OrderableDBInstanceOption) SetSupportsIAMDatabaseAuthentication(v bool) *OrderableDBInstanceOption { + s.SupportsIAMDatabaseAuthentication = &v + return s +} + // SetSupportsIops sets the SupportsIops field's value. func (s *OrderableDBInstanceOption) SetSupportsIops(v bool) *OrderableDBInstanceOption { s.SupportsIops = &v @@ -24508,7 +24542,7 @@ func (s *RecurringCharge) SetRecurringChargeFrequency(v string) *RecurringCharge type RemoveRoleFromDBClusterInput struct { _ struct{} `type:"structure"` - // The name of the DB cluster to disassociate the IAM role rom. + // The name of the DB cluster to disassociate the IAM role from. // // DBClusterIdentifier is a required field DBClusterIdentifier *string `type:"string" required:"true"` @@ -25060,10 +25094,10 @@ type ResetDBParameterGroupInput struct { // DBParameterGroupName is a required field DBParameterGroupName *string `type:"string" required:"true"` - // An array of parameter names, values, and the apply method for the parameter - // update. At least one parameter name, value, and apply method must be supplied; - // subsequent arguments are optional. A maximum of 20 parameters can be modified - // in a single request. + // To reset the entire DB parameter group, specify the DBParameterGroup name + // and ResetAllParameters parameters. To reset specific parameters, provide + // a list of the following: ParameterName and ApplyMethod. A maximum of 20 parameters + // can be modified in a single request. // // MySQL // @@ -25230,6 +25264,12 @@ type RestoreDBClusterFromS3Input struct { // The database name for the restored DB cluster. DatabaseName *string `type:"string"` + // A Boolean value that is true to enable mapping of AWS Identity and Access + // Management (IAM) accounts to database accounts, and otherwise false. + // + // Default: false + EnableIAMDatabaseAuthentication *bool `type:"boolean"` + // The name of the database engine to be used for the restored DB cluster. // // Valid Values: aurora @@ -25457,6 +25497,12 @@ func (s *RestoreDBClusterFromS3Input) SetDatabaseName(v string) *RestoreDBCluste return s } +// SetEnableIAMDatabaseAuthentication sets the EnableIAMDatabaseAuthentication field's value. +func (s *RestoreDBClusterFromS3Input) SetEnableIAMDatabaseAuthentication(v bool) *RestoreDBClusterFromS3Input { + s.EnableIAMDatabaseAuthentication = &v + return s +} + // SetEngine sets the Engine field's value. func (s *RestoreDBClusterFromS3Input) SetEngine(v string) *RestoreDBClusterFromS3Input { s.Engine = &v @@ -25632,6 +25678,12 @@ type RestoreDBClusterFromSnapshotInput struct { // The database name for the restored DB cluster. DatabaseName *string `type:"string"` + // A Boolean value that is true to enable mapping of AWS Identity and Access + // Management (IAM) accounts to database accounts, and otherwise false. + // + // Default: false + EnableIAMDatabaseAuthentication *bool `type:"boolean"` + // The database engine to use for the new DB cluster. // // Default: The same as source @@ -25746,6 +25798,12 @@ func (s *RestoreDBClusterFromSnapshotInput) SetDatabaseName(v string) *RestoreDB return s } +// SetEnableIAMDatabaseAuthentication sets the EnableIAMDatabaseAuthentication field's value. +func (s *RestoreDBClusterFromSnapshotInput) SetEnableIAMDatabaseAuthentication(v bool) *RestoreDBClusterFromSnapshotInput { + s.EnableIAMDatabaseAuthentication = &v + return s +} + // SetEngine sets the Engine field's value. func (s *RestoreDBClusterFromSnapshotInput) SetEngine(v string) *RestoreDBClusterFromSnapshotInput { s.Engine = &v @@ -25857,6 +25915,12 @@ type RestoreDBClusterToPointInTimeInput struct { // Example: mySubnetgroup DBSubnetGroupName *string `type:"string"` + // A Boolean value that is true to enable mapping of AWS Identity and Access + // Management (IAM) accounts to database accounts, and otherwise false. + // + // Default: false + EnableIAMDatabaseAuthentication *bool `type:"boolean"` + // The KMS key identifier to use when restoring an encrypted DB cluster from // an encrypted DB cluster. // @@ -25974,6 +26038,12 @@ func (s *RestoreDBClusterToPointInTimeInput) SetDBSubnetGroupName(v string) *Res return s } +// SetEnableIAMDatabaseAuthentication sets the EnableIAMDatabaseAuthentication field's value. +func (s *RestoreDBClusterToPointInTimeInput) SetEnableIAMDatabaseAuthentication(v bool) *RestoreDBClusterToPointInTimeInput { + s.EnableIAMDatabaseAuthentication = &v + return s +} + // SetKmsKeyId sets the KmsKeyId field's value. func (s *RestoreDBClusterToPointInTimeInput) SetKmsKeyId(v string) *RestoreDBClusterToPointInTimeInput { s.KmsKeyId = &v @@ -26144,6 +26214,20 @@ type RestoreDBInstanceFromDBSnapshotInput struct { // Directory Service. DomainIAMRoleName *string `type:"string"` + // True to enable mapping of AWS Identity and Access Management (IAM) accounts + // to database accounts; otherwise false. + // + // You can enable IAM database authentication for the following database engines + // + // * For MySQL 5.6, minor version 5.6.34 or higher + // + // * For MySQL 5.7, minor version 5.7.16 or higher + // + // * Aurora 5.6 or higher. + // + // Default: false + EnableIAMDatabaseAuthentication *bool `type:"boolean"` + // The database engine to use for the new instance. // // Default: The same as source @@ -26320,6 +26404,12 @@ func (s *RestoreDBInstanceFromDBSnapshotInput) SetDomainIAMRoleName(v string) *R return s } +// SetEnableIAMDatabaseAuthentication sets the EnableIAMDatabaseAuthentication field's value. +func (s *RestoreDBInstanceFromDBSnapshotInput) SetEnableIAMDatabaseAuthentication(v bool) *RestoreDBInstanceFromDBSnapshotInput { + s.EnableIAMDatabaseAuthentication = &v + return s +} + // SetEngine sets the Engine field's value. func (s *RestoreDBInstanceFromDBSnapshotInput) SetEngine(v string) *RestoreDBInstanceFromDBSnapshotInput { s.Engine = &v @@ -26471,6 +26561,20 @@ type RestoreDBInstanceToPointInTimeInput struct { // Directory Service. DomainIAMRoleName *string `type:"string"` + // True to enable mapping of AWS Identity and Access Management (IAM) accounts + // to database accounts; otherwise false. + // + // You can enable IAM database authentication for the following database engines + // + // * For MySQL 5.6, minor version 5.6.34 or higher + // + // * For MySQL 5.7, minor version 5.7.16 or higher + // + // * Aurora 5.6 or higher. + // + // Default: false + EnableIAMDatabaseAuthentication *bool `type:"boolean"` + // The database engine to use for the new instance. // // Default: The same as source @@ -26679,6 +26783,12 @@ func (s *RestoreDBInstanceToPointInTimeInput) SetDomainIAMRoleName(v string) *Re return s } +// SetEnableIAMDatabaseAuthentication sets the EnableIAMDatabaseAuthentication field's value. +func (s *RestoreDBInstanceToPointInTimeInput) SetEnableIAMDatabaseAuthentication(v bool) *RestoreDBInstanceToPointInTimeInput { + s.EnableIAMDatabaseAuthentication = &v + return s +} + // SetEngine sets the Engine field's value. func (s *RestoreDBInstanceToPointInTimeInput) SetEngine(v string) *RestoreDBInstanceToPointInTimeInput { s.Engine = &v diff --git a/vendor/github.com/aws/aws-sdk-go/service/rds/errors.go b/vendor/github.com/aws/aws-sdk-go/service/rds/errors.go index 2617719ff..4cb1983df 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/rds/errors.go +++ b/vendor/github.com/aws/aws-sdk-go/service/rds/errors.go @@ -272,7 +272,9 @@ const ( // ErrCodeInvalidDBParameterGroupStateFault for service response error code // "InvalidDBParameterGroupState". // - // The DB parameter group cannot be deleted because it is in use. + // The DB parameter group is in use or is in an invalid state. If you are attempting + // to delete the parameter group, you cannot delete it when the parameter group + // is in this state. ErrCodeInvalidDBParameterGroupStateFault = "InvalidDBParameterGroupState" // ErrCodeInvalidDBSecurityGroupStateFault for service response error code diff --git a/vendor/github.com/aws/aws-sdk-go/service/rds/examples_test.go b/vendor/github.com/aws/aws-sdk-go/service/rds/examples_test.go index 59936cc3b..df8dfcc47 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/rds/examples_test.go +++ b/vendor/github.com/aws/aws-sdk-go/service/rds/examples_test.go @@ -305,24 +305,25 @@ func ExampleRDS_CreateDBCluster() { aws.String("String"), // Required // More values... }, - BackupRetentionPeriod: aws.Int64(1), - CharacterSetName: aws.String("String"), - DBClusterParameterGroupName: aws.String("String"), - DBSubnetGroupName: aws.String("String"), - DatabaseName: aws.String("String"), - DestinationRegion: aws.String("String"), - EngineVersion: aws.String("String"), - KmsKeyId: aws.String("String"), - MasterUserPassword: aws.String("String"), - MasterUsername: aws.String("String"), - OptionGroupName: aws.String("String"), - Port: aws.Int64(1), - PreSignedUrl: aws.String("String"), - PreferredBackupWindow: aws.String("String"), - PreferredMaintenanceWindow: aws.String("String"), - ReplicationSourceIdentifier: aws.String("String"), - SourceRegion: aws.String("String"), - StorageEncrypted: aws.Bool(true), + BackupRetentionPeriod: aws.Int64(1), + CharacterSetName: aws.String("String"), + DBClusterParameterGroupName: aws.String("String"), + DBSubnetGroupName: aws.String("String"), + DatabaseName: aws.String("String"), + DestinationRegion: aws.String("String"), + EnableIAMDatabaseAuthentication: aws.Bool(true), + EngineVersion: aws.String("String"), + KmsKeyId: aws.String("String"), + MasterUserPassword: aws.String("String"), + MasterUsername: aws.String("String"), + OptionGroupName: aws.String("String"), + Port: aws.Int64(1), + PreSignedUrl: aws.String("String"), + PreferredBackupWindow: aws.String("String"), + PreferredMaintenanceWindow: aws.String("String"), + ReplicationSourceIdentifier: aws.String("String"), + SourceRegion: aws.String("String"), + StorageEncrypted: aws.Bool(true), Tags: []*rds.Tag{ { // Required Key: aws.String("String"), @@ -429,20 +430,21 @@ func ExampleRDS_CreateDBInstance() { aws.String("String"), // Required // More values... }, - DBSubnetGroupName: aws.String("String"), - Domain: aws.String("String"), - DomainIAMRoleName: aws.String("String"), - EngineVersion: aws.String("String"), - Iops: aws.Int64(1), - KmsKeyId: aws.String("String"), - LicenseModel: aws.String("String"), - MasterUserPassword: aws.String("String"), - MasterUsername: aws.String("String"), - MonitoringInterval: aws.Int64(1), - MonitoringRoleArn: aws.String("String"), - MultiAZ: aws.Bool(true), - OptionGroupName: aws.String("String"), - Port: aws.Int64(1), + DBSubnetGroupName: aws.String("String"), + Domain: aws.String("String"), + DomainIAMRoleName: aws.String("String"), + EnableIAMDatabaseAuthentication: aws.Bool(true), + EngineVersion: aws.String("String"), + Iops: aws.Int64(1), + KmsKeyId: aws.String("String"), + LicenseModel: aws.String("String"), + MasterUserPassword: aws.String("String"), + MasterUsername: aws.String("String"), + MonitoringInterval: aws.Int64(1), + MonitoringRoleArn: aws.String("String"), + MultiAZ: aws.Bool(true), + OptionGroupName: aws.String("String"), + Port: aws.Int64(1), PreferredBackupWindow: aws.String("String"), PreferredMaintenanceWindow: aws.String("String"), PromotionTier: aws.Int64(1), @@ -483,24 +485,25 @@ func ExampleRDS_CreateDBInstanceReadReplica() { svc := rds.New(sess) params := &rds.CreateDBInstanceReadReplicaInput{ - DBInstanceIdentifier: aws.String("String"), // Required - SourceDBInstanceIdentifier: aws.String("String"), // Required - AutoMinorVersionUpgrade: aws.Bool(true), - AvailabilityZone: aws.String("String"), - CopyTagsToSnapshot: aws.Bool(true), - DBInstanceClass: aws.String("String"), - DBSubnetGroupName: aws.String("String"), - DestinationRegion: aws.String("String"), - Iops: aws.Int64(1), - KmsKeyId: aws.String("String"), - MonitoringInterval: aws.Int64(1), - MonitoringRoleArn: aws.String("String"), - OptionGroupName: aws.String("String"), - Port: aws.Int64(1), - PreSignedUrl: aws.String("String"), - PubliclyAccessible: aws.Bool(true), - SourceRegion: aws.String("String"), - StorageType: aws.String("String"), + DBInstanceIdentifier: aws.String("String"), // Required + SourceDBInstanceIdentifier: aws.String("String"), // Required + AutoMinorVersionUpgrade: aws.Bool(true), + AvailabilityZone: aws.String("String"), + CopyTagsToSnapshot: aws.Bool(true), + DBInstanceClass: aws.String("String"), + DBSubnetGroupName: aws.String("String"), + DestinationRegion: aws.String("String"), + EnableIAMDatabaseAuthentication: aws.Bool(true), + Iops: aws.Int64(1), + KmsKeyId: aws.String("String"), + MonitoringInterval: aws.Int64(1), + MonitoringRoleArn: aws.String("String"), + OptionGroupName: aws.String("String"), + Port: aws.Int64(1), + PreSignedUrl: aws.String("String"), + PubliclyAccessible: aws.Bool(true), + SourceRegion: aws.String("String"), + StorageType: aws.String("String"), Tags: []*rds.Tag{ { // Required Key: aws.String("String"), @@ -1938,14 +1941,15 @@ func ExampleRDS_ModifyDBCluster() { svc := rds.New(sess) params := &rds.ModifyDBClusterInput{ - DBClusterIdentifier: aws.String("String"), // Required - ApplyImmediately: aws.Bool(true), - BackupRetentionPeriod: aws.Int64(1), - DBClusterParameterGroupName: aws.String("String"), - MasterUserPassword: aws.String("String"), - NewDBClusterIdentifier: aws.String("String"), - OptionGroupName: aws.String("String"), - Port: aws.Int64(1), + DBClusterIdentifier: aws.String("String"), // Required + ApplyImmediately: aws.Bool(true), + BackupRetentionPeriod: aws.Int64(1), + DBClusterParameterGroupName: aws.String("String"), + EnableIAMDatabaseAuthentication: aws.Bool(true), + MasterUserPassword: aws.String("String"), + NewDBClusterIdentifier: aws.String("String"), + OptionGroupName: aws.String("String"), + Port: aws.Int64(1), PreferredBackupWindow: aws.String("String"), PreferredMaintenanceWindow: aws.String("String"), VpcSecurityGroupIds: []*string{ @@ -2053,25 +2057,26 @@ func ExampleRDS_ModifyDBInstance() { aws.String("String"), // Required // More values... }, - DBSubnetGroupName: aws.String("String"), - Domain: aws.String("String"), - DomainIAMRoleName: aws.String("String"), - EngineVersion: aws.String("String"), - Iops: aws.Int64(1), - LicenseModel: aws.String("String"), - MasterUserPassword: aws.String("String"), - MonitoringInterval: aws.Int64(1), - MonitoringRoleArn: aws.String("String"), - MultiAZ: aws.Bool(true), - NewDBInstanceIdentifier: aws.String("String"), - OptionGroupName: aws.String("String"), - PreferredBackupWindow: aws.String("String"), - PreferredMaintenanceWindow: aws.String("String"), - PromotionTier: aws.Int64(1), - PubliclyAccessible: aws.Bool(true), - StorageType: aws.String("String"), - TdeCredentialArn: aws.String("String"), - TdeCredentialPassword: aws.String("String"), + DBSubnetGroupName: aws.String("String"), + Domain: aws.String("String"), + DomainIAMRoleName: aws.String("String"), + EnableIAMDatabaseAuthentication: aws.Bool(true), + EngineVersion: aws.String("String"), + Iops: aws.Int64(1), + LicenseModel: aws.String("String"), + MasterUserPassword: aws.String("String"), + MonitoringInterval: aws.Int64(1), + MonitoringRoleArn: aws.String("String"), + MultiAZ: aws.Bool(true), + NewDBInstanceIdentifier: aws.String("String"), + OptionGroupName: aws.String("String"), + PreferredBackupWindow: aws.String("String"), + PreferredMaintenanceWindow: aws.String("String"), + PromotionTier: aws.Int64(1), + PubliclyAccessible: aws.Bool(true), + StorageType: aws.String("String"), + TdeCredentialArn: aws.String("String"), + TdeCredentialPassword: aws.String("String"), VpcSecurityGroupIds: []*string{ aws.String("String"), // Required // More values... @@ -2545,15 +2550,16 @@ func ExampleRDS_RestoreDBClusterFromS3() { aws.String("String"), // Required // More values... }, - BackupRetentionPeriod: aws.Int64(1), - CharacterSetName: aws.String("String"), - DBClusterParameterGroupName: aws.String("String"), - DBSubnetGroupName: aws.String("String"), - DatabaseName: aws.String("String"), - EngineVersion: aws.String("String"), - KmsKeyId: aws.String("String"), - OptionGroupName: aws.String("String"), - Port: aws.Int64(1), + BackupRetentionPeriod: aws.Int64(1), + CharacterSetName: aws.String("String"), + DBClusterParameterGroupName: aws.String("String"), + DBSubnetGroupName: aws.String("String"), + DatabaseName: aws.String("String"), + EnableIAMDatabaseAuthentication: aws.Bool(true), + EngineVersion: aws.String("String"), + KmsKeyId: aws.String("String"), + OptionGroupName: aws.String("String"), + Port: aws.Int64(1), PreferredBackupWindow: aws.String("String"), PreferredMaintenanceWindow: aws.String("String"), S3Prefix: aws.String("String"), @@ -2596,12 +2602,13 @@ func ExampleRDS_RestoreDBClusterFromSnapshot() { aws.String("String"), // Required // More values... }, - DBSubnetGroupName: aws.String("String"), - DatabaseName: aws.String("String"), - EngineVersion: aws.String("String"), - KmsKeyId: aws.String("String"), - OptionGroupName: aws.String("String"), - Port: aws.Int64(1), + DBSubnetGroupName: aws.String("String"), + DatabaseName: aws.String("String"), + EnableIAMDatabaseAuthentication: aws.Bool(true), + EngineVersion: aws.String("String"), + KmsKeyId: aws.String("String"), + OptionGroupName: aws.String("String"), + Port: aws.Int64(1), Tags: []*rds.Tag{ { // Required Key: aws.String("String"), @@ -2633,13 +2640,14 @@ func ExampleRDS_RestoreDBClusterToPointInTime() { svc := rds.New(sess) params := &rds.RestoreDBClusterToPointInTimeInput{ - DBClusterIdentifier: aws.String("String"), // Required - SourceDBClusterIdentifier: aws.String("String"), // Required - DBSubnetGroupName: aws.String("String"), - KmsKeyId: aws.String("String"), - OptionGroupName: aws.String("String"), - Port: aws.Int64(1), - RestoreToTime: aws.Time(time.Now()), + DBClusterIdentifier: aws.String("String"), // Required + SourceDBClusterIdentifier: aws.String("String"), // Required + DBSubnetGroupName: aws.String("String"), + EnableIAMDatabaseAuthentication: aws.Bool(true), + KmsKeyId: aws.String("String"), + OptionGroupName: aws.String("String"), + Port: aws.Int64(1), + RestoreToTime: aws.Time(time.Now()), Tags: []*rds.Tag{ { // Required Key: aws.String("String"), @@ -2672,24 +2680,25 @@ func ExampleRDS_RestoreDBInstanceFromDBSnapshot() { svc := rds.New(sess) params := &rds.RestoreDBInstanceFromDBSnapshotInput{ - DBInstanceIdentifier: aws.String("String"), // Required - DBSnapshotIdentifier: aws.String("String"), // Required - AutoMinorVersionUpgrade: aws.Bool(true), - AvailabilityZone: aws.String("String"), - CopyTagsToSnapshot: aws.Bool(true), - DBInstanceClass: aws.String("String"), - DBName: aws.String("String"), - DBSubnetGroupName: aws.String("String"), - Domain: aws.String("String"), - DomainIAMRoleName: aws.String("String"), - Engine: aws.String("String"), - Iops: aws.Int64(1), - LicenseModel: aws.String("String"), - MultiAZ: aws.Bool(true), - OptionGroupName: aws.String("String"), - Port: aws.Int64(1), - PubliclyAccessible: aws.Bool(true), - StorageType: aws.String("String"), + DBInstanceIdentifier: aws.String("String"), // Required + DBSnapshotIdentifier: aws.String("String"), // Required + AutoMinorVersionUpgrade: aws.Bool(true), + AvailabilityZone: aws.String("String"), + CopyTagsToSnapshot: aws.Bool(true), + DBInstanceClass: aws.String("String"), + DBName: aws.String("String"), + DBSubnetGroupName: aws.String("String"), + Domain: aws.String("String"), + DomainIAMRoleName: aws.String("String"), + EnableIAMDatabaseAuthentication: aws.Bool(true), + Engine: aws.String("String"), + Iops: aws.Int64(1), + LicenseModel: aws.String("String"), + MultiAZ: aws.Bool(true), + OptionGroupName: aws.String("String"), + Port: aws.Int64(1), + PubliclyAccessible: aws.Bool(true), + StorageType: aws.String("String"), Tags: []*rds.Tag{ { // Required Key: aws.String("String"), @@ -2719,25 +2728,26 @@ func ExampleRDS_RestoreDBInstanceToPointInTime() { svc := rds.New(sess) params := &rds.RestoreDBInstanceToPointInTimeInput{ - SourceDBInstanceIdentifier: aws.String("String"), // Required - TargetDBInstanceIdentifier: aws.String("String"), // Required - AutoMinorVersionUpgrade: aws.Bool(true), - AvailabilityZone: aws.String("String"), - CopyTagsToSnapshot: aws.Bool(true), - DBInstanceClass: aws.String("String"), - DBName: aws.String("String"), - DBSubnetGroupName: aws.String("String"), - Domain: aws.String("String"), - DomainIAMRoleName: aws.String("String"), - Engine: aws.String("String"), - Iops: aws.Int64(1), - LicenseModel: aws.String("String"), - MultiAZ: aws.Bool(true), - OptionGroupName: aws.String("String"), - Port: aws.Int64(1), - PubliclyAccessible: aws.Bool(true), - RestoreTime: aws.Time(time.Now()), - StorageType: aws.String("String"), + SourceDBInstanceIdentifier: aws.String("String"), // Required + TargetDBInstanceIdentifier: aws.String("String"), // Required + AutoMinorVersionUpgrade: aws.Bool(true), + AvailabilityZone: aws.String("String"), + CopyTagsToSnapshot: aws.Bool(true), + DBInstanceClass: aws.String("String"), + DBName: aws.String("String"), + DBSubnetGroupName: aws.String("String"), + Domain: aws.String("String"), + DomainIAMRoleName: aws.String("String"), + EnableIAMDatabaseAuthentication: aws.Bool(true), + Engine: aws.String("String"), + Iops: aws.Int64(1), + LicenseModel: aws.String("String"), + MultiAZ: aws.Bool(true), + OptionGroupName: aws.String("String"), + Port: aws.Int64(1), + PubliclyAccessible: aws.Bool(true), + RestoreTime: aws.Time(time.Now()), + StorageType: aws.String("String"), Tags: []*rds.Tag{ { // Required Key: aws.String("String"), diff --git a/vendor/github.com/aws/aws-sdk-go/service/rds/rdsutils/connect.go b/vendor/github.com/aws/aws-sdk-go/service/rds/rdsutils/connect.go new file mode 100644 index 000000000..28415d176 --- /dev/null +++ b/vendor/github.com/aws/aws-sdk-go/service/rds/rdsutils/connect.go @@ -0,0 +1,47 @@ +package rdsutils + +import ( + "net/http" + "strings" + "time" + + "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/aws/aws-sdk-go/aws/signer/v4" +) + +// BuildAuthToken is used for generate a autherized presigned URL to connect to +// the database. +// +// The endpoint consists of the scheme, hostname, and port. IE {scheme}://{hostname}[:port]. The +// region is the region of database that the auth token would be generated for. The dbUser is the user +// that the request would be authenticated with. The creds are the credentials the auth token is signed +// with. +// +// The url that is returned will not contain the scheme. +func BuildAuthToken(endpoint, region, dbUser string, creds *credentials.Credentials) (string, error) { + req, err := http.NewRequest("GET", endpoint, nil) + if err != nil { + return "", err + } + values := req.URL.Query() + values.Set("Action", "connect") + values.Set("DBUser", dbUser) + req.URL.RawQuery = values.Encode() + + signer := v4.Signer{ + Credentials: creds, + } + _, err = signer.Presign(req, nil, "rds-db", region, 15*time.Minute, time.Now()) + if err != nil { + return "", err + } + + url := req.URL.String() + if strings.HasPrefix(url, "http://") { + url = url[len("http://"):] + } else if strings.HasPrefix(url, "https://") { + url = url[len("https://"):] + } + + return url, nil +} diff --git a/vendor/github.com/aws/aws-sdk-go/service/rds/rdsutils/connect_test.go b/vendor/github.com/aws/aws-sdk-go/service/rds/rdsutils/connect_test.go new file mode 100644 index 000000000..af42bf180 --- /dev/null +++ b/vendor/github.com/aws/aws-sdk-go/service/rds/rdsutils/connect_test.go @@ -0,0 +1,21 @@ +package rdsutils_test + +import ( + "testing" + + "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/aws/aws-sdk-go/service/rds/rdsutils" + + "github.com/stretchr/testify/assert" +) + +func TestBuildAuthToken(t *testing.T) { + endpoint := "https://prod-instance.us-east-1.rds.amazonaws.com:3306" + region := "us-west-2" + creds := credentials.NewStaticCredentials("AKID", "SECRET", "SESSION") + user := "mysqlUser" + + url, err := rdsutils.BuildAuthToken(endpoint, region, user, creds) + assert.NoError(t, err) + assert.Regexp(t, `^prod-instance\.us-east-1\.rds\.amazonaws\.com:3306\?Action=connect.*?DBUser=mysqlUser.*`, url) +} 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 80fa5120a..0c02c6217 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 @@ -14,9 +14,9 @@ import ( // // Amazon Relational Database Service (Amazon RDS) is a web service that makes // it easier to set up, operate, and scale a relational database in the cloud. -// It provides cost-efficient, resizeable capacity for an industry-standard -// relational database and manages common database administration tasks, freeing -// up developers to focus on what makes their applications and businesses unique. +// It provides cost-efficient, resizable capacity for an industry-standard relational +// database and manages common database administration tasks, freeing 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 Amazon Aurora database server. These capabilities diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error_test.go b/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error_test.go index f508cd153..9b75072fd 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error_test.go +++ b/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error_test.go @@ -54,7 +54,7 @@ func TestCopyObjectError(t *testing.T) { func TestUploadPartCopySuccess(t *testing.T) { const successMsg = ` -2009-11-23T0:00:00Z"1da64c7f13d1e8dbeaea40b905fd586c"` +2009-11-23T0:00:00Z"1da64c7f13d1e8dbeaea40b905fd586c"` res, err := newCopyTestSvc(successMsg).UploadPartCopy(&s3.UploadPartCopyInput{ Bucket: aws.String("bucketname"),