From f401fe6dc8e74d992001fc8677e53b102bf8d9f3 Mon Sep 17 00:00:00 2001 From: aws-sdk-go-automation <43143561+aws-sdk-go-automation@users.noreply.github.com> Date: Wed, 22 Feb 2023 11:31:35 -0800 Subject: [PATCH] Release v1.44.207 (2023-02-22) (#4735) Release v1.44.207 (2023-02-22) === ### Service Client Updates * `service/chime-sdk-voice`: Updates service API and documentation * `service/cloudfront`: Updates service API and documentation * CloudFront now supports block lists in origin request policies so that you can forward all headers, cookies, or query string from viewer requests to the origin *except* for those specified in the block list. * `service/datasync`: Updates service API * `service/opensearch`: Updates service API, documentation, and paginators * `service/rum`: Updates service API and documentation * `service/ssm`: Updates service documentation * Document only update for Feb 2023 --- CHANGELOG.md | 13 + aws/version.go | 2 +- .../chime-sdk-voice/2022-08-03/api-2.json | 3 +- .../chime-sdk-voice/2022-08-03/docs-2.json | 1 + .../2022-08-03/endpoint-rule-set-1.json | 405 ++-- .../2022-08-03/endpoint-tests-1.json | 86 +- models/apis/cloudfront/2020-05-31/api-2.json | 9 +- models/apis/cloudfront/2020-05-31/docs-2.json | 38 +- .../2020-05-31/endpoint-rule-set-1.json | 1193 ++++++------ .../2020-05-31/endpoint-tests-1.json | 290 ++- models/apis/datasync/2018-11-09/api-2.json | 4 +- .../datasync/2018-11-09/endpoint-tests-1.json | 180 +- models/apis/opensearch/2021-01-01/api-2.json | 249 ++- models/apis/opensearch/2021-01-01/docs-2.json | 179 +- .../2021-01-01/endpoint-rule-set-1.json | 380 ++-- .../2021-01-01/endpoint-tests-1.json | 363 ++-- .../opensearch/2021-01-01/paginators-1.json | 5 + models/apis/rum/2018-05-10/api-2.json | 52 +- models/apis/rum/2018-05-10/docs-2.json | 54 +- .../rum/2018-05-10/endpoint-rule-set-1.json | 399 ++-- .../apis/rum/2018-05-10/endpoint-tests-1.json | 392 ++-- models/apis/ssm/2014-11-06/docs-2.json | 36 +- .../ssm/2014-11-06/endpoint-rule-set-1.json | 412 +++-- .../apis/ssm/2014-11-06/endpoint-tests-1.json | 1575 ++-------------- service/chimesdkvoice/api.go | 8 + service/cloudfront/api.go | 198 +- service/cloudwatchrum/api.go | 229 ++- service/datasync/api.go | 26 +- service/opensearchservice/api.go | 1635 +++++++++++++++-- service/opensearchservice/errors.go | 16 +- .../opensearchserviceiface/interface.go | 11 + service/ssm/api.go | 102 +- service/ssm/errors.go | 4 +- 33 files changed, 4792 insertions(+), 3757 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb397d37494..6e5e5198c84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +Release v1.44.207 (2023-02-22) +=== + +### Service Client Updates +* `service/chime-sdk-voice`: Updates service API and documentation +* `service/cloudfront`: Updates service API and documentation + * CloudFront now supports block lists in origin request policies so that you can forward all headers, cookies, or query string from viewer requests to the origin *except* for those specified in the block list. +* `service/datasync`: Updates service API +* `service/opensearch`: Updates service API, documentation, and paginators +* `service/rum`: Updates service API and documentation +* `service/ssm`: Updates service documentation + * Document only update for Feb 2023 + Release v1.44.206 (2023-02-21) === diff --git a/aws/version.go b/aws/version.go index 0d409595e62..00526729422 100644 --- a/aws/version.go +++ b/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.44.206" +const SDKVersion = "1.44.207" diff --git a/models/apis/chime-sdk-voice/2022-08-03/api-2.json b/models/apis/chime-sdk-voice/2022-08-03/api-2.json index 28a447516e7..ed3136d8eb1 100644 --- a/models/apis/chime-sdk-voice/2022-08-03/api-2.json +++ b/models/apis/chime-sdk-voice/2022-08-03/api-2.json @@ -2565,7 +2565,8 @@ "LoggingConfiguration":{ "type":"structure", "members":{ - "EnableSIPLogs":{"shape":"Boolean"} + "EnableSIPLogs":{"shape":"Boolean"}, + "EnableMediaMetricLogs":{"shape":"Boolean"} } }, "NextTokenString":{ diff --git a/models/apis/chime-sdk-voice/2022-08-03/docs-2.json b/models/apis/chime-sdk-voice/2022-08-03/docs-2.json index a72366cb50d..ee853aa600b 100644 --- a/models/apis/chime-sdk-voice/2022-08-03/docs-2.json +++ b/models/apis/chime-sdk-voice/2022-08-03/docs-2.json @@ -172,6 +172,7 @@ "refs": { "CreateVoiceConnectorRequest$RequireEncryption": null, "LoggingConfiguration$EnableSIPLogs": null, + "LoggingConfiguration$EnableMediaMetricLogs": null, "Origination$Disabled": null, "Proxy$Disabled": null, "PutVoiceConnectorProxyRequest$Disabled": null, diff --git a/models/apis/chime-sdk-voice/2022-08-03/endpoint-rule-set-1.json b/models/apis/chime-sdk-voice/2022-08-03/endpoint-rule-set-1.json index a3e2b59aaa9..70607cca0c3 100644 --- a/models/apis/chime-sdk-voice/2022-08-03/endpoint-rule-set-1.json +++ b/models/apis/chime-sdk-voice/2022-08-03/endpoint-rule-set-1.json @@ -32,13 +32,12 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "isSet", "argv": [ { - "ref": "Region" + "ref": "Endpoint" } - ], - "assign": "PartitionResult" + ] } ], "type": "tree", @@ -46,23 +45,20 @@ { "conditions": [ { - "fn": "isSet", + "fn": "booleanEquals", "argv": [ { - "ref": "Endpoint" - } + "ref": "UseFIPS" + }, + true ] - }, - { - "fn": "parseURL", - "argv": [ - { - "ref": "Endpoint" - } - ], - "assign": "url" } ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], "type": "tree", "rules": [ { @@ -71,67 +67,42 @@ "fn": "booleanEquals", "argv": [ { - "ref": "UseFIPS" + "ref": "UseDualStack" }, true ] } ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", "type": "error" }, { "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" + "endpoint": { + "url": { + "ref": "Endpoint" }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" - }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, + } + ] + }, + { + "conditions": [], + "type": "tree", + "rules": [ { "conditions": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", + "fn": "isSet", "argv": [ { - "ref": "UseDualStack" - }, - true + "ref": "Region" + } ] } ], @@ -140,168 +111,238 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "aws.partition", "argv": [ - true, { - "fn": "getAttr", + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsFIPS" + true ] - } - ] - }, - { - "fn": "booleanEquals", - "argv": [ - true, + }, { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" }, - "supportsDualStack" + true ] } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://voice-chime-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://voice-chime-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsFIPS" + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://voice-chime-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" } ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://voice-chime-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" }, - "supportsDualStack" + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://voice-chime.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [], - "endpoint": { - "url": "https://voice-chime.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://voice-chime.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] } ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } ] }, { "conditions": [], - "endpoint": { - "url": "https://voice-chime.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } diff --git a/models/apis/chime-sdk-voice/2022-08-03/endpoint-tests-1.json b/models/apis/chime-sdk-voice/2022-08-03/endpoint-tests-1.json index 9150af50207..df083670bc3 100644 --- a/models/apis/chime-sdk-voice/2022-08-03/endpoint-tests-1.json +++ b/models/apis/chime-sdk-voice/2022-08-03/endpoint-tests-1.json @@ -8,9 +8,9 @@ } }, "params": { - "UseDualStack": true, "UseFIPS": true, - "Region": "us-gov-east-1" + "Region": "us-gov-east-1", + "UseDualStack": true } }, { @@ -21,9 +21,9 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": true, - "Region": "us-gov-east-1" + "Region": "us-gov-east-1", + "UseDualStack": false } }, { @@ -34,9 +34,9 @@ } }, "params": { - "UseDualStack": true, "UseFIPS": false, - "Region": "us-gov-east-1" + "Region": "us-gov-east-1", + "UseDualStack": true } }, { @@ -47,9 +47,9 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": false, - "Region": "us-gov-east-1" + "Region": "us-gov-east-1", + "UseDualStack": false } }, { @@ -60,9 +60,9 @@ } }, "params": { - "UseDualStack": true, "UseFIPS": true, - "Region": "cn-north-1" + "Region": "cn-north-1", + "UseDualStack": true } }, { @@ -73,9 +73,9 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": true, - "Region": "cn-north-1" + "Region": "cn-north-1", + "UseDualStack": false } }, { @@ -86,9 +86,9 @@ } }, "params": { - "UseDualStack": true, "UseFIPS": false, - "Region": "cn-north-1" + "Region": "cn-north-1", + "UseDualStack": true } }, { @@ -99,9 +99,9 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": false, - "Region": "cn-north-1" + "Region": "cn-north-1", + "UseDualStack": false } }, { @@ -110,9 +110,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "UseDualStack": true, "UseFIPS": true, - "Region": "us-iso-east-1" + "Region": "us-iso-east-1", + "UseDualStack": true } }, { @@ -123,9 +123,9 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": true, - "Region": "us-iso-east-1" + "Region": "us-iso-east-1", + "UseDualStack": false } }, { @@ -134,9 +134,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "UseDualStack": true, "UseFIPS": false, - "Region": "us-iso-east-1" + "Region": "us-iso-east-1", + "UseDualStack": true } }, { @@ -147,9 +147,9 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": false, - "Region": "us-iso-east-1" + "Region": "us-iso-east-1", + "UseDualStack": false } }, { @@ -160,9 +160,9 @@ } }, "params": { - "UseDualStack": true, "UseFIPS": true, - "Region": "us-east-1" + "Region": "us-east-1", + "UseDualStack": true } }, { @@ -173,9 +173,9 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": true, - "Region": "us-east-1" + "Region": "us-east-1", + "UseDualStack": false } }, { @@ -186,9 +186,9 @@ } }, "params": { - "UseDualStack": true, "UseFIPS": false, - "Region": "us-east-1" + "Region": "us-east-1", + "UseDualStack": true } }, { @@ -199,9 +199,9 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": false, - "Region": "us-east-1" + "Region": "us-east-1", + "UseDualStack": false } }, { @@ -210,9 +210,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "UseDualStack": true, "UseFIPS": true, - "Region": "us-isob-east-1" + "Region": "us-isob-east-1", + "UseDualStack": true } }, { @@ -223,9 +223,9 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": true, - "Region": "us-isob-east-1" + "Region": "us-isob-east-1", + "UseDualStack": false } }, { @@ -234,9 +234,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "UseDualStack": true, "UseFIPS": false, - "Region": "us-isob-east-1" + "Region": "us-isob-east-1", + "UseDualStack": true } }, { @@ -247,9 +247,9 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": false, - "Region": "us-isob-east-1" + "Region": "us-isob-east-1", + "UseDualStack": false } }, { @@ -260,9 +260,9 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": false, "Region": "us-east-1", + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -272,9 +272,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "UseDualStack": false, "UseFIPS": true, "Region": "us-east-1", + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -284,9 +284,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "UseDualStack": true, "UseFIPS": false, "Region": "us-east-1", + "UseDualStack": true, "Endpoint": "https://example.com" } } diff --git a/models/apis/cloudfront/2020-05-31/api-2.json b/models/apis/cloudfront/2020-05-31/api-2.json index d9f75e87bbe..e133eb4df07 100644 --- a/models/apis/cloudfront/2020-05-31/api-2.json +++ b/models/apis/cloudfront/2020-05-31/api-2.json @@ -6258,7 +6258,8 @@ "enum":[ "none", "whitelist", - "all" + "all", + "allExcept" ] }, "OriginRequestPolicyCookiesConfig":{ @@ -6275,7 +6276,8 @@ "none", "whitelist", "allViewer", - "allViewerAndWhitelistCloudFront" + "allViewerAndWhitelistCloudFront", + "allExcept" ] }, "OriginRequestPolicyHeadersConfig":{ @@ -6312,7 +6314,8 @@ "enum":[ "none", "whitelist", - "all" + "all", + "allExcept" ] }, "OriginRequestPolicyQueryStringsConfig":{ diff --git a/models/apis/cloudfront/2020-05-31/docs-2.json b/models/apis/cloudfront/2020-05-31/docs-2.json index 9e8d56f153c..87a4f8db2e7 100644 --- a/models/apis/cloudfront/2020-05-31/docs-2.json +++ b/models/apis/cloudfront/2020-05-31/docs-2.json @@ -4,7 +4,7 @@ "operations": { "AssociateAlias": "

Associates an alias (also known as a CNAME or an alternate domain name) with a CloudFront distribution.

With this operation you can move an alias that's already in use on a CloudFront distribution to a different distribution in one step. This prevents the downtime that could occur if you first remove the alias from one distribution and then separately add the alias to another distribution.

To use this operation to associate an alias with a distribution, you provide the alias and the ID of the target distribution for the alias. For more information, including how to set up the target distribution, prerequisites that you must complete, and other restrictions, see Moving an alternate domain name to a different distribution in the Amazon CloudFront Developer Guide.

", "CopyDistribution": "

Creates a staging distribution using the configuration of the provided primary distribution. A staging distribution is a copy of an existing distribution (called the primary distribution) that you can use in a continuous deployment workflow.

After you create a staging distribution, you can use UpdateDistribution to modify the staging distribution's configuration. Then you can use CreateContinuousDeploymentPolicy to incrementally move traffic to the staging distribution.

", - "CreateCachePolicy": "

Creates a cache policy.

After you create a cache policy, you can attach it to one or more cache behaviors. When it's attached to a cache behavior, the cache policy determines the following:

The headers, cookies, and query strings that are included in the cache key are automatically included in requests that CloudFront sends to the origin. CloudFront sends a request when it can't find an object in its cache that matches the request's cache key. If you want to send values to the origin but not include them in the cache key, use OriginRequestPolicy.

For more information about cache policies, see Controlling the cache key in the Amazon CloudFront Developer Guide.

", + "CreateCachePolicy": "

Creates a cache policy.

After you create a cache policy, you can attach it to one or more cache behaviors. When it's attached to a cache behavior, the cache policy determines the following:

The headers, cookies, and query strings that are included in the cache key are also included in requests that CloudFront sends to the origin. CloudFront sends a request when it can't find an object in its cache that matches the request's cache key. If you want to send values to the origin but not include them in the cache key, use OriginRequestPolicy.

For more information about cache policies, see Controlling the cache key in the Amazon CloudFront Developer Guide.

", "CreateCloudFrontOriginAccessIdentity": "

Creates a new origin access identity. If you're using Amazon S3 for your origin, you can use an origin access identity to require users to access your content using a CloudFront URL instead of the Amazon S3 URL. For more information about how to use origin access identities, see Serving Private Content through CloudFront in the Amazon CloudFront Developer Guide.

", "CreateContinuousDeploymentPolicy": "

Creates a continuous deployment policy that distributes traffic for a custom domain name to two different CloudFront distributions.

To use a continuous deployment policy, first use CopyDistribution to create a staging distribution, then use UpdateDistribution to modify the staging distribution's configuration.

After you create and update a staging distribution, you can use a continuous deployment policy to incrementally move traffic to the staging distribution. This workflow enables you to test changes to a distribution's configuration before moving all of your domain's production traffic to the new configuration.

", "CreateDistribution": "

Creates a CloudFront distribution.

", @@ -228,7 +228,7 @@ } }, "CachePolicy": { - "base": "

A cache policy.

When it's attached to a cache behavior, the cache policy determines the following:

The headers, cookies, and query strings that are included in the cache key are automatically included in requests that CloudFront sends to the origin. CloudFront sends a request when it can't find a valid object in its cache that matches the request's cache key. If you want to send values to the origin but not include them in the cache key, use OriginRequestPolicy.

", + "base": "

A cache policy.

When it's attached to a cache behavior, the cache policy determines the following:

The headers, cookies, and query strings that are included in the cache key are also included in requests that CloudFront sends to the origin. CloudFront sends a request when it can't find a valid object in its cache that matches the request's cache key. If you want to send values to the origin but not include them in the cache key, use OriginRequestPolicy.

", "refs": { "CachePolicySummary$CachePolicy": "

The cache policy.

", "CreateCachePolicyResult$CachePolicy": "

A cache policy.

", @@ -242,7 +242,7 @@ } }, "CachePolicyConfig": { - "base": "

A cache policy configuration.

This configuration determines the following:

The headers, cookies, and query strings that are included in the cache key are automatically included in requests that CloudFront sends to the origin. CloudFront sends a request when it can't find a valid object in its cache that matches the request's cache key. If you want to send values to the origin but not include them in the cache key, use OriginRequestPolicy.

", + "base": "

A cache policy configuration.

This configuration determines the following:

The headers, cookies, and query strings that are included in the cache key are also included in requests that CloudFront sends to the origin. CloudFront sends a request when it can't find a valid object in its cache that matches the request's cache key. If you want to send values to the origin but not include them in the cache key, use OriginRequestPolicy.

", "refs": { "CachePolicy$CachePolicyConfig": "

The cache policy configuration.

", "CreateCachePolicyRequest$CachePolicyConfig": "

A cache policy configuration.

", @@ -253,25 +253,25 @@ "CachePolicyCookieBehavior": { "base": null, "refs": { - "CachePolicyCookiesConfig$CookieBehavior": "

Determines whether any cookies in viewer requests are included in the cache key and automatically included in requests that CloudFront sends to the origin. Valid values are:

" + "CachePolicyCookiesConfig$CookieBehavior": "

Determines whether any cookies in viewer requests are included in the cache key and in requests that CloudFront sends to the origin. Valid values are:

" } }, "CachePolicyCookiesConfig": { - "base": "

An object that determines whether any cookies in viewer requests (and if so, which cookies) are included in the cache key and automatically included in requests that CloudFront sends to the origin.

", + "base": "

An object that determines whether any cookies in viewer requests (and if so, which cookies) are included in the cache key and in requests that CloudFront sends to the origin.

", "refs": { - "ParametersInCacheKeyAndForwardedToOrigin$CookiesConfig": "

An object that determines whether any cookies in viewer requests (and if so, which cookies) are included in the cache key and automatically included in requests that CloudFront sends to the origin.

" + "ParametersInCacheKeyAndForwardedToOrigin$CookiesConfig": "

An object that determines whether any cookies in viewer requests (and if so, which cookies) are included in the cache key and in requests that CloudFront sends to the origin.

" } }, "CachePolicyHeaderBehavior": { "base": null, "refs": { - "CachePolicyHeadersConfig$HeaderBehavior": "

Determines whether any HTTP headers are included in the cache key and automatically included in requests that CloudFront sends to the origin. Valid values are:

" + "CachePolicyHeadersConfig$HeaderBehavior": "

Determines whether any HTTP headers are included in the cache key and in requests that CloudFront sends to the origin. Valid values are:

" } }, "CachePolicyHeadersConfig": { - "base": "

An object that determines whether any HTTP headers (and if so, which headers) are included in the cache key and automatically included in requests that CloudFront sends to the origin.

", + "base": "

An object that determines whether any HTTP headers (and if so, which headers) are included in the cache key and in requests that CloudFront sends to the origin.

", "refs": { - "ParametersInCacheKeyAndForwardedToOrigin$HeadersConfig": "

An object that determines whether any HTTP headers (and if so, which headers) are included in the cache key and automatically included in requests that CloudFront sends to the origin.

" + "ParametersInCacheKeyAndForwardedToOrigin$HeadersConfig": "

An object that determines whether any HTTP headers (and if so, which headers) are included in the cache key and in requests that CloudFront sends to the origin.

" } }, "CachePolicyInUse": { @@ -288,13 +288,13 @@ "CachePolicyQueryStringBehavior": { "base": null, "refs": { - "CachePolicyQueryStringsConfig$QueryStringBehavior": "

Determines whether any URL query strings in viewer requests are included in the cache key and automatically included in requests that CloudFront sends to the origin. Valid values are:

" + "CachePolicyQueryStringsConfig$QueryStringBehavior": "

Determines whether any URL query strings in viewer requests are included in the cache key and in requests that CloudFront sends to the origin. Valid values are:

" } }, "CachePolicyQueryStringsConfig": { - "base": "

An object that determines whether any URL query strings in viewer requests (and if so, which query strings) are included in the cache key and automatically included in requests that CloudFront sends to the origin.

", + "base": "

An object that determines whether any URL query strings in viewer requests (and if so, which query strings) are included in the cache key and in requests that CloudFront sends to the origin.

", "refs": { - "ParametersInCacheKeyAndForwardedToOrigin$QueryStringsConfig": "

An object that determines whether any URL query strings in viewer requests (and if so, which query strings) are included in the cache key and automatically included in requests that CloudFront sends to the origin.

" + "ParametersInCacheKeyAndForwardedToOrigin$QueryStringsConfig": "

An object that determines whether any URL query strings in viewer requests (and if so, which query strings) are included in the cache key and in requests that CloudFront sends to the origin.

" } }, "CachePolicySummary": { @@ -2333,7 +2333,7 @@ "OriginRequestPolicyCookieBehavior": { "base": null, "refs": { - "OriginRequestPolicyCookiesConfig$CookieBehavior": "

Determines whether cookies in viewer requests are included in requests that CloudFront sends to the origin. Valid values are:

" + "OriginRequestPolicyCookiesConfig$CookieBehavior": "

Determines whether cookies in viewer requests are included in requests that CloudFront sends to the origin. Valid values are:

" } }, "OriginRequestPolicyCookiesConfig": { @@ -2345,7 +2345,7 @@ "OriginRequestPolicyHeaderBehavior": { "base": null, "refs": { - "OriginRequestPolicyHeadersConfig$HeaderBehavior": "

Determines whether any HTTP headers are included in requests that CloudFront sends to the origin. Valid values are:

" + "OriginRequestPolicyHeadersConfig$HeaderBehavior": "

Determines whether any HTTP headers are included in requests that CloudFront sends to the origin. Valid values are:

" } }, "OriginRequestPolicyHeadersConfig": { @@ -2368,7 +2368,7 @@ "OriginRequestPolicyQueryStringBehavior": { "base": null, "refs": { - "OriginRequestPolicyQueryStringsConfig$QueryStringBehavior": "

Determines whether any URL query strings in viewer requests are included in requests that CloudFront sends to the origin. Valid values are:

" + "OriginRequestPolicyQueryStringsConfig$QueryStringBehavior": "

Determines whether any URL query strings in viewer requests are included in requests that CloudFront sends to the origin. Valid values are:

" } }, "OriginRequestPolicyQueryStringsConfig": { @@ -2422,9 +2422,9 @@ } }, "ParametersInCacheKeyAndForwardedToOrigin": { - "base": "

This object determines the values that CloudFront includes in the cache key. These values can include HTTP headers, cookies, and URL query strings. CloudFront uses the cache key to find an object in its cache that it can return to the viewer.

The headers, cookies, and query strings that are included in the cache key are automatically included in requests that CloudFront sends to the origin. CloudFront sends a request when it can't find an object in its cache that matches the request's cache key. If you want to send values to the origin but not include them in the cache key, use OriginRequestPolicy.

", + "base": "

This object determines the values that CloudFront includes in the cache key. These values can include HTTP headers, cookies, and URL query strings. CloudFront uses the cache key to find an object in its cache that it can return to the viewer.

The headers, cookies, and query strings that are included in the cache key are also included in requests that CloudFront sends to the origin. CloudFront sends a request when it can't find an object in its cache that matches the request's cache key. If you want to send values to the origin but not include them in the cache key, use OriginRequestPolicy.

", "refs": { - "CachePolicyConfig$ParametersInCacheKeyAndForwardedToOrigin": "

The HTTP headers, cookies, and URL query strings to include in the cache key. The values included in the cache key are automatically included in requests that CloudFront sends to the origin.

" + "CachePolicyConfig$ParametersInCacheKeyAndForwardedToOrigin": "

The HTTP headers, cookies, and URL query strings to include in the cache key. The values included in the cache key are also included in requests that CloudFront sends to the origin.

" } }, "PathList": { @@ -2559,8 +2559,8 @@ "QueryStringNames": { "base": "

Contains a list of query string names.

", "refs": { - "CachePolicyQueryStringsConfig$QueryStrings": "

Contains the specific query strings in viewer requests that either are or are not included in the cache key and automatically included in requests that CloudFront sends to the origin. The behavior depends on whether the QueryStringBehavior field in the CachePolicyQueryStringsConfig type is set to whitelist (the listed query strings are included) or allExcept (the listed query strings are not included, but all other query strings are).

", - "OriginRequestPolicyQueryStringsConfig$QueryStrings": "

Contains a list of the query strings in viewer requests that are included in requests that CloudFront sends to the origin.

" + "CachePolicyQueryStringsConfig$QueryStrings": "

Contains the specific query strings in viewer requests that either are or are not included in the cache key and in requests that CloudFront sends to the origin. The behavior depends on whether the QueryStringBehavior field in the CachePolicyQueryStringsConfig type is set to whitelist (the listed query strings are included) or allExcept (the listed query strings are not included, but all other query strings are).

", + "OriginRequestPolicyQueryStringsConfig$QueryStrings": "

Contains the specific query strings in viewer requests that either are or are not included in requests that CloudFront sends to the origin. The behavior depends on whether the QueryStringBehavior field in the OriginRequestPolicyQueryStringsConfig type is set to whitelist (the listed query strings are included) or allExcept (the listed query strings are not included, but all other query strings are).

" } }, "QueryStringNamesList": { diff --git a/models/apis/cloudfront/2020-05-31/endpoint-rule-set-1.json b/models/apis/cloudfront/2020-05-31/endpoint-rule-set-1.json index b13d359bc0e..2d908ad292a 100644 --- a/models/apis/cloudfront/2020-05-31/endpoint-rule-set-1.json +++ b/models/apis/cloudfront/2020-05-31/endpoint-rule-set-1.json @@ -3,7 +3,7 @@ "parameters": { "Region": { "builtIn": "AWS::Region", - "required": true, + "required": false, "documentation": "The AWS region used to dispatch the request.", "type": "String" }, @@ -32,13 +32,12 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "isSet", "argv": [ { - "ref": "Region" + "ref": "Endpoint" } - ], - "assign": "PartitionResult" + ] } ], "type": "tree", @@ -46,14 +45,20 @@ { "conditions": [ { - "fn": "isSet", + "fn": "booleanEquals", "argv": [ { - "ref": "Endpoint" - } + "ref": "UseFIPS" + }, + true ] } ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], "type": "tree", "rules": [ { @@ -62,64 +67,42 @@ "fn": "booleanEquals", "argv": [ { - "ref": "UseFIPS" + "ref": "UseDualStack" }, true ] } ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", "type": "error" }, { "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" + "endpoint": { + "url": { + "ref": "Endpoint" }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" - }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, + } + ] + }, + { + "conditions": [], + "type": "tree", + "rules": [ { "conditions": [ { - "fn": "stringEquals", + "fn": "isSet", "argv": [ { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "name" - ] - }, - "aws" + "ref": "Region" + } ] } ], @@ -128,22 +111,13 @@ { "conditions": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", + "fn": "aws.partition", "argv": [ { - "ref": "UseDualStack" - }, - true - ] + "ref": "Region" + } + ], + "assign": "PartitionResult" } ], "type": "tree", @@ -151,48 +125,221 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "stringEquals", "argv": [ - true, { "fn": "getAttr", "argv": [ { "ref": "PartitionResult" }, - "supportsFIPS" + "name" + ] + }, + "aws" + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://cloudfront-fips.{Region}.api.aws", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" } ] }, { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsDualStack" + true ] } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://cloudfront-fips.amazonaws.com", + "properties": { + "authSchemes": [ + { + "name": "sigv4", + "signingName": "cloudfront", + "signingRegion": "us-east-1" + } + ] + }, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } ] - } - ], - "type": "tree", - "rules": [ + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://cloudfront.{Region}.api.aws", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" + } + ] + }, { "conditions": [], "endpoint": { - "url": "https://cloudfront-fips.{Region}.api.aws", + "url": "https://cloudfront.amazonaws.com", "properties": { "authSchemes": [ { "name": "sigv4", - "signingRegion": "us-east-1", - "signingName": "cloudfront" + "signingName": "cloudfront", + "signingRegion": "us-east-1" } ] }, @@ -202,117 +349,216 @@ } ] }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - } - ], - "type": "tree", - "rules": [ { "conditions": [ { - "fn": "booleanEquals", + "fn": "stringEquals", "argv": [ - true, { "fn": "getAttr", "argv": [ { "ref": "PartitionResult" }, - "supportsFIPS" + "name" ] - } + }, + "aws-cn" ] } ], "type": "tree", "rules": [ { - "conditions": [], - "endpoint": { - "url": "https://cloudfront-fips.{Region}.amazonaws.com", - "properties": { - "authSchemes": [ + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ { - "name": "sigv4", - "signingRegion": "us-east-1", - "signingName": "cloudfront" + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://cloudfront-fips.{Region}.api.amazonwebservices.com.cn", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } + ] + }, { - "ref": "UseDualStack" + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://cloudfront-fips.{Region}.amazonaws.com.cn", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" }, - "supportsDualStack" + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://cloudfront.{Region}.api.amazonwebservices.com.cn", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [], "endpoint": { - "url": "https://cloudfront.{Region}.api.aws", + "url": "https://cloudfront.cn-northwest-1.amazonaws.com.cn", "properties": { "authSchemes": [ { "name": "sigv4", - "signingRegion": "us-east-1", - "signingName": "cloudfront" + "signingName": "cloudfront", + "signingRegion": "cn-northwest-1" } ] }, @@ -323,392 +569,292 @@ ] }, { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" - } - ] - }, - { - "conditions": [], - "endpoint": { - "url": "https://cloudfront.amazonaws.com", - "properties": { - "authSchemes": [ + "conditions": [ { - "name": "sigv4", - "signingRegion": "us-east-1", - "signingName": "cloudfront" - } - ] - }, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [ - { - "fn": "stringEquals", - "argv": [ - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] }, - "name" - ] - }, - "aws-cn" - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", - "argv": [ + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ { - "ref": "UseDualStack" + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://cloudfront-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] }, - true + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [ { "fn": "booleanEquals", "argv": [ - true, { - "fn": "getAttr", + "ref": "UseFIPS" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", "argv": [ + true, { - "ref": "PartitionResult" + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + { + "ref": "Region" + }, + "aws-global" + ] + } + ], + "endpoint": { + "url": "https://cloudfront-fips.amazonaws.com", + "properties": { + "authSchemes": [ + { + "name": "sigv4", + "signingName": "cloudfront", + "signingRegion": "us-east-1" + } + ] + }, + "headers": {} + }, + "type": "endpoint" }, - "supportsFIPS" + { + "conditions": [], + "endpoint": { + "url": "https://cloudfront-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } ] } ] }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] + }, + { + "conditions": [ { "fn": "booleanEquals", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } + "ref": "UseDualStack" + }, + true ] } ], "type": "tree", "rules": [ { - "conditions": [], - "endpoint": { - "url": "https://cloudfront-fips.{Region}.api.amazonwebservices.com.cn", - "properties": { - "authSchemes": [ + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, { - "name": "sigv4", - "signingRegion": "cn-northwest-1", - "signingName": "cloudfront" + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] } ] - }, - "headers": {} - }, - "type": "endpoint" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://cloudfront.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] }, { "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ + "type": "tree", + "rules": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "stringEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "Region" }, - "supportsFIPS" + "aws-global" ] } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], + ], "endpoint": { - "url": "https://cloudfront-fips.{Region}.amazonaws.com.cn", + "url": "https://cloudfront.amazonaws.com", "properties": { "authSchemes": [ { "name": "sigv4", - "signingRegion": "cn-northwest-1", - "signingName": "cloudfront" + "signingName": "cloudfront", + "signingRegion": "us-east-1" } ] }, "headers": {} }, "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "stringEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "Region" }, - "supportsDualStack" + "aws-cn-global" ] } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], + ], "endpoint": { - "url": "https://cloudfront.{Region}.api.amazonwebservices.com.cn", + "url": "https://cloudfront.cn-northwest-1.amazonaws.com.cn", "properties": { "authSchemes": [ { "name": "sigv4", - "signingRegion": "cn-northwest-1", - "signingName": "cloudfront" + "signingName": "cloudfront", + "signingRegion": "cn-northwest-1" } ] }, "headers": {} }, "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" - } - ] - }, - { - "conditions": [], - "endpoint": { - "url": "https://cloudfront.cn-northwest-1.amazonaws.com.cn", - "properties": { - "authSchemes": [ - { - "name": "sigv4", - "signingRegion": "cn-northwest-1", - "signingName": "cloudfront" - } - ] - }, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://cloudfront-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ + }, { "conditions": [], "endpoint": { - "url": "https://cloudfront-fips.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://cloudfront.{Region}.{PartitionResult#dnsSuffix}", "properties": {}, "headers": {} }, @@ -717,134 +863,13 @@ ] } ] - }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://cloudfront.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } ] }, { "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "stringEquals", - "argv": [ - { - "ref": "Region" - }, - "aws-global" - ] - } - ], - "endpoint": { - "url": "https://cloudfront.amazonaws.com", - "properties": { - "authSchemes": [ - { - "name": "sigv4", - "signingRegion": "us-east-1", - "signingName": "cloudfront" - } - ] - }, - "headers": {} - }, - "type": "endpoint" - }, - { - "conditions": [ - { - "fn": "stringEquals", - "argv": [ - { - "ref": "Region" - }, - "aws-cn-global" - ] - } - ], - "endpoint": { - "url": "https://cloudfront.cn-northwest-1.amazonaws.com.cn", - "properties": { - "authSchemes": [ - { - "name": "sigv4", - "signingRegion": "cn-northwest-1", - "signingName": "cloudfront" - } - ] - }, - "headers": {} - }, - "type": "endpoint" - }, - { - "conditions": [], - "endpoint": { - "url": "https://cloudfront.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } diff --git a/models/apis/cloudfront/2020-05-31/endpoint-tests-1.json b/models/apis/cloudfront/2020-05-31/endpoint-tests-1.json index c2dbe731efc..736cf87722f 100644 --- a/models/apis/cloudfront/2020-05-31/endpoint-tests-1.json +++ b/models/apis/cloudfront/2020-05-31/endpoint-tests-1.json @@ -1,5 +1,119 @@ { "testCases": [ + { + "documentation": "For region aws-global with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "properties": { + "authSchemes": [ + { + "name": "sigv4", + "signingName": "cloudfront", + "signingRegion": "us-east-1" + } + ] + }, + "url": "https://cloudfront.amazonaws.com" + } + }, + "params": { + "Region": "aws-global", + "UseDualStack": false, + "UseFIPS": false + } + }, + { + "documentation": "For region aws-global with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "properties": { + "authSchemes": [ + { + "name": "sigv4", + "signingName": "cloudfront", + "signingRegion": "us-east-1" + } + ] + }, + "url": "https://cloudfront-fips.amazonaws.com" + } + }, + "params": { + "Region": "aws-global", + "UseDualStack": false, + "UseFIPS": true + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://cloudfront-fips.us-east-1.api.aws" + } + }, + "params": { + "Region": "us-east-1", + "UseDualStack": true, + "UseFIPS": true + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "properties": { + "authSchemes": [ + { + "name": "sigv4", + "signingName": "cloudfront", + "signingRegion": "us-east-1" + } + ] + }, + "url": "https://cloudfront-fips.amazonaws.com" + } + }, + "params": { + "Region": "us-east-1", + "UseDualStack": false, + "UseFIPS": true + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://cloudfront.us-east-1.api.aws" + } + }, + "params": { + "Region": "us-east-1", + "UseDualStack": true, + "UseFIPS": false + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "properties": { + "authSchemes": [ + { + "name": "sigv4", + "signingName": "cloudfront", + "signingRegion": "us-east-1" + } + ] + }, + "url": "https://cloudfront.amazonaws.com" + } + }, + "params": { + "Region": "us-east-1", + "UseDualStack": false, + "UseFIPS": false + } + }, { "documentation": "For region aws-cn-global with FIPS disabled and DualStack disabled", "expect": { @@ -17,13 +131,52 @@ } }, "params": { + "Region": "aws-cn-global", "UseDualStack": false, - "UseFIPS": false, - "Region": "aws-cn-global" + "UseFIPS": false } }, { - "documentation": "For region aws-global with FIPS disabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://cloudfront-fips.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseDualStack": true, + "UseFIPS": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://cloudfront-fips.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseDualStack": false, + "UseFIPS": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://cloudfront.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseDualStack": true, + "UseFIPS": false + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { "properties": { @@ -31,21 +184,139 @@ { "name": "sigv4", "signingName": "cloudfront", - "signingRegion": "us-east-1" + "signingRegion": "cn-northwest-1" } ] }, - "url": "https://cloudfront.amazonaws.com" + "url": "https://cloudfront.cn-northwest-1.amazonaws.com.cn" } }, "params": { + "Region": "cn-north-1", + "UseDualStack": false, + "UseFIPS": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://cloudfront-fips.us-gov-east-1.api.aws" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseDualStack": true, + "UseFIPS": true + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://cloudfront-fips.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseDualStack": false, + "UseFIPS": true + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://cloudfront.us-gov-east-1.api.aws" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseDualStack": true, + "UseFIPS": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://cloudfront.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseDualStack": false, + "UseFIPS": false + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://cloudfront-fips.us-iso-east-1.c2s.ic.gov" + } + }, + "params": { + "Region": "us-iso-east-1", + "UseDualStack": false, + "UseFIPS": true + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://cloudfront.us-iso-east-1.c2s.ic.gov" + } + }, + "params": { + "Region": "us-iso-east-1", + "UseDualStack": false, + "UseFIPS": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://cloudfront-fips.us-isob-east-1.sc2s.sgov.gov" + } + }, + "params": { + "Region": "us-isob-east-1", + "UseDualStack": false, + "UseFIPS": true + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://cloudfront.us-isob-east-1.sc2s.sgov.gov" + } + }, + "params": { + "Region": "us-isob-east-1", + "UseDualStack": false, + "UseFIPS": false + } + }, + { + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "Region": "us-east-1", "UseDualStack": false, "UseFIPS": false, - "Region": "aws-global" + "Endpoint": "https://example.com" } }, { - "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", "expect": { "endpoint": { "url": "https://example.com" @@ -54,7 +325,6 @@ "params": { "UseDualStack": false, "UseFIPS": false, - "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -64,9 +334,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { + "Region": "us-east-1", "UseDualStack": false, "UseFIPS": true, - "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -76,9 +346,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { + "Region": "us-east-1", "UseDualStack": true, "UseFIPS": false, - "Region": "us-east-1", "Endpoint": "https://example.com" } } diff --git a/models/apis/datasync/2018-11-09/api-2.json b/models/apis/datasync/2018-11-09/api-2.json index 09ef4d749cc..33291e9e676 100644 --- a/models/apis/datasync/2018-11-09/api-2.json +++ b/models/apis/datasync/2018-11-09/api-2.json @@ -1682,7 +1682,7 @@ "ObjectStorageAccessKey":{ "type":"string", "max":200, - "min":8, + "min":1, "pattern":"^.+$" }, "ObjectStorageBucketName":{ @@ -1698,7 +1698,7 @@ "ObjectStorageSecretKey":{ "type":"string", "max":200, - "min":8, + "min":1, "pattern":"^.+$", "sensitive":true }, diff --git a/models/apis/datasync/2018-11-09/endpoint-tests-1.json b/models/apis/datasync/2018-11-09/endpoint-tests-1.json index b217ef23a79..cd873b96aa5 100644 --- a/models/apis/datasync/2018-11-09/endpoint-tests-1.json +++ b/models/apis/datasync/2018-11-09/endpoint-tests-1.json @@ -9,8 +9,8 @@ }, "params": { "Region": "af-south-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -22,8 +22,8 @@ }, "params": { "Region": "ap-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -35,8 +35,8 @@ }, "params": { "Region": "ap-northeast-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -48,8 +48,8 @@ }, "params": { "Region": "ap-northeast-2", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -61,8 +61,8 @@ }, "params": { "Region": "ap-northeast-3", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -74,8 +74,8 @@ }, "params": { "Region": "ap-south-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -87,8 +87,8 @@ }, "params": { "Region": "ap-southeast-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -100,8 +100,8 @@ }, "params": { "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -113,8 +113,8 @@ }, "params": { "Region": "ap-southeast-3", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -126,8 +126,8 @@ }, "params": { "Region": "ca-central-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -139,8 +139,8 @@ }, "params": { "Region": "ca-central-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -152,8 +152,8 @@ }, "params": { "Region": "eu-central-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -165,8 +165,8 @@ }, "params": { "Region": "eu-north-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -178,8 +178,8 @@ }, "params": { "Region": "eu-south-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -191,8 +191,8 @@ }, "params": { "Region": "eu-west-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -204,8 +204,8 @@ }, "params": { "Region": "eu-west-2", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -217,8 +217,8 @@ }, "params": { "Region": "eu-west-3", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -230,8 +230,8 @@ }, "params": { "Region": "me-south-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -243,8 +243,8 @@ }, "params": { "Region": "sa-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -256,8 +256,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -269,8 +269,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -282,8 +282,8 @@ }, "params": { "Region": "us-east-2", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -295,8 +295,8 @@ }, "params": { "Region": "us-east-2", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -308,8 +308,8 @@ }, "params": { "Region": "us-west-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -321,8 +321,8 @@ }, "params": { "Region": "us-west-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -334,8 +334,8 @@ }, "params": { "Region": "us-west-2", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -347,8 +347,8 @@ }, "params": { "Region": "us-west-2", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -360,8 +360,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -373,8 +373,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -386,8 +386,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -399,8 +399,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -412,8 +412,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -425,8 +425,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -438,8 +438,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -451,8 +451,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -464,8 +464,8 @@ }, "params": { "Region": "us-gov-west-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -477,8 +477,8 @@ }, "params": { "Region": "us-gov-west-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -490,8 +490,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -503,8 +503,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -516,8 +516,8 @@ }, "params": { "Region": "us-iso-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -529,8 +529,8 @@ }, "params": { "Region": "us-iso-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -542,8 +542,8 @@ }, "params": { "Region": "us-isob-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -555,8 +555,8 @@ }, "params": { "Region": "us-isob-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -568,8 +568,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -581,8 +581,8 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -593,8 +593,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -605,8 +605,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, "UseFIPS": false, + "UseDualStack": true, "Endpoint": "https://example.com" } } diff --git a/models/apis/opensearch/2021-01-01/api-2.json b/models/apis/opensearch/2021-01-01/api-2.json index 8ffb291b150..cdaa54fdfb3 100644 --- a/models/apis/opensearch/2021-01-01/api-2.json +++ b/models/apis/opensearch/2021-01-01/api-2.json @@ -563,6 +563,22 @@ {"shape":"ValidationException"} ] }, + "ListScheduledActions":{ + "name":"ListScheduledActions", + "http":{ + "method":"GET", + "requestUri":"/2021-01-01/opensearch/domain/{DomainName}/scheduledActions" + }, + "input":{"shape":"ListScheduledActionsRequest"}, + "output":{"shape":"ListScheduledActionsResponse"}, + "errors":[ + {"shape":"BaseException"}, + {"shape":"InternalException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"InvalidPaginationTokenException"}, + {"shape":"ValidationException"} + ] + }, "ListTags":{ "name":"ListTags", "http":{ @@ -745,6 +761,24 @@ {"shape":"ValidationException"} ] }, + "UpdateScheduledAction":{ + "name":"UpdateScheduledAction", + "http":{ + "method":"PUT", + "requestUri":"/2021-01-01/opensearch/domain/{DomainName}/scheduledAction/update" + }, + "input":{"shape":"UpdateScheduledActionRequest"}, + "output":{"shape":"UpdateScheduledActionResponse"}, + "errors":[ + {"shape":"BaseException"}, + {"shape":"InternalException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"SlotNotAvailableException"}, + {"shape":"ConflictException"}, + {"shape":"LimitExceededException"}, + {"shape":"ValidationException"} + ] + }, "UpdateVpcEndpoint":{ "name":"UpdateVpcEndpoint", "http":{ @@ -835,6 +869,33 @@ "Status":{"shape":"OptionStatus"} } }, + "ActionSeverity":{ + "type":"string", + "enum":[ + "HIGH", + "MEDIUM", + "LOW" + ] + }, + "ActionStatus":{ + "type":"string", + "enum":[ + "PENDING_UPDATE", + "IN_PROGRESS", + "FAILED", + "COMPLETED", + "NOT_ELIGIBLE", + "ELIGIBLE" + ] + }, + "ActionType":{ + "type":"string", + "enum":[ + "SERVICE_SOFTWARE_UPDATE", + "JVM_HEAP_SIZE_TUNING", + "JVM_YOUNG_GEN_TUNING" + ] + }, "AddTagsRequest":{ "type":"structure", "required":[ @@ -1005,21 +1066,24 @@ "members":{ "DesiredState":{"shape":"AutoTuneDesiredState"}, "RollbackOnDisable":{"shape":"RollbackOnDisable"}, - "MaintenanceSchedules":{"shape":"AutoTuneMaintenanceScheduleList"} + "MaintenanceSchedules":{"shape":"AutoTuneMaintenanceScheduleList"}, + "UseOffPeakWindow":{"shape":"Boolean"} } }, "AutoTuneOptionsInput":{ "type":"structure", "members":{ "DesiredState":{"shape":"AutoTuneDesiredState"}, - "MaintenanceSchedules":{"shape":"AutoTuneMaintenanceScheduleList"} + "MaintenanceSchedules":{"shape":"AutoTuneMaintenanceScheduleList"}, + "UseOffPeakWindow":{"shape":"Boolean"} } }, "AutoTuneOptionsOutput":{ "type":"structure", "members":{ "State":{"shape":"AutoTuneState"}, - "ErrorMessage":{"shape":"String"} + "ErrorMessage":{"shape":"String"}, + "UseOffPeakWindow":{"shape":"Boolean"} } }, "AutoTuneOptionsStatus":{ @@ -1263,7 +1327,9 @@ "DomainEndpointOptions":{"shape":"DomainEndpointOptions"}, "AdvancedSecurityOptions":{"shape":"AdvancedSecurityOptionsInput"}, "TagList":{"shape":"TagList"}, - "AutoTuneOptions":{"shape":"AutoTuneOptionsInput"} + "AutoTuneOptions":{"shape":"AutoTuneOptionsInput"}, + "OffPeakWindowOptions":{"shape":"OffPeakWindowOptions"}, + "SoftwareUpdateOptions":{"shape":"SoftwareUpdateOptions"} } }, "CreateDomainResponse":{ @@ -1792,7 +1858,9 @@ "DomainEndpointOptions":{"shape":"DomainEndpointOptionsStatus"}, "AdvancedSecurityOptions":{"shape":"AdvancedSecurityOptionsStatus"}, "AutoTuneOptions":{"shape":"AutoTuneOptionsStatus"}, - "ChangeProgressDetails":{"shape":"ChangeProgressDetails"} + "ChangeProgressDetails":{"shape":"ChangeProgressDetails"}, + "OffPeakWindowOptions":{"shape":"OffPeakWindowOptionsStatus"}, + "SoftwareUpdateOptions":{"shape":"SoftwareUpdateOptionsStatus"} } }, "DomainEndpointOptions":{ @@ -1915,7 +1983,9 @@ "DomainEndpointOptions":{"shape":"DomainEndpointOptions"}, "AdvancedSecurityOptions":{"shape":"AdvancedSecurityOptions"}, "AutoTuneOptions":{"shape":"AutoTuneOptionsOutput"}, - "ChangeProgressDetails":{"shape":"ChangeProgressDetails"} + "ChangeProgressDetails":{"shape":"ChangeProgressDetails"}, + "OffPeakWindowOptions":{"shape":"OffPeakWindowOptions"}, + "SoftwareUpdateOptions":{"shape":"SoftwareUpdateOptions"} } }, "DomainStatusList":{ @@ -2383,6 +2453,34 @@ "NextToken":{"shape":"String"} } }, + "ListScheduledActionsRequest":{ + "type":"structure", + "required":["DomainName"], + "members":{ + "DomainName":{ + "shape":"DomainName", + "location":"uri", + "locationName":"DomainName" + }, + "MaxResults":{ + "shape":"MaxResults", + "location":"querystring", + "locationName":"maxResults" + }, + "NextToken":{ + "shape":"NextToken", + "location":"querystring", + "locationName":"nextToken" + } + } + }, + "ListScheduledActionsResponse":{ + "type":"structure", + "members":{ + "ScheduledActions":{"shape":"ScheduledActionsList"}, + "NextToken":{"shape":"NextToken"} + } + }, "ListTagsRequest":{ "type":"structure", "required":["ARN"], @@ -2569,6 +2667,26 @@ "min":1, "pattern":"[a-zA-Z0-9\\-\\_\\.]+" }, + "OffPeakWindow":{ + "type":"structure", + "members":{ + "WindowStartTime":{"shape":"WindowStartTime"} + } + }, + "OffPeakWindowOptions":{ + "type":"structure", + "members":{ + "Enabled":{"shape":"Boolean"}, + "OffPeakWindow":{"shape":"OffPeakWindow"} + } + }, + "OffPeakWindowOptionsStatus":{ + "type":"structure", + "members":{ + "Options":{"shape":"OffPeakWindowOptions"}, + "Status":{"shape":"OptionStatus"} + } + }, "OpenSearchPartitionInstanceType":{ "type":"string", "enum":[ @@ -3058,6 +3176,38 @@ "SessionTimeoutMinutes":{"shape":"IntegerClass"} } }, + "ScheduleAt":{ + "type":"string", + "enum":[ + "NOW", + "TIMESTAMP", + "OFF_PEAK_WINDOW" + ] + }, + "ScheduledAction":{ + "type":"structure", + "required":[ + "Id", + "Type", + "Severity", + "ScheduledTime" + ], + "members":{ + "Id":{"shape":"String"}, + "Type":{"shape":"ActionType"}, + "Severity":{"shape":"ActionSeverity"}, + "ScheduledTime":{"shape":"Long"}, + "Description":{"shape":"String"}, + "ScheduledBy":{"shape":"ScheduledBy"}, + "Status":{"shape":"ActionStatus"}, + "Mandatory":{"shape":"Boolean"}, + "Cancellable":{"shape":"Boolean"} + } + }, + "ScheduledActionsList":{ + "type":"list", + "member":{"shape":"ScheduledAction"} + }, "ScheduledAutoTuneActionType":{ "type":"string", "enum":[ @@ -3083,6 +3233,13 @@ "HIGH" ] }, + "ScheduledBy":{ + "type":"string", + "enum":[ + "CUSTOMER", + "SYSTEM" + ] + }, "ServiceSoftwareOptions":{ "type":"structure", "members":{ @@ -3097,6 +3254,18 @@ } }, "ServiceUrl":{"type":"string"}, + "SlotList":{ + "type":"list", + "member":{"shape":"Long"} + }, + "SlotNotAvailableException":{ + "type":"structure", + "members":{ + "SlotSuggestions":{"shape":"SlotList"} + }, + "error":{"httpStatusCode":409}, + "exception":true + }, "SnapshotOptions":{ "type":"structure", "members":{ @@ -3114,12 +3283,27 @@ "Status":{"shape":"OptionStatus"} } }, + "SoftwareUpdateOptions":{ + "type":"structure", + "members":{ + "AutoSoftwareUpdateEnabled":{"shape":"Boolean"} + } + }, + "SoftwareUpdateOptionsStatus":{ + "type":"structure", + "members":{ + "Options":{"shape":"SoftwareUpdateOptions"}, + "Status":{"shape":"OptionStatus"} + } + }, "StartAt":{"type":"timestamp"}, "StartServiceSoftwareUpdateRequest":{ "type":"structure", "required":["DomainName"], "members":{ - "DomainName":{"shape":"DomainName"} + "DomainName":{"shape":"DomainName"}, + "ScheduleAt":{"shape":"ScheduleAt"}, + "DesiredStartTime":{"shape":"Long"} } }, "StartServiceSoftwareUpdateResponse":{ @@ -3128,6 +3312,16 @@ "ServiceSoftwareOptions":{"shape":"ServiceSoftwareOptions"} } }, + "StartTimeHours":{ + "type":"long", + "max":23, + "min":0 + }, + "StartTimeMinutes":{ + "type":"long", + "max":59, + "min":0 + }, "StartTimestamp":{"type":"timestamp"}, "StorageSubTypeName":{"type":"string"}, "StorageType":{ @@ -3225,7 +3419,9 @@ "AdvancedSecurityOptions":{"shape":"AdvancedSecurityOptionsInput"}, "AutoTuneOptions":{"shape":"AutoTuneOptions"}, "DryRun":{"shape":"DryRun"}, - "DryRunMode":{"shape":"DryRunMode"} + "DryRunMode":{"shape":"DryRunMode"}, + "OffPeakWindowOptions":{"shape":"OffPeakWindowOptions"}, + "SoftwareUpdateOptions":{"shape":"SoftwareUpdateOptions"} } }, "UpdateDomainConfigResponse":{ @@ -3256,6 +3452,32 @@ "PackageDetails":{"shape":"PackageDetails"} } }, + "UpdateScheduledActionRequest":{ + "type":"structure", + "required":[ + "DomainName", + "ActionID", + "ActionType", + "ScheduleAt" + ], + "members":{ + "DomainName":{ + "shape":"DomainName", + "location":"uri", + "locationName":"DomainName" + }, + "ActionID":{"shape":"String"}, + "ActionType":{"shape":"ActionType"}, + "ScheduleAt":{"shape":"ScheduleAt"}, + "DesiredStartTime":{"shape":"Long"} + } + }, + "UpdateScheduledActionResponse":{ + "type":"structure", + "members":{ + "ScheduledAction":{"shape":"ScheduledAction"} + } + }, "UpdateTimestamp":{"type":"timestamp"}, "UpdateVpcEndpointRequest":{ "type":"structure", @@ -3505,6 +3727,17 @@ "type":"list", "member":{"shape":"VpcEndpoint"} }, + "WindowStartTime":{ + "type":"structure", + "required":[ + "Hours", + "Minutes" + ], + "members":{ + "Hours":{"shape":"StartTimeHours"}, + "Minutes":{"shape":"StartTimeMinutes"} + } + }, "ZoneAwarenessConfig":{ "type":"structure", "members":{ diff --git a/models/apis/opensearch/2021-01-01/docs-2.json b/models/apis/opensearch/2021-01-01/docs-2.json index bd0a679e10f..522016c5793 100644 --- a/models/apis/opensearch/2021-01-01/docs-2.json +++ b/models/apis/opensearch/2021-01-01/docs-2.json @@ -38,6 +38,7 @@ "ListDomainsForPackage": "

Lists all Amazon OpenSearch Service domains associated with a given package. For more information, see Custom packages for Amazon OpenSearch Service.

", "ListInstanceTypeDetails": "

Lists all instance types and available features for a given OpenSearch or Elasticsearch version.

", "ListPackagesForDomain": "

Lists all packages associated with an Amazon OpenSearch Service domain. For more information, see Custom packages for Amazon OpenSearch Service.

", + "ListScheduledActions": "

Retrieves a list of configuration changes that are scheduled for a domain. These changes can be service software updates or blue/green Auto-Tune enhancements.

", "ListTags": "

Returns all resource tags for an Amazon OpenSearch Service domain. For more information, see Tagging Amazon OpenSearch Service domains.

", "ListVersions": "

Lists all versions of OpenSearch and Elasticsearch that Amazon OpenSearch Service supports.

", "ListVpcEndpointAccess": "

Retrieves information about each Amazon Web Services principal that is allowed to access a given Amazon OpenSearch Service domain through the use of an interface VPC endpoint.

", @@ -50,6 +51,7 @@ "StartServiceSoftwareUpdate": "

Schedules a service software update for an Amazon OpenSearch Service domain. For more information, see Service software updates in Amazon OpenSearch Service.

", "UpdateDomainConfig": "

Modifies the cluster configuration of the specified Amazon OpenSearch Service domain.

", "UpdatePackage": "

Updates a package for use with Amazon OpenSearch Service domains. For more information, see Custom packages for Amazon OpenSearch Service.

", + "UpdateScheduledAction": "

Reschedules a planned domain configuration change for a later time. This change can be a scheduled service software update or a blue/green Auto-Tune enhancement.

", "UpdateVpcEndpoint": "

Modifies an Amazon OpenSearch Service-managed interface VPC endpoint.

", "UpgradeDomain": "

Allows you to either upgrade your Amazon OpenSearch Service domain or perform an upgrade eligibility check to a compatible version of OpenSearch or Elasticsearch.

" }, @@ -100,6 +102,25 @@ "DomainConfig$AccessPolicies": "

Specifies the access policies for the domain.

" } }, + "ActionSeverity": { + "base": null, + "refs": { + "ScheduledAction$Severity": "

The severity of the action.

" + } + }, + "ActionStatus": { + "base": null, + "refs": { + "ScheduledAction$Status": "

The current status of the scheduled action.

" + } + }, + "ActionType": { + "base": null, + "refs": { + "ScheduledAction$Type": "

The type of action that will be taken on the domain.

", + "UpdateScheduledActionRequest$ActionType": "

The type of action to reschedule. Can be one of SERVICE_SOFTWARE_UPDATE, JVM_HEAP_SIZE_TUNING, or JVM_YOUNG_GEN_TUNING. To retrieve this value, send a ListScheduledActions request.

" + } + }, "AddTagsRequest": { "base": "

Container for the parameters to the AddTags operation. Specifies the tags to attach to the domain.

", "refs": { @@ -219,7 +240,7 @@ } }, "AutoTuneMaintenanceSchedule": { - "base": "

The Auto-Tune maintenance schedule. For more information, see Auto-Tune for Amazon OpenSearch Service.

", + "base": "

This object is deprecated. Use the domain's off-peak window to schedule Auto-Tune optimizations. For migration instructions, see Migrating from Auto-Tune maintenance windows.

The Auto-Tune maintenance schedule. For more information, see Auto-Tune for Amazon OpenSearch Service.

", "refs": { "AutoTuneMaintenanceScheduleList$member": null } @@ -227,8 +248,8 @@ "AutoTuneMaintenanceScheduleList": { "base": null, "refs": { - "AutoTuneOptions$MaintenanceSchedules": "

A list of maintenance schedules during which Auto-Tune can deploy changes.

", - "AutoTuneOptionsInput$MaintenanceSchedules": "

A list of maintenance schedules during which Auto-Tune can deploy changes. Maintenance schedules are overwrite, not append. If your request includes no schedules, the request deletes all existing schedules. To preserve existing schedules, make a call to DescribeDomainConfig first and use the MaintenanceSchedules portion of the response as the basis for this section.

" + "AutoTuneOptions$MaintenanceSchedules": "

DEPRECATED. Use off-peak window instead.

A list of maintenance schedules during which Auto-Tune can deploy changes.

", + "AutoTuneOptionsInput$MaintenanceSchedules": "

A list of maintenance schedules during which Auto-Tune can deploy changes. Maintenance windows are deprecated and have been replaced with off-peak windows.

" } }, "AutoTuneOptions": { @@ -239,7 +260,7 @@ } }, "AutoTuneOptionsInput": { - "base": "

Options for configuring Auto-Tune. For more information, see Auto-Tune for Amazon OpenSearch Service.

", + "base": "

Options for configuring Auto-Tune. For more information, see Auto-Tune for Amazon OpenSearch Service

", "refs": { "CreateDomainRequest$AutoTuneOptions": "

Options for Auto-Tune.

" } @@ -257,7 +278,7 @@ } }, "AutoTuneState": { - "base": "

The Auto-Tune state for the domain. For valid states see Auto-Tune for Amazon OpenSearch Service.

", + "base": "

The Auto-Tune state for the domain. For valid states see Auto-Tune for Amazon OpenSearch Service.

", "refs": { "AutoTuneOptionsOutput$State": "

The current state of Auto-Tune on the domain.

", "AutoTuneStatus$State": "

The current state of Auto-Tune on the domain.

" @@ -295,6 +316,9 @@ "AdvancedSecurityOptionsInput$Enabled": "

True to enable fine-grained access control.

", "AdvancedSecurityOptionsInput$InternalUserDatabaseEnabled": "

True to enable the internal user database.

", "AdvancedSecurityOptionsInput$AnonymousAuthEnabled": "

True to enable a 30-day migration period during which administrators can create role mappings. Only necessary when enabling fine-grained access control on an existing domain.

", + "AutoTuneOptions$UseOffPeakWindow": "

Whether to use the domain's off-peak window to deploy configuration changes on the domain rather than a maintenance schedule.

", + "AutoTuneOptionsInput$UseOffPeakWindow": "

Whether to schedule Auto-Tune optimizations that require blue/green deployments during the domain's configured daily off-peak window.

", + "AutoTuneOptionsOutput$UseOffPeakWindow": "

Whether the domain's off-peak window will be used to deploy Auto-Tune changes rather than a maintenance schedule.

", "AutoTuneStatus$PendingDeletion": "

Indicates whether the domain is being deleted.

", "ClusterConfig$DedicatedMasterEnabled": "

Indicates whether dedicated master nodes are enabled for the cluster.True if the cluster will use a dedicated master node.False if the cluster will not.

", "ClusterConfig$ZoneAwarenessEnabled": "

Indicates whether multiple Availability Zones are enabled. For more information, see Configuring a multi-AZ domain in Amazon OpenSearch Service.

", @@ -317,12 +341,16 @@ "InstanceTypeDetails$WarmEnabled": "

Whether UltraWarm is supported for the instance type.

", "LogPublishingOption$Enabled": "

Whether the log should be published.

", "NodeToNodeEncryptionOptions$Enabled": "

True to enable node-to-node encryption.

", + "OffPeakWindowOptions$Enabled": "

Whether to enable an off-peak window.

This option is only available when modifying a domain created prior to February 13, 2023, not when creating a new domain. All domains created after this date have the off-peak window enabled by default. You can't disable the off-peak window after it's enabled for a domain.

", "OptionStatus$PendingDeletion": "

Indicates whether the entity is being deleted.

", "SAMLOptionsInput$Enabled": "

True to enable SAML authentication for a domain.

", "SAMLOptionsOutput$Enabled": "

True if SAML is enabled.

", + "ScheduledAction$Mandatory": "

Whether the action is required or optional.

", + "ScheduledAction$Cancellable": "

Whether or not the scheduled action is cancellable.

", "ServiceSoftwareOptions$UpdateAvailable": "

True if you're able to update your service software version. False if you can't update your service software version.

", "ServiceSoftwareOptions$Cancellable": "

True if you're able to cancel your service software version update. False if you can't cancel your service software update.

", "ServiceSoftwareOptions$OptionalDeployment": "

True if a service software is never automatically updated. False if a service software is automatically updated after the automated update date.

", + "SoftwareUpdateOptions$AutoSoftwareUpdateEnabled": "

Whether automatic service software updates are enabled for the domain.

", "UpgradeDomainRequest$PerformCheckOnly": "

When true, indicates that an upgrade eligibility check needs to be performed. Does not actually perform the upgrade.

", "UpgradeDomainResponse$PerformCheckOnly": "

When true, indicates that an upgrade eligibility check was performed.

" } @@ -443,7 +471,7 @@ } }, "ConflictException": { - "base": "

An error occurred because the client attempts to remove a resource that's currently in use.

", + "base": "

An error occurred because the client attempts to remove a resource that is currently in use.

", "refs": { } }, @@ -778,7 +806,7 @@ } }, "DisabledOperationException": { - "base": "

An error occured because the client wanted to access an unsupported operation.

", + "base": "

An error occured because the client wanted to access a not supported operation.

", "refs": { } }, @@ -878,11 +906,13 @@ "GetUpgradeStatusRequest$DomainName": "

The domain of the domain to get upgrade status information for.

", "ListInstanceTypeDetailsRequest$DomainName": "

Name of the domain to list instance type details for.

", "ListPackagesForDomainRequest$DomainName": "

The name of the domain for which you want to list associated packages.

", + "ListScheduledActionsRequest$DomainName": "

The name of the domain.

", "ListVpcEndpointAccessRequest$DomainName": "

The name of the OpenSearch Service domain to retrieve access information for.

", "ListVpcEndpointsForDomainRequest$DomainName": "

The name of the domain to list associated VPC endpoints for.

", "RevokeVpcEndpointAccessRequest$DomainName": "

The name of the OpenSearch Service domain.

", "StartServiceSoftwareUpdateRequest$DomainName": "

The name of the domain that you want to update to the latest service software.

", "UpdateDomainConfigRequest$DomainName": "

The name of the domain that you're updating.

", + "UpdateScheduledActionRequest$DomainName": "

The name of the domain to reschedule an action for.

", "UpgradeDomainRequest$DomainName": "

Name of the OpenSearch Service domain that you want to upgrade.

", "UpgradeDomainResponse$DomainName": "

The name of the domain that was upgraded.

" } @@ -997,7 +1027,7 @@ "EBSOptionsStatus": { "base": "

The status of the EBS options for the specified OpenSearch Service domain.

", "refs": { - "DomainConfig$EBSOptions": "

Container for EBS options configured for an OpenSearch Service domain.

" + "DomainConfig$EBSOptions": "

Container for EBS options configured for the domain.

" } }, "EncryptionAtRestOptions": { @@ -1341,6 +1371,16 @@ "refs": { } }, + "ListScheduledActionsRequest": { + "base": null, + "refs": { + } + }, + "ListScheduledActionsResponse": { + "base": null, + "refs": { + } + }, "ListTagsRequest": { "base": "

Container for the parameters to the ListTags operation.

", "refs": { @@ -1403,7 +1443,7 @@ "CreateDomainRequest$LogPublishingOptions": "

Key-value pairs to configure slow log publishing.

", "DomainStatus$LogPublishingOptions": "

Log publishing options for the domain.

", "LogPublishingOptionsStatus$Options": "

The log publishing options configured for the domain.

", - "UpdateDomainConfigRequest$LogPublishingOptions": "

Options to publish OpenSearch lots to Amazon CloudWatch Logs.

" + "UpdateDomainConfigRequest$LogPublishingOptions": "

Options to publish OpenSearch logs to Amazon CloudWatch Logs.

" } }, "LogPublishingOptionsStatus": { @@ -1421,7 +1461,11 @@ "Long": { "base": null, "refs": { - "ReservedInstance$BillingSubscriptionId": "

The unique identifier of the billing subscription.

" + "ReservedInstance$BillingSubscriptionId": "

The unique identifier of the billing subscription.

", + "ScheduledAction$ScheduledTime": "

The time when the change is scheduled to happen.

", + "SlotList$member": null, + "StartServiceSoftwareUpdateRequest$DesiredStartTime": "

The Epoch timestamp when you want the service software update to start. You only need to specify this parameter if you set ScheduleAt to TIMESTAMP.

", + "UpdateScheduledActionRequest$DesiredStartTime": "

The time to implement the change, in Coordinated Universal Time (UTC). Only specify this parameter if you set ScheduleAt to TIMESTAMP.

" } }, "MasterUserOptions": { @@ -1444,6 +1488,7 @@ "ListDomainsForPackageRequest$MaxResults": "

An optional parameter that specifies the maximum number of results to return. You can use nextToken to get the next page of results.

", "ListInstanceTypeDetailsRequest$MaxResults": "

An optional parameter that specifies the maximum number of results to return. You can use nextToken to get the next page of results.

", "ListPackagesForDomainRequest$MaxResults": "

An optional parameter that specifies the maximum number of results to return. You can use nextToken to get the next page of results.

", + "ListScheduledActionsRequest$MaxResults": "

An optional parameter that specifies the maximum number of results to return. You can use nextToken to get the next page of results.

", "ListVersionsRequest$MaxResults": "

An optional parameter that specifies the maximum number of results to return. You can use nextToken to get the next page of results.

" } }, @@ -1485,6 +1530,8 @@ "ListInstanceTypeDetailsRequest$NextToken": "

If your initial ListInstanceTypeDetails operation returns a nextToken, you can include the returned nextToken in subsequent ListInstanceTypeDetails operations, which returns results in the next page.

", "ListInstanceTypeDetailsResponse$NextToken": "

When nextToken is returned, there are more results available. The value of nextToken is a unique pagination token for each page. Make the call again using the returned token to retrieve the next page.

", "ListPackagesForDomainRequest$NextToken": "

If your initial ListPackagesForDomain operation returns a nextToken, you can include the returned nextToken in subsequent ListPackagesForDomain operations, which returns results in the next page.

", + "ListScheduledActionsRequest$NextToken": "

If your initial ListScheduledActions operation returns a nextToken, you can include the returned nextToken in subsequent ListScheduledActions operations, which returns results in the next page.

", + "ListScheduledActionsResponse$NextToken": "

When nextToken is returned, there are more results available. The value of nextToken is a unique pagination token for each page. Make the call again using the returned token to retrieve the next page.

", "ListVersionsRequest$NextToken": "

If your initial ListVersions operation returns a nextToken, you can include the returned nextToken in subsequent ListVersions operations, which returns results in the next page.

", "ListVersionsResponse$NextToken": "

When nextToken is returned, there are more results available. The value of nextToken is a unique pagination token for each page. Make the call again using the returned token to retrieve the next page.

", "ListVpcEndpointAccessRequest$NextToken": "

If your initial ListVpcEndpointAccess operation returns a nextToken, you can include the returned nextToken in subsequent ListVpcEndpointAccess operations, which returns results in the next page.

", @@ -1501,7 +1548,7 @@ "CreateDomainRequest$NodeToNodeEncryptionOptions": "

Enables node-to-node encryption.

", "DomainStatus$NodeToNodeEncryptionOptions": "

Whether node-to-node encryption is enabled or disabled.

", "NodeToNodeEncryptionOptionsStatus$Options": "

The node-to-node encryption options for the specified domain.

", - "UpdateDomainConfigRequest$NodeToNodeEncryptionOptions": "

Node-To-Node Encryption options for the domain.

" + "UpdateDomainConfigRequest$NodeToNodeEncryptionOptions": "

Node-to-node encryption options for the domain.

" } }, "NodeToNodeEncryptionOptionsStatus": { @@ -1517,6 +1564,27 @@ "ValueStringList$member": null } }, + "OffPeakWindow": { + "base": "

A custom 10-hour, low-traffic window during which OpenSearch Service can perform mandatory configuration changes on the domain. These actions can include scheduled service software updates and blue/green Auto-Tune enhancements. OpenSearch Service will schedule these actions during the window that you specify.

If you don't specify a window start time, it defaults to 10:00 P.M. local time.

For more information, see Defining off-peak maintenance windows for Amazon OpenSearch Service.

", + "refs": { + "OffPeakWindowOptions$OffPeakWindow": "

Off-peak window settings for the domain.

" + } + }, + "OffPeakWindowOptions": { + "base": "

Options for a domain's off-peak window, during which OpenSearch Service can perform mandatory configuration changes on the domain.

", + "refs": { + "CreateDomainRequest$OffPeakWindowOptions": "

Specifies a daily 10-hour time block during which OpenSearch Service can perform configuration changes on the domain, including service software updates and Auto-Tune enhancements that require a blue/green deployment. If no options are specified, the default start time of 10:00 P.M. local time (for the Region that the domain is created in) is used.

", + "DomainStatus$OffPeakWindowOptions": "

Options that specify a custom 10-hour window during which OpenSearch Service can perform configuration changes on the domain.

", + "OffPeakWindowOptionsStatus$Options": "

The domain's off-peak window configuration.

", + "UpdateDomainConfigRequest$OffPeakWindowOptions": "

Off-peak window options for the domain.

" + } + }, + "OffPeakWindowOptionsStatus": { + "base": "

The status of off-peak window options for a domain.

", + "refs": { + "DomainConfig$OffPeakWindowOptions": "

Container for off-peak window options for the domain.

" + } + }, "OpenSearchPartitionInstanceType": { "base": null, "refs": { @@ -1553,7 +1621,9 @@ "EncryptionAtRestOptionsStatus$Status": "

The status of the encryption at rest options for the specified domain.

", "LogPublishingOptionsStatus$Status": "

The status of the log publishing options for the domain.

", "NodeToNodeEncryptionOptionsStatus$Status": "

The status of the node-to-node encryption options for the specified domain.

", + "OffPeakWindowOptionsStatus$Status": "

The current status of off-peak window options.

", "SnapshotOptionsStatus$Status": "

The status of a daily automated snapshot.

", + "SoftwareUpdateOptionsStatus$Status": "

The status of service software update options, including creation date and last updated date.

", "VPCDerivedInfoStatus$Status": "

The status of the VPC options for the specified domain.

", "VersionStatus$Status": "

The status of the version options for the specified domain.

" } @@ -1798,7 +1868,7 @@ } }, "ResourceNotFoundException": { - "base": "

An exception for accessing or deleting a resource that doesn't exist.

", + "base": "

An exception for accessing or deleting a resource that does not exist..

", "refs": { } }, @@ -1867,6 +1937,26 @@ "AdvancedSecurityOptions$SAMLOptions": "

Container for information about the SAML configuration for OpenSearch Dashboards.

" } }, + "ScheduleAt": { + "base": null, + "refs": { + "StartServiceSoftwareUpdateRequest$ScheduleAt": "

When to start the service software update.

Default: NOW if you don't specify a value for DesiredStartTime, and TIMESTAMP if you do.

", + "UpdateScheduledActionRequest$ScheduleAt": "

When to schedule the action.

" + } + }, + "ScheduledAction": { + "base": "

Information about a scheduled configuration change for an OpenSearch Service domain. This actions can be a service software update or a blue/green Auto-Tune enhancement.

", + "refs": { + "ScheduledActionsList$member": null, + "UpdateScheduledActionResponse$ScheduledAction": "

Information about the rescheduled action.

" + } + }, + "ScheduledActionsList": { + "base": null, + "refs": { + "ListScheduledActionsResponse$ScheduledActions": "

A list of actions that are scheduled for the domain.

" + } + }, "ScheduledAutoTuneActionType": { "base": "

The Auto-Tune action type.

", "refs": { @@ -1891,6 +1981,12 @@ "ScheduledAutoTuneDetails$Severity": "

The severity of the Auto-Tune action. Valid values are LOW, MEDIUM, and HIGH.

" } }, + "ScheduledBy": { + "base": null, + "refs": { + "ScheduledAction$ScheduledBy": "

Whether the action was scheduled manually (CUSTOMER, or by OpenSearch Service automatically (SYSTEM).

" + } + }, "ServiceSoftwareOptions": { "base": "

The current status of the service software for an Amazon OpenSearch Service domain. For more information, see Service software updates in Amazon OpenSearch Service.

", "refs": { @@ -1906,6 +2002,17 @@ "EndpointsMap$value": null } }, + "SlotList": { + "base": null, + "refs": { + "SlotNotAvailableException$SlotSuggestions": "

Alternate time slots during which OpenSearch Service has available capacity to schedule a domain action.

" + } + }, + "SlotNotAvailableException": { + "base": "

An exception for attempting to schedule a domain action during an unavailable time slot.

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

The time, in UTC format, when OpenSearch Service takes a daily automated snapshot of the specified domain. Default is 0 hours.

", "refs": { @@ -1921,6 +2028,21 @@ "DomainConfig$SnapshotOptions": "

DEPRECATED. Container for parameters required to configure automated snapshots of domain indexes.

" } }, + "SoftwareUpdateOptions": { + "base": "

Options for configuring service software updates for a domain.

", + "refs": { + "CreateDomainRequest$SoftwareUpdateOptions": "

Software update options for the domain.

", + "DomainStatus$SoftwareUpdateOptions": "

Service software update options for the domain.

", + "SoftwareUpdateOptionsStatus$Options": "

The service software update options for a domain.

", + "UpdateDomainConfigRequest$SoftwareUpdateOptions": "

Service software update options for the domain.

" + } + }, + "SoftwareUpdateOptionsStatus": { + "base": "

The status of the service software options for a domain.

", + "refs": { + "DomainConfig$SoftwareUpdateOptions": "

Software update options for the domain.

" + } + }, "StartAt": { "base": null, "refs": { @@ -1937,6 +2059,18 @@ "refs": { } }, + "StartTimeHours": { + "base": null, + "refs": { + "WindowStartTime$Hours": "

The start hour of the window in Coordinated Universal Time (UTC), using 24-hour time. For example, 17 refers to 5:00 P.M. UTC.

" + } + }, + "StartTimeMinutes": { + "base": null, + "refs": { + "WindowStartTime$Minutes": "

The start minute of the window, in UTC.

" + } + }, "StartTimestamp": { "base": null, "refs": { @@ -2007,10 +2141,13 @@ "SAMLOptionsInput$RolesKey": "

Element of the SAML assertion to use for backend roles. Default is roles.

", "SAMLOptionsOutput$SubjectKey": "

The key used for matching the SAML subject attribute.

", "SAMLOptionsOutput$RolesKey": "

The key used for matching the SAML roles attribute.

", + "ScheduledAction$Id": "

The unique identifier of the scheduled action.

", + "ScheduledAction$Description": "

A description of the action to be taken.

", "ServiceSoftwareOptions$CurrentVersion": "

The current service software version present on the domain.

", "ServiceSoftwareOptions$NewVersion": "

The new service software version, if one is available.

", "ServiceSoftwareOptions$Description": "

A description of the service software update status.

", "StringList$member": null, + "UpdateScheduledActionRequest$ActionID": "

The unique identifier of the action to reschedule. To retrieve this ID, send a ListScheduledActions request.

", "UpgradeDomainResponse$UpgradeId": "

The unique identifier of the domain upgrade.

", "VPCDerivedInfo$VPCId": "

The ID for your VPC. Amazon VPC generates this value when you create a VPC.

", "ValidationFailure$Code": "

The error code of the failure.

", @@ -2103,6 +2240,16 @@ "refs": { } }, + "UpdateScheduledActionRequest": { + "base": null, + "refs": { + } + }, + "UpdateScheduledActionResponse": { + "base": null, + "refs": { + } + }, "UpdateTimestamp": { "base": null, "refs": { @@ -2217,7 +2364,7 @@ } }, "ValidationException": { - "base": "

An exception for missing or invalid input fields.

", + "base": "

An exception for accessing or deleting a resource that doesn't exist.

", "refs": { } }, @@ -2342,6 +2489,12 @@ "DescribeVpcEndpointsResponse$VpcEndpoints": "

Information about each requested VPC endpoint.

" } }, + "WindowStartTime": { + "base": "

The desired start time for an off-peak maintenance window.

", + "refs": { + "OffPeakWindow$WindowStartTime": "

A custom start time for the off-peak window, in Coordinated Universal Time (UTC). The window length will always be 10 hours, so you can't specify an end time. For example, if you specify 11:00 P.M. UTC as a start time, the end time will automatically be set to 9:00 A.M.

" + } + }, "ZoneAwarenessConfig": { "base": "

The zone awareness configuration for an Amazon OpenSearch Service domain.

", "refs": { diff --git a/models/apis/opensearch/2021-01-01/endpoint-rule-set-1.json b/models/apis/opensearch/2021-01-01/endpoint-rule-set-1.json index 52831b1f5cb..07a7ff33961 100644 --- a/models/apis/opensearch/2021-01-01/endpoint-rule-set-1.json +++ b/models/apis/opensearch/2021-01-01/endpoint-rule-set-1.json @@ -3,7 +3,7 @@ "parameters": { "Region": { "builtIn": "AWS::Region", - "required": true, + "required": false, "documentation": "The AWS region used to dispatch the request.", "type": "String" }, @@ -32,13 +32,12 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "isSet", "argv": [ { - "ref": "Region" + "ref": "Endpoint" } - ], - "assign": "PartitionResult" + ] } ], "type": "tree", @@ -46,14 +45,20 @@ { "conditions": [ { - "fn": "isSet", + "fn": "booleanEquals", "argv": [ { - "ref": "Endpoint" - } + "ref": "UseFIPS" + }, + true ] } ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], "type": "tree", "rules": [ { @@ -62,67 +67,42 @@ "fn": "booleanEquals", "argv": [ { - "ref": "UseFIPS" + "ref": "UseDualStack" }, true ] } ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", "type": "error" }, { "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" + "endpoint": { + "url": { + "ref": "Endpoint" }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" - }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, + } + ] + }, + { + "conditions": [], + "type": "tree", + "rules": [ { "conditions": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", + "fn": "isSet", "argv": [ { - "ref": "UseDualStack" - }, - true + "ref": "Region" + } ] } ], @@ -131,154 +111,215 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "aws.partition", "argv": [ - true, { - "fn": "getAttr", + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsFIPS" + true ] - } - ] - }, - { - "fn": "booleanEquals", - "argv": [ - true, + }, { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" }, - "supportsDualStack" + true ] } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], + ], "type": "tree", "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://es-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, { "conditions": [], - "endpoint": { - "url": "https://es-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" } ] - } - ] - }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsFIPS" + true ] } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], + ], "type": "tree", "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://es-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, { "conditions": [], - "endpoint": { - "url": "https://es-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" } ] - } - ] - }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" }, - "supportsDualStack" + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://es.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [], "type": "tree", @@ -286,7 +327,7 @@ { "conditions": [], "endpoint": { - "url": "https://es.{Region}.{PartitionResult#dualStackDnsSuffix}", + "url": "https://es.{Region}.{PartitionResult#dnsSuffix}", "properties": {}, "headers": {} }, @@ -295,28 +336,13 @@ ] } ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } ] }, { "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://es.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } diff --git a/models/apis/opensearch/2021-01-01/endpoint-tests-1.json b/models/apis/opensearch/2021-01-01/endpoint-tests-1.json index 4e66741b689..d291d4ca01e 100644 --- a/models/apis/opensearch/2021-01-01/endpoint-tests-1.json +++ b/models/apis/opensearch/2021-01-01/endpoint-tests-1.json @@ -1,42 +1,55 @@ { "testCases": [ { - "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.us-iso-east-1.c2s.ic.gov" + "url": "https://es.af-south-1.amazonaws.com" } }, "params": { + "Region": "af-south-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "us-iso-east-1" + "UseFIPS": false } }, { - "documentation": "For region us-iso-west-1 with FIPS disabled and DualStack disabled", + "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.us-iso-west-1.c2s.ic.gov" + "url": "https://es.ap-east-1.amazonaws.com" } }, "params": { + "Region": "ap-east-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "us-iso-west-1" + "UseFIPS": false } }, { - "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es-fips.us-iso-east-1.c2s.ic.gov" + "url": "https://es.ap-northeast-1.amazonaws.com" } }, "params": { + "Region": "ap-northeast-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "us-iso-east-1" + "UseFIPS": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://es.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-2", + "UseDualStack": false, + "UseFIPS": false } }, { @@ -47,87 +60,87 @@ } }, "params": { + "Region": "ap-northeast-3", "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-northeast-3" + "UseFIPS": false } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.us-east-1.amazonaws.com" + "url": "https://es.ap-south-1.amazonaws.com" } }, "params": { + "Region": "ap-south-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "us-east-1" + "UseFIPS": false } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es-fips.us-east-1.amazonaws.com" + "url": "https://es.ap-southeast-1.amazonaws.com" } }, "params": { + "Region": "ap-southeast-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "us-east-1" + "UseFIPS": false } }, { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.eu-west-1.amazonaws.com" + "url": "https://es.ap-southeast-2.amazonaws.com" } }, "params": { + "Region": "ap-southeast-2", "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-west-1" + "UseFIPS": false } }, { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", + "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.eu-west-2.amazonaws.com" + "url": "https://es.ap-southeast-3.amazonaws.com" } }, "params": { + "Region": "ap-southeast-3", "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-west-2" + "UseFIPS": false } }, { - "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", + "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.eu-west-3.amazonaws.com" + "url": "https://es.ca-central-1.amazonaws.com" } }, "params": { + "Region": "ca-central-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-west-3" + "UseFIPS": false } }, { - "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.me-south-1.amazonaws.com" + "url": "https://es.eu-central-1.amazonaws.com" } }, "params": { + "Region": "eu-central-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "me-south-1" + "UseFIPS": false } }, { @@ -138,139 +151,139 @@ } }, "params": { + "Region": "eu-north-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-north-1" + "UseFIPS": false } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.us-east-2.amazonaws.com" + "url": "https://es.eu-south-1.amazonaws.com" } }, "params": { + "Region": "eu-south-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "us-east-2" + "UseFIPS": false } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es-fips.us-east-2.amazonaws.com" + "url": "https://es.eu-west-1.amazonaws.com" } }, "params": { + "Region": "eu-west-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "us-east-2" + "UseFIPS": false } }, { - "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.sa-east-1.amazonaws.com" + "url": "https://es.eu-west-2.amazonaws.com" } }, "params": { + "Region": "eu-west-2", "UseDualStack": false, - "UseFIPS": false, - "Region": "sa-east-1" + "UseFIPS": false } }, { - "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.ap-east-1.amazonaws.com" + "url": "https://es.eu-west-3.amazonaws.com" } }, "params": { + "Region": "eu-west-3", "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-east-1" + "UseFIPS": false } }, { - "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", + "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.eu-south-1.amazonaws.com" + "url": "https://es.me-south-1.amazonaws.com" } }, "params": { + "Region": "me-south-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-south-1" + "UseFIPS": false } }, { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", + "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.eu-central-1.amazonaws.com" + "url": "https://es.sa-east-1.amazonaws.com" } }, "params": { + "Region": "sa-east-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-central-1" + "UseFIPS": false } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.ap-southeast-1.amazonaws.com" + "url": "https://es.us-east-1.amazonaws.com" } }, "params": { + "Region": "us-east-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-southeast-1" + "UseFIPS": false } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.ap-southeast-2.amazonaws.com" + "url": "https://es-fips.us-east-1.amazonaws.com" } }, "params": { + "Region": "us-east-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-southeast-2" + "UseFIPS": true } }, { - "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.ap-southeast-3.amazonaws.com" + "url": "https://es.us-east-2.amazonaws.com" } }, "params": { + "Region": "us-east-2", "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-southeast-3" + "UseFIPS": false } }, { - "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.ca-central-1.amazonaws.com" + "url": "https://es-fips.us-east-2.amazonaws.com" } }, "params": { + "Region": "us-east-2", "UseDualStack": false, - "UseFIPS": false, - "Region": "ca-central-1" + "UseFIPS": true } }, { @@ -281,9 +294,9 @@ } }, "params": { + "Region": "us-west-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "us-west-1" + "UseFIPS": false } }, { @@ -294,9 +307,9 @@ } }, "params": { + "Region": "us-west-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "us-west-1" + "UseFIPS": true } }, { @@ -307,9 +320,9 @@ } }, "params": { + "Region": "us-west-2", "UseDualStack": false, - "UseFIPS": false, - "Region": "us-west-2" + "UseFIPS": false } }, { @@ -320,260 +333,261 @@ } }, "params": { + "Region": "us-west-2", "UseDualStack": false, - "UseFIPS": true, - "Region": "us-west-2" + "UseFIPS": true } }, { - "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://es.af-south-1.amazonaws.com" + "url": "https://es-fips.us-east-1.api.aws" } }, "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "af-south-1" + "Region": "us-east-1", + "UseDualStack": true, + "UseFIPS": true } }, { - "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://es.ap-south-1.amazonaws.com" + "url": "https://es.us-east-1.api.aws" } }, "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-south-1" + "Region": "us-east-1", + "UseDualStack": true, + "UseFIPS": false } }, { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.ap-northeast-1.amazonaws.com" + "url": "https://es.cn-north-1.amazonaws.com.cn" } }, "params": { + "Region": "cn-north-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-northeast-1" + "UseFIPS": false } }, { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.ap-northeast-2.amazonaws.com" + "url": "https://es.cn-northwest-1.amazonaws.com.cn" } }, "params": { + "Region": "cn-northwest-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-northeast-2" + "UseFIPS": false } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://es-fips.us-east-1.api.aws" + "url": "https://es-fips.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { + "Region": "cn-north-1", "UseDualStack": true, - "UseFIPS": true, - "Region": "us-east-1" + "UseFIPS": true } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.us-east-1.api.aws" + "url": "https://es-fips.cn-north-1.amazonaws.com.cn" } }, "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "us-east-1" + "Region": "cn-north-1", + "UseDualStack": false, + "UseFIPS": true } }, { - "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://es.us-gov-west-1.amazonaws.com" + "url": "https://es.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "us-gov-west-1" + "Region": "cn-north-1", + "UseDualStack": true, + "UseFIPS": false } }, { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es-fips.us-gov-west-1.amazonaws.com" + "url": "https://es.us-gov-east-1.amazonaws.com" } }, "params": { + "Region": "us-gov-east-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "us-gov-west-1" + "UseFIPS": false } }, { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.us-gov-east-1.amazonaws.com" + "url": "https://es-fips.us-gov-east-1.amazonaws.com" } }, "params": { + "Region": "us-gov-east-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "us-gov-east-1" + "UseFIPS": true } }, { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es-fips.us-gov-east-1.amazonaws.com" + "url": "https://es.us-gov-west-1.amazonaws.com" } }, "params": { + "Region": "us-gov-west-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "us-gov-east-1" + "UseFIPS": false } }, { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es-fips.us-gov-east-1.api.aws" + "url": "https://es-fips.us-gov-west-1.amazonaws.com" } }, "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "us-gov-east-1" + "Region": "us-gov-west-1", + "UseDualStack": false, + "UseFIPS": true } }, { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://es.us-gov-east-1.api.aws" + "url": "https://es-fips.us-gov-east-1.api.aws" } }, "params": { + "Region": "us-gov-east-1", "UseDualStack": true, - "UseFIPS": false, - "Region": "us-gov-east-1" + "UseFIPS": true } }, { - "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://es.us-isob-east-1.sc2s.sgov.gov" + "url": "https://es.us-gov-east-1.api.aws" } }, "params": { - "UseDualStack": false, - "UseFIPS": false, - "Region": "us-isob-east-1" + "Region": "us-gov-east-1", + "UseDualStack": true, + "UseFIPS": false } }, { - "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es-fips.us-isob-east-1.sc2s.sgov.gov" + "url": "https://es.us-iso-east-1.c2s.ic.gov" } }, "params": { + "Region": "us-iso-east-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "us-isob-east-1" + "UseFIPS": false } }, { - "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-iso-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.cn-northwest-1.amazonaws.com.cn" + "url": "https://es.us-iso-west-1.c2s.ic.gov" } }, "params": { + "Region": "us-iso-west-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "cn-northwest-1" + "UseFIPS": false } }, { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es.cn-north-1.amazonaws.com.cn" + "url": "https://es-fips.us-iso-east-1.c2s.ic.gov" } }, "params": { + "Region": "us-iso-east-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "cn-north-1" + "UseFIPS": true } }, { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es-fips.cn-north-1.api.amazonwebservices.com.cn" + "url": "https://es.us-isob-east-1.sc2s.sgov.gov" } }, "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "cn-north-1" + "Region": "us-isob-east-1", + "UseDualStack": false, + "UseFIPS": false } }, { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://es-fips.cn-north-1.amazonaws.com.cn" + "url": "https://es-fips.us-isob-east-1.sc2s.sgov.gov" } }, "params": { + "Region": "us-isob-east-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "cn-north-1" + "UseFIPS": true } }, { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", "expect": { "endpoint": { - "url": "https://es.cn-north-1.api.amazonwebservices.com.cn" + "url": "https://example.com" } }, "params": { - "UseDualStack": true, + "Region": "us-east-1", + "UseDualStack": false, "UseFIPS": false, - "Region": "cn-north-1" + "Endpoint": "https://example.com" } }, { - "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", "expect": { "endpoint": { "url": "https://example.com" @@ -582,7 +596,6 @@ "params": { "UseDualStack": false, "UseFIPS": false, - "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -592,9 +605,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { + "Region": "us-east-1", "UseDualStack": false, "UseFIPS": true, - "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -604,9 +617,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { + "Region": "us-east-1", "UseDualStack": true, "UseFIPS": false, - "Region": "us-east-1", "Endpoint": "https://example.com" } } diff --git a/models/apis/opensearch/2021-01-01/paginators-1.json b/models/apis/opensearch/2021-01-01/paginators-1.json index ca82b13bee5..cd834352dc8 100644 --- a/models/apis/opensearch/2021-01-01/paginators-1.json +++ b/models/apis/opensearch/2021-01-01/paginators-1.json @@ -55,6 +55,11 @@ "output_token": "NextToken", "limit_key": "MaxResults" }, + "ListScheduledActions": { + "input_token": "NextToken", + "output_token": "NextToken", + "limit_key": "MaxResults" + }, "ListVersions": { "input_token": "NextToken", "output_token": "NextToken", diff --git a/models/apis/rum/2018-05-10/api-2.json b/models/apis/rum/2018-05-10/api-2.json index 4f5eb6b1eb7..4d14014ca58 100644 --- a/models/apis/rum/2018-05-10/api-2.json +++ b/models/apis/rum/2018-05-10/api-2.json @@ -666,7 +666,9 @@ "DimensionKeysMap":{ "type":"map", "key":{"shape":"DimensionKey"}, - "value":{"shape":"DimensionName"} + "value":{"shape":"DimensionName"}, + "max":29, + "min":0 }, "DimensionName":{ "type":"string", @@ -862,6 +864,7 @@ "EventPattern":{"shape":"EventPattern"}, "MetricDefinitionId":{"shape":"MetricDefinitionId"}, "Name":{"shape":"MetricName"}, + "Namespace":{"shape":"Namespace"}, "UnitLabel":{"shape":"UnitLabel"}, "ValueKey":{"shape":"ValueKey"} } @@ -882,6 +885,7 @@ "DimensionKeys":{"shape":"DimensionKeysMap"}, "EventPattern":{"shape":"EventPattern"}, "Name":{"shape":"MetricName"}, + "Namespace":{"shape":"Namespace"}, "UnitLabel":{"shape":"UnitLabel"}, "ValueKey":{"shape":"ValueKey"} } @@ -918,6 +922,12 @@ "max":255, "min":1 }, + "Namespace":{ + "type":"string", + "max":237, + "min":1, + "pattern":"[a-zA-Z0-9-._/#:]+$" + }, "Pages":{ "type":"list", "member":{"shape":"Url"}, @@ -935,9 +945,9 @@ ], "members":{ "AppMonitorDetails":{"shape":"AppMonitorDetails"}, - "BatchId":{"shape":"String"}, + "BatchId":{"shape":"PutRumEventsRequestBatchIdString"}, "Id":{ - "shape":"AppMonitorId", + "shape":"PutRumEventsRequestIdString", "location":"uri", "locationName":"Id" }, @@ -945,6 +955,18 @@ "UserDetails":{"shape":"UserDetails"} } }, + "PutRumEventsRequestBatchIdString":{ + "type":"string", + "max":36, + "min":36, + "pattern":"^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" + }, + "PutRumEventsRequestIdString":{ + "type":"string", + "max":36, + "min":36, + "pattern":"^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" + }, "PutRumEventsResponse":{ "type":"structure", "members":{ @@ -1020,7 +1042,7 @@ "shape":"JsonValue", "jsonvalue":true }, - "id":{"shape":"String"}, + "id":{"shape":"RumEventIdString"}, "metadata":{ "shape":"JsonValue", "jsonvalue":true @@ -1029,6 +1051,12 @@ "type":{"shape":"String"} } }, + "RumEventIdString":{ + "type":"string", + "max":36, + "min":36, + "pattern":"^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" + }, "RumEventList":{ "type":"list", "member":{"shape":"RumEvent"} @@ -1226,10 +1254,22 @@ "UserDetails":{ "type":"structure", "members":{ - "sessionId":{"shape":"String"}, - "userId":{"shape":"String"} + "sessionId":{"shape":"UserDetailsSessionIdString"}, + "userId":{"shape":"UserDetailsUserIdString"} } }, + "UserDetailsSessionIdString":{ + "type":"string", + "max":36, + "min":36, + "pattern":"^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" + }, + "UserDetailsUserIdString":{ + "type":"string", + "max":36, + "min":36, + "pattern":"^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$" + }, "ValidationException":{ "type":"structure", "required":["message"], diff --git a/models/apis/rum/2018-05-10/docs-2.json b/models/apis/rum/2018-05-10/docs-2.json index 293e6430f53..76794d81ba7 100644 --- a/models/apis/rum/2018-05-10/docs-2.json +++ b/models/apis/rum/2018-05-10/docs-2.json @@ -2,7 +2,7 @@ "version": "2.0", "service": "

With Amazon CloudWatch RUM, you can perform real-user monitoring to collect client-side data about your web application performance from actual user sessions in real time. The data collected includes page load times, client-side errors, and user behavior. When you view this data, you can see it all aggregated together and also see breakdowns by the browsers and devices that your customers use.

You can use the collected data to quickly identify and debug client-side performance issues. CloudWatch RUM helps you visualize anomalies in your application performance and find relevant debugging data such as error messages, stack traces, and user sessions. You can also use RUM to understand the range of end-user impact including the number of users, geolocations, and browsers used.

", "operations": { - "BatchCreateRumMetricDefinitions": "

Specifies the extended metrics that you want a CloudWatch RUM app monitor to send to a destination. Valid destinations include CloudWatch and Evidently.

By default, RUM app monitors send some metrics to CloudWatch. These default metrics are listed in CloudWatch metrics that you can collect with CloudWatch RUM.

If you also send extended metrics, you can send metrics to Evidently as well as CloudWatch, and you can also optionally send the metrics with additional dimensions. The valid dimension names for the additional dimensions are BrowserName, CountryCode, DeviceType, FileType, OSName, and PageId. For more information, see Extended metrics that you can send to CloudWatch and CloudWatch Evidently.

The maximum number of metric definitions that you can specify in one BatchCreateRumMetricDefinitions operation is 200.

The maximum number of metric definitions that one destination can contain is 2000.

Extended metrics sent are charged as CloudWatch custom metrics. Each combination of additional dimension name and dimension value counts as a custom metric. For more information, see Amazon CloudWatch Pricing.

You must have already created a destination for the metrics before you send them. For more information, see PutRumMetricsDestination.

If some metric definitions specified in a BatchCreateRumMetricDefinitions operations are not valid, those metric definitions fail and return errors, but all valid metric definitions in the same operation still succeed.

", + "BatchCreateRumMetricDefinitions": "

Specifies the extended metrics and custom metrics that you want a CloudWatch RUM app monitor to send to a destination. Valid destinations include CloudWatch and Evidently.

By default, RUM app monitors send some metrics to CloudWatch. These default metrics are listed in CloudWatch metrics that you can collect with CloudWatch RUM.

In addition to these default metrics, you can choose to send extended metrics or custom metrics or both.

The maximum number of metric definitions that you can specify in one BatchCreateRumMetricDefinitions operation is 200.

The maximum number of metric definitions that one destination can contain is 2000.

Extended metrics sent to CloudWatch and RUM custom metrics are charged as CloudWatch custom metrics. Each combination of additional dimension name and dimension value counts as a custom metric. For more information, see Amazon CloudWatch Pricing.

You must have already created a destination for the metrics before you send them. For more information, see PutRumMetricsDestination.

If some metric definitions specified in a BatchCreateRumMetricDefinitions operations are not valid, those metric definitions fail and return errors, but all valid metric definitions in the same operation still succeed.

", "BatchDeleteRumMetricDefinitions": "

Removes the specified metrics from being sent to an extended metrics destination.

If some metric definition IDs specified in a BatchDeleteRumMetricDefinitions operations are not valid, those metric definitions fail and return errors, but all valid metric definition IDs in the same operation are still deleted.

The maximum number of metric definitions that you can specify in one BatchDeleteRumMetricDefinitions operation is 200.

", "BatchGetRumMetricDefinitions": "

Retrieves the list of metrics and dimensions that a RUM app monitor is sending to a single destination.

", "CreateAppMonitor": "

Creates a Amazon CloudWatch RUM app monitor, which collects telemetry data from your application and sends that data to RUM. The data includes performance and reliability information such as page load time, client-side errors, and user behavior.

You use this operation only to create a new app monitor. To update an existing app monitor, use UpdateAppMonitor instead.

After you create an app monitor, sign in to the CloudWatch RUM console to get the JavaScript code snippet to add to your web application. For more information, see How do I find a code snippet that I've already generated?

", @@ -14,7 +14,7 @@ "ListRumMetricsDestinations": "

Returns a list of destinations that you have created to receive RUM extended metrics, for the specified app monitor.

For more information about extended metrics, see AddRumMetrics.

", "ListTagsForResource": "

Displays the tags associated with a CloudWatch RUM resource.

", "PutRumEvents": "

Sends telemetry events about your application performance and user behavior to CloudWatch RUM. The code snippet that RUM generates for you to add to your application includes PutRumEvents operations to send this data to RUM.

Each PutRumEvents operation can send a batch of events from one user session.

", - "PutRumMetricsDestination": "

Creates or updates a destination to receive extended metrics from CloudWatch RUM. You can send extended metrics to CloudWatch or to a CloudWatch Evidently experiment.

For more information about extended metrics, see AddRumMetrics.

", + "PutRumMetricsDestination": "

Creates or updates a destination to receive extended metrics from CloudWatch RUM. You can send extended metrics to CloudWatch or to a CloudWatch Evidently experiment.

For more information about extended metrics, see BatchCreateRumMetricDefinitions.

", "TagResource": "

Assigns one or more tags (key-value pairs) to the specified CloudWatch RUM resource. Currently, the only resources that can be tagged app monitors.

Tags can help you organize and categorize your resources. You can also use them to scope user permissions by granting a user permission to access or change only resources with certain tag values.

Tags don't have any semantic meaning to Amazon Web Services and are interpreted strictly as strings of characters.

You can use the TagResource action with a resource that already has tags. If you specify a new tag key for the resource, this tag is appended to the list of tags associated with the alarm. If you specify a tag key that is already associated with the resource, the new tag value that you specify replaces the previous value for that tag.

You can associate as many as 50 tags with a resource.

For more information, see Tagging Amazon Web Services resources.

", "UntagResource": "

Removes one or more tags from the specified resource.

", "UpdateAppMonitor": "

Updates the configuration of an existing app monitor. When you use this operation, only the parts of the app monitor configuration that you specify in this operation are changed. For any parameters that you omit, the existing values are kept.

You can't use this operation to change the tags of an existing app monitor. To change the tags of an existing app monitor, use TagResource.

To create a new app monitor, use CreateAppMonitor.

After you update an app monitor, sign in to the CloudWatch RUM console to get the updated JavaScript code snippet to add to your web application. For more information, see How do I find a code snippet that I've already generated?

", @@ -59,8 +59,7 @@ "refs": { "AppMonitor$Id": "

The unique ID of this app monitor.

", "AppMonitorSummary$Id": "

The unique ID of this app monitor.

", - "CreateAppMonitorResponse$Id": "

The unique ID of the new app monitor.

", - "PutRumEventsRequest$Id": "

The ID of the app monitor that is sending this data.

" + "CreateAppMonitorResponse$Id": "

The unique ID of the new app monitor.

" } }, "AppMonitorName": { @@ -251,7 +250,7 @@ "base": null, "refs": { "MetricDefinition$DimensionKeys": "

This field is a map of field paths to dimension names. It defines the dimensions to associate with this metric in CloudWatch The value of this field is used only if the metric destination is CloudWatch. If the metric destination is Evidently, the value of DimensionKeys is ignored.

", - "MetricDefinitionRequest$DimensionKeys": "

Use this field only if you are sending the metric to CloudWatch.

This field is a map of field paths to dimension names. It defines the dimensions to associate with this metric in CloudWatch. Valid values for the entries in this field are the following:

All dimensions listed in this field must also be included in EventPattern.

" + "MetricDefinitionRequest$DimensionKeys": "

Use this field only if you are sending the metric to CloudWatch.

This field is a map of field paths to dimension names. It defines the dimensions to associate with this metric in CloudWatch. For extended metrics, valid values for the entries in this field are the following:

For both extended metrics and custom metrics, all dimensions listed in this field must also be included in EventPattern.

" } }, "DimensionName": { @@ -413,7 +412,7 @@ } }, "MetricDefinitionRequest": { - "base": "

Use this structure to define one extended metric that RUM will send to CloudWatch or CloudWatch Evidently. For more information, see Additional metrics that you can send to CloudWatch and CloudWatch Evidently.

Only certain combinations of values for Name, ValueKey, and EventPattern are valid. In addition to what is displayed in the list below, the EventPattern can also include information used by the DimensionKeys field.

", + "base": "

Use this structure to define one extended metric or custom metric that RUM will send to CloudWatch or CloudWatch Evidently. For more information, see Additional metrics that you can send to CloudWatch and CloudWatch Evidently.

This structure is validated differently for extended metrics and custom metrics. For extended metrics that are sent to the AWS/RUM namespace, the following validations apply:

For custom metrics, the following validation rules apply:

Valid key values for first-level keys in the ValueKey, EventPattern, and DimensionKeys fields:

", "refs": { "BatchCreateRumMetricDefinitionsError$MetricDefinition": "

The metric definition that caused this error.

", "MetricDefinitionsRequest$member": null, @@ -461,7 +460,14 @@ "base": null, "refs": { "MetricDefinition$Name": "

The name of the metric that is defined in this structure.

", - "MetricDefinitionRequest$Name": "

The name for the metric that is defined in this structure. Valid values are the following:

" + "MetricDefinitionRequest$Name": "

The name for the metric that is defined in this structure. For custom metrics, you can specify any name that you like. For extended metrics, valid values are the following:

" + } + }, + "Namespace": { + "base": null, + "refs": { + "MetricDefinition$Namespace": "

If this metric definition is for a custom metric instead of an extended metric, this field displays the metric namespace that the custom metric is published to.

", + "MetricDefinitionRequest$Namespace": "

If this structure is for a custom metric instead of an extended metrics, use this parameter to define the metric namespace for that custom metric. Do not specify this parameter if this structure is for an extended metric.

You cannot use any string that starts with AWS/ for your namespace.

" } }, "Pages": { @@ -476,6 +482,18 @@ "refs": { } }, + "PutRumEventsRequestBatchIdString": { + "base": null, + "refs": { + "PutRumEventsRequest$BatchId": "

A unique identifier for this batch of RUM event data.

" + } + }, + "PutRumEventsRequestIdString": { + "base": null, + "refs": { + "PutRumEventsRequest$Id": "

The ID of the app monitor that is sending this data.

" + } + }, "PutRumEventsResponse": { "base": null, "refs": { @@ -539,6 +557,12 @@ "RumEventList$member": null } }, + "RumEventIdString": { + "base": null, + "refs": { + "RumEvent$id": "

A unique ID for this event.

" + } + }, "RumEventList": { "base": null, "refs": { @@ -586,18 +610,14 @@ "ListAppMonitorsResponse$NextToken": "

A token that you can use in a subsequent operation to retrieve the next set of results.

", "ListRumMetricsDestinationsRequest$NextToken": "

Use the token returned by the previous operation to request the next page of results.

", "ListRumMetricsDestinationsResponse$NextToken": "

A token that you can use in a subsequent operation to retrieve the next set of results.

", - "PutRumEventsRequest$BatchId": "

A unique identifier for this batch of RUM event data.

", "ResourceNotFoundException$message": null, "ResourceNotFoundException$resourceName": "

The name of the resource that is associated with the error.

", "ResourceNotFoundException$resourceType": "

The type of the resource that is associated with the error.

", - "RumEvent$id": "

A unique ID for this event.

", "RumEvent$type": "

The JSON schema that denotes the type of event this is, such as a page load or a new session.

", "ServiceQuotaExceededException$message": null, "ThrottlingException$message": null, "ThrottlingException$quotaCode": "

The ID of the service quota that was exceeded.

", "ThrottlingException$serviceCode": "

The ID of the service that is associated with the error.

", - "UserDetails$sessionId": "

The session ID that the performance events are from.

", - "UserDetails$userId": "

The ID of the user for this user session. This ID is generated by RUM and does not include any personally identifiable information about the user.

", "ValidationException$message": null } }, @@ -724,6 +744,18 @@ "PutRumEventsRequest$UserDetails": "

A structure that contains information about the user session that this batch of events was collected from.

" } }, + "UserDetailsSessionIdString": { + "base": null, + "refs": { + "UserDetails$sessionId": "

The session ID that the performance events are from.

" + } + }, + "UserDetailsUserIdString": { + "base": null, + "refs": { + "UserDetails$userId": "

The ID of the user for this user session. This ID is generated by RUM and does not include any personally identifiable information about the user.

" + } + }, "ValidationException": { "base": "

One of the arguments for the request is not valid.

", "refs": { diff --git a/models/apis/rum/2018-05-10/endpoint-rule-set-1.json b/models/apis/rum/2018-05-10/endpoint-rule-set-1.json index 448f04b6f57..8fdeb4663ac 100644 --- a/models/apis/rum/2018-05-10/endpoint-rule-set-1.json +++ b/models/apis/rum/2018-05-10/endpoint-rule-set-1.json @@ -32,13 +32,12 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "isSet", "argv": [ { - "ref": "Region" + "ref": "Endpoint" } - ], - "assign": "PartitionResult" + ] } ], "type": "tree", @@ -46,23 +45,20 @@ { "conditions": [ { - "fn": "isSet", + "fn": "booleanEquals", "argv": [ { - "ref": "Endpoint" - } + "ref": "UseFIPS" + }, + true ] - }, - { - "fn": "parseURL", - "argv": [ - { - "ref": "Endpoint" - } - ], - "assign": "url" } ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], "type": "tree", "rules": [ { @@ -71,67 +67,42 @@ "fn": "booleanEquals", "argv": [ { - "ref": "UseFIPS" + "ref": "UseDualStack" }, true ] } ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", "type": "error" }, { "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" + "endpoint": { + "url": { + "ref": "Endpoint" }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" - }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, + } + ] + }, + { + "conditions": [], + "type": "tree", + "rules": [ { "conditions": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", + "fn": "isSet", "argv": [ { - "ref": "UseDualStack" - }, - true + "ref": "Region" + } ] } ], @@ -140,90 +111,215 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "aws.partition", "argv": [ - true, { - "fn": "getAttr", + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsFIPS" + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true ] } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://rum-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } ] }, { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsDualStack" + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://rum-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" } ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://rum-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" }, - "supportsFIPS" + true ] } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://rum.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" + } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [], "type": "tree", @@ -231,7 +327,7 @@ { "conditions": [], "endpoint": { - "url": "https://rum-fips.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://rum.{Region}.{PartitionResult#dnsSuffix}", "properties": {}, "headers": {} }, @@ -240,74 +336,13 @@ ] } ] - }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://rum.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } ] }, { "conditions": [], - "endpoint": { - "url": "https://rum.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } diff --git a/models/apis/rum/2018-05-10/endpoint-tests-1.json b/models/apis/rum/2018-05-10/endpoint-tests-1.json index bf22fcfdf07..bb59ef12e33 100644 --- a/models/apis/rum/2018-05-10/endpoint-tests-1.json +++ b/models/apis/rum/2018-05-10/endpoint-tests-1.json @@ -1,146 +1,55 @@ { "testCases": [ { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://rum-fips.eu-central-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "eu-central-1" - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://rum-fips.eu-central-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "eu-central-1" - } - }, - { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://rum.eu-central-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "eu-central-1" - } - }, - { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum.eu-central-1.amazonaws.com" + "url": "https://rum.ap-northeast-1.amazonaws.com" } }, "params": { + "Region": "ap-northeast-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-central-1" - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://rum-fips.us-west-2.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "us-west-2" + "UseFIPS": false } }, { - "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum-fips.us-west-2.amazonaws.com" + "url": "https://rum.ap-southeast-1.amazonaws.com" } }, "params": { + "Region": "ap-southeast-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "us-west-2" + "UseFIPS": false } }, { - "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://rum.us-west-2.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "us-west-2" - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum.us-west-2.amazonaws.com" + "url": "https://rum.ap-southeast-2.amazonaws.com" } }, "params": { + "Region": "ap-southeast-2", "UseDualStack": false, - "UseFIPS": false, - "Region": "us-west-2" - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://rum-fips.eu-north-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "eu-north-1" + "UseFIPS": false } }, { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled", + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum-fips.eu-north-1.amazonaws.com" + "url": "https://rum.eu-central-1.amazonaws.com" } }, "params": { + "Region": "eu-central-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "eu-north-1" - } - }, - { - "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://rum.eu-north-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "eu-north-1" + "UseFIPS": false } }, { @@ -151,48 +60,22 @@ } }, "params": { + "Region": "eu-north-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-north-1" - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://rum-fips.eu-west-2.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "eu-west-2" + "UseFIPS": false } }, { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum-fips.eu-west-2.amazonaws.com" + "url": "https://rum.eu-west-1.amazonaws.com" } }, "params": { + "Region": "eu-west-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "eu-west-2" - } - }, - { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://rum.eu-west-2.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "eu-west-2" + "UseFIPS": false } }, { @@ -203,325 +86,261 @@ } }, "params": { + "Region": "eu-west-2", "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-west-2" + "UseFIPS": false } }, { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://rum-fips.eu-west-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "eu-west-1" - } - }, - { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum-fips.eu-west-1.amazonaws.com" + "url": "https://rum.us-east-1.amazonaws.com" } }, "params": { + "Region": "us-east-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "eu-west-1" - } - }, - { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://rum.eu-west-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "eu-west-1" + "UseFIPS": false } }, { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum.eu-west-1.amazonaws.com" + "url": "https://rum.us-east-2.amazonaws.com" } }, "params": { + "Region": "us-east-2", "UseDualStack": false, - "UseFIPS": false, - "Region": "eu-west-1" - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://rum-fips.ap-northeast-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "ap-northeast-1" + "UseFIPS": false } }, { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum-fips.ap-northeast-1.amazonaws.com" + "url": "https://rum.us-west-2.amazonaws.com" } }, "params": { + "Region": "us-west-2", "UseDualStack": false, - "UseFIPS": true, - "Region": "ap-northeast-1" + "UseFIPS": false } }, { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://rum.ap-northeast-1.api.aws" + "url": "https://rum-fips.us-east-1.api.aws" } }, "params": { + "Region": "us-east-1", "UseDualStack": true, - "UseFIPS": false, - "Region": "ap-northeast-1" + "UseFIPS": true } }, { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum.ap-northeast-1.amazonaws.com" + "url": "https://rum-fips.us-east-1.amazonaws.com" } }, "params": { + "Region": "us-east-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-northeast-1" + "UseFIPS": true } }, { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://rum-fips.ap-southeast-1.api.aws" + "url": "https://rum.us-east-1.api.aws" } }, "params": { + "Region": "us-east-1", "UseDualStack": true, - "UseFIPS": true, - "Region": "ap-southeast-1" - } - }, - { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://rum-fips.ap-southeast-1.amazonaws.com" - } - }, - "params": { - "UseDualStack": false, - "UseFIPS": true, - "Region": "ap-southeast-1" + "UseFIPS": false } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://rum.ap-southeast-1.api.aws" + "url": "https://rum-fips.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { + "Region": "cn-north-1", "UseDualStack": true, - "UseFIPS": false, - "Region": "ap-southeast-1" + "UseFIPS": true } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum.ap-southeast-1.amazonaws.com" + "url": "https://rum-fips.cn-north-1.amazonaws.com.cn" } }, "params": { + "Region": "cn-north-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-southeast-1" + "UseFIPS": true } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://rum-fips.ap-southeast-2.api.aws" + "url": "https://rum.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { + "Region": "cn-north-1", "UseDualStack": true, - "UseFIPS": true, - "Region": "ap-southeast-2" + "UseFIPS": false } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum-fips.ap-southeast-2.amazonaws.com" + "url": "https://rum.cn-north-1.amazonaws.com.cn" } }, "params": { + "Region": "cn-north-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "ap-southeast-2" + "UseFIPS": false } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://rum.ap-southeast-2.api.aws" + "url": "https://rum-fips.us-gov-east-1.api.aws" } }, "params": { + "Region": "us-gov-east-1", "UseDualStack": true, - "UseFIPS": false, - "Region": "ap-southeast-2" + "UseFIPS": true } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum.ap-southeast-2.amazonaws.com" + "url": "https://rum-fips.us-gov-east-1.amazonaws.com" } }, "params": { + "Region": "us-gov-east-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "ap-southeast-2" + "UseFIPS": true } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://rum-fips.us-east-1.api.aws" + "url": "https://rum.us-gov-east-1.api.aws" } }, "params": { + "Region": "us-gov-east-1", "UseDualStack": true, - "UseFIPS": true, - "Region": "us-east-1" + "UseFIPS": false } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum-fips.us-east-1.amazonaws.com" + "url": "https://rum.us-gov-east-1.amazonaws.com" } }, "params": { + "Region": "us-gov-east-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "us-east-1" - } - }, - { - "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://rum.us-east-1.api.aws" - } - }, - "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "us-east-1" + "UseFIPS": false } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum.us-east-1.amazonaws.com" + "url": "https://rum-fips.us-iso-east-1.c2s.ic.gov" } }, "params": { + "Region": "us-iso-east-1", "UseDualStack": false, - "UseFIPS": false, - "Region": "us-east-1" + "UseFIPS": true } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum-fips.us-east-2.api.aws" + "url": "https://rum.us-iso-east-1.c2s.ic.gov" } }, "params": { - "UseDualStack": true, - "UseFIPS": true, - "Region": "us-east-2" + "Region": "us-iso-east-1", + "UseDualStack": false, + "UseFIPS": false } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum-fips.us-east-2.amazonaws.com" + "url": "https://rum-fips.us-isob-east-1.sc2s.sgov.gov" } }, "params": { + "Region": "us-isob-east-1", "UseDualStack": false, - "UseFIPS": true, - "Region": "us-east-2" + "UseFIPS": true } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://rum.us-east-2.api.aws" + "url": "https://rum.us-isob-east-1.sc2s.sgov.gov" } }, "params": { - "UseDualStack": true, - "UseFIPS": false, - "Region": "us-east-2" + "Region": "us-isob-east-1", + "UseDualStack": false, + "UseFIPS": false } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", "expect": { "endpoint": { - "url": "https://rum.us-east-2.amazonaws.com" + "url": "https://example.com" } }, "params": { + "Region": "us-east-1", "UseDualStack": false, "UseFIPS": false, - "Region": "us-east-2" + "Endpoint": "https://example.com" } }, { - "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", "expect": { "endpoint": { "url": "https://example.com" @@ -530,7 +349,6 @@ "params": { "UseDualStack": false, "UseFIPS": false, - "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -540,9 +358,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { + "Region": "us-east-1", "UseDualStack": false, "UseFIPS": true, - "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -552,9 +370,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { + "Region": "us-east-1", "UseDualStack": true, "UseFIPS": false, - "Region": "us-east-1", "Endpoint": "https://example.com" } } diff --git a/models/apis/ssm/2014-11-06/docs-2.json b/models/apis/ssm/2014-11-06/docs-2.json index aff8ece2aa8..f2cc9a76a9a 100644 --- a/models/apis/ssm/2014-11-06/docs-2.json +++ b/models/apis/ssm/2014-11-06/docs-2.json @@ -105,7 +105,7 @@ "ListResourceComplianceSummaries": "

Returns a resource-level summary count. The summary includes information about compliant and non-compliant statuses and detailed compliance-item severity counts, according to the filter criteria you specify.

", "ListResourceDataSync": "

Lists your resource data sync configurations. Includes information about the last time a sync attempted to start, the last sync status, and the last time a sync successfully completed.

The number of sync configurations might be too large to return using a single call to ListResourceDataSync. You can limit the number of sync configurations returned by using the MaxResults parameter. To determine whether there are more sync configurations to list, check the value of NextToken in the output. If there are more sync configurations to list, you can request them by specifying the NextToken returned in the call to the parameter of a subsequent call.

", "ListTagsForResource": "

Returns a list of the tags assigned to the specified resource.

For information about the ID format for each supported resource type, see AddTagsToResource.

", - "ModifyDocumentPermission": "

Shares a Amazon Web Services Systems Manager document (SSM document)publicly or privately. If you share a document privately, you must specify the Amazon Web Services user account IDs for those people who can use the document. If you share a document publicly, you must specify All as the account ID.

", + "ModifyDocumentPermission": "

Shares a Amazon Web Services Systems Manager document (SSM document)publicly or privately. If you share a document privately, you must specify the Amazon Web Services user IDs for those people who can use the document. If you share a document publicly, you must specify All as the account ID.

", "PutComplianceItems": "

Registers a compliance type and other compliance details on a designated resource. This operation lets you register custom compliance details with a resource. This call overwrites existing compliance information on the resource, so you must provide a full list of compliance items each time that you send the request.

ComplianceType can be one of the following:

", "PutInventory": "

Bulk update custom inventory items on one or more managed nodes. The request adds an inventory item, if it doesn't already exist, or updates an inventory item, if it does exist.

", "PutParameter": "

Add a parameter to the system.

", @@ -126,7 +126,7 @@ "StopAutomationExecution": "

Stop an Automation that is currently running.

", "TerminateSession": "

Permanently ends a session and closes the data connection between the Session Manager client and SSM Agent on the managed node. A terminated session can't be resumed.

", "UnlabelParameterVersion": "

Remove a label or labels from a parameter.

", - "UpdateAssociation": "

Updates an association. You can update the association name and version, the document version, schedule, parameters, and Amazon Simple Storage Service (Amazon S3) output. When you call UpdateAssociation, the system removes all optional parameters from the request and overwrites the association with null values for those parameters. This is by design. You must specify all optional parameters in the call, even if you are not changing the parameters. This includes the Name parameter. Before calling this API action, we recommend that you call the DescribeAssociation API operation and make a note of all optional parameters required for your UpdateAssociation call.

In order to call this API operation, your Identity and Access Management (IAM) user account, group, or role must be configured with permission to call the DescribeAssociation API operation. If you don't have permission to call DescribeAssociation, then you receive the following error: An error occurred (AccessDeniedException) when calling the UpdateAssociation operation: User: <user_arn> isn't authorized to perform: ssm:DescribeAssociation on resource: <resource_arn>

When you update an association, the association immediately runs against the specified targets. You can add the ApplyOnlyAtCronInterval parameter to run the association during the next schedule run.

", + "UpdateAssociation": "

Updates an association. You can update the association name and version, the document version, schedule, parameters, and Amazon Simple Storage Service (Amazon S3) output. When you call UpdateAssociation, the system removes all optional parameters from the request and overwrites the association with null values for those parameters. This is by design. You must specify all optional parameters in the call, even if you are not changing the parameters. This includes the Name parameter. Before calling this API action, we recommend that you call the DescribeAssociation API operation and make a note of all optional parameters required for your UpdateAssociation call.

In order to call this API operation, a user, group, or role must be granted permission to call the DescribeAssociation API operation. If you don't have permission to call DescribeAssociation, then you receive the following error: An error occurred (AccessDeniedException) when calling the UpdateAssociation operation: User: <user_arn> isn't authorized to perform: ssm:DescribeAssociation on resource: <resource_arn>

When you update an association, the association immediately runs against the specified targets. You can add the ApplyOnlyAtCronInterval parameter to run the association during the next schedule run.

", "UpdateAssociationStatus": "

Updates the status of the Amazon Web Services Systems Manager document (SSM document) associated with the specified managed node.

UpdateAssociationStatus is primarily used by the Amazon Web Services Systems Manager Agent (SSM Agent) to report status updates about your associations and is only used for associations created with the InstanceId legacy parameter.

", "UpdateDocument": "

Updates one or more values for an SSM document.

", "UpdateDocumentDefaultVersion": "

Set the default version of a document.

If you change a document version for a State Manager association, Systems Manager immediately runs the association unless you previously specifed the apply-only-at-cron-interval parameter.

", @@ -159,8 +159,8 @@ "base": null, "refs": { "DescribeDocumentPermissionResponse$AccountIds": "

The account IDs that have permission to use this document. The ID can be either an Amazon Web Services account or All.

", - "ModifyDocumentPermissionRequest$AccountIdsToAdd": "

The Amazon Web Services user accounts that should have access to the document. The account IDs can either be a group of account IDs or All.

", - "ModifyDocumentPermissionRequest$AccountIdsToRemove": "

The Amazon Web Services user accounts that should no longer have access to the document. The Amazon Web Services user account can either be a group of account IDs or All. This action has a higher priority than AccountIdsToAdd. If you specify an account ID to add and the same ID to remove, the system removes access to the document.

" + "ModifyDocumentPermissionRequest$AccountIdsToAdd": "

The Amazon Web Services users that should have access to the document. The account IDs can either be a group of account IDs or All.

", + "ModifyDocumentPermissionRequest$AccountIdsToRemove": "

The Amazon Web Services users that should no longer have access to the document. The Amazon Web Services user can either be a group of account IDs or All. This action has a higher priority than AccountIdsToAdd. If you specify an ID to add and the same ID to remove, the system removes access to the document.

" } }, "AccountSharingInfo": { @@ -958,7 +958,7 @@ "base": null, "refs": { "Activation$Expired": "

Whether or not the activation is expired.

", - "AlarmConfiguration$IgnorePollAlarmFailure": "

If you specify true for this value, your automation or command continue to run even if we can't gather information about the state of your CloudWatch alarm. The default value is false.

", + "AlarmConfiguration$IgnorePollAlarmFailure": "

When this value is true, your automation or command continues to run in cases where we can’t retrieve alarm status information from CloudWatch. In cases where we successfully retrieve an alarm status of OK or INSUFFICIENT_DATA, the automation or command continues to run, regardless of this value. Default is false.

", "AutomationExecution$StepExecutionsTruncated": "

A boolean value that indicates if the response contains the full list of the Automation step executions. If true, use the DescribeAutomationStepExecutions API operation to get the full list of step executions.

", "BaselineOverride$ApprovedPatchesEnableNonSecurity": "

Indicates whether the list of approved patches includes non-security updates that should be applied to the managed nodes. The default value is false. Applies to Linux managed nodes only.

", "CreatePatchBaselineRequest$ApprovedPatchesEnableNonSecurity": "

Indicates whether the list of approved patches includes non-security updates that should be applied to the managed nodes. The default value is false. Applies to Linux managed nodes only.

", @@ -2192,7 +2192,7 @@ "AssociationDescription$Name": "

The name of the SSM document.

", "AssociationVersionInfo$Name": "

The name specified when the association was created.

", "CreateAssociationBatchRequestEntry$Name": "

The name of the SSM document that contains the configuration information for the managed node. You can specify Command or Automation runbooks.

You can specify Amazon Web Services-predefined documents, documents you created, or a document that is shared with you from another account.

For SSM documents that are shared with you from other Amazon Web Services accounts, you must specify the complete SSM document ARN, in the following format:

arn:aws:ssm:region:account-id:document/document-name

For example:

arn:aws:ssm:us-east-2:12345678912:document/My-Shared-Document

For Amazon Web Services-predefined documents and SSM documents you created in your account, you only need to specify the document name. For example, AWS-ApplyPatchBaseline or My-Document.

", - "CreateAssociationRequest$Name": "

The name of the SSM Command document or Automation runbook that contains the configuration information for the managed node.

You can specify Amazon Web Services-predefined documents, documents you created, or a document that is shared with you from another account.

For Systems Manager documents (SSM documents) that are shared with you from other Amazon Web Services accounts, you must specify the complete SSM document ARN, in the following format:

arn:partition:ssm:region:account-id:document/document-name

For example:

arn:aws:ssm:us-east-2:12345678912:document/My-Shared-Document

For Amazon Web Services-predefined documents and SSM documents you created in your account, you only need to specify the document name. For example, AWS-ApplyPatchBaseline or My-Document.

", + "CreateAssociationRequest$Name": "

The name of the SSM Command document or Automation runbook that contains the configuration information for the managed node.

You can specify Amazon Web Services-predefined documents, documents you created, or a document that is shared with you from another Amazon Web Services account.

For Systems Manager documents (SSM documents) that are shared with you from other Amazon Web Services accounts, you must specify the complete SSM document ARN, in the following format:

arn:partition:ssm:region:account-id:document/document-name

For example:

arn:aws:ssm:us-east-2:12345678912:document/My-Shared-Document

For Amazon Web Services-predefined documents and SSM documents you created in your account, you only need to specify the document name. For example, AWS-ApplyPatchBaseline or My-Document.

", "DeleteAssociationRequest$Name": "

The name of the SSM document.

", "DescribeAssociationRequest$Name": "

The name of the SSM document.

", "DescribeDocumentRequest$Name": "

The name of the SSM document.

", @@ -2228,7 +2228,7 @@ "DocumentContent": { "base": null, "refs": { - "CreateDocumentRequest$Content": "

The content for the new SSM document in JSON or YAML format. We recommend storing the contents for your new document in an external JSON or YAML file and referencing the file in a command.

For examples, see the following topics in the Amazon Web Services Systems Manager User Guide.

", + "CreateDocumentRequest$Content": "

The content for the new SSM document in JSON or YAML format. The content of the document must not exceed 64KB. This quota also includes the content specified for input parameters at runtime. We recommend storing the contents for your new document in an external JSON or YAML file and referencing the file in a command.

For examples, see the following topics in the Amazon Web Services Systems Manager User Guide.

", "GetDocumentResult$Content": "

The contents of the SSM document.

", "InstanceAssociation$Content": "

The content of the association document for the managed node(s).

", "UpdateDocumentRequest$Content": "

A valid JSON or YAML string.

" @@ -2395,12 +2395,12 @@ "DocumentOwner": { "base": null, "refs": { - "DocumentDescription$Owner": "

The Amazon Web Services user account that created the document.

", - "DocumentIdentifier$Owner": "

The Amazon Web Services user account that created the document.

" + "DocumentDescription$Owner": "

The Amazon Web Services user that created the document.

", + "DocumentIdentifier$Owner": "

The Amazon Web Services user that created the document.

" } }, "DocumentParameter": { - "base": "

Parameters specified in a System Manager document that run on the server when the command is run.

", + "base": "

Parameters specified in a Systems Manager document that run on the server when the command is run.

", "refs": { "DocumentParameterList$member": null } @@ -2436,7 +2436,7 @@ } }, "DocumentPermissionLimit": { - "base": "

The document can't be shared with more Amazon Web Services user accounts. You can specify a maximum of 20 accounts per API operation to share a private document.

By default, you can share a private document with a maximum of 1,000 accounts and publicly share up to five documents.

If you need to increase the quota for privately or publicly shared Systems Manager documents, contact Amazon Web Services Support.

", + "base": "

The document can't be shared with more Amazon Web Services accounts. You can specify a maximum of 20 accounts per API operation to share a private document.

By default, you can share a private document with a maximum of 1,000 accounts and publicly share up to five documents.

If you need to increase the quota for privately or publicly shared Systems Manager documents, contact Amazon Web Services Support.

", "refs": { } }, @@ -5725,7 +5725,7 @@ "Parameter$DataType": "

The data type of the parameter, such as text or aws:ec2:image. The default is text.

", "ParameterHistory$DataType": "

The data type of the parameter, such as text or aws:ec2:image. The default is text.

", "ParameterMetadata$DataType": "

The data type of the parameter, such as text or aws:ec2:image. The default is text.

", - "PutParameterRequest$DataType": "

The data type for a String parameter. Supported data types include plain text and Amazon Machine Image (AMI) IDs.

The following data type values are supported.

When you create a String parameter and specify aws:ec2:image, Amazon Web Services Systems Manager validates the parameter value is in the required format, such as ami-12345abcdeEXAMPLE, and that the specified AMI is available in your Amazon Web Services account. For more information, see Native parameter support for Amazon Machine Image (AMI) IDs in the Amazon Web Services Systems Manager User Guide.

" + "PutParameterRequest$DataType": "

The data type for a String parameter. Supported data types include plain text and Amazon Machine Image (AMI) IDs.

The following data type values are supported.

When you create a String parameter and specify aws:ec2:image, Amazon Web Services Systems Manager validates the parameter value is in the required format, such as ami-12345abcdeEXAMPLE, and that the specified AMI is available in your Amazon Web Services account.

If the action is successful, the service sends back an HTTP 200 response which indicates a successful PutParameter call for all cases except for data type aws:ec2:image. If you call PutParameter with aws:ec2:image data type, a successful HTTP 200 response does not guarantee that your parameter was successfully created or updated. The aws:ec2:image value is validated asynchronously, and the PutParameter call returns before the validation is complete. If you submit an invalid AMI value, the PutParameter operation will return success, but the asynchronous validation will fail and the parameter will not be created or updated. To monitor whether your aws:ec2:image parameters are created successfully, see Setting up notifications or trigger actions based on Parameter Store events. For more information about AMI format validation , see Native parameter support for Amazon Machine Image (AMI) IDs.

" } }, "ParameterDescription": { @@ -5759,7 +5759,7 @@ "refs": { "ParameterHistory$KeyId": "

The ID of the query key used for this parameter.

", "ParameterMetadata$KeyId": "

The ID of the query key used for this parameter.

", - "PutParameterRequest$KeyId": "

The Key Management Service (KMS) ID that you want to use to encrypt a parameter. Either the default KMS key automatically assigned to your Amazon Web Services account or a custom key. Required for parameters that use the SecureString data type.

If you don't specify a key ID, the system uses the default key associated with your Amazon Web Services account.

" + "PutParameterRequest$KeyId": "

The Key Management Service (KMS) ID that you want to use to encrypt a parameter. Use a custom key for better security. Required for parameters that use the SecureString data type.

If you don't specify a key ID, the system uses the default key associated with your Amazon Web Services account which is not as secure as using a custom key.

" } }, "ParameterLabel": { @@ -7261,10 +7261,10 @@ "ServiceSettingId": { "base": null, "refs": { - "GetServiceSettingRequest$SettingId": "

The ID of the service setting to get. The setting ID can be one of the following.

", + "GetServiceSettingRequest$SettingId": "

The ID of the service setting to get. The setting ID can be one of the following.

", "ResetServiceSettingRequest$SettingId": "

The Amazon Resource Name (ARN) of the service setting to reset. The setting ID can be one of the following.

", "ServiceSetting$SettingId": "

The ID of the service setting.

", - "UpdateServiceSettingRequest$SettingId": "

The Amazon Resource Name (ARN) of the service setting to reset. For example, arn:aws:ssm:us-east-1:111122223333:servicesetting/ssm/parameter-store/high-throughput-enabled. The setting ID can be one of the following.

" + "UpdateServiceSettingRequest$SettingId": "

The Amazon Resource Name (ARN) of the service setting to reset. For example, arn:aws:ssm:us-east-1:111122223333:servicesetting/ssm/parameter-store/high-throughput-enabled. The setting ID can be one of the following.

" } }, "ServiceSettingNotFound": { @@ -7312,7 +7312,7 @@ "SessionFilterValue": { "base": null, "refs": { - "SessionFilter$value": "

The filter value. Valid values for each filter key are as follows:

" + "SessionFilter$value": "

The filter value. Valid values for each filter key are as follows:

" } }, "SessionId": { @@ -7383,7 +7383,7 @@ "SessionOwner": { "base": null, "refs": { - "Session$Owner": "

The ID of the Amazon Web Services user account that started the session.

" + "Session$Owner": "

The ID of the Amazon Web Services user that started the session.

" } }, "SessionReason": { @@ -7422,7 +7422,7 @@ } }, "SharedDocumentVersion": { - "base": "

The document version shared with other accounts. You can share Latest, Default or All versions.

", + "base": "

The document version shared with other Amazon Web Services accounts. You can share Latest, Default or All versions.

", "refs": { "AccountSharingInfo$SharedDocumentVersion": "

The version of the current document shared with the account.

", "ModifyDocumentPermissionRequest$SharedDocumentVersion": "

(Optional) The version of the document to share. If it isn't specified, the system choose the Default version to share.

" diff --git a/models/apis/ssm/2014-11-06/endpoint-rule-set-1.json b/models/apis/ssm/2014-11-06/endpoint-rule-set-1.json index 69b689a1f43..67ec4003d08 100644 --- a/models/apis/ssm/2014-11-06/endpoint-rule-set-1.json +++ b/models/apis/ssm/2014-11-06/endpoint-rule-set-1.json @@ -3,7 +3,7 @@ "parameters": { "Region": { "builtIn": "AWS::Region", - "required": true, + "required": false, "documentation": "The AWS region used to dispatch the request.", "type": "String" }, @@ -32,13 +32,12 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "isSet", "argv": [ { - "ref": "Region" + "ref": "Endpoint" } - ], - "assign": "PartitionResult" + ] } ], "type": "tree", @@ -46,14 +45,20 @@ { "conditions": [ { - "fn": "isSet", + "fn": "booleanEquals", "argv": [ { - "ref": "Endpoint" - } + "ref": "UseFIPS" + }, + true ] } ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], "type": "tree", "rules": [ { @@ -62,67 +67,42 @@ "fn": "booleanEquals", "argv": [ { - "ref": "UseFIPS" + "ref": "UseDualStack" }, true ] } ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", "type": "error" }, { "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" + "endpoint": { + "url": { + "ref": "Endpoint" }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" - }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, + } + ] + }, + { + "conditions": [], + "type": "tree", + "rules": [ { "conditions": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", + "fn": "isSet", "argv": [ { - "ref": "UseDualStack" - }, - true + "ref": "Region" + } ] } ], @@ -131,199 +111,263 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "aws.partition", "argv": [ - true, { - "fn": "getAttr", + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsFIPS" + true ] - } - ] - }, - { - "fn": "booleanEquals", - "argv": [ - true, + }, { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] }, - "supportsDualStack" + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://ssm-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" } ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://ssm-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsFIPS" + true ] } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], + ], "type": "tree", "rules": [ { "conditions": [ { - "fn": "stringEquals", + "fn": "booleanEquals", "argv": [ - "aws-us-gov", + true, { "fn": "getAttr", "argv": [ { "ref": "PartitionResult" }, - "name" + "supportsFIPS" ] } ] } ], - "endpoint": { - "url": "https://ssm.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + "aws-us-gov", + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "name" + ] + } + ] + } + ], + "endpoint": { + "url": "https://ssm.{Region}.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [], + "endpoint": { + "url": "https://ssm-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] }, { "conditions": [], - "endpoint": { - "url": "https://ssm-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" } ] - } - ] - }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" }, - "supportsDualStack" + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://ssm.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [], - "endpoint": { - "url": "https://ssm.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://ssm.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] } ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } ] }, { "conditions": [], - "endpoint": { - "url": "https://ssm.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } diff --git a/models/apis/ssm/2014-11-06/endpoint-tests-1.json b/models/apis/ssm/2014-11-06/endpoint-tests-1.json index fd49dce0806..efe5a0c640d 100644 --- a/models/apis/ssm/2014-11-06/endpoint-tests-1.json +++ b/models/apis/ssm/2014-11-06/endpoint-tests-1.json @@ -1,1722 +1,562 @@ { "testCases": [ { - "documentation": "For region ap-south-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.ap-south-2.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "ap-south-2", - "UseDualStack": true - } - }, - { - "documentation": "For region ap-south-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.ap-south-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "ap-south-2", - "UseDualStack": false - } - }, - { - "documentation": "For region ap-south-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.ap-south-2.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "ap-south-2", - "UseDualStack": true - } - }, - { - "documentation": "For region ap-south-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.ap-south-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "ap-south-2", - "UseDualStack": false - } - }, - { - "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.ap-south-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "ap-south-1", - "UseDualStack": true - } - }, - { - "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.ap-south-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "ap-south-1", - "UseDualStack": false - } - }, - { - "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.ap-south-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "ap-south-1", - "UseDualStack": true - } - }, - { - "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.ap-south-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "ap-south-1", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-south-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-south-1", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-south-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-south-1", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-south-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-south-1", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-south-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-south-1", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-south-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-south-2.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-south-2", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-south-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-south-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-south-2", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-south-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-south-2.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-south-2", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-south-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-south-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-south-2", - "UseDualStack": false - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.us-gov-east-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "us-gov-east-1", - "UseDualStack": true - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.us-gov-east-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "us-gov-east-1", - "UseDualStack": false - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.us-gov-east-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "us-gov-east-1", - "UseDualStack": true - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.us-gov-east-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "us-gov-east-1", - "UseDualStack": false - } - }, - { - "documentation": "For region me-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.me-central-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "me-central-1", - "UseDualStack": true - } - }, - { - "documentation": "For region me-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.me-central-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "me-central-1", - "UseDualStack": false - } - }, - { - "documentation": "For region me-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.me-central-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "me-central-1", - "UseDualStack": true - } - }, - { - "documentation": "For region me-central-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.me-central-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "me-central-1", - "UseDualStack": false - } - }, - { - "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.ca-central-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "ca-central-1", - "UseDualStack": true - } - }, - { - "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.ca-central-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "ca-central-1", - "UseDualStack": false - } - }, - { - "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.ca-central-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "ca-central-1", - "UseDualStack": true - } - }, - { - "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.ca-central-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "ca-central-1", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-central-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-central-1", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-central-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-central-1", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-central-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-central-1", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-central-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-central-1", - "UseDualStack": false - } - }, - { - "documentation": "For region us-iso-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "error": "FIPS and DualStack are enabled, but this partition does not support one or both" - }, - "params": { - "UseFIPS": true, - "Region": "us-iso-west-1", - "UseDualStack": true - } - }, - { - "documentation": "For region us-iso-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.us-iso-west-1.c2s.ic.gov" - } - }, - "params": { - "UseFIPS": true, - "Region": "us-iso-west-1", - "UseDualStack": false - } - }, - { - "documentation": "For region us-iso-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "error": "DualStack is enabled but this partition does not support DualStack" - }, - "params": { - "UseFIPS": false, - "Region": "us-iso-west-1", - "UseDualStack": true - } - }, - { - "documentation": "For region us-iso-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.us-iso-west-1.c2s.ic.gov" - } - }, - "params": { - "UseFIPS": false, - "Region": "us-iso-west-1", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-central-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-central-2.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-central-2", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-central-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-central-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-central-2", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-central-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-central-2.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-central-2", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-central-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-central-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-central-2", - "UseDualStack": false - } - }, - { - "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.us-west-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "us-west-1", - "UseDualStack": true - } - }, - { - "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.us-west-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "us-west-1", - "UseDualStack": false - } - }, - { - "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.us-west-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "us-west-1", - "UseDualStack": true - } - }, - { - "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.us-west-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "us-west-1", - "UseDualStack": false - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.us-west-2.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "us-west-2", - "UseDualStack": true - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.us-west-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "us-west-2", - "UseDualStack": false - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.us-west-2.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "us-west-2", - "UseDualStack": true - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.us-west-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "us-west-2", - "UseDualStack": false - } - }, - { - "documentation": "For region af-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.af-south-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "af-south-1", - "UseDualStack": true - } - }, - { - "documentation": "For region af-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.af-south-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "af-south-1", - "UseDualStack": false - } - }, - { - "documentation": "For region af-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.af-south-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "af-south-1", - "UseDualStack": true - } - }, - { - "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.af-south-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "af-south-1", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-north-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-north-1", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-north-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-north-1", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-north-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-north-1", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-north-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-north-1", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-west-3.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-west-3", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-west-3.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-west-3", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-west-3.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-west-3", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-west-3.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-west-3", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-west-2.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-west-2", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-west-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-west-2", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-west-2.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-west-2", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-west-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-west-2", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-west-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-west-1", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.eu-west-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "eu-west-1", - "UseDualStack": false - } - }, - { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-west-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-west-1", - "UseDualStack": true - } - }, - { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.eu-west-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "eu-west-1", - "UseDualStack": false - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.ap-northeast-3.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "ap-northeast-3", - "UseDualStack": true - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.ap-northeast-3.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "ap-northeast-3", - "UseDualStack": false - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.ap-northeast-3.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "ap-northeast-3", - "UseDualStack": true - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.ap-northeast-3.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "ap-northeast-3", - "UseDualStack": false - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.ap-northeast-2.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "ap-northeast-2", - "UseDualStack": true - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.ap-northeast-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "ap-northeast-2", - "UseDualStack": false - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.ap-northeast-2.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "ap-northeast-2", - "UseDualStack": true - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.ap-northeast-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "ap-northeast-2", - "UseDualStack": false - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.ap-northeast-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "ap-northeast-1", - "UseDualStack": true - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.ap-northeast-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "ap-northeast-1", - "UseDualStack": false - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.ap-northeast-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "ap-northeast-1", - "UseDualStack": true - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.ap-northeast-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "ap-northeast-1", - "UseDualStack": false - } - }, - { - "documentation": "For region me-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.me-south-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "me-south-1", - "UseDualStack": true - } - }, - { - "documentation": "For region me-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.me-south-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "me-south-1", - "UseDualStack": false - } - }, - { - "documentation": "For region me-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.me-south-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "me-south-1", - "UseDualStack": true - } - }, - { - "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm.me-south-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "Region": "me-south-1", - "UseDualStack": false - } - }, - { - "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.sa-east-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "sa-east-1", - "UseDualStack": true - } - }, - { - "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.sa-east-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "Region": "sa-east-1", - "UseDualStack": false - } - }, - { - "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm.sa-east-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "Region": "sa-east-1", - "UseDualStack": true - } - }, - { - "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.sa-east-1.amazonaws.com" + "url": "https://ssm.af-south-1.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "sa-east-1", - "UseDualStack": false + "Region": "af-south-1" } }, { - "documentation": "For region ap-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.ap-east-1.api.aws" + "url": "https://ssm.ap-east-1.amazonaws.com" } }, "params": { - "UseFIPS": true, - "Region": "ap-east-1", - "UseDualStack": true + "UseDualStack": false, + "UseFIPS": false, + "Region": "ap-east-1" } }, { - "documentation": "For region ap-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.ap-east-1.amazonaws.com" + "url": "https://ssm.ap-northeast-1.amazonaws.com" } }, "params": { - "UseFIPS": true, - "Region": "ap-east-1", - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false, + "Region": "ap-northeast-1" } }, { - "documentation": "For region ap-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.ap-east-1.api.aws" + "url": "https://ssm.ap-northeast-2.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-east-1", - "UseDualStack": true + "Region": "ap-northeast-2" } }, { - "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.ap-east-1.amazonaws.com" + "url": "https://ssm.ap-northeast-3.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-east-1", - "UseDualStack": false + "Region": "ap-northeast-3" } }, { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", + "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.cn-north-1.api.amazonwebservices.com.cn" + "url": "https://ssm.ap-south-1.amazonaws.com" } }, "params": { - "UseFIPS": true, - "Region": "cn-north-1", - "UseDualStack": true + "UseDualStack": false, + "UseFIPS": false, + "Region": "ap-south-1" } }, { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.cn-north-1.amazonaws.com.cn" + "url": "https://ssm.ap-southeast-1.amazonaws.com" } }, "params": { - "UseFIPS": true, - "Region": "cn-north-1", - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false, + "Region": "ap-southeast-1" } }, { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.cn-north-1.api.amazonwebservices.com.cn" + "url": "https://ssm.ap-southeast-2.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "cn-north-1", - "UseDualStack": true + "Region": "ap-southeast-2" } }, { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", + "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.cn-north-1.amazonaws.com.cn" + "url": "https://ssm.ap-southeast-3.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "cn-north-1", - "UseDualStack": false + "Region": "ap-southeast-3" } }, { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled", + "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.us-gov-west-1.api.aws" + "url": "https://ssm.ca-central-1.amazonaws.com" } }, "params": { - "UseFIPS": true, - "Region": "us-gov-west-1", - "UseDualStack": true + "UseDualStack": false, + "UseFIPS": false, + "Region": "ca-central-1" } }, { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.us-gov-west-1.amazonaws.com" + "url": "https://ssm-fips.ca-central-1.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-gov-west-1", - "UseDualStack": false + "Region": "ca-central-1" } }, { - "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled", + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.us-gov-west-1.api.aws" + "url": "https://ssm.eu-central-1.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-gov-west-1", - "UseDualStack": true + "Region": "eu-central-1" } }, { - "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", + "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.us-gov-west-1.amazonaws.com" + "url": "https://ssm.eu-north-1.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-gov-west-1", - "UseDualStack": false - } - }, - { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://ssm-fips.ap-southeast-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "Region": "ap-southeast-1", - "UseDualStack": true + "Region": "eu-north-1" } }, { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.ap-southeast-1.amazonaws.com" + "url": "https://ssm.eu-south-1.amazonaws.com" } }, "params": { - "UseFIPS": true, - "Region": "ap-southeast-1", - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false, + "Region": "eu-south-1" } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.ap-southeast-1.api.aws" + "url": "https://ssm.eu-west-1.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-southeast-1", - "UseDualStack": true + "Region": "eu-west-1" } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.ap-southeast-1.amazonaws.com" + "url": "https://ssm.eu-west-2.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-southeast-1", - "UseDualStack": false + "Region": "eu-west-2" } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.ap-southeast-2.api.aws" + "url": "https://ssm.eu-west-3.amazonaws.com" } }, "params": { - "UseFIPS": true, - "Region": "ap-southeast-2", - "UseDualStack": true + "UseDualStack": false, + "UseFIPS": false, + "Region": "eu-west-3" } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.ap-southeast-2.amazonaws.com" + "url": "https://ssm.me-south-1.amazonaws.com" } }, "params": { - "UseFIPS": true, - "Region": "ap-southeast-2", - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false, + "Region": "me-south-1" } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.ap-southeast-2.api.aws" + "url": "https://ssm.sa-east-1.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-southeast-2", - "UseDualStack": true + "Region": "sa-east-1" } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.ap-southeast-2.amazonaws.com" + "url": "https://ssm.us-east-1.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-southeast-2", - "UseDualStack": false - } - }, - { - "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "error": "FIPS and DualStack are enabled, but this partition does not support one or both" - }, - "params": { - "UseFIPS": true, - "Region": "us-iso-east-1", - "UseDualStack": true + "Region": "us-east-1" } }, { - "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.us-iso-east-1.c2s.ic.gov" + "url": "https://ssm-fips.us-east-1.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-iso-east-1", - "UseDualStack": false + "Region": "us-east-1" } }, { - "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "error": "DualStack is enabled but this partition does not support DualStack" - }, - "params": { - "UseFIPS": false, - "Region": "us-iso-east-1", - "UseDualStack": true - } - }, - { - "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.us-iso-east-1.c2s.ic.gov" + "url": "https://ssm.us-east-2.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-iso-east-1", - "UseDualStack": false + "Region": "us-east-2" } }, { - "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack enabled", + "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.ap-southeast-3.api.aws" + "url": "https://ssm-fips.us-east-2.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-southeast-3", - "UseDualStack": true + "Region": "us-east-2" } }, { - "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack disabled", + "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.ap-southeast-3.amazonaws.com" + "url": "https://ssm.us-west-1.amazonaws.com" } }, "params": { - "UseFIPS": true, - "Region": "ap-southeast-3", - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": false, + "Region": "us-west-1" } }, { - "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack enabled", + "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.ap-southeast-3.api.aws" + "url": "https://ssm-fips.us-west-1.amazonaws.com" } }, "params": { - "UseFIPS": false, - "Region": "ap-southeast-3", - "UseDualStack": true + "UseDualStack": false, + "UseFIPS": true, + "Region": "us-west-1" } }, { - "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled", + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.ap-southeast-3.amazonaws.com" + "url": "https://ssm.us-west-2.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-southeast-3", - "UseDualStack": false + "Region": "us-west-2" } }, { - "documentation": "For region ap-southeast-4 with FIPS enabled and DualStack enabled", + "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.ap-southeast-4.api.aws" + "url": "https://ssm-fips.us-west-2.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-southeast-4", - "UseDualStack": true + "Region": "us-west-2" } }, { - "documentation": "For region ap-southeast-4 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://ssm-fips.ap-southeast-4.amazonaws.com" + "url": "https://ssm-fips.us-east-1.api.aws" } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-southeast-4", - "UseDualStack": false + "Region": "us-east-1" } }, { - "documentation": "For region ap-southeast-4 with FIPS disabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://ssm.ap-southeast-4.api.aws" + "url": "https://ssm.us-east-1.api.aws" } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-southeast-4", - "UseDualStack": true + "Region": "us-east-1" } }, { - "documentation": "For region ap-southeast-4 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.ap-southeast-4.amazonaws.com" + "url": "https://ssm.cn-north-1.amazonaws.com.cn" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-southeast-4", - "UseDualStack": false + "Region": "cn-north-1" } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.us-east-1.api.aws" + "url": "https://ssm.cn-northwest-1.amazonaws.com.cn" } }, "params": { - "UseFIPS": true, - "Region": "us-east-1", - "UseDualStack": true + "UseDualStack": false, + "UseFIPS": false, + "Region": "cn-northwest-1" } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://ssm-fips.us-east-1.amazonaws.com" + "url": "https://ssm-fips.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-east-1", - "UseDualStack": false + "Region": "cn-north-1" } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.us-east-1.api.aws" + "url": "https://ssm-fips.cn-north-1.amazonaws.com.cn" } }, "params": { - "UseFIPS": false, - "Region": "us-east-1", - "UseDualStack": true + "UseDualStack": false, + "UseFIPS": true, + "Region": "cn-north-1" } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://ssm.us-east-1.amazonaws.com" + "url": "https://ssm.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-east-1", - "UseDualStack": false + "Region": "cn-north-1" } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.us-east-2.api.aws" + "url": "https://ssm.us-gov-east-1.amazonaws.com" } }, "params": { - "UseFIPS": true, - "Region": "us-east-2", - "UseDualStack": true + "UseDualStack": false, + "UseFIPS": false, + "Region": "us-gov-east-1" } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm-fips.us-east-2.amazonaws.com" + "url": "https://ssm.us-gov-east-1.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-east-2", - "UseDualStack": false + "Region": "us-gov-east-1" } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.us-east-2.api.aws" + "url": "https://ssm.us-gov-west-1.amazonaws.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-east-2", - "UseDualStack": true + "Region": "us-gov-west-1" } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.us-east-2.amazonaws.com" + "url": "https://ssm.us-gov-west-1.amazonaws.com" } }, "params": { - "UseFIPS": false, - "Region": "us-east-2", - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": true, + "Region": "us-gov-west-1" } }, { - "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://ssm-fips.cn-northwest-1.api.amazonwebservices.com.cn" + "url": "https://ssm-fips.us-gov-east-1.api.aws" } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "cn-northwest-1", - "UseDualStack": true + "Region": "us-gov-east-1" } }, { - "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://ssm-fips.cn-northwest-1.amazonaws.com.cn" + "url": "https://ssm.us-gov-east-1.api.aws" } }, "params": { - "UseFIPS": true, - "Region": "cn-northwest-1", - "UseDualStack": false + "UseDualStack": true, + "UseFIPS": false, + "Region": "us-gov-east-1" } }, { - "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.cn-northwest-1.api.amazonwebservices.com.cn" + "url": "https://ssm.us-iso-east-1.c2s.ic.gov" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "cn-northwest-1", - "UseDualStack": true + "Region": "us-iso-east-1" } }, { - "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://ssm.cn-northwest-1.amazonaws.com.cn" + "url": "https://ssm-fips.us-iso-east-1.c2s.ic.gov" } }, "params": { - "UseFIPS": false, - "Region": "cn-northwest-1", - "UseDualStack": false + "UseDualStack": false, + "UseFIPS": true, + "Region": "us-iso-east-1" } }, { - "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", "expect": { - "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + "endpoint": { + "url": "https://ssm.us-isob-east-1.sc2s.sgov.gov" + } }, "params": { - "UseFIPS": true, - "Region": "us-isob-east-1", - "UseDualStack": true + "UseDualStack": false, + "UseFIPS": false, + "Region": "us-isob-east-1" } }, { @@ -1727,46 +567,35 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-isob-east-1", - "UseDualStack": false - } - }, - { - "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "error": "DualStack is enabled but this partition does not support DualStack" - }, - "params": { - "UseFIPS": false, - "Region": "us-isob-east-1", - "UseDualStack": true + "Region": "us-isob-east-1" } }, { - "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", "expect": { "endpoint": { - "url": "https://ssm.us-isob-east-1.sc2s.sgov.gov" + "url": "https://example.com" } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-isob-east-1", - "UseDualStack": false + "Region": "us-east-1", + "Endpoint": "https://example.com" } }, { - "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", "expect": { "endpoint": { "url": "https://example.com" } }, "params": { - "UseFIPS": false, - "Region": "us-east-1", "UseDualStack": false, + "UseFIPS": false, "Endpoint": "https://example.com" } }, @@ -1776,9 +605,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { + "UseDualStack": false, "UseFIPS": true, "Region": "us-east-1", - "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -1788,9 +617,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { + "UseDualStack": true, "UseFIPS": false, "Region": "us-east-1", - "UseDualStack": true, "Endpoint": "https://example.com" } } diff --git a/service/chimesdkvoice/api.go b/service/chimesdkvoice/api.go index 03b7c264f08..80a04580993 100644 --- a/service/chimesdkvoice/api.go +++ b/service/chimesdkvoice/api.go @@ -12163,6 +12163,8 @@ func (s *ListVoiceConnectorsOutput) SetVoiceConnectors(v []*VoiceConnector) *Lis type LoggingConfiguration struct { _ struct{} `type:"structure"` + EnableMediaMetricLogs *bool `type:"boolean"` + EnableSIPLogs *bool `type:"boolean"` } @@ -12184,6 +12186,12 @@ func (s LoggingConfiguration) GoString() string { return s.String() } +// SetEnableMediaMetricLogs sets the EnableMediaMetricLogs field's value. +func (s *LoggingConfiguration) SetEnableMediaMetricLogs(v bool) *LoggingConfiguration { + s.EnableMediaMetricLogs = &v + return s +} + // SetEnableSIPLogs sets the EnableSIPLogs field's value. func (s *LoggingConfiguration) SetEnableSIPLogs(v bool) *LoggingConfiguration { s.EnableSIPLogs = &v diff --git a/service/cloudfront/api.go b/service/cloudfront/api.go index 00a621aef76..28517721bf9 100644 --- a/service/cloudfront/api.go +++ b/service/cloudfront/api.go @@ -485,10 +485,10 @@ func (c *CloudFront) CreateCachePolicyRequest(input *CreateCachePolicyInput) (re // want objects to stay in the CloudFront cache. // // The headers, cookies, and query strings that are included in the cache key -// are automatically included in requests that CloudFront sends to the origin. -// CloudFront sends a request when it can't find an object in its cache that -// matches the request's cache key. If you want to send values to the origin -// but not include them in the cache key, use OriginRequestPolicy. +// are also included in requests that CloudFront sends to the origin. CloudFront +// sends a request when it can't find an object in its cache that matches the +// request's cache key. If you want to send values to the origin but not include +// them in the cache key, use OriginRequestPolicy. // // For more information about cache policies, see Controlling the cache key // (https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/controlling-the-cache-key.html) @@ -12394,10 +12394,10 @@ func (s *CacheBehaviors) SetQuantity(v int64) *CacheBehaviors { // want objects to stay in the CloudFront cache. // // The headers, cookies, and query strings that are included in the cache key -// are automatically included in requests that CloudFront sends to the origin. -// CloudFront sends a request when it can't find a valid object in its cache -// that matches the request's cache key. If you want to send values to the origin -// but not include them in the cache key, use OriginRequestPolicy. +// are also included in requests that CloudFront sends to the origin. CloudFront +// sends a request when it can't find a valid object in its cache that matches +// the request's cache key. If you want to send values to the origin but not +// include them in the cache key, use OriginRequestPolicy. type CachePolicy struct { _ struct{} `type:"structure"` @@ -12466,10 +12466,10 @@ func (s *CachePolicy) SetLastModifiedTime(v time.Time) *CachePolicy { // want objects to stay in the CloudFront cache. // // The headers, cookies, and query strings that are included in the cache key -// are automatically included in requests that CloudFront sends to the origin. -// CloudFront sends a request when it can't find a valid object in its cache -// that matches the request's cache key. If you want to send values to the origin -// but not include them in the cache key, use OriginRequestPolicy. +// are also included in requests that CloudFront sends to the origin. CloudFront +// sends a request when it can't find a valid object in its cache that matches +// the request's cache key. If you want to send values to the origin but not +// include them in the cache key, use OriginRequestPolicy. type CachePolicyConfig struct { _ struct{} `type:"structure"` @@ -12517,8 +12517,8 @@ type CachePolicyConfig struct { Name *string `type:"string" required:"true"` // The HTTP headers, cookies, and URL query strings to include in the cache - // key. The values included in the cache key are automatically included in requests - // that CloudFront sends to the origin. + // key. The values included in the cache key are also included in requests that + // CloudFront sends to the origin. ParametersInCacheKeyAndForwardedToOrigin *ParametersInCacheKeyAndForwardedToOrigin `type:"structure"` } @@ -12598,31 +12598,29 @@ func (s *CachePolicyConfig) SetParametersInCacheKeyAndForwardedToOrigin(v *Param } // An object that determines whether any cookies in viewer requests (and if -// so, which cookies) are included in the cache key and automatically included -// in requests that CloudFront sends to the origin. +// so, which cookies) are included in the cache key and in requests that CloudFront +// sends to the origin. type CachePolicyCookiesConfig struct { _ struct{} `type:"structure"` // Determines whether any cookies in viewer requests are included in the cache - // key and automatically included in requests that CloudFront sends to the origin. - // Valid values are: + // key and in requests that CloudFront sends to the origin. Valid values are: // - // * none – Cookies in viewer requests are not included in the cache key - // and are not automatically included in requests that CloudFront sends to - // the origin. Even when this field is set to none, any cookies that are - // listed in an OriginRequestPolicy are included in origin requests. + // * none – No cookies in viewer requests are included in the cache key + // or in requests that CloudFront sends to the origin. Even when this field + // is set to none, any cookies that are listed in an OriginRequestPolicy + // are included in origin requests. // - // * whitelist – The cookies in viewer requests that are listed in the - // CookieNames type are included in the cache key and automatically included - // in requests that CloudFront sends to the origin. + // * whitelist – Only the cookies in viewer requests that are listed in + // the CookieNames type are included in the cache key and in requests that + // CloudFront sends to the origin. // - // * allExcept – All cookies in viewer requests that are not listed in - // the CookieNames type are included in the cache key and automatically included - // in requests that CloudFront sends to the origin. + // * allExcept – All cookies in viewer requests are included in the cache + // key and in requests that CloudFront sends to the origin, except for those + // that are listed in the CookieNames type, which are not included. // // * all – All cookies in viewer requests are included in the cache key - // and are automatically included in requests that CloudFront sends to the - // origin. + // and in requests that CloudFront sends to the origin. // // CookieBehavior is a required field CookieBehavior *string `type:"string" required:"true" enum:"CachePolicyCookieBehavior"` @@ -12680,22 +12678,22 @@ func (s *CachePolicyCookiesConfig) SetCookies(v *CookieNames) *CachePolicyCookie } // An object that determines whether any HTTP headers (and if so, which headers) -// are included in the cache key and automatically included in requests that -// CloudFront sends to the origin. +// are included in the cache key and in requests that CloudFront sends to the +// origin. type CachePolicyHeadersConfig struct { _ struct{} `type:"structure"` - // Determines whether any HTTP headers are included in the cache key and automatically - // included in requests that CloudFront sends to the origin. Valid values are: + // Determines whether any HTTP headers are included in the cache key and in + // requests that CloudFront sends to the origin. Valid values are: // - // * none – HTTP headers are not included in the cache key and are not - // automatically included in requests that CloudFront sends to the origin. - // Even when this field is set to none, any headers that are listed in an - // OriginRequestPolicy are included in origin requests. + // * none – No HTTP headers are included in the cache key or in requests + // that CloudFront sends to the origin. Even when this field is set to none, + // any headers that are listed in an OriginRequestPolicy are included in + // origin requests. // - // * whitelist – The HTTP headers that are listed in the Headers type are - // included in the cache key and are automatically included in requests that - // CloudFront sends to the origin. + // * whitelist – Only the HTTP headers that are listed in the Headers type + // are included in the cache key and in requests that CloudFront sends to + // the origin. // // HeaderBehavior is a required field HeaderBehavior *string `type:"string" required:"true" enum:"CachePolicyHeaderBehavior"` @@ -12819,41 +12817,40 @@ func (s *CachePolicyList) SetQuantity(v int64) *CachePolicyList { } // An object that determines whether any URL query strings in viewer requests -// (and if so, which query strings) are included in the cache key and automatically -// included in requests that CloudFront sends to the origin. +// (and if so, which query strings) are included in the cache key and in requests +// that CloudFront sends to the origin. type CachePolicyQueryStringsConfig struct { _ struct{} `type:"structure"` // Determines whether any URL query strings in viewer requests are included - // in the cache key and automatically included in requests that CloudFront sends - // to the origin. Valid values are: + // in the cache key and in requests that CloudFront sends to the origin. Valid + // values are: // - // * none – Query strings in viewer requests are not included in the cache - // key and are not automatically included in requests that CloudFront sends - // to the origin. Even when this field is set to none, any query strings - // that are listed in an OriginRequestPolicy are included in origin requests. + // * none – No query strings in viewer requests are included in the cache + // key or in requests that CloudFront sends to the origin. Even when this + // field is set to none, any query strings that are listed in an OriginRequestPolicy + // are included in origin requests. // - // * whitelist – The query strings in viewer requests that are listed in - // the QueryStringNames type are included in the cache key and automatically - // included in requests that CloudFront sends to the origin. + // * whitelist – Only the query strings in viewer requests that are listed + // in the QueryStringNames type are included in the cache key and in requests + // that CloudFront sends to the origin. // - // * allExcept – All query strings in viewer requests that are not listed - // in the QueryStringNames type are included in the cache key and automatically - // included in requests that CloudFront sends to the origin. + // * allExcept – All query strings in viewer requests are included in the + // cache key and in requests that CloudFront sends to the origin, except + // those that are listed in the QueryStringNames type, which are not included. // // * all – All query strings in viewer requests are included in the cache - // key and are automatically included in requests that CloudFront sends to - // the origin. + // key and in requests that CloudFront sends to the origin. // // QueryStringBehavior is a required field QueryStringBehavior *string `type:"string" required:"true" enum:"CachePolicyQueryStringBehavior"` // Contains the specific query strings in viewer requests that either are or - // are not included in the cache key and automatically included in requests - // that CloudFront sends to the origin. The behavior depends on whether the - // QueryStringBehavior field in the CachePolicyQueryStringsConfig type is set - // to whitelist (the listed query strings are included) or allExcept (the listed - // query strings are not included, but all other query strings are). + // are not included in the cache key and in requests that CloudFront sends to + // the origin. The behavior depends on whether the QueryStringBehavior field + // in the CachePolicyQueryStringsConfig type is set to whitelist (the listed + // query strings are included) or allExcept (the listed query strings are not + // included, but all other query strings are). QueryStrings *QueryStringNames `type:"structure"` } @@ -27779,17 +27776,21 @@ type OriginRequestPolicyCookiesConfig struct { // Determines whether cookies in viewer requests are included in requests that // CloudFront sends to the origin. Valid values are: // - // * none – Cookies in viewer requests are not included in requests that + // * none – No cookies in viewer requests are included in requests that // CloudFront sends to the origin. Even when this field is set to none, any // cookies that are listed in a CachePolicy are included in origin requests. // - // * whitelist – The cookies in viewer requests that are listed in the - // CookieNames type are included in requests that CloudFront sends to the - // origin. + // * whitelist – Only the cookies in viewer requests that are listed in + // the CookieNames type are included in requests that CloudFront sends to + // the origin. // // * all – All cookies in viewer requests are included in requests that // CloudFront sends to the origin. // + // * allExcept – All cookies in viewer requests are included in requests + // that CloudFront sends to the origin, except for those listed in the CookieNames + // type, which are not included. + // // CookieBehavior is a required field CookieBehavior *string `type:"string" required:"true" enum:"OriginRequestPolicyCookieBehavior"` @@ -27853,12 +27854,12 @@ type OriginRequestPolicyHeadersConfig struct { // Determines whether any HTTP headers are included in requests that CloudFront // sends to the origin. Valid values are: // - // * none – HTTP headers are not included in requests that CloudFront sends - // to the origin. Even when this field is set to none, any headers that are - // listed in a CachePolicy are included in origin requests. + // * none – No HTTP headers in viewer requests are included in requests + // that CloudFront sends to the origin. Even when this field is set to none, + // any headers that are listed in a CachePolicy are included in origin requests. // - // * whitelist – The HTTP headers that are listed in the Headers type are - // included in requests that CloudFront sends to the origin. + // * whitelist – Only the HTTP headers that are listed in the Headers type + // are included in requests that CloudFront sends to the origin. // // * allViewer – All HTTP headers in viewer requests are included in requests // that CloudFront sends to the origin. @@ -27868,6 +27869,10 @@ type OriginRequestPolicyHeadersConfig struct { // are included in requests that CloudFront sends to the origin. The additional // headers are added by CloudFront. // + // * allExcept – All HTTP headers in viewer requests are included in requests + // that CloudFront sends to the origin, except for those listed in the Headers + // type, which are not included. + // // HeaderBehavior is a required field HeaderBehavior *string `type:"string" required:"true" enum:"OriginRequestPolicyHeaderBehavior"` @@ -27998,23 +28003,30 @@ type OriginRequestPolicyQueryStringsConfig struct { // Determines whether any URL query strings in viewer requests are included // in requests that CloudFront sends to the origin. Valid values are: // - // * none – Query strings in viewer requests are not included in requests + // * none – No query strings in viewer requests are included in requests // that CloudFront sends to the origin. Even when this field is set to none, // any query strings that are listed in a CachePolicy are included in origin // requests. // - // * whitelist – The query strings in viewer requests that are listed in - // the QueryStringNames type are included in requests that CloudFront sends - // to the origin. + // * whitelist – Only the query strings in viewer requests that are listed + // in the QueryStringNames type are included in requests that CloudFront + // sends to the origin. // // * all – All query strings in viewer requests are included in requests // that CloudFront sends to the origin. // + // * allExcept – All query strings in viewer requests are included in requests + // that CloudFront sends to the origin, except for those listed in the QueryStringNames + // type, which are not included. + // // QueryStringBehavior is a required field QueryStringBehavior *string `type:"string" required:"true" enum:"OriginRequestPolicyQueryStringBehavior"` - // Contains a list of the query strings in viewer requests that are included - // in requests that CloudFront sends to the origin. + // Contains the specific query strings in viewer requests that either are or + // are not included in requests that CloudFront sends to the origin. The behavior + // depends on whether the QueryStringBehavior field in the OriginRequestPolicyQueryStringsConfig + // type is set to whitelist (the listed query strings are included) or allExcept + // (the listed query strings are not included, but all other query strings are). QueryStrings *QueryStringNames `type:"structure"` } @@ -28333,16 +28345,16 @@ func (s *Origins) SetQuantity(v int64) *Origins { // viewer. // // The headers, cookies, and query strings that are included in the cache key -// are automatically included in requests that CloudFront sends to the origin. -// CloudFront sends a request when it can't find an object in its cache that -// matches the request's cache key. If you want to send values to the origin -// but not include them in the cache key, use OriginRequestPolicy. +// are also included in requests that CloudFront sends to the origin. CloudFront +// sends a request when it can't find an object in its cache that matches the +// request's cache key. If you want to send values to the origin but not include +// them in the cache key, use OriginRequestPolicy. type ParametersInCacheKeyAndForwardedToOrigin struct { _ struct{} `type:"structure"` // An object that determines whether any cookies in viewer requests (and if - // so, which cookies) are included in the cache key and automatically included - // in requests that CloudFront sends to the origin. + // so, which cookies) are included in the cache key and in requests that CloudFront + // sends to the origin. // // CookiesConfig is a required field CookiesConfig *CachePolicyCookiesConfig `type:"structure" required:"true"` @@ -28410,15 +28422,15 @@ type ParametersInCacheKeyAndForwardedToOrigin struct { EnableAcceptEncodingGzip *bool `type:"boolean" required:"true"` // An object that determines whether any HTTP headers (and if so, which headers) - // are included in the cache key and automatically included in requests that - // CloudFront sends to the origin. + // are included in the cache key and in requests that CloudFront sends to the + // origin. // // HeadersConfig is a required field HeadersConfig *CachePolicyHeadersConfig `type:"structure" required:"true"` // An object that determines whether any URL query strings in viewer requests - // (and if so, which query strings) are included in the cache key and automatically - // included in requests that CloudFront sends to the origin. + // (and if so, which query strings) are included in the cache key and in requests + // that CloudFront sends to the origin. // // QueryStringsConfig is a required field QueryStringsConfig *CachePolicyQueryStringsConfig `type:"structure" required:"true"` @@ -35558,6 +35570,9 @@ const ( // OriginRequestPolicyCookieBehaviorAll is a OriginRequestPolicyCookieBehavior enum value OriginRequestPolicyCookieBehaviorAll = "all" + + // OriginRequestPolicyCookieBehaviorAllExcept is a OriginRequestPolicyCookieBehavior enum value + OriginRequestPolicyCookieBehaviorAllExcept = "allExcept" ) // OriginRequestPolicyCookieBehavior_Values returns all elements of the OriginRequestPolicyCookieBehavior enum @@ -35566,6 +35581,7 @@ func OriginRequestPolicyCookieBehavior_Values() []string { OriginRequestPolicyCookieBehaviorNone, OriginRequestPolicyCookieBehaviorWhitelist, OriginRequestPolicyCookieBehaviorAll, + OriginRequestPolicyCookieBehaviorAllExcept, } } @@ -35581,6 +35597,9 @@ const ( // OriginRequestPolicyHeaderBehaviorAllViewerAndWhitelistCloudFront is a OriginRequestPolicyHeaderBehavior enum value OriginRequestPolicyHeaderBehaviorAllViewerAndWhitelistCloudFront = "allViewerAndWhitelistCloudFront" + + // OriginRequestPolicyHeaderBehaviorAllExcept is a OriginRequestPolicyHeaderBehavior enum value + OriginRequestPolicyHeaderBehaviorAllExcept = "allExcept" ) // OriginRequestPolicyHeaderBehavior_Values returns all elements of the OriginRequestPolicyHeaderBehavior enum @@ -35590,6 +35609,7 @@ func OriginRequestPolicyHeaderBehavior_Values() []string { OriginRequestPolicyHeaderBehaviorWhitelist, OriginRequestPolicyHeaderBehaviorAllViewer, OriginRequestPolicyHeaderBehaviorAllViewerAndWhitelistCloudFront, + OriginRequestPolicyHeaderBehaviorAllExcept, } } @@ -35602,6 +35622,9 @@ const ( // OriginRequestPolicyQueryStringBehaviorAll is a OriginRequestPolicyQueryStringBehavior enum value OriginRequestPolicyQueryStringBehaviorAll = "all" + + // OriginRequestPolicyQueryStringBehaviorAllExcept is a OriginRequestPolicyQueryStringBehavior enum value + OriginRequestPolicyQueryStringBehaviorAllExcept = "allExcept" ) // OriginRequestPolicyQueryStringBehavior_Values returns all elements of the OriginRequestPolicyQueryStringBehavior enum @@ -35610,6 +35633,7 @@ func OriginRequestPolicyQueryStringBehavior_Values() []string { OriginRequestPolicyQueryStringBehaviorNone, OriginRequestPolicyQueryStringBehaviorWhitelist, OriginRequestPolicyQueryStringBehaviorAll, + OriginRequestPolicyQueryStringBehaviorAllExcept, } } diff --git a/service/cloudwatchrum/api.go b/service/cloudwatchrum/api.go index 5e2961e107d..5ffcb7a134a 100644 --- a/service/cloudwatchrum/api.go +++ b/service/cloudwatchrum/api.go @@ -56,19 +56,33 @@ func (c *CloudWatchRUM) BatchCreateRumMetricDefinitionsRequest(input *BatchCreat // BatchCreateRumMetricDefinitions API operation for CloudWatch RUM. // -// Specifies the extended metrics that you want a CloudWatch RUM app monitor -// to send to a destination. Valid destinations include CloudWatch and Evidently. +// Specifies the extended metrics and custom metrics that you want a CloudWatch +// RUM app monitor to send to a destination. Valid destinations include CloudWatch +// and Evidently. // // By default, RUM app monitors send some metrics to CloudWatch. These default // metrics are listed in CloudWatch metrics that you can collect with CloudWatch // RUM (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-RUM-metrics.html). // -// If you also send extended metrics, you can send metrics to Evidently as well -// as CloudWatch, and you can also optionally send the metrics with additional -// dimensions. The valid dimension names for the additional dimensions are BrowserName, -// CountryCode, DeviceType, FileType, OSName, and PageId. For more information, -// see Extended metrics that you can send to CloudWatch and CloudWatch Evidently -// (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-RUM-vended-metrics.html). +// In addition to these default metrics, you can choose to send extended metrics +// or custom metrics or both. +// +// - Extended metrics enable you to send metrics with additional dimensions +// not included in the default metrics. You can also send extended metrics +// to Evidently as well as CloudWatch. The valid dimension names for the +// additional dimensions for extended metrics are BrowserName, CountryCode, +// DeviceType, FileType, OSName, and PageId. For more information, see Extended +// metrics that you can send to CloudWatch and CloudWatch Evidently (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-RUM-vended-metrics.html). +// +// - Custom metrics are metrics that you define. You can send custom metrics +// to CloudWatch or to CloudWatch Evidently or to both. With custom metrics, +// you can use any metric name and namespace, and to derive the metrics you +// can use any custom events, built-in events, custom attributes, or default +// attributes. You can't send custom metrics to the AWS/RUM namespace. You +// must send custom metrics to a custom namespace that you define. The namespace +// that you use can't start with AWS/. CloudWatch RUM prepends RUM/CustomMetrics/ +// to the custom namespace that you define, so the final namespace for your +// metrics in CloudWatch is RUM/CustomMetrics/your-custom-namespace . // // The maximum number of metric definitions that you can specify in one BatchCreateRumMetricDefinitions // operation is 200. @@ -76,9 +90,10 @@ func (c *CloudWatchRUM) BatchCreateRumMetricDefinitionsRequest(input *BatchCreat // The maximum number of metric definitions that one destination can contain // is 2000. // -// Extended metrics sent are charged as CloudWatch custom metrics. Each combination -// of additional dimension name and dimension value counts as a custom metric. -// For more information, see Amazon CloudWatch Pricing (https://aws.amazon.com/cloudwatch/pricing/). +// Extended metrics sent to CloudWatch and RUM custom metrics are charged as +// CloudWatch custom metrics. Each combination of additional dimension name +// and dimension value counts as a custom metric. For more information, see +// Amazon CloudWatch Pricing (https://aws.amazon.com/cloudwatch/pricing/). // // You must have already created a destination for the metrics before you send // them. For more information, see PutRumMetricsDestination (https://docs.aws.amazon.com/cloudwatchrum/latest/APIReference/API_PutRumMetricsDestination.html). @@ -1451,7 +1466,8 @@ func (c *CloudWatchRUM) PutRumMetricsDestinationRequest(input *PutRumMetricsDest // RUM. You can send extended metrics to CloudWatch or to a CloudWatch Evidently // experiment. // -// For more information about extended metrics, see AddRumMetrics (https://docs.aws.amazon.com/cloudwatchrum/latest/APIReference/API_AddRumMetrics.html). +// For more information about extended metrics, see BatchCreateRumMetricDefinitions +// (https://docs.aws.amazon.com/cloudwatchrum/latest/APIReference/API_BatchCreateRumMetricDefinitions.html). // // 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 @@ -4037,6 +4053,11 @@ type MetricDefinition struct { // Name is a required field Name *string `min:"1" type:"string" required:"true"` + // If this metric definition is for a custom metric instead of an extended metric, + // this field displays the metric namespace that the custom metric is published + // to. + Namespace *string `min:"1" type:"string"` + // Use this field only if you are sending this metric to CloudWatch. It defines // the CloudWatch metric unit that this metric is measured in. UnitLabel *string `min:"1" type:"string"` @@ -4087,6 +4108,12 @@ func (s *MetricDefinition) SetName(v string) *MetricDefinition { return s } +// SetNamespace sets the Namespace field's value. +func (s *MetricDefinition) SetNamespace(v string) *MetricDefinition { + s.Namespace = &v + return s +} + // SetUnitLabel sets the UnitLabel field's value. func (s *MetricDefinition) SetUnitLabel(v string) *MetricDefinition { s.UnitLabel = &v @@ -4099,58 +4126,111 @@ func (s *MetricDefinition) SetValueKey(v string) *MetricDefinition { return s } -// Use this structure to define one extended metric that RUM will send to CloudWatch -// or CloudWatch Evidently. For more information, see Additional metrics that -// you can send to CloudWatch and CloudWatch Evidently (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-RUM-vended-metrics.html). +// Use this structure to define one extended metric or custom metric that RUM +// will send to CloudWatch or CloudWatch Evidently. For more information, see +// Additional metrics that you can send to CloudWatch and CloudWatch Evidently +// (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-RUM-vended-metrics.html). // -// Only certain combinations of values for Name, ValueKey, and EventPattern -// are valid. In addition to what is displayed in the list below, the EventPattern -// can also include information used by the DimensionKeys field. +// This structure is validated differently for extended metrics and custom metrics. +// For extended metrics that are sent to the AWS/RUM namespace, the following +// validations apply: // -// - If Name is PerformanceNavigationDuration, then ValueKeymust be event_details.duration -// and the EventPattern must include {"event_type":["com.amazon.rum.performance_navigation_event"]} +// - The Namespace parameter must be omitted or set to AWS/RUM. // -// - If Name is PerformanceResourceDuration, then ValueKeymust be event_details.duration +// - Only certain combinations of values for Name, ValueKey, and EventPattern +// are valid. In addition to what is displayed in the list below, the EventPattern +// can also include information used by the DimensionKeys field. If Name +// is PerformanceNavigationDuration, then ValueKeymust be event_details.duration +// and the EventPattern must include {"event_type":["com.amazon.rum.performance_navigation_event"]} +// If Name is PerformanceResourceDuration, then ValueKeymust be event_details.duration // and the EventPattern must include {"event_type":["com.amazon.rum.performance_resource_event"]} -// -// - If Name is NavigationSatisfiedTransaction, then ValueKeymust be null +// If Name is NavigationSatisfiedTransaction, then ValueKeymust be null and +// the EventPattern must include { "event_type": ["com.amazon.rum.performance_navigation_event"], +// "event_details": { "duration": [{ "numeric": [">",2000] }] } } If Name +// is NavigationToleratedTransaction, then ValueKeymust be null and the EventPattern +// must include { "event_type": ["com.amazon.rum.performance_navigation_event"], +// "event_details": { "duration": [{ "numeric": [">=",2000,"<"8000] }] } +// } If Name is NavigationFrustratedTransaction, then ValueKeymust be null // and the EventPattern must include { "event_type": ["com.amazon.rum.performance_navigation_event"], -// "event_details": { "duration": [{ "numeric": [">",2000] }] } } +// "event_details": { "duration": [{ "numeric": [">=",8000] }] } } If Name +// is WebVitalsCumulativeLayoutShift, then ValueKeymust be event_details.value +// and the EventPattern must include {"event_type":["com.amazon.rum.cumulative_layout_shift_event"]} +// If Name is WebVitalsFirstInputDelay, then ValueKeymust be event_details.value +// and the EventPattern must include {"event_type":["com.amazon.rum.first_input_delay_event"]} +// If Name is WebVitalsLargestContentfulPaint, then ValueKeymust be event_details.value +// and the EventPattern must include {"event_type":["com.amazon.rum.largest_contentful_paint_event"]} +// If Name is JsErrorCount, then ValueKeymust be null and the EventPattern +// must include {"event_type":["com.amazon.rum.js_error_event"]} If Name +// is HttpErrorCount, then ValueKeymust be null and the EventPattern must +// include {"event_type":["com.amazon.rum.http_event"]} If Name is SessionCount, +// then ValueKeymust be null and the EventPattern must include {"event_type":["com.amazon.rum.session_start_event"]} // -// - If Name is NavigationToleratedTransaction, then ValueKeymust be null -// and the EventPattern must include { "event_type": ["com.amazon.rum.performance_navigation_event"], -// "event_details": { "duration": [{ "numeric": [">=",2000,"<"8000] }] } -// } +// For custom metrics, the following validation rules apply: // -// - If Name is NavigationFrustratedTransaction, then ValueKeymust be null -// and the EventPattern must include { "event_type": ["com.amazon.rum.performance_navigation_event"], -// "event_details": { "duration": [{ "numeric": [">=",8000] }] } } +// - The namespace can't be omitted and can't be AWS/RUM. You can use the +// AWS/RUM namespace only for extended metrics. // -// - If Name is WebVitalsCumulativeLayoutShift, then ValueKeymust be event_details.value -// and the EventPattern must include {"event_type":["com.amazon.rum.cumulative_layout_shift_event"]} +// - All dimensions listed in the DimensionKeys field must be present in +// the value of EventPattern. // -// - If Name is WebVitalsFirstInputDelay, then ValueKeymust be event_details.value -// and the EventPattern must include {"event_type":["com.amazon.rum.first_input_delay_event"]} +// - The values that you specify for ValueKey, EventPattern, and DimensionKeys +// must be fields in RUM events, so all first-level keys in these fields +// must be one of the keys in the list later in this section. // -// - If Name is WebVitalsLargestContentfulPaint, then ValueKeymust be event_details.value -// and the EventPattern must include {"event_type":["com.amazon.rum.largest_contentful_paint_event"]} +// - If you set a value for EventPattern, it must be a JSON object. +// +// - For every non-empty event_details, there must be a non-empty event_type. +// +// - If EventPattern contains an event_details field, it must also contain +// an event_type. For every built-in event_type that you use, you must use +// a value for event_details that corresponds to that event_type. For information +// about event details that correspond to event types, see RUM event details +// (https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-RUM-datacollected.html#CloudWatch-RUM-datacollected-eventDetails). +// +// - In EventPattern, any JSON array must contain only one value. +// +// Valid key values for first-level keys in the ValueKey, EventPattern, and +// DimensionKeys fields: +// +// - account_id +// +// - application_Id +// +// - application_version +// +// - application_name +// +// - batch_id +// +// - event_details // -// - If Name is JsErrorCount, then ValueKeymust be null and the EventPattern -// must include {"event_type":["com.amazon.rum.js_error_event"]} +// - event_id // -// - If Name is HttpErrorCount, then ValueKeymust be null and the EventPattern -// must include {"event_type":["com.amazon.rum.http_event"]} +// - event_interaction // -// - If Name is SessionCount, then ValueKeymust be null and the EventPattern -// must include {"event_type":["com.amazon.rum.session_start_event"]} +// - event_timestamp +// +// - event_type +// +// - event_version +// +// - log_stream +// +// - metadata +// +// - sessionId +// +// - user_details +// +// - userId type MetricDefinitionRequest struct { _ struct{} `type:"structure"` // Use this field only if you are sending the metric to CloudWatch. // // This field is a map of field paths to dimension names. It defines the dimensions - // to associate with this metric in CloudWatch. Valid values for the entries - // in this field are the following: + // to associate with this metric in CloudWatch. For extended metrics, valid + // values for the entries in this field are the following: // // * "metadata.pageId": "PageId" // @@ -4164,7 +4244,8 @@ type MetricDefinitionRequest struct { // // * "event_details.fileType": "FileType" // - // All dimensions listed in this field must also be included in EventPattern. + // For both extended metrics and custom metrics, all dimensions listed in this + // field must also be included in EventPattern. DimensionKeys map[string]*string `type:"map"` // The pattern that defines the metric, specified as a JSON object. RUM checks @@ -4191,8 +4272,9 @@ type MetricDefinitionRequest struct { // in DimensionKeys, then the metric is published with the specified dimensions. EventPattern *string `type:"string"` - // The name for the metric that is defined in this structure. Valid values are - // the following: + // The name for the metric that is defined in this structure. For custom metrics, + // you can specify any name that you like. For extended metrics, valid values + // are the following: // // * PerformanceNavigationDuration // @@ -4219,6 +4301,13 @@ type MetricDefinitionRequest struct { // Name is a required field Name *string `min:"1" type:"string" required:"true"` + // If this structure is for a custom metric instead of an extended metrics, + // use this parameter to define the metric namespace for that custom metric. + // Do not specify this parameter if this structure is for an extended metric. + // + // You cannot use any string that starts with AWS/ for your namespace. + Namespace *string `min:"1" type:"string"` + // The CloudWatch metric unit to use for this metric. If you omit this field, // the metric is recorded with no unit. UnitLabel *string `min:"1" type:"string"` @@ -4261,6 +4350,9 @@ func (s *MetricDefinitionRequest) Validate() error { if s.Name != nil && len(*s.Name) < 1 { invalidParams.Add(request.NewErrParamMinLen("Name", 1)) } + if s.Namespace != nil && len(*s.Namespace) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Namespace", 1)) + } if s.UnitLabel != nil && len(*s.UnitLabel) < 1 { invalidParams.Add(request.NewErrParamMinLen("UnitLabel", 1)) } @@ -4292,6 +4384,12 @@ func (s *MetricDefinitionRequest) SetName(v string) *MetricDefinitionRequest { return s } +// SetNamespace sets the Namespace field's value. +func (s *MetricDefinitionRequest) SetNamespace(v string) *MetricDefinitionRequest { + s.Namespace = &v + return s +} + // SetUnitLabel sets the UnitLabel field's value. func (s *MetricDefinitionRequest) SetUnitLabel(v string) *MetricDefinitionRequest { s.UnitLabel = &v @@ -4370,7 +4468,7 @@ type PutRumEventsInput struct { // A unique identifier for this batch of RUM event data. // // BatchId is a required field - BatchId *string `type:"string" required:"true"` + BatchId *string `min:"36" type:"string" required:"true"` // The ID of the app monitor that is sending this data. // @@ -4416,6 +4514,9 @@ func (s *PutRumEventsInput) Validate() error { if s.BatchId == nil { invalidParams.Add(request.NewErrParamRequired("BatchId")) } + if s.BatchId != nil && len(*s.BatchId) < 36 { + invalidParams.Add(request.NewErrParamMinLen("BatchId", 36)) + } if s.Id == nil { invalidParams.Add(request.NewErrParamRequired("Id")) } @@ -4438,6 +4539,11 @@ func (s *PutRumEventsInput) Validate() error { } } } + if s.UserDetails != nil { + if err := s.UserDetails.Validate(); err != nil { + invalidParams.AddNested("UserDetails", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -4748,7 +4854,7 @@ type RumEvent struct { // A unique ID for this event. // // Id is a required field - Id *string `locationName:"id" type:"string" required:"true"` + Id *string `locationName:"id" min:"36" type:"string" required:"true"` // Metadata about this event, which contains a JSON serialization of the identity // of the user for this session. The user information comes from information @@ -4794,6 +4900,9 @@ func (s *RumEvent) Validate() error { if s.Id == nil { invalidParams.Add(request.NewErrParamRequired("Id")) } + if s.Id != nil && len(*s.Id) < 36 { + invalidParams.Add(request.NewErrParamMinLen("Id", 36)) + } if s.Timestamp == nil { invalidParams.Add(request.NewErrParamRequired("Timestamp")) } @@ -5474,11 +5583,11 @@ type UserDetails struct { _ struct{} `type:"structure"` // The session ID that the performance events are from. - SessionId *string `locationName:"sessionId" type:"string"` + SessionId *string `locationName:"sessionId" min:"36" type:"string"` // The ID of the user for this user session. This ID is generated by RUM and // does not include any personally identifiable information about the user. - UserId *string `locationName:"userId" type:"string"` + UserId *string `locationName:"userId" min:"36" type:"string"` } // String returns the string representation. @@ -5499,6 +5608,22 @@ func (s UserDetails) GoString() string { return s.String() } +// Validate inspects the fields of the type to determine if they are valid. +func (s *UserDetails) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UserDetails"} + if s.SessionId != nil && len(*s.SessionId) < 36 { + invalidParams.Add(request.NewErrParamMinLen("SessionId", 36)) + } + if s.UserId != nil && len(*s.UserId) < 36 { + invalidParams.Add(request.NewErrParamMinLen("UserId", 36)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + // SetSessionId sets the SessionId field's value. func (s *UserDetails) SetSessionId(v string) *UserDetails { s.SessionId = &v diff --git a/service/datasync/api.go b/service/datasync/api.go index 2236b35de15..ae4c249bdb8 100644 --- a/service/datasync/api.go +++ b/service/datasync/api.go @@ -5553,7 +5553,7 @@ type CreateLocationObjectStorageInput struct { // Specifies the access key (for example, a user name) if credentials are required // to authenticate with the object storage server. - AccessKey *string `min:"8" type:"string"` + AccessKey *string `min:"1" type:"string"` // Specifies the Amazon Resource Names (ARNs) of the DataSync agents that can // securely connect with your location. @@ -5572,7 +5572,7 @@ type CreateLocationObjectStorageInput struct { // SecretKey is a sensitive parameter and its value will be // replaced with "sensitive" in string returned by CreateLocationObjectStorageInput's // String and GoString methods. - SecretKey *string `min:"8" type:"string" sensitive:"true"` + SecretKey *string `min:"1" type:"string" sensitive:"true"` // Specifies a certificate to authenticate with an object storage system that // uses a private or self-signed certificate authority (CA). You must specify @@ -5628,8 +5628,8 @@ func (s CreateLocationObjectStorageInput) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *CreateLocationObjectStorageInput) Validate() error { invalidParams := request.ErrInvalidParams{Context: "CreateLocationObjectStorageInput"} - if s.AccessKey != nil && len(*s.AccessKey) < 8 { - invalidParams.Add(request.NewErrParamMinLen("AccessKey", 8)) + if s.AccessKey != nil && len(*s.AccessKey) < 1 { + invalidParams.Add(request.NewErrParamMinLen("AccessKey", 1)) } if s.AgentArns == nil { invalidParams.Add(request.NewErrParamRequired("AgentArns")) @@ -5643,8 +5643,8 @@ func (s *CreateLocationObjectStorageInput) Validate() error { if s.BucketName != nil && len(*s.BucketName) < 3 { invalidParams.Add(request.NewErrParamMinLen("BucketName", 3)) } - if s.SecretKey != nil && len(*s.SecretKey) < 8 { - invalidParams.Add(request.NewErrParamMinLen("SecretKey", 8)) + if s.SecretKey != nil && len(*s.SecretKey) < 1 { + invalidParams.Add(request.NewErrParamMinLen("SecretKey", 1)) } if s.ServerHostname == nil { invalidParams.Add(request.NewErrParamRequired("ServerHostname")) @@ -7650,7 +7650,7 @@ type DescribeLocationObjectStorageOutput struct { // The access key (for example, a user name) required to authenticate with the // object storage system. - AccessKey *string `min:"8" type:"string"` + AccessKey *string `min:"1" type:"string"` // The ARNs of the DataSync agents that can securely connect with your location. AgentArns []*string `min:"1" type:"list"` @@ -11497,7 +11497,7 @@ type UpdateLocationObjectStorageInput struct { // Specifies the access key (for example, a user name) if credentials are required // to authenticate with the object storage server. - AccessKey *string `min:"8" type:"string"` + AccessKey *string `min:"1" type:"string"` // Specifies the Amazon Resource Names (ARNs) of the DataSync agents that can // securely connect with your location. @@ -11514,7 +11514,7 @@ type UpdateLocationObjectStorageInput struct { // SecretKey is a sensitive parameter and its value will be // replaced with "sensitive" in string returned by UpdateLocationObjectStorageInput's // String and GoString methods. - SecretKey *string `min:"8" type:"string" sensitive:"true"` + SecretKey *string `min:"1" type:"string" sensitive:"true"` // Specifies a certificate to authenticate with an object storage system that // uses a private or self-signed certificate authority (CA). You must specify @@ -11561,8 +11561,8 @@ func (s UpdateLocationObjectStorageInput) GoString() string { // Validate inspects the fields of the type to determine if they are valid. func (s *UpdateLocationObjectStorageInput) Validate() error { invalidParams := request.ErrInvalidParams{Context: "UpdateLocationObjectStorageInput"} - if s.AccessKey != nil && len(*s.AccessKey) < 8 { - invalidParams.Add(request.NewErrParamMinLen("AccessKey", 8)) + if s.AccessKey != nil && len(*s.AccessKey) < 1 { + invalidParams.Add(request.NewErrParamMinLen("AccessKey", 1)) } if s.AgentArns != nil && len(s.AgentArns) < 1 { invalidParams.Add(request.NewErrParamMinLen("AgentArns", 1)) @@ -11570,8 +11570,8 @@ func (s *UpdateLocationObjectStorageInput) Validate() error { if s.LocationArn == nil { invalidParams.Add(request.NewErrParamRequired("LocationArn")) } - if s.SecretKey != nil && len(*s.SecretKey) < 8 { - invalidParams.Add(request.NewErrParamMinLen("SecretKey", 8)) + if s.SecretKey != nil && len(*s.SecretKey) < 1 { + invalidParams.Add(request.NewErrParamMinLen("SecretKey", 1)) } if s.ServerPort != nil && *s.ServerPort < 1 { invalidParams.Add(request.NewErrParamMinValue("ServerPort", 1)) diff --git a/service/opensearchservice/api.go b/service/opensearchservice/api.go index 1cae4d64f78..d37b4bcad93 100644 --- a/service/opensearchservice/api.go +++ b/service/opensearchservice/api.go @@ -70,14 +70,14 @@ func (c *OpenSearchService) AcceptInboundConnectionRequest(input *AcceptInboundC // Returned Error Types: // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - LimitExceededException // An exception for trying to create more than the allowed number of resources // or sub-resources. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/AcceptInboundConnection func (c *OpenSearchService) AcceptInboundConnection(input *AcceptInboundConnectionInput) (*AcceptInboundConnectionOutput, error) { @@ -166,7 +166,7 @@ func (c *OpenSearchService) AddTagsRequest(input *AddTagsInput) (req *request.Re // or sub-resources. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - InternalException // Request processing failed because of an unknown error, exception, or internal @@ -257,16 +257,16 @@ func (c *OpenSearchService) AssociatePackageRequest(input *AssociatePackageInput // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - AccessDeniedException // An error occurred because you don't have permissions to access the resource. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - ConflictException -// An error occurred because the client attempts to remove a resource that's +// An error occurred because the client attempts to remove a resource that is // currently in use. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/AssociatePackage @@ -347,17 +347,17 @@ func (c *OpenSearchService) AuthorizeVpcEndpointAccessRequest(input *AuthorizeVp // Returned Error Types: // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - LimitExceededException // An exception for trying to create more than the allowed number of resources // or sub-resources. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - InternalException // Request processing failed because of an unknown error, exception, or internal @@ -453,10 +453,10 @@ func (c *OpenSearchService) CancelServiceSoftwareUpdateRequest(input *CancelServ // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/CancelServiceSoftwareUpdate func (c *OpenSearchService) CancelServiceSoftwareUpdate(input *CancelServiceSoftwareUpdateInput) (*CancelServiceSoftwareUpdateOutput, error) { @@ -539,7 +539,7 @@ func (c *OpenSearchService) CreateDomainRequest(input *CreateDomainInput) (req * // An error occurred while processing the request. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - InternalException // Request processing failed because of an unknown error, exception, or internal @@ -557,7 +557,7 @@ func (c *OpenSearchService) CreateDomainRequest(input *CreateDomainInput) (req * // An exception for creating a resource that already exists. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/CreateDomain func (c *OpenSearchService) CreateDomain(input *CreateDomainInput) (*CreateDomainOutput, error) { @@ -649,7 +649,7 @@ func (c *OpenSearchService) CreateOutboundConnectionRequest(input *CreateOutboun // An exception for creating a resource that already exists. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/CreateOutboundConnection func (c *OpenSearchService) CreateOutboundConnection(input *CreateOutboundConnectionInput) (*CreateOutboundConnectionOutput, error) { @@ -750,7 +750,7 @@ func (c *OpenSearchService) CreatePackageRequest(input *CreatePackageInput) (req // An error occurred because you don't have permissions to access the resource. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/CreatePackage func (c *OpenSearchService) CreatePackage(input *CreatePackageInput) (*CreatePackageOutput, error) { @@ -829,11 +829,11 @@ func (c *OpenSearchService) CreateVpcEndpointRequest(input *CreateVpcEndpointInp // Returned Error Types: // // - ConflictException -// An error occurred because the client attempts to remove a resource that's +// An error occurred because the client attempts to remove a resource that is // currently in use. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - LimitExceededException // An exception for trying to create more than the allowed number of resources @@ -844,7 +844,7 @@ func (c *OpenSearchService) CreateVpcEndpointRequest(input *CreateVpcEndpointInp // failure. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - BaseException // An error occurred while processing the request. @@ -934,10 +934,10 @@ func (c *OpenSearchService) DeleteDomainRequest(input *DeleteDomainInput) (req * // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DeleteDomain func (c *OpenSearchService) DeleteDomain(input *DeleteDomainInput) (*DeleteDomainOutput, error) { @@ -1018,10 +1018,10 @@ func (c *OpenSearchService) DeleteInboundConnectionRequest(input *DeleteInboundC // Returned Error Types: // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DeleteInboundConnection func (c *OpenSearchService) DeleteInboundConnection(input *DeleteInboundConnectionInput) (*DeleteInboundConnectionOutput, error) { @@ -1102,10 +1102,10 @@ func (c *OpenSearchService) DeleteOutboundConnectionRequest(input *DeleteOutboun // Returned Error Types: // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DeleteOutboundConnection func (c *OpenSearchService) DeleteOutboundConnection(input *DeleteOutboundConnectionInput) (*DeleteOutboundConnectionOutput, error) { @@ -1192,16 +1192,16 @@ func (c *OpenSearchService) DeletePackageRequest(input *DeletePackageInput) (req // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - AccessDeniedException // An error occurred because you don't have permissions to access the resource. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - ConflictException -// An error occurred because the client attempts to remove a resource that's +// An error occurred because the client attempts to remove a resource that is // currently in use. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DeletePackage @@ -1281,10 +1281,10 @@ func (c *OpenSearchService) DeleteVpcEndpointRequest(input *DeleteVpcEndpointInp // Returned Error Types: // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - InternalException // Request processing failed because of an unknown error, exception, or internal @@ -1378,10 +1378,10 @@ func (c *OpenSearchService) DescribeDomainRequest(input *DescribeDomainInput) (r // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DescribeDomain func (c *OpenSearchService) DescribeDomain(input *DescribeDomainInput) (*DescribeDomainOutput, error) { @@ -1475,10 +1475,10 @@ func (c *OpenSearchService) DescribeDomainAutoTunesRequest(input *DescribeDomain // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DescribeDomainAutoTunes func (c *OpenSearchService) DescribeDomainAutoTunes(input *DescribeDomainAutoTunesInput) (*DescribeDomainAutoTunesOutput, error) { @@ -1617,10 +1617,10 @@ func (c *OpenSearchService) DescribeDomainChangeProgressRequest(input *DescribeD // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DescribeDomainChangeProgress func (c *OpenSearchService) DescribeDomainChangeProgress(input *DescribeDomainChangeProgressInput) (*DescribeDomainChangeProgressOutput, error) { @@ -1706,10 +1706,10 @@ func (c *OpenSearchService) DescribeDomainConfigRequest(input *DescribeDomainCon // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DescribeDomainConfig func (c *OpenSearchService) DescribeDomainConfig(input *DescribeDomainConfigInput) (*DescribeDomainConfigOutput, error) { @@ -1796,7 +1796,7 @@ func (c *OpenSearchService) DescribeDomainsRequest(input *DescribeDomainsInput) // failure. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DescribeDomains func (c *OpenSearchService) DescribeDomains(input *DescribeDomainsInput) (*DescribeDomainsOutput, error) { @@ -1884,13 +1884,13 @@ func (c *OpenSearchService) DescribeDryRunProgressRequest(input *DescribeDryRunP // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DescribeDryRunProgress func (c *OpenSearchService) DescribeDryRunProgress(input *DescribeDryRunProgressInput) (*DescribeDryRunProgressOutput, error) { @@ -1981,7 +1981,7 @@ func (c *OpenSearchService) DescribeInboundConnectionsRequest(input *DescribeInb // token. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DescribeInboundConnections func (c *OpenSearchService) DescribeInboundConnections(input *DescribeInboundConnectionsInput) (*DescribeInboundConnectionsOutput, error) { @@ -2127,10 +2127,10 @@ func (c *OpenSearchService) DescribeInstanceTypeLimitsRequest(input *DescribeIns // or sub-resources. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DescribeInstanceTypeLimits func (c *OpenSearchService) DescribeInstanceTypeLimits(input *DescribeInstanceTypeLimitsInput) (*DescribeInstanceTypeLimitsOutput, error) { @@ -2221,7 +2221,7 @@ func (c *OpenSearchService) DescribeOutboundConnectionsRequest(input *DescribeOu // token. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DescribeOutboundConnections func (c *OpenSearchService) DescribeOutboundConnections(input *DescribeOutboundConnectionsInput) (*DescribeOutboundConnectionsOutput, error) { @@ -2365,13 +2365,13 @@ func (c *OpenSearchService) DescribePackagesRequest(input *DescribePackagesInput // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - AccessDeniedException // An error occurred because you don't have permissions to access the resource. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DescribePackages func (c *OpenSearchService) DescribePackages(input *DescribePackagesInput) (*DescribePackagesOutput, error) { @@ -2509,13 +2509,13 @@ func (c *OpenSearchService) DescribeReservedInstanceOfferingsRequest(input *Desc // Returned Error Types: // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - InternalException // Request processing failed because of an unknown error, exception, or internal @@ -2657,17 +2657,17 @@ func (c *OpenSearchService) DescribeReservedInstancesRequest(input *DescribeRese // Returned Error Types: // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - InternalException // Request processing failed because of an unknown error, exception, or internal // failure. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DescribeReservedInstances func (c *OpenSearchService) DescribeReservedInstances(input *DescribeReservedInstancesInput) (*DescribeReservedInstancesOutput, error) { @@ -2797,14 +2797,14 @@ func (c *OpenSearchService) DescribeVpcEndpointsRequest(input *DescribeVpcEndpoi // Returned Error Types: // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - InternalException // Request processing failed because of an unknown error, exception, or internal // failure. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - BaseException // An error occurred while processing the request. @@ -2897,16 +2897,16 @@ func (c *OpenSearchService) DissociatePackageRequest(input *DissociatePackageInp // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - AccessDeniedException // An error occurred because you don't have permissions to access the resource. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - ConflictException -// An error occurred because the client attempts to remove a resource that's +// An error occurred because the client attempts to remove a resource that is // currently in use. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/DissociatePackage @@ -2990,13 +2990,13 @@ func (c *OpenSearchService) GetCompatibleVersionsRequest(input *GetCompatibleVer // An error occurred while processing the request. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - InternalException // Request processing failed because of an unknown error, exception, or internal @@ -3094,13 +3094,13 @@ func (c *OpenSearchService) GetPackageVersionHistoryRequest(input *GetPackageVer // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - AccessDeniedException // An error occurred because you don't have permissions to access the resource. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/GetPackageVersionHistory func (c *OpenSearchService) GetPackageVersionHistory(input *GetPackageVersionHistoryInput) (*GetPackageVersionHistoryOutput, error) { @@ -3240,13 +3240,13 @@ func (c *OpenSearchService) GetUpgradeHistoryRequest(input *GetUpgradeHistoryInp // An error occurred while processing the request. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - InternalException // Request processing failed because of an unknown error, exception, or internal @@ -3384,13 +3384,13 @@ func (c *OpenSearchService) GetUpgradeStatusRequest(input *GetUpgradeStatusInput // An error occurred while processing the request. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - InternalException // Request processing failed because of an unknown error, exception, or internal @@ -3477,7 +3477,7 @@ func (c *OpenSearchService) ListDomainNamesRequest(input *ListDomainNamesInput) // An error occurred while processing the request. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/ListDomainNames func (c *OpenSearchService) ListDomainNames(input *ListDomainNamesInput) (*ListDomainNamesOutput, error) { @@ -3570,13 +3570,13 @@ func (c *OpenSearchService) ListDomainsForPackageRequest(input *ListDomainsForPa // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - AccessDeniedException // An error occurred because you don't have permissions to access the resource. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/ListDomainsForPackage func (c *OpenSearchService) ListDomainsForPackage(input *ListDomainsForPackageInput) (*ListDomainsForPackageOutput, error) { @@ -3720,10 +3720,10 @@ func (c *OpenSearchService) ListInstanceTypeDetailsRequest(input *ListInstanceTy // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/ListInstanceTypeDetails func (c *OpenSearchService) ListInstanceTypeDetails(input *ListInstanceTypeDetailsInput) (*ListInstanceTypeDetailsOutput, error) { @@ -3867,13 +3867,13 @@ func (c *OpenSearchService) ListPackagesForDomainRequest(input *ListPackagesForD // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - AccessDeniedException // An error occurred because you don't have permissions to access the resource. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/ListPackagesForDomain func (c *OpenSearchService) ListPackagesForDomain(input *ListPackagesForDomainInput) (*ListPackagesForDomainOutput, error) { @@ -3948,6 +3948,158 @@ func (c *OpenSearchService) ListPackagesForDomainPagesWithContext(ctx aws.Contex return p.Err() } +const opListScheduledActions = "ListScheduledActions" + +// ListScheduledActionsRequest generates a "aws/request.Request" representing the +// client's request for the ListScheduledActions operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See ListScheduledActions for more information on using the ListScheduledActions +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the ListScheduledActionsRequest method. +// req, resp := client.ListScheduledActionsRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/ListScheduledActions +func (c *OpenSearchService) ListScheduledActionsRequest(input *ListScheduledActionsInput) (req *request.Request, output *ListScheduledActionsOutput) { + op := &request.Operation{ + Name: opListScheduledActions, + HTTPMethod: "GET", + HTTPPath: "/2021-01-01/opensearch/domain/{DomainName}/scheduledActions", + Paginator: &request.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, + } + + if input == nil { + input = &ListScheduledActionsInput{} + } + + output = &ListScheduledActionsOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListScheduledActions API operation for Amazon OpenSearch Service. +// +// Retrieves a list of configuration changes that are scheduled for a domain. +// These changes can be service software updates (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/service-software.html) +// or blue/green Auto-Tune enhancements (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/auto-tune.html#auto-tune-types). +// +// 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. +// +// See the AWS API reference guide for Amazon OpenSearch Service's +// API operation ListScheduledActions for usage and error information. +// +// Returned Error Types: +// +// - BaseException +// An error occurred while processing the request. +// +// - InternalException +// Request processing failed because of an unknown error, exception, or internal +// failure. +// +// - ResourceNotFoundException +// An exception for accessing or deleting a resource that does not exist.. +// +// - InvalidPaginationTokenException +// The request processing has failed because you provided an invalid pagination +// token. +// +// - ValidationException +// An exception for accessing or deleting a resource that doesn't exist. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/ListScheduledActions +func (c *OpenSearchService) ListScheduledActions(input *ListScheduledActionsInput) (*ListScheduledActionsOutput, error) { + req, out := c.ListScheduledActionsRequest(input) + return out, req.Send() +} + +// ListScheduledActionsWithContext is the same as ListScheduledActions with the addition of +// the ability to pass a context and additional request options. +// +// See ListScheduledActions for details on how to use this API operation. +// +// 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 *OpenSearchService) ListScheduledActionsWithContext(ctx aws.Context, input *ListScheduledActionsInput, opts ...request.Option) (*ListScheduledActionsOutput, error) { + req, out := c.ListScheduledActionsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// ListScheduledActionsPages iterates over the pages of a ListScheduledActions operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListScheduledActions method for more information on how to use this operation. +// +// Note: This operation can generate multiple requests to a service. +// +// // Example iterating over at most 3 pages of a ListScheduledActions operation. +// pageNum := 0 +// err := client.ListScheduledActionsPages(params, +// func(page *opensearchservice.ListScheduledActionsOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +func (c *OpenSearchService) ListScheduledActionsPages(input *ListScheduledActionsInput, fn func(*ListScheduledActionsOutput, bool) bool) error { + return c.ListScheduledActionsPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListScheduledActionsPagesWithContext same as ListScheduledActionsPages except +// it takes a Context and allows setting request options on the pages. +// +// 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 *OpenSearchService) ListScheduledActionsPagesWithContext(ctx aws.Context, input *ListScheduledActionsInput, fn func(*ListScheduledActionsOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListScheduledActionsInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListScheduledActionsRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListScheduledActionsOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + const opListTags = "ListTags" // ListTagsRequest generates a "aws/request.Request" representing the @@ -4007,10 +4159,10 @@ func (c *OpenSearchService) ListTagsRequest(input *ListTagsInput) (req *request. // An error occurred while processing the request. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - InternalException // Request processing failed because of an unknown error, exception, or internal @@ -4107,10 +4259,10 @@ func (c *OpenSearchService) ListVersionsRequest(input *ListVersionsInput) (req * // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/ListVersions func (c *OpenSearchService) ListVersions(input *ListVersionsInput) (*ListVersionsOutput, error) { @@ -4242,10 +4394,10 @@ func (c *OpenSearchService) ListVpcEndpointAccessRequest(input *ListVpcEndpointA // Returned Error Types: // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - InternalException // Request processing failed because of an unknown error, exception, or internal @@ -4336,7 +4488,7 @@ func (c *OpenSearchService) ListVpcEndpointsRequest(input *ListVpcEndpointsInput // failure. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - BaseException // An error occurred while processing the request. @@ -4423,10 +4575,10 @@ func (c *OpenSearchService) ListVpcEndpointsForDomainRequest(input *ListVpcEndpo // failure. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - BaseException // An error occurred while processing the request. @@ -4508,7 +4660,7 @@ func (c *OpenSearchService) PurchaseReservedInstanceOfferingRequest(input *Purch // Returned Error Types: // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ResourceAlreadyExistsException // An exception for creating a resource that already exists. @@ -4518,10 +4670,10 @@ func (c *OpenSearchService) PurchaseReservedInstanceOfferingRequest(input *Purch // or sub-resources. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - InternalException // Request processing failed because of an unknown error, exception, or internal @@ -4605,10 +4757,10 @@ func (c *OpenSearchService) RejectInboundConnectionRequest(input *RejectInboundC // Returned Error Types: // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/RejectInboundConnection func (c *OpenSearchService) RejectInboundConnection(input *RejectInboundConnectionInput) (*RejectInboundConnectionOutput, error) { @@ -4692,7 +4844,7 @@ func (c *OpenSearchService) RemoveTagsRequest(input *RemoveTagsInput) (req *requ // An error occurred while processing the request. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - InternalException // Request processing failed because of an unknown error, exception, or internal @@ -4777,13 +4929,13 @@ func (c *OpenSearchService) RevokeVpcEndpointAccessRequest(input *RevokeVpcEndpo // Returned Error Types: // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - InternalException // Request processing failed because of an unknown error, exception, or internal @@ -4878,10 +5030,10 @@ func (c *OpenSearchService) StartServiceSoftwareUpdateRequest(input *StartServic // failure. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/StartServiceSoftwareUpdate func (c *OpenSearchService) StartServiceSoftwareUpdate(input *StartServiceSoftwareUpdateInput) (*StartServiceSoftwareUpdateOutput, error) { @@ -4976,10 +5128,10 @@ func (c *OpenSearchService) UpdateDomainConfigRequest(input *UpdateDomainConfigI // or sub-resources. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/UpdateDomainConfig func (c *OpenSearchService) UpdateDomainConfig(input *UpdateDomainConfigInput) (*UpdateDomainConfigOutput, error) { @@ -5070,13 +5222,13 @@ func (c *OpenSearchService) UpdatePackageRequest(input *UpdatePackageInput) (req // or sub-resources. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - AccessDeniedException // An error occurred because you don't have permissions to access the resource. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/UpdatePackage func (c *OpenSearchService) UpdatePackage(input *UpdatePackageInput) (*UpdatePackageOutput, error) { @@ -5100,146 +5252,249 @@ func (c *OpenSearchService) UpdatePackageWithContext(ctx aws.Context, input *Upd return out, req.Send() } -const opUpdateVpcEndpoint = "UpdateVpcEndpoint" +const opUpdateScheduledAction = "UpdateScheduledAction" -// UpdateVpcEndpointRequest generates a "aws/request.Request" representing the -// client's request for the UpdateVpcEndpoint operation. The "output" return +// UpdateScheduledActionRequest generates a "aws/request.Request" representing the +// client's request for the UpdateScheduledAction operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // Use "Send" method on the returned Request to send the API call to the service. // the "output" return value is not valid until after Send returns without error. // -// See UpdateVpcEndpoint for more information on using the UpdateVpcEndpoint +// See UpdateScheduledAction for more information on using the UpdateScheduledAction // API call, and error handling. // // This method is useful when you want to inject custom logic or configuration // into the SDK's request lifecycle. Such as custom headers, or retry logic. // -// // Example sending a request using the UpdateVpcEndpointRequest method. -// req, resp := client.UpdateVpcEndpointRequest(params) +// // Example sending a request using the UpdateScheduledActionRequest method. +// req, resp := client.UpdateScheduledActionRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/UpdateVpcEndpoint -func (c *OpenSearchService) UpdateVpcEndpointRequest(input *UpdateVpcEndpointInput) (req *request.Request, output *UpdateVpcEndpointOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/UpdateScheduledAction +func (c *OpenSearchService) UpdateScheduledActionRequest(input *UpdateScheduledActionInput) (req *request.Request, output *UpdateScheduledActionOutput) { op := &request.Operation{ - Name: opUpdateVpcEndpoint, - HTTPMethod: "POST", - HTTPPath: "/2021-01-01/opensearch/vpcEndpoints/update", + Name: opUpdateScheduledAction, + HTTPMethod: "PUT", + HTTPPath: "/2021-01-01/opensearch/domain/{DomainName}/scheduledAction/update", } if input == nil { - input = &UpdateVpcEndpointInput{} + input = &UpdateScheduledActionInput{} } - output = &UpdateVpcEndpointOutput{} + output = &UpdateScheduledActionOutput{} req = c.newRequest(op, input, output) return } -// UpdateVpcEndpoint API operation for Amazon OpenSearch Service. +// UpdateScheduledAction API operation for Amazon OpenSearch Service. // -// Modifies an Amazon OpenSearch Service-managed interface VPC endpoint. +// Reschedules a planned domain configuration change for a later time. This +// change can be a scheduled service software update (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/service-software.html) +// or a blue/green Auto-Tune enhancement (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/auto-tune.html#auto-tune-types). // // 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. // // See the AWS API reference guide for Amazon OpenSearch Service's -// API operation UpdateVpcEndpoint for usage and error information. +// API operation UpdateScheduledAction for usage and error information. // // Returned Error Types: // -// - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. -// -// - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// - BaseException +// An error occurred while processing the request. // // - InternalException // Request processing failed because of an unknown error, exception, or internal // failure. // -// - ValidationException -// An exception for missing or invalid input fields. +// - ResourceNotFoundException +// An exception for accessing or deleting a resource that does not exist.. +// +// - SlotNotAvailableException +// An exception for attempting to schedule a domain action during an unavailable +// time slot. // // - ConflictException -// An error occurred because the client attempts to remove a resource that's +// An error occurred because the client attempts to remove a resource that is // currently in use. // -// - BaseException -// An error occurred while processing the request. +// - LimitExceededException +// An exception for trying to create more than the allowed number of resources +// or sub-resources. // -// See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/UpdateVpcEndpoint -func (c *OpenSearchService) UpdateVpcEndpoint(input *UpdateVpcEndpointInput) (*UpdateVpcEndpointOutput, error) { - req, out := c.UpdateVpcEndpointRequest(input) +// - ValidationException +// An exception for accessing or deleting a resource that doesn't exist. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/UpdateScheduledAction +func (c *OpenSearchService) UpdateScheduledAction(input *UpdateScheduledActionInput) (*UpdateScheduledActionOutput, error) { + req, out := c.UpdateScheduledActionRequest(input) return out, req.Send() } -// UpdateVpcEndpointWithContext is the same as UpdateVpcEndpoint with the addition of +// UpdateScheduledActionWithContext is the same as UpdateScheduledAction with the addition of // the ability to pass a context and additional request options. // -// See UpdateVpcEndpoint for details on how to use this API operation. +// See UpdateScheduledAction for details on how to use this API operation. // // 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 *OpenSearchService) UpdateVpcEndpointWithContext(ctx aws.Context, input *UpdateVpcEndpointInput, opts ...request.Option) (*UpdateVpcEndpointOutput, error) { - req, out := c.UpdateVpcEndpointRequest(input) +func (c *OpenSearchService) UpdateScheduledActionWithContext(ctx aws.Context, input *UpdateScheduledActionInput, opts ...request.Option) (*UpdateScheduledActionOutput, error) { + req, out := c.UpdateScheduledActionRequest(input) req.SetContext(ctx) req.ApplyOptions(opts...) return out, req.Send() } -const opUpgradeDomain = "UpgradeDomain" +const opUpdateVpcEndpoint = "UpdateVpcEndpoint" -// UpgradeDomainRequest generates a "aws/request.Request" representing the -// client's request for the UpgradeDomain operation. The "output" return +// UpdateVpcEndpointRequest generates a "aws/request.Request" representing the +// client's request for the UpdateVpcEndpoint operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // Use "Send" method on the returned Request to send the API call to the service. // the "output" return value is not valid until after Send returns without error. // -// See UpgradeDomain for more information on using the UpgradeDomain +// See UpdateVpcEndpoint for more information on using the UpdateVpcEndpoint // API call, and error handling. // // This method is useful when you want to inject custom logic or configuration // into the SDK's request lifecycle. Such as custom headers, or retry logic. // -// // Example sending a request using the UpgradeDomainRequest method. -// req, resp := client.UpgradeDomainRequest(params) +// // Example sending a request using the UpdateVpcEndpointRequest method. +// req, resp := client.UpdateVpcEndpointRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/UpgradeDomain -func (c *OpenSearchService) UpgradeDomainRequest(input *UpgradeDomainInput) (req *request.Request, output *UpgradeDomainOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/UpdateVpcEndpoint +func (c *OpenSearchService) UpdateVpcEndpointRequest(input *UpdateVpcEndpointInput) (req *request.Request, output *UpdateVpcEndpointOutput) { op := &request.Operation{ - Name: opUpgradeDomain, + Name: opUpdateVpcEndpoint, HTTPMethod: "POST", - HTTPPath: "/2021-01-01/opensearch/upgradeDomain", + HTTPPath: "/2021-01-01/opensearch/vpcEndpoints/update", } if input == nil { - input = &UpgradeDomainInput{} + input = &UpdateVpcEndpointInput{} } - output = &UpgradeDomainOutput{} + output = &UpdateVpcEndpointOutput{} req = c.newRequest(op, input, output) return } -// UpgradeDomain API operation for Amazon OpenSearch Service. +// UpdateVpcEndpoint API operation for Amazon OpenSearch Service. // -// Allows you to either upgrade your Amazon OpenSearch Service domain or perform +// Modifies an Amazon OpenSearch Service-managed interface VPC endpoint. +// +// 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. +// +// See the AWS API reference guide for Amazon OpenSearch Service's +// API operation UpdateVpcEndpoint for usage and error information. +// +// Returned Error Types: +// +// - ResourceNotFoundException +// An exception for accessing or deleting a resource that does not exist.. +// +// - DisabledOperationException +// An error occured because the client wanted to access a not supported operation. +// +// - InternalException +// Request processing failed because of an unknown error, exception, or internal +// failure. +// +// - ValidationException +// An exception for accessing or deleting a resource that doesn't exist. +// +// - ConflictException +// An error occurred because the client attempts to remove a resource that is +// currently in use. +// +// - BaseException +// An error occurred while processing the request. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/UpdateVpcEndpoint +func (c *OpenSearchService) UpdateVpcEndpoint(input *UpdateVpcEndpointInput) (*UpdateVpcEndpointOutput, error) { + req, out := c.UpdateVpcEndpointRequest(input) + return out, req.Send() +} + +// UpdateVpcEndpointWithContext is the same as UpdateVpcEndpoint with the addition of +// the ability to pass a context and additional request options. +// +// See UpdateVpcEndpoint for details on how to use this API operation. +// +// 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 *OpenSearchService) UpdateVpcEndpointWithContext(ctx aws.Context, input *UpdateVpcEndpointInput, opts ...request.Option) (*UpdateVpcEndpointOutput, error) { + req, out := c.UpdateVpcEndpointRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opUpgradeDomain = "UpgradeDomain" + +// UpgradeDomainRequest generates a "aws/request.Request" representing the +// client's request for the UpgradeDomain operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See UpgradeDomain for more information on using the UpgradeDomain +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the UpgradeDomainRequest method. +// req, resp := client.UpgradeDomainRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/opensearch-2021-01-01/UpgradeDomain +func (c *OpenSearchService) UpgradeDomainRequest(input *UpgradeDomainInput) (req *request.Request, output *UpgradeDomainOutput) { + op := &request.Operation{ + Name: opUpgradeDomain, + HTTPMethod: "POST", + HTTPPath: "/2021-01-01/opensearch/upgradeDomain", + } + + if input == nil { + input = &UpgradeDomainInput{} + } + + output = &UpgradeDomainOutput{} + req = c.newRequest(op, input, output) + return +} + +// UpgradeDomain API operation for Amazon OpenSearch Service. +// +// Allows you to either upgrade your Amazon OpenSearch Service domain or perform // an upgrade eligibility check to a compatible version of OpenSearch or Elasticsearch. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -5255,16 +5510,16 @@ func (c *OpenSearchService) UpgradeDomainRequest(input *UpgradeDomainInput) (req // An error occurred while processing the request. // // - ResourceNotFoundException -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. // // - ResourceAlreadyExistsException // An exception for creating a resource that already exists. // // - DisabledOperationException -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. // // - ValidationException -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. // // - InternalException // Request processing failed because of an unknown error, exception, or internal @@ -6298,6 +6553,10 @@ func (s *AutoTuneDetails) SetScheduledAutoTuneDetails(v *ScheduledAutoTuneDetail return s } +// This object is deprecated. Use the domain's off-peak window (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/off-peak.html) +// to schedule Auto-Tune optimizations. For migration instructions, see Migrating +// from Auto-Tune maintenance windows (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/off-peak.html#off-peak-migrate). +// // The Auto-Tune maintenance schedule. For more information, see Auto-Tune for // Amazon OpenSearch Service (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/auto-tune.html). type AutoTuneMaintenanceSchedule struct { @@ -6374,6 +6633,9 @@ type AutoTuneOptions struct { // Whether Auto-Tune is enabled or disabled. DesiredState *string `type:"string" enum:"AutoTuneDesiredState"` + // DEPRECATED. Use off-peak window (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/off-peak.html) + // instead. + // // A list of maintenance schedules during which Auto-Tune can deploy changes. MaintenanceSchedules []*AutoTuneMaintenanceSchedule `type:"list"` @@ -6382,6 +6644,10 @@ type AutoTuneOptions struct { // If you specify DEFAULT_ROLLBACK, you must include a MaintenanceSchedule in // the request. Otherwise, OpenSearch Service is unable to perform the rollback. RollbackOnDisable *string `type:"string" enum:"RollbackOnDisable"` + + // Whether to use the domain's off-peak window (https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_OffPeakWindow.html) + // to deploy configuration changes on the domain rather than a maintenance schedule. + UseOffPeakWindow *bool `type:"boolean"` } // String returns the string representation. @@ -6440,8 +6706,14 @@ func (s *AutoTuneOptions) SetRollbackOnDisable(v string) *AutoTuneOptions { return s } +// SetUseOffPeakWindow sets the UseOffPeakWindow field's value. +func (s *AutoTuneOptions) SetUseOffPeakWindow(v bool) *AutoTuneOptions { + s.UseOffPeakWindow = &v + return s +} + // Options for configuring Auto-Tune. For more information, see Auto-Tune for -// Amazon OpenSearch Service (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/auto-tune.html). +// Amazon OpenSearch Service (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/auto-tune.html) type AutoTuneOptionsInput_ struct { _ struct{} `type:"structure"` @@ -6449,11 +6721,13 @@ type AutoTuneOptionsInput_ struct { DesiredState *string `type:"string" enum:"AutoTuneDesiredState"` // A list of maintenance schedules during which Auto-Tune can deploy changes. - // Maintenance schedules are overwrite, not append. If your request includes - // no schedules, the request deletes all existing schedules. To preserve existing - // schedules, make a call to DescribeDomainConfig first and use the MaintenanceSchedules - // portion of the response as the basis for this section. + // Maintenance windows are deprecated and have been replaced with off-peak windows + // (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/off-peak.html). MaintenanceSchedules []*AutoTuneMaintenanceSchedule `type:"list"` + + // Whether to schedule Auto-Tune optimizations that require blue/green deployments + // during the domain's configured daily off-peak window. + UseOffPeakWindow *bool `type:"boolean"` } // String returns the string representation. @@ -6506,6 +6780,12 @@ func (s *AutoTuneOptionsInput_) SetMaintenanceSchedules(v []*AutoTuneMaintenance return s } +// SetUseOffPeakWindow sets the UseOffPeakWindow field's value. +func (s *AutoTuneOptionsInput_) SetUseOffPeakWindow(v bool) *AutoTuneOptionsInput_ { + s.UseOffPeakWindow = &v + return s +} + // The Auto-Tune settings for a domain, displayed when enabling or disabling // Auto-Tune. type AutoTuneOptionsOutput_ struct { @@ -6516,6 +6796,10 @@ type AutoTuneOptionsOutput_ struct { // The current state of Auto-Tune on the domain. State *string `type:"string" enum:"AutoTuneState"` + + // Whether the domain's off-peak window will be used to deploy Auto-Tune changes + // rather than a maintenance schedule. + UseOffPeakWindow *bool `type:"boolean"` } // String returns the string representation. @@ -6548,6 +6832,12 @@ func (s *AutoTuneOptionsOutput_) SetState(v string) *AutoTuneOptionsOutput_ { return s } +// SetUseOffPeakWindow sets the UseOffPeakWindow field's value. +func (s *AutoTuneOptionsOutput_) SetUseOffPeakWindow(v bool) *AutoTuneOptionsOutput_ { + s.UseOffPeakWindow = &v + return s +} + // The Auto-Tune status for the domain. type AutoTuneOptionsStatus struct { _ struct{} `type:"structure"` @@ -7421,7 +7711,7 @@ func (s *CompatibleVersionsMap) SetTargetVersions(v []*string) *CompatibleVersio return s } -// An error occurred because the client attempts to remove a resource that's +// An error occurred because the client attempts to remove a resource that is // currently in use. type ConflictException struct { _ struct{} `type:"structure"` @@ -7594,10 +7884,20 @@ type CreateDomainInput struct { // Enables node-to-node encryption. NodeToNodeEncryptionOptions *NodeToNodeEncryptionOptions `type:"structure"` + // Specifies a daily 10-hour time block during which OpenSearch Service can + // perform configuration changes on the domain, including service software updates + // and Auto-Tune enhancements that require a blue/green deployment. If no options + // are specified, the default start time of 10:00 P.M. local time (for the Region + // that the domain is created in) is used. + OffPeakWindowOptions *OffPeakWindowOptions `type:"structure"` + // DEPRECATED. Container for the parameters required to configure automated // snapshots of domain indexes. SnapshotOptions *SnapshotOptions `type:"structure"` + // Software update options for the domain. + SoftwareUpdateOptions *SoftwareUpdateOptions `type:"structure"` + // List of tags to add to the domain upon creation. TagList []*Tag `type:"list"` @@ -7678,6 +7978,11 @@ func (s *CreateDomainInput) Validate() error { } } } + if s.OffPeakWindowOptions != nil { + if err := s.OffPeakWindowOptions.Validate(); err != nil { + invalidParams.AddNested("OffPeakWindowOptions", err.(request.ErrInvalidParams)) + } + } if s.TagList != nil { for i, v := range s.TagList { if v == nil { @@ -7773,12 +8078,24 @@ func (s *CreateDomainInput) SetNodeToNodeEncryptionOptions(v *NodeToNodeEncrypti return s } +// SetOffPeakWindowOptions sets the OffPeakWindowOptions field's value. +func (s *CreateDomainInput) SetOffPeakWindowOptions(v *OffPeakWindowOptions) *CreateDomainInput { + s.OffPeakWindowOptions = v + return s +} + // SetSnapshotOptions sets the SnapshotOptions field's value. func (s *CreateDomainInput) SetSnapshotOptions(v *SnapshotOptions) *CreateDomainInput { s.SnapshotOptions = v return s } +// SetSoftwareUpdateOptions sets the SoftwareUpdateOptions field's value. +func (s *CreateDomainInput) SetSoftwareUpdateOptions(v *SoftwareUpdateOptions) *CreateDomainInput { + s.SoftwareUpdateOptions = v + return s +} + // SetTagList sets the TagList field's value. func (s *CreateDomainInput) SetTagList(v []*Tag) *CreateDomainInput { s.TagList = v @@ -10037,7 +10354,7 @@ func (s *DescribeVpcEndpointsOutput) SetVpcEndpoints(v []*VpcEndpoint) *Describe return s } -// An error occured because the client wanted to access an unsupported operation. +// An error occured because the client wanted to access a not supported operation. type DisabledOperationException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -10232,7 +10549,7 @@ type DomainConfig struct { // for all traffic. DomainEndpointOptions *DomainEndpointOptionsStatus `type:"structure"` - // Container for EBS options configured for an OpenSearch Service domain. + // Container for EBS options configured for the domain. EBSOptions *EBSOptionsStatus `type:"structure"` // Key-value pairs to enable encryption at rest. @@ -10247,10 +10564,16 @@ type DomainConfig struct { // Whether node-to-node encryption is enabled or disabled. NodeToNodeEncryptionOptions *NodeToNodeEncryptionOptionsStatus `type:"structure"` + // Container for off-peak window options for the domain. + OffPeakWindowOptions *OffPeakWindowOptionsStatus `type:"structure"` + // DEPRECATED. Container for parameters required to configure automated snapshots // of domain indexes. SnapshotOptions *SnapshotOptionsStatus `type:"structure"` + // Software update options for the domain. + SoftwareUpdateOptions *SoftwareUpdateOptionsStatus `type:"structure"` + // The current VPC options for the domain and the status of any updates to their // configuration. VPCOptions *VPCDerivedInfoStatus `type:"structure"` @@ -10352,12 +10675,24 @@ func (s *DomainConfig) SetNodeToNodeEncryptionOptions(v *NodeToNodeEncryptionOpt return s } +// SetOffPeakWindowOptions sets the OffPeakWindowOptions field's value. +func (s *DomainConfig) SetOffPeakWindowOptions(v *OffPeakWindowOptionsStatus) *DomainConfig { + s.OffPeakWindowOptions = v + return s +} + // SetSnapshotOptions sets the SnapshotOptions field's value. func (s *DomainConfig) SetSnapshotOptions(v *SnapshotOptionsStatus) *DomainConfig { s.SnapshotOptions = v return s } +// SetSoftwareUpdateOptions sets the SoftwareUpdateOptions field's value. +func (s *DomainConfig) SetSoftwareUpdateOptions(v *SoftwareUpdateOptionsStatus) *DomainConfig { + s.SoftwareUpdateOptions = v + return s +} + // SetVPCOptions sets the VPCOptions field's value. func (s *DomainConfig) SetVPCOptions(v *VPCDerivedInfoStatus) *DomainConfig { s.VPCOptions = v @@ -10781,6 +11116,10 @@ type DomainStatus struct { // Whether node-to-node encryption is enabled or disabled. NodeToNodeEncryptionOptions *NodeToNodeEncryptionOptions `type:"structure"` + // Options that specify a custom 10-hour window during which OpenSearch Service + // can perform configuration changes on the domain. + OffPeakWindowOptions *OffPeakWindowOptions `type:"structure"` + // The status of the domain configuration. True if OpenSearch Service is processing // configuration changes. False if the configuration is active. Processing *bool `type:"boolean"` @@ -10792,6 +11131,9 @@ type DomainStatus struct { // of domain indexes. SnapshotOptions *SnapshotOptions `type:"structure"` + // Service software update options for the domain. + SoftwareUpdateOptions *SoftwareUpdateOptions `type:"structure"` + // The status of a domain version upgrade to a new version of OpenSearch or // Elasticsearch. True if OpenSearch Service is in the process of a version // upgrade. False if the configuration is active. @@ -10939,6 +11281,12 @@ func (s *DomainStatus) SetNodeToNodeEncryptionOptions(v *NodeToNodeEncryptionOpt return s } +// SetOffPeakWindowOptions sets the OffPeakWindowOptions field's value. +func (s *DomainStatus) SetOffPeakWindowOptions(v *OffPeakWindowOptions) *DomainStatus { + s.OffPeakWindowOptions = v + return s +} + // SetProcessing sets the Processing field's value. func (s *DomainStatus) SetProcessing(v bool) *DomainStatus { s.Processing = &v @@ -10957,6 +11305,12 @@ func (s *DomainStatus) SetSnapshotOptions(v *SnapshotOptions) *DomainStatus { return s } +// SetSoftwareUpdateOptions sets the SoftwareUpdateOptions field's value. +func (s *DomainStatus) SetSoftwareUpdateOptions(v *SoftwareUpdateOptions) *DomainStatus { + s.SoftwareUpdateOptions = v + return s +} + // SetUpgradeProcessing sets the UpgradeProcessing field's value. func (s *DomainStatus) SetUpgradeProcessing(v bool) *DomainStatus { s.UpgradeProcessing = &v @@ -12913,6 +13267,118 @@ func (s *ListPackagesForDomainOutput) SetNextToken(v string) *ListPackagesForDom return s } +type ListScheduledActionsInput struct { + _ struct{} `type:"structure" nopayload:"true"` + + // The name of the domain. + // + // DomainName is a required field + DomainName *string `location:"uri" locationName:"DomainName" min:"3" type:"string" required:"true"` + + // An optional parameter that specifies the maximum number of results to return. + // You can use nextToken to get the next page of results. + MaxResults *int64 `location:"querystring" locationName:"maxResults" type:"integer"` + + // If your initial ListScheduledActions operation returns a nextToken, you can + // include the returned nextToken in subsequent ListScheduledActions operations, + // which returns results in the next page. + NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListScheduledActionsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListScheduledActionsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListScheduledActionsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListScheduledActionsInput"} + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + if s.DomainName != nil && len(*s.DomainName) < 3 { + invalidParams.Add(request.NewErrParamMinLen("DomainName", 3)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDomainName sets the DomainName field's value. +func (s *ListScheduledActionsInput) SetDomainName(v string) *ListScheduledActionsInput { + s.DomainName = &v + return s +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListScheduledActionsInput) SetMaxResults(v int64) *ListScheduledActionsInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListScheduledActionsInput) SetNextToken(v string) *ListScheduledActionsInput { + s.NextToken = &v + return s +} + +type ListScheduledActionsOutput struct { + _ struct{} `type:"structure"` + + // When nextToken is returned, there are more results available. The value of + // nextToken is a unique pagination token for each page. Make the call again + // using the returned token to retrieve the next page. + NextToken *string `type:"string"` + + // A list of actions that are scheduled for the domain. + ScheduledActions []*ScheduledAction `type:"list"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListScheduledActionsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListScheduledActionsOutput) GoString() string { + return s.String() +} + +// SetNextToken sets the NextToken field's value. +func (s *ListScheduledActionsOutput) SetNextToken(v string) *ListScheduledActionsOutput { + s.NextToken = &v + return s +} + +// SetScheduledActions sets the ScheduledActions field's value. +func (s *ListScheduledActionsOutput) SetScheduledActions(v []*ScheduledAction) *ListScheduledActionsOutput { + s.ScheduledActions = v + return s +} + // Container for the parameters to the ListTags operation. type ListTagsInput struct { _ struct{} `type:"structure" nopayload:"true"` @@ -13636,30 +14102,25 @@ func (s *NodeToNodeEncryptionOptionsStatus) SetStatus(v *OptionStatus) *NodeToNo return s } -// Provides the current status of an entity. -type OptionStatus struct { +// A custom 10-hour, low-traffic window during which OpenSearch Service can +// perform mandatory configuration changes on the domain. These actions can +// include scheduled service software updates and blue/green Auto-Tune enhancements. +// OpenSearch Service will schedule these actions during the window that you +// specify. +// +// If you don't specify a window start time, it defaults to 10:00 P.M. local +// time. +// +// For more information, see Defining off-peak maintenance windows for Amazon +// OpenSearch Service (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/off-peak.html). +type OffPeakWindow struct { _ struct{} `type:"structure"` - // The timestamp when the entity was created. - // - // CreationDate is a required field - CreationDate *time.Time `type:"timestamp" required:"true"` - - // Indicates whether the entity is being deleted. - PendingDeletion *bool `type:"boolean"` - - // The state of the entity. - // - // State is a required field - State *string `type:"string" required:"true" enum:"OptionState"` - - // The timestamp of the last time the entity was updated. - // - // UpdateDate is a required field - UpdateDate *time.Time `type:"timestamp" required:"true"` - - // The latest version of the entity. - UpdateVersion *int64 `type:"integer"` + // A custom start time for the off-peak window, in Coordinated Universal Time + // (UTC). The window length will always be 10 hours, so you can't specify an + // end time. For example, if you specify 11:00 P.M. UTC as a start time, the + // end time will automatically be set to 9:00 A.M. + WindowStartTime *WindowStartTime `type:"structure"` } // String returns the string representation. @@ -13667,7 +14128,7 @@ type OptionStatus struct { // API parameter values that are decorated as "sensitive" in the API will not // be included in the string output. The member name will be present, but the // value will be replaced with "sensitive". -func (s OptionStatus) String() string { +func (s OffPeakWindow) String() string { return awsutil.Prettify(s) } @@ -13676,7 +14137,177 @@ func (s OptionStatus) String() string { // API parameter values that are decorated as "sensitive" in the API will not // be included in the string output. The member name will be present, but the // value will be replaced with "sensitive". -func (s OptionStatus) GoString() string { +func (s OffPeakWindow) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *OffPeakWindow) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "OffPeakWindow"} + if s.WindowStartTime != nil { + if err := s.WindowStartTime.Validate(); err != nil { + invalidParams.AddNested("WindowStartTime", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetWindowStartTime sets the WindowStartTime field's value. +func (s *OffPeakWindow) SetWindowStartTime(v *WindowStartTime) *OffPeakWindow { + s.WindowStartTime = v + return s +} + +// Options for a domain's off-peak window (https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_OffPeakWindow.html), +// during which OpenSearch Service can perform mandatory configuration changes +// on the domain. +type OffPeakWindowOptions struct { + _ struct{} `type:"structure"` + + // Whether to enable an off-peak window. + // + // This option is only available when modifying a domain created prior to February + // 13, 2023, not when creating a new domain. All domains created after this + // date have the off-peak window enabled by default. You can't disable the off-peak + // window after it's enabled for a domain. + Enabled *bool `type:"boolean"` + + // Off-peak window settings for the domain. + OffPeakWindow *OffPeakWindow `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s OffPeakWindowOptions) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s OffPeakWindowOptions) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *OffPeakWindowOptions) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "OffPeakWindowOptions"} + if s.OffPeakWindow != nil { + if err := s.OffPeakWindow.Validate(); err != nil { + invalidParams.AddNested("OffPeakWindow", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetEnabled sets the Enabled field's value. +func (s *OffPeakWindowOptions) SetEnabled(v bool) *OffPeakWindowOptions { + s.Enabled = &v + return s +} + +// SetOffPeakWindow sets the OffPeakWindow field's value. +func (s *OffPeakWindowOptions) SetOffPeakWindow(v *OffPeakWindow) *OffPeakWindowOptions { + s.OffPeakWindow = v + return s +} + +// The status of off-peak window (https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_OffPeakWindow.html) +// options for a domain. +type OffPeakWindowOptionsStatus struct { + _ struct{} `type:"structure"` + + // The domain's off-peak window configuration. + Options *OffPeakWindowOptions `type:"structure"` + + // The current status of off-peak window options. + Status *OptionStatus `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s OffPeakWindowOptionsStatus) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s OffPeakWindowOptionsStatus) GoString() string { + return s.String() +} + +// SetOptions sets the Options field's value. +func (s *OffPeakWindowOptionsStatus) SetOptions(v *OffPeakWindowOptions) *OffPeakWindowOptionsStatus { + s.Options = v + return s +} + +// SetStatus sets the Status field's value. +func (s *OffPeakWindowOptionsStatus) SetStatus(v *OptionStatus) *OffPeakWindowOptionsStatus { + s.Status = v + return s +} + +// Provides the current status of an entity. +type OptionStatus struct { + _ struct{} `type:"structure"` + + // The timestamp when the entity was created. + // + // CreationDate is a required field + CreationDate *time.Time `type:"timestamp" required:"true"` + + // Indicates whether the entity is being deleted. + PendingDeletion *bool `type:"boolean"` + + // The state of the entity. + // + // State is a required field + State *string `type:"string" required:"true" enum:"OptionState"` + + // The timestamp of the last time the entity was updated. + // + // UpdateDate is a required field + UpdateDate *time.Time `type:"timestamp" required:"true"` + + // The latest version of the entity. + UpdateVersion *int64 `type:"integer"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s OptionStatus) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s OptionStatus) GoString() string { return s.String() } @@ -14719,7 +15350,7 @@ func (s *ResourceAlreadyExistsException) RequestID() string { return s.RespMetadata.RequestID } -// An exception for accessing or deleting a resource that doesn't exist. +// An exception for accessing or deleting a resource that does not exist.. type ResourceNotFoundException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -15116,6 +15747,121 @@ func (s *SAMLOptionsOutput_) SetSubjectKey(v string) *SAMLOptionsOutput_ { return s } +// Information about a scheduled configuration change for an OpenSearch Service +// domain. This actions can be a service software update (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/service-software.html) +// or a blue/green Auto-Tune enhancement (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/auto-tune.html#auto-tune-types). +type ScheduledAction struct { + _ struct{} `type:"structure"` + + // Whether or not the scheduled action is cancellable. + Cancellable *bool `type:"boolean"` + + // A description of the action to be taken. + Description *string `type:"string"` + + // The unique identifier of the scheduled action. + // + // Id is a required field + Id *string `type:"string" required:"true"` + + // Whether the action is required or optional. + Mandatory *bool `type:"boolean"` + + // Whether the action was scheduled manually (CUSTOMER, or by OpenSearch Service + // automatically (SYSTEM). + ScheduledBy *string `type:"string" enum:"ScheduledBy"` + + // The time when the change is scheduled to happen. + // + // ScheduledTime is a required field + ScheduledTime *int64 `type:"long" required:"true"` + + // The severity of the action. + // + // Severity is a required field + Severity *string `type:"string" required:"true" enum:"ActionSeverity"` + + // The current status of the scheduled action. + Status *string `type:"string" enum:"ActionStatus"` + + // The type of action that will be taken on the domain. + // + // Type is a required field + Type *string `type:"string" required:"true" enum:"ActionType"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ScheduledAction) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ScheduledAction) GoString() string { + return s.String() +} + +// SetCancellable sets the Cancellable field's value. +func (s *ScheduledAction) SetCancellable(v bool) *ScheduledAction { + s.Cancellable = &v + return s +} + +// SetDescription sets the Description field's value. +func (s *ScheduledAction) SetDescription(v string) *ScheduledAction { + s.Description = &v + return s +} + +// SetId sets the Id field's value. +func (s *ScheduledAction) SetId(v string) *ScheduledAction { + s.Id = &v + return s +} + +// SetMandatory sets the Mandatory field's value. +func (s *ScheduledAction) SetMandatory(v bool) *ScheduledAction { + s.Mandatory = &v + return s +} + +// SetScheduledBy sets the ScheduledBy field's value. +func (s *ScheduledAction) SetScheduledBy(v string) *ScheduledAction { + s.ScheduledBy = &v + return s +} + +// SetScheduledTime sets the ScheduledTime field's value. +func (s *ScheduledAction) SetScheduledTime(v int64) *ScheduledAction { + s.ScheduledTime = &v + return s +} + +// SetSeverity sets the Severity field's value. +func (s *ScheduledAction) SetSeverity(v string) *ScheduledAction { + s.Severity = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *ScheduledAction) SetStatus(v string) *ScheduledAction { + s.Status = &v + return s +} + +// SetType sets the Type field's value. +func (s *ScheduledAction) SetType(v string) *ScheduledAction { + s.Type = &v + return s +} + // Specifies details about a scheduled Auto-Tune action. For more information, // see Auto-Tune for Amazon OpenSearch Service (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/auto-tune.html). type ScheduledAutoTuneDetails struct { @@ -15277,6 +16023,75 @@ func (s *ServiceSoftwareOptions) SetUpdateStatus(v string) *ServiceSoftwareOptio return s } +// An exception for attempting to schedule a domain action during an unavailable +// time slot. +type SlotNotAvailableException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"message" type:"string"` + + // Alternate time slots during which OpenSearch Service has available capacity + // to schedule a domain action. + SlotSuggestions []*int64 `type:"list"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s SlotNotAvailableException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s SlotNotAvailableException) GoString() string { + return s.String() +} + +func newErrorSlotNotAvailableException(v protocol.ResponseMetadata) error { + return &SlotNotAvailableException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *SlotNotAvailableException) Code() string { + return "SlotNotAvailableException" +} + +// Message returns the exception's message. +func (s *SlotNotAvailableException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *SlotNotAvailableException) OrigErr() error { + return nil +} + +func (s *SlotNotAvailableException) Error() string { + return fmt.Sprintf("%s: %s\n%s", s.Code(), s.Message(), s.String()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *SlotNotAvailableException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *SlotNotAvailableException) RequestID() string { + return s.RespMetadata.RequestID +} + // The time, in UTC format, when OpenSearch Service takes a daily automated // snapshot of the specified domain. Default is 0 hours. type SnapshotOptions struct { @@ -15357,14 +16172,109 @@ func (s *SnapshotOptionsStatus) SetStatus(v *OptionStatus) *SnapshotOptionsStatu return s } +// Options for configuring service software updates for a domain. +type SoftwareUpdateOptions struct { + _ struct{} `type:"structure"` + + // Whether automatic service software updates are enabled for the domain. + AutoSoftwareUpdateEnabled *bool `type:"boolean"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s SoftwareUpdateOptions) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s SoftwareUpdateOptions) GoString() string { + return s.String() +} + +// SetAutoSoftwareUpdateEnabled sets the AutoSoftwareUpdateEnabled field's value. +func (s *SoftwareUpdateOptions) SetAutoSoftwareUpdateEnabled(v bool) *SoftwareUpdateOptions { + s.AutoSoftwareUpdateEnabled = &v + return s +} + +// The status of the service software options for a domain. +type SoftwareUpdateOptionsStatus struct { + _ struct{} `type:"structure"` + + // The service software update options for a domain. + Options *SoftwareUpdateOptions `type:"structure"` + + // The status of service software update options, including creation date and + // last updated date. + Status *OptionStatus `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s SoftwareUpdateOptionsStatus) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s SoftwareUpdateOptionsStatus) GoString() string { + return s.String() +} + +// SetOptions sets the Options field's value. +func (s *SoftwareUpdateOptionsStatus) SetOptions(v *SoftwareUpdateOptions) *SoftwareUpdateOptionsStatus { + s.Options = v + return s +} + +// SetStatus sets the Status field's value. +func (s *SoftwareUpdateOptionsStatus) SetStatus(v *OptionStatus) *SoftwareUpdateOptionsStatus { + s.Status = v + return s +} + // Container for the request parameters to the StartServiceSoftwareUpdate operation. type StartServiceSoftwareUpdateInput struct { _ struct{} `type:"structure"` + // The Epoch timestamp when you want the service software update to start. You + // only need to specify this parameter if you set ScheduleAt to TIMESTAMP. + DesiredStartTime *int64 `type:"long"` + // The name of the domain that you want to update to the latest service software. // // DomainName is a required field DomainName *string `min:"3" type:"string" required:"true"` + + // When to start the service software update. + // + // * NOW - Immediately schedules the update to happen in the current hour + // if there's capacity available. + // + // * TIMESTAMP - Lets you specify a custom date and time to apply the update. + // If you specify this value, you must also provide a value for DesiredStartTime. + // + // * OFF_PEAK_WINDOW - Marks the update to be picked up during an upcoming + // off-peak window. There's no guarantee that the update will happen during + // the next immediate window. Depending on capacity, it might happen in subsequent + // days. + // + // Default: NOW if you don't specify a value for DesiredStartTime, and TIMESTAMP + // if you do. + ScheduleAt *string `type:"string" enum:"ScheduleAt"` } // String returns the string representation. @@ -15401,12 +16311,24 @@ func (s *StartServiceSoftwareUpdateInput) Validate() error { return nil } +// SetDesiredStartTime sets the DesiredStartTime field's value. +func (s *StartServiceSoftwareUpdateInput) SetDesiredStartTime(v int64) *StartServiceSoftwareUpdateInput { + s.DesiredStartTime = &v + return s +} + // SetDomainName sets the DomainName field's value. func (s *StartServiceSoftwareUpdateInput) SetDomainName(v string) *StartServiceSoftwareUpdateInput { s.DomainName = &v return s } +// SetScheduleAt sets the ScheduleAt field's value. +func (s *StartServiceSoftwareUpdateInput) SetScheduleAt(v string) *StartServiceSoftwareUpdateInput { + s.ScheduleAt = &v + return s +} + // Represents the output of a StartServiceSoftwareUpdate operation. Contains // the status of the update. type StartServiceSoftwareUpdateOutput struct { @@ -15695,16 +16617,22 @@ type UpdateDomainConfigInput struct { // Encryption at rest options for the domain. EncryptionAtRestOptions *EncryptionAtRestOptions `type:"structure"` - // Options to publish OpenSearch lots to Amazon CloudWatch Logs. + // Options to publish OpenSearch logs to Amazon CloudWatch Logs. LogPublishingOptions map[string]*LogPublishingOption `type:"map"` - // Node-To-Node Encryption options for the domain. + // Node-to-node encryption options for the domain. NodeToNodeEncryptionOptions *NodeToNodeEncryptionOptions `type:"structure"` + // Off-peak window options for the domain. + OffPeakWindowOptions *OffPeakWindowOptions `type:"structure"` + // Option to set the time, in UTC format, for the daily automated snapshot. // Default value is 0 hours. SnapshotOptions *SnapshotOptions `type:"structure"` + // Service software update options for the domain. + SoftwareUpdateOptions *SoftwareUpdateOptions `type:"structure"` + // Options to specify the subnets and security groups for a VPC endpoint. For // more information, see Launching your Amazon OpenSearch Service domains using // a VPC (https://docs.aws.amazon.com/opensearch-service/latest/developerguide/vpc.html). @@ -15778,6 +16706,11 @@ func (s *UpdateDomainConfigInput) Validate() error { } } } + if s.OffPeakWindowOptions != nil { + if err := s.OffPeakWindowOptions.Validate(); err != nil { + invalidParams.AddNested("OffPeakWindowOptions", err.(request.ErrInvalidParams)) + } + } if invalidParams.Len() > 0 { return invalidParams @@ -15869,12 +16802,24 @@ func (s *UpdateDomainConfigInput) SetNodeToNodeEncryptionOptions(v *NodeToNodeEn return s } +// SetOffPeakWindowOptions sets the OffPeakWindowOptions field's value. +func (s *UpdateDomainConfigInput) SetOffPeakWindowOptions(v *OffPeakWindowOptions) *UpdateDomainConfigInput { + s.OffPeakWindowOptions = v + return s +} + // SetSnapshotOptions sets the SnapshotOptions field's value. func (s *UpdateDomainConfigInput) SetSnapshotOptions(v *SnapshotOptions) *UpdateDomainConfigInput { s.SnapshotOptions = v return s } +// SetSoftwareUpdateOptions sets the SoftwareUpdateOptions field's value. +func (s *UpdateDomainConfigInput) SetSoftwareUpdateOptions(v *SoftwareUpdateOptions) *UpdateDomainConfigInput { + s.SoftwareUpdateOptions = v + return s +} + // SetVPCOptions sets the VPCOptions field's value. func (s *UpdateDomainConfigInput) SetVPCOptions(v *VPCOptions) *UpdateDomainConfigInput { s.VPCOptions = v @@ -16050,6 +16995,154 @@ func (s *UpdatePackageOutput) SetPackageDetails(v *PackageDetails) *UpdatePackag return s } +type UpdateScheduledActionInput struct { + _ struct{} `type:"structure"` + + // The unique identifier of the action to reschedule. To retrieve this ID, send + // a ListScheduledActions (https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_ListScheduledActions.html) + // request. + // + // ActionID is a required field + ActionID *string `type:"string" required:"true"` + + // The type of action to reschedule. Can be one of SERVICE_SOFTWARE_UPDATE, + // JVM_HEAP_SIZE_TUNING, or JVM_YOUNG_GEN_TUNING. To retrieve this value, send + // a ListScheduledActions (https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_ListScheduledActions.html) + // request. + // + // ActionType is a required field + ActionType *string `type:"string" required:"true" enum:"ActionType"` + + // The time to implement the change, in Coordinated Universal Time (UTC). Only + // specify this parameter if you set ScheduleAt to TIMESTAMP. + DesiredStartTime *int64 `type:"long"` + + // The name of the domain to reschedule an action for. + // + // DomainName is a required field + DomainName *string `location:"uri" locationName:"DomainName" min:"3" type:"string" required:"true"` + + // When to schedule the action. + // + // * NOW - Immediately schedules the update to happen in the current hour + // if there's capacity available. + // + // * TIMESTAMP - Lets you specify a custom date and time to apply the update. + // If you specify this value, you must also provide a value for DesiredStartTime. + // + // * OFF_PEAK_WINDOW - Marks the action to be picked up during an upcoming + // off-peak window. There's no guarantee that the change will be implemented + // during the next immediate window. Depending on capacity, it might happen + // in subsequent days. + // + // ScheduleAt is a required field + ScheduleAt *string `type:"string" required:"true" enum:"ScheduleAt"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s UpdateScheduledActionInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s UpdateScheduledActionInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UpdateScheduledActionInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UpdateScheduledActionInput"} + if s.ActionID == nil { + invalidParams.Add(request.NewErrParamRequired("ActionID")) + } + if s.ActionType == nil { + invalidParams.Add(request.NewErrParamRequired("ActionType")) + } + if s.DomainName == nil { + invalidParams.Add(request.NewErrParamRequired("DomainName")) + } + if s.DomainName != nil && len(*s.DomainName) < 3 { + invalidParams.Add(request.NewErrParamMinLen("DomainName", 3)) + } + if s.ScheduleAt == nil { + invalidParams.Add(request.NewErrParamRequired("ScheduleAt")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetActionID sets the ActionID field's value. +func (s *UpdateScheduledActionInput) SetActionID(v string) *UpdateScheduledActionInput { + s.ActionID = &v + return s +} + +// SetActionType sets the ActionType field's value. +func (s *UpdateScheduledActionInput) SetActionType(v string) *UpdateScheduledActionInput { + s.ActionType = &v + return s +} + +// SetDesiredStartTime sets the DesiredStartTime field's value. +func (s *UpdateScheduledActionInput) SetDesiredStartTime(v int64) *UpdateScheduledActionInput { + s.DesiredStartTime = &v + return s +} + +// SetDomainName sets the DomainName field's value. +func (s *UpdateScheduledActionInput) SetDomainName(v string) *UpdateScheduledActionInput { + s.DomainName = &v + return s +} + +// SetScheduleAt sets the ScheduleAt field's value. +func (s *UpdateScheduledActionInput) SetScheduleAt(v string) *UpdateScheduledActionInput { + s.ScheduleAt = &v + return s +} + +type UpdateScheduledActionOutput struct { + _ struct{} `type:"structure"` + + // Information about the rescheduled action. + ScheduledAction *ScheduledAction `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s UpdateScheduledActionOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s UpdateScheduledActionOutput) GoString() string { + return s.String() +} + +// SetScheduledAction sets the ScheduledAction field's value. +func (s *UpdateScheduledActionOutput) SetScheduledAction(v *ScheduledAction) *UpdateScheduledActionOutput { + s.ScheduledAction = v + return s +} + type UpdateVpcEndpointInput struct { _ struct{} `type:"structure"` @@ -16615,7 +17708,7 @@ func (s *VPCOptions) SetSubnetIds(v []*string) *VPCOptions { return s } -// An exception for missing or invalid input fields. +// An exception for accessing or deleting a resource that doesn't exist. type ValidationException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -16956,6 +18049,68 @@ func (s *VpcEndpointSummary) SetVpcEndpointOwner(v string) *VpcEndpointSummary { return s } +// The desired start time for an off-peak maintenance window (https://docs.aws.amazon.com/opensearch-service/latest/APIReference/API_OffPeakWindow.html). +type WindowStartTime struct { + _ struct{} `type:"structure"` + + // The start hour of the window in Coordinated Universal Time (UTC), using 24-hour + // time. For example, 17 refers to 5:00 P.M. UTC. + // + // Hours is a required field + Hours *int64 `type:"long" required:"true"` + + // The start minute of the window, in UTC. + // + // Minutes is a required field + Minutes *int64 `type:"long" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s WindowStartTime) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s WindowStartTime) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *WindowStartTime) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "WindowStartTime"} + if s.Hours == nil { + invalidParams.Add(request.NewErrParamRequired("Hours")) + } + if s.Minutes == nil { + invalidParams.Add(request.NewErrParamRequired("Minutes")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetHours sets the Hours field's value. +func (s *WindowStartTime) SetHours(v int64) *WindowStartTime { + s.Hours = &v + return s +} + +// SetMinutes sets the Minutes field's value. +func (s *WindowStartTime) SetMinutes(v int64) *WindowStartTime { + s.Minutes = &v + return s +} + // The zone awareness configuration for an Amazon OpenSearch Service domain. type ZoneAwarenessConfig struct { _ struct{} `type:"structure"` @@ -16990,6 +18145,78 @@ func (s *ZoneAwarenessConfig) SetAvailabilityZoneCount(v int64) *ZoneAwarenessCo return s } +const ( + // ActionSeverityHigh is a ActionSeverity enum value + ActionSeverityHigh = "HIGH" + + // ActionSeverityMedium is a ActionSeverity enum value + ActionSeverityMedium = "MEDIUM" + + // ActionSeverityLow is a ActionSeverity enum value + ActionSeverityLow = "LOW" +) + +// ActionSeverity_Values returns all elements of the ActionSeverity enum +func ActionSeverity_Values() []string { + return []string{ + ActionSeverityHigh, + ActionSeverityMedium, + ActionSeverityLow, + } +} + +const ( + // ActionStatusPendingUpdate is a ActionStatus enum value + ActionStatusPendingUpdate = "PENDING_UPDATE" + + // ActionStatusInProgress is a ActionStatus enum value + ActionStatusInProgress = "IN_PROGRESS" + + // ActionStatusFailed is a ActionStatus enum value + ActionStatusFailed = "FAILED" + + // ActionStatusCompleted is a ActionStatus enum value + ActionStatusCompleted = "COMPLETED" + + // ActionStatusNotEligible is a ActionStatus enum value + ActionStatusNotEligible = "NOT_ELIGIBLE" + + // ActionStatusEligible is a ActionStatus enum value + ActionStatusEligible = "ELIGIBLE" +) + +// ActionStatus_Values returns all elements of the ActionStatus enum +func ActionStatus_Values() []string { + return []string{ + ActionStatusPendingUpdate, + ActionStatusInProgress, + ActionStatusFailed, + ActionStatusCompleted, + ActionStatusNotEligible, + ActionStatusEligible, + } +} + +const ( + // ActionTypeServiceSoftwareUpdate is a ActionType enum value + ActionTypeServiceSoftwareUpdate = "SERVICE_SOFTWARE_UPDATE" + + // ActionTypeJvmHeapSizeTuning is a ActionType enum value + ActionTypeJvmHeapSizeTuning = "JVM_HEAP_SIZE_TUNING" + + // ActionTypeJvmYoungGenTuning is a ActionType enum value + ActionTypeJvmYoungGenTuning = "JVM_YOUNG_GEN_TUNING" +) + +// ActionType_Values returns all elements of the ActionType enum +func ActionType_Values() []string { + return []string{ + ActionTypeServiceSoftwareUpdate, + ActionTypeJvmHeapSizeTuning, + ActionTypeJvmYoungGenTuning, + } +} + // The Auto-Tune desired state. Valid values are ENABLED and DISABLED. const ( // AutoTuneDesiredStateEnabled is a AutoTuneDesiredState enum value @@ -17885,6 +19112,26 @@ func RollbackOnDisable_Values() []string { } } +const ( + // ScheduleAtNow is a ScheduleAt enum value + ScheduleAtNow = "NOW" + + // ScheduleAtTimestamp is a ScheduleAt enum value + ScheduleAtTimestamp = "TIMESTAMP" + + // ScheduleAtOffPeakWindow is a ScheduleAt enum value + ScheduleAtOffPeakWindow = "OFF_PEAK_WINDOW" +) + +// ScheduleAt_Values returns all elements of the ScheduleAt enum +func ScheduleAt_Values() []string { + return []string{ + ScheduleAtNow, + ScheduleAtTimestamp, + ScheduleAtOffPeakWindow, + } +} + // The Auto-Tune action type. const ( // ScheduledAutoTuneActionTypeJvmHeapSizeTuning is a ScheduledAutoTuneActionType enum value @@ -17923,6 +19170,22 @@ func ScheduledAutoTuneSeverityType_Values() []string { } } +const ( + // ScheduledByCustomer is a ScheduledBy enum value + ScheduledByCustomer = "CUSTOMER" + + // ScheduledBySystem is a ScheduledBy enum value + ScheduledBySystem = "SYSTEM" +) + +// ScheduledBy_Values returns all elements of the ScheduledBy enum +func ScheduledBy_Values() []string { + return []string{ + ScheduledByCustomer, + ScheduledBySystem, + } +} + const ( // TLSSecurityPolicyPolicyMinTls10201907 is a TLSSecurityPolicy enum value TLSSecurityPolicyPolicyMinTls10201907 = "Policy-Min-TLS-1-0-2019-07" diff --git a/service/opensearchservice/errors.go b/service/opensearchservice/errors.go index ad37f3e6b9e..c65f4137ca7 100644 --- a/service/opensearchservice/errors.go +++ b/service/opensearchservice/errors.go @@ -23,14 +23,14 @@ const ( // ErrCodeConflictException for service response error code // "ConflictException". // - // An error occurred because the client attempts to remove a resource that's + // An error occurred because the client attempts to remove a resource that is // currently in use. ErrCodeConflictException = "ConflictException" // ErrCodeDisabledOperationException for service response error code // "DisabledOperationException". // - // An error occured because the client wanted to access an unsupported operation. + // An error occured because the client wanted to access a not supported operation. ErrCodeDisabledOperationException = "DisabledOperationException" // ErrCodeInternalException for service response error code @@ -70,13 +70,20 @@ const ( // ErrCodeResourceNotFoundException for service response error code // "ResourceNotFoundException". // - // An exception for accessing or deleting a resource that doesn't exist. + // An exception for accessing or deleting a resource that does not exist.. ErrCodeResourceNotFoundException = "ResourceNotFoundException" + // ErrCodeSlotNotAvailableException for service response error code + // "SlotNotAvailableException". + // + // An exception for attempting to schedule a domain action during an unavailable + // time slot. + ErrCodeSlotNotAvailableException = "SlotNotAvailableException" + // ErrCodeValidationException for service response error code // "ValidationException". // - // An exception for missing or invalid input fields. + // An exception for accessing or deleting a resource that doesn't exist. ErrCodeValidationException = "ValidationException" ) @@ -91,5 +98,6 @@ var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ "LimitExceededException": newErrorLimitExceededException, "ResourceAlreadyExistsException": newErrorResourceAlreadyExistsException, "ResourceNotFoundException": newErrorResourceNotFoundException, + "SlotNotAvailableException": newErrorSlotNotAvailableException, "ValidationException": newErrorValidationException, } diff --git a/service/opensearchservice/opensearchserviceiface/interface.go b/service/opensearchservice/opensearchserviceiface/interface.go index c23344a54a3..4d16fdb017a 100644 --- a/service/opensearchservice/opensearchserviceiface/interface.go +++ b/service/opensearchservice/opensearchserviceiface/interface.go @@ -237,6 +237,13 @@ type OpenSearchServiceAPI interface { ListPackagesForDomainPages(*opensearchservice.ListPackagesForDomainInput, func(*opensearchservice.ListPackagesForDomainOutput, bool) bool) error ListPackagesForDomainPagesWithContext(aws.Context, *opensearchservice.ListPackagesForDomainInput, func(*opensearchservice.ListPackagesForDomainOutput, bool) bool, ...request.Option) error + ListScheduledActions(*opensearchservice.ListScheduledActionsInput) (*opensearchservice.ListScheduledActionsOutput, error) + ListScheduledActionsWithContext(aws.Context, *opensearchservice.ListScheduledActionsInput, ...request.Option) (*opensearchservice.ListScheduledActionsOutput, error) + ListScheduledActionsRequest(*opensearchservice.ListScheduledActionsInput) (*request.Request, *opensearchservice.ListScheduledActionsOutput) + + ListScheduledActionsPages(*opensearchservice.ListScheduledActionsInput, func(*opensearchservice.ListScheduledActionsOutput, bool) bool) error + ListScheduledActionsPagesWithContext(aws.Context, *opensearchservice.ListScheduledActionsInput, func(*opensearchservice.ListScheduledActionsOutput, bool) bool, ...request.Option) error + ListTags(*opensearchservice.ListTagsInput) (*opensearchservice.ListTagsOutput, error) ListTagsWithContext(aws.Context, *opensearchservice.ListTagsInput, ...request.Option) (*opensearchservice.ListTagsOutput, error) ListTagsRequest(*opensearchservice.ListTagsInput) (*request.Request, *opensearchservice.ListTagsOutput) @@ -288,6 +295,10 @@ type OpenSearchServiceAPI interface { UpdatePackageWithContext(aws.Context, *opensearchservice.UpdatePackageInput, ...request.Option) (*opensearchservice.UpdatePackageOutput, error) UpdatePackageRequest(*opensearchservice.UpdatePackageInput) (*request.Request, *opensearchservice.UpdatePackageOutput) + UpdateScheduledAction(*opensearchservice.UpdateScheduledActionInput) (*opensearchservice.UpdateScheduledActionOutput, error) + UpdateScheduledActionWithContext(aws.Context, *opensearchservice.UpdateScheduledActionInput, ...request.Option) (*opensearchservice.UpdateScheduledActionOutput, error) + UpdateScheduledActionRequest(*opensearchservice.UpdateScheduledActionInput) (*request.Request, *opensearchservice.UpdateScheduledActionOutput) + UpdateVpcEndpoint(*opensearchservice.UpdateVpcEndpointInput) (*opensearchservice.UpdateVpcEndpointOutput, error) UpdateVpcEndpointWithContext(aws.Context, *opensearchservice.UpdateVpcEndpointInput, ...request.Option) (*opensearchservice.UpdateVpcEndpointOutput, error) UpdateVpcEndpointRequest(*opensearchservice.UpdateVpcEndpointInput) (*request.Request, *opensearchservice.UpdateVpcEndpointOutput) diff --git a/service/ssm/api.go b/service/ssm/api.go index e56d756788d..9f905559c96 100644 --- a/service/ssm/api.go +++ b/service/ssm/api.go @@ -12318,8 +12318,8 @@ func (c *SSM) ModifyDocumentPermissionRequest(input *ModifyDocumentPermissionInp // // Shares a Amazon Web Services Systems Manager document (SSM document)publicly // or privately. If you share a document privately, you must specify the Amazon -// Web Services user account IDs for those people who can use the document. -// If you share a document publicly, you must specify All as the account ID. +// Web Services user IDs for those people who can use the document. If you share +// a document publicly, you must specify All as the account ID. // // 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 @@ -12341,8 +12341,8 @@ func (c *SSM) ModifyDocumentPermissionRequest(input *ModifyDocumentPermissionInp // type. // // - DocumentPermissionLimit -// The document can't be shared with more Amazon Web Services user accounts. -// You can specify a maximum of 20 accounts per API operation to share a private +// The document can't be shared with more Amazon Web Services accounts. You +// can specify a maximum of 20 accounts per API operation to share a private // document. // // By default, you can share a private document with a maximum of 1,000 accounts @@ -14505,13 +14505,12 @@ func (c *SSM) UpdateAssociationRequest(input *UpdateAssociationInput) (req *requ // that you call the DescribeAssociation API operation and make a note of all // optional parameters required for your UpdateAssociation call. // -// In order to call this API operation, your Identity and Access Management -// (IAM) user account, group, or role must be configured with permission to -// call the DescribeAssociation API operation. If you don't have permission -// to call DescribeAssociation, then you receive the following error: An error -// occurred (AccessDeniedException) when calling the UpdateAssociation operation: -// User: isn't authorized to perform: ssm:DescribeAssociation on -// resource: +// In order to call this API operation, a user, group, or role must be granted +// permission to call the DescribeAssociation API operation. If you don't have +// permission to call DescribeAssociation, then you receive the following error: +// An error occurred (AccessDeniedException) when calling the UpdateAssociation +// operation: User: isn't authorized to perform: ssm:DescribeAssociation +// on resource: // // When you update an association, the association immediately runs against // the specified targets. You can add the ApplyOnlyAtCronInterval parameter @@ -16261,9 +16260,11 @@ type AlarmConfiguration struct { // Alarms is a required field Alarms []*Alarm `min:"1" type:"list" required:"true"` - // If you specify true for this value, your automation or command continue to - // run even if we can't gather information about the state of your CloudWatch - // alarm. The default value is false. + // When this value is true, your automation or command continues to run in cases + // where we can’t retrieve alarm status information from CloudWatch. In cases + // where we successfully retrieve an alarm status of OK or INSUFFICIENT_DATA, + // the automation or command continues to run, regardless of this value. Default + // is false. IgnorePollAlarmFailure *bool `type:"boolean"` } @@ -21948,7 +21949,7 @@ type CreateAssociationInput struct { // the configuration information for the managed node. // // You can specify Amazon Web Services-predefined documents, documents you created, - // or a document that is shared with you from another account. + // or a document that is shared with you from another Amazon Web Services account. // // For Systems Manager documents (SSM documents) that are shared with you from // other Amazon Web Services accounts, you must specify the complete SSM document @@ -22279,9 +22280,11 @@ type CreateDocumentInput struct { // A list of key-value pairs that describe attachments to a version of a document. Attachments []*AttachmentsSource `type:"list"` - // The content for the new SSM document in JSON or YAML format. We recommend - // storing the contents for your new document in an external JSON or YAML file - // and referencing the file in a command. + // The content for the new SSM document in JSON or YAML format. The content + // of the document must not exceed 64KB. This quota also includes the content + // specified for input parameters at runtime. We recommend storing the contents + // for your new document in an external JSON or YAML file and referencing the + // file in a command. // // For examples, see the following topics in the Amazon Web Services Systems // Manager User Guide. @@ -29602,7 +29605,7 @@ type DocumentDescription struct { // The name of the SSM document. Name *string `type:"string"` - // The Amazon Web Services user account that created the document. + // The Amazon Web Services user that created the document. Owner *string `type:"string"` // A description of the parameters for a document. @@ -29941,7 +29944,7 @@ type DocumentIdentifier struct { // The name of the SSM document. Name *string `type:"string"` - // The Amazon Web Services user account that created the document. + // The Amazon Web Services user that created the document. Owner *string `type:"string"` // The operating system platform. @@ -30297,7 +30300,7 @@ func (s *DocumentMetadataResponseInfo) SetReviewerResponse(v []*DocumentReviewer return s } -// Parameters specified in a System Manager document that run on the server +// Parameters specified in a Systems Manager document that run on the server // when the command is run. type DocumentParameter struct { _ struct{} `type:"structure"` @@ -30359,8 +30362,8 @@ func (s *DocumentParameter) SetType(v string) *DocumentParameter { return s } -// The document can't be shared with more Amazon Web Services user accounts. -// You can specify a maximum of 20 accounts per API operation to share a private +// The document can't be shared with more Amazon Web Services accounts. You +// can specify a maximum of 20 accounts per API operation to share a private // document. // // By default, you can share a private document with a maximum of 1,000 accounts @@ -35191,6 +35194,8 @@ type GetServiceSettingInput struct { // The ID of the service setting to get. The setting ID can be one of the following. // + // * /ssm/managed-instance/default-ec2-instance-management-role + // // * /ssm/automation/customer-script-log-destination // // * /ssm/automation/customer-script-log-group-name @@ -44719,15 +44724,14 @@ func (s *MetadataValue) SetValue(v string) *MetadataValue { type ModifyDocumentPermissionInput struct { _ struct{} `type:"structure"` - // The Amazon Web Services user accounts that should have access to the document. - // The account IDs can either be a group of account IDs or All. + // The Amazon Web Services users that should have access to the document. The + // account IDs can either be a group of account IDs or All. AccountIdsToAdd []*string `type:"list"` - // The Amazon Web Services user accounts that should no longer have access to - // the document. The Amazon Web Services user account can either be a group - // of account IDs or All. This action has a higher priority than AccountIdsToAdd. - // If you specify an account ID to add and the same ID to remove, the system - // removes access to the document. + // The Amazon Web Services users that should no longer have access to the document. + // The Amazon Web Services user can either be a group of account IDs or All. + // This action has a higher priority than AccountIdsToAdd. If you specify an + // ID to add and the same ID to remove, the system removes access to the document. AccountIdsToRemove []*string `type:"list"` // The name of the document that you want to share. @@ -49812,9 +49816,21 @@ type PutParameterInput struct { // When you create a String parameter and specify aws:ec2:image, Amazon Web // Services Systems Manager validates the parameter value is in the required // format, such as ami-12345abcdeEXAMPLE, and that the specified AMI is available - // in your Amazon Web Services account. For more information, see Native parameter - // support for Amazon Machine Image (AMI) IDs (https://docs.aws.amazon.com/systems-manager/latest/userguide/parameter-store-ec2-aliases.html) - // in the Amazon Web Services Systems Manager User Guide. + // in your Amazon Web Services account. + // + // If the action is successful, the service sends back an HTTP 200 response + // which indicates a successful PutParameter call for all cases except for data + // type aws:ec2:image. If you call PutParameter with aws:ec2:image data type, + // a successful HTTP 200 response does not guarantee that your parameter was + // successfully created or updated. The aws:ec2:image value is validated asynchronously, + // and the PutParameter call returns before the validation is complete. If you + // submit an invalid AMI value, the PutParameter operation will return success, + // but the asynchronous validation will fail and the parameter will not be created + // or updated. To monitor whether your aws:ec2:image parameters are created + // successfully, see Setting up notifications or trigger actions based on Parameter + // Store events (https://docs.aws.amazon.com/systems-manager/latest/userguide/sysman-paramstore-cwe.html). + // For more information about AMI format validation , see Native parameter support + // for Amazon Machine Image (AMI) IDs (https://docs.aws.amazon.com/systems-manager/latest/userguide/parameter-store-ec2-aliases.html). DataType *string `type:"string"` // Information about the parameter that you want to add to the system. Optional @@ -49824,16 +49840,12 @@ type PutParameterInput struct { Description *string `type:"string"` // The Key Management Service (KMS) ID that you want to use to encrypt a parameter. - // Either the default KMS key automatically assigned to your Amazon Web Services - // account or a custom key. Required for parameters that use the SecureString - // data type. + // Use a custom key for better security. Required for parameters that use the + // SecureString data type. // // If you don't specify a key ID, the system uses the default key associated - // with your Amazon Web Services account. - // - // * To use your default KMS key, choose the SecureString data type, and - // do not specify the Key ID when you create the parameter. The system automatically - // populates Key ID with your default KMS key. + // with your Amazon Web Services account which is not as secure as using a custom + // key. // // * To use a custom KMS key, choose the SecureString data type with the // Key ID parameter. @@ -53971,7 +53983,7 @@ type Session struct { // Reserved for future use. OutputUrl *SessionManagerOutputUrl `type:"structure"` - // The ID of the Amazon Web Services user account that started the session. + // The ID of the Amazon Web Services user that started the session. Owner *string `min:"1" type:"string"` // The reason for connecting to the instance. @@ -54096,8 +54108,8 @@ type SessionFilter struct { // * Target: Specify a managed node to which session connections have been // made. // - // * Owner: Specify an Amazon Web Services user account to see a list of - // sessions started by that user. + // * Owner: Specify an Amazon Web Services user to see a list of sessions + // started by that user. // // * Status: Specify a valid session status to see a list of all sessions // with that status. Status values you can specify include: Connected Connecting @@ -59696,6 +59708,8 @@ type UpdateServiceSettingInput struct { // arn:aws:ssm:us-east-1:111122223333:servicesetting/ssm/parameter-store/high-throughput-enabled. // The setting ID can be one of the following. // + // * /ssm/managed-instance/default-ec2-instance-management-role + // // * /ssm/automation/customer-script-log-destination // // * /ssm/automation/customer-script-log-group-name diff --git a/service/ssm/errors.go b/service/ssm/errors.go index fe84c7a1585..78ead5d57e7 100644 --- a/service/ssm/errors.go +++ b/service/ssm/errors.go @@ -122,8 +122,8 @@ const ( // ErrCodeDocumentPermissionLimit for service response error code // "DocumentPermissionLimit". // - // The document can't be shared with more Amazon Web Services user accounts. - // You can specify a maximum of 20 accounts per API operation to share a private + // The document can't be shared with more Amazon Web Services accounts. You + // can specify a maximum of 20 accounts per API operation to share a private // document. // // By default, you can share a private document with a maximum of 1,000 accounts