From 32ea2b368b5e4e1fb7dbfa428f38aa294b3dcf4b Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Thu, 31 Aug 2023 18:58:39 +0000 Subject: [PATCH 1/3] Update to latest models --- ...i-change-chimesdkmediapipelines-27870.json | 5 + .../api-change-cloudhsm-87878.json | 5 + .../api-change-connectcampaigns-35324.json | 5 + .../api-change-connectparticipant-9284.json | 5 + .../api-change-customerprofiles-2304.json | 5 + .../next-release/api-change-ecs-81774.json | 5 + .../api-change-grafana-20686.json | 5 + .../next-release/api-change-health-7143.json | 5 + .../next-release/api-change-ivs-25500.json | 5 + .../api-change-kafkaconnect-57090.json | 5 + ...-change-paymentcryptographydata-20003.json | 5 + .../api-change-sagemakerruntime-56964.json | 5 + .../2021-07-15/endpoint-rule-set-1.json | 344 ++++--- .../2021-07-15/service-2.json | 57 +- .../2014-05-30/endpoint-rule-set-1.json | 341 ++++--- .../data/cloudhsm/2014-05-30/service-2.json | 80 +- .../2021-01-30/endpoint-rule-set-1.json | 341 ++++--- .../2021-01-30/service-2.json | 142 +-- .../2018-09-07/endpoint-rule-set-1.json | 362 ++++---- .../2018-09-07/service-2.json | 165 +++- .../2020-08-15/endpoint-rule-set-1.json | 344 ++++--- .../2020-08-15/service-2.json | 175 ++-- botocore/data/ecs/2014-11-13/service-2.json | 27 +- .../2020-08-18/endpoint-rule-set-1.json | 344 ++++--- .../data/grafana/2020-08-18/service-2.json | 9 +- .../2016-08-04/endpoint-rule-set-1.json | 450 +++++----- .../data/health/2016-08-04/service-2.json | 143 ++- .../ivs/2020-07-14/endpoint-rule-set-1.json | 344 ++++--- botocore/data/ivs/2020-07-14/service-2.json | 8 +- .../2021-09-14/endpoint-rule-set-1.json | 341 ++++--- .../kafkaconnect/2021-09-14/service-2.json | 38 +- .../2022-02-03/service-2.json | 38 +- .../2017-05-13/endpoint-rule-set-1.json | 400 ++++----- .../2017-05-13/service-2.json | 175 +++- .../cloudhsm/endpoint-tests-1.json | 260 +++++- .../connectcampaigns/endpoint-tests-1.json | 262 ++++-- .../connectparticipant/endpoint-tests-1.json | 96 +- .../kafkaconnect/endpoint-tests-1.json | 842 ++++-------------- .../endpoint-tests-1.json | 123 +-- .../sagemaker-runtime/endpoint-tests-1.json | 98 +- 40 files changed, 3325 insertions(+), 3084 deletions(-) create mode 100644 .changes/next-release/api-change-chimesdkmediapipelines-27870.json create mode 100644 .changes/next-release/api-change-cloudhsm-87878.json create mode 100644 .changes/next-release/api-change-connectcampaigns-35324.json create mode 100644 .changes/next-release/api-change-connectparticipant-9284.json create mode 100644 .changes/next-release/api-change-customerprofiles-2304.json create mode 100644 .changes/next-release/api-change-ecs-81774.json create mode 100644 .changes/next-release/api-change-grafana-20686.json create mode 100644 .changes/next-release/api-change-health-7143.json create mode 100644 .changes/next-release/api-change-ivs-25500.json create mode 100644 .changes/next-release/api-change-kafkaconnect-57090.json create mode 100644 .changes/next-release/api-change-paymentcryptographydata-20003.json create mode 100644 .changes/next-release/api-change-sagemakerruntime-56964.json diff --git a/.changes/next-release/api-change-chimesdkmediapipelines-27870.json b/.changes/next-release/api-change-chimesdkmediapipelines-27870.json new file mode 100644 index 0000000000..a16b76af35 --- /dev/null +++ b/.changes/next-release/api-change-chimesdkmediapipelines-27870.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``chime-sdk-media-pipelines``", + "description": "This release adds support for feature Voice Enhancement for Call Recording as part of Amazon Chime SDK call analytics." +} diff --git a/.changes/next-release/api-change-cloudhsm-87878.json b/.changes/next-release/api-change-cloudhsm-87878.json new file mode 100644 index 0000000000..faed28579f --- /dev/null +++ b/.changes/next-release/api-change-cloudhsm-87878.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``cloudhsm``", + "description": "Deprecating CloudHSM Classic API Service." +} diff --git a/.changes/next-release/api-change-connectcampaigns-35324.json b/.changes/next-release/api-change-connectcampaigns-35324.json new file mode 100644 index 0000000000..4e2958f5d7 --- /dev/null +++ b/.changes/next-release/api-change-connectcampaigns-35324.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``connectcampaigns``", + "description": "Amazon Connect outbound campaigns has launched agentless dialing mode which enables customers to make automated outbound calls without agent engagement. This release updates three of the campaign management API's to support the new agentless dialing mode and the new dialing capacity field." +} diff --git a/.changes/next-release/api-change-connectparticipant-9284.json b/.changes/next-release/api-change-connectparticipant-9284.json new file mode 100644 index 0000000000..61dc4ad2d1 --- /dev/null +++ b/.changes/next-release/api-change-connectparticipant-9284.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``connectparticipant``", + "description": "Amazon Connect Participant Service adds the ability to get a view resource using a view token, which is provided in a participant message, with the release of the DescribeView API." +} diff --git a/.changes/next-release/api-change-customerprofiles-2304.json b/.changes/next-release/api-change-customerprofiles-2304.json new file mode 100644 index 0000000000..b9750a512a --- /dev/null +++ b/.changes/next-release/api-change-customerprofiles-2304.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``customer-profiles``", + "description": "Adds sensitive trait to various shapes in Customer Profiles API model." +} diff --git a/.changes/next-release/api-change-ecs-81774.json b/.changes/next-release/api-change-ecs-81774.json new file mode 100644 index 0000000000..52c1ffce00 --- /dev/null +++ b/.changes/next-release/api-change-ecs-81774.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``ecs``", + "description": "This release adds support for an account-level setting that you can use to configure the number of days for AWS Fargate task retirement." +} diff --git a/.changes/next-release/api-change-grafana-20686.json b/.changes/next-release/api-change-grafana-20686.json new file mode 100644 index 0000000000..8a4b83d77e --- /dev/null +++ b/.changes/next-release/api-change-grafana-20686.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``grafana``", + "description": "Marking SAML RoleValues attribute as sensitive and updating VpcConfiguration attributes to match documentation." +} diff --git a/.changes/next-release/api-change-health-7143.json b/.changes/next-release/api-change-health-7143.json new file mode 100644 index 0000000000..d2171f9c26 --- /dev/null +++ b/.changes/next-release/api-change-health-7143.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``health``", + "description": "Adds new API DescribeEntityAggregatesForOrganization that retrieves entity aggregates across your organization. Also adds support for resource status filtering in DescribeAffectedEntitiesForOrganization, resource status aggregates in the DescribeEntityAggregates response, and new resource statuses." +} diff --git a/.changes/next-release/api-change-ivs-25500.json b/.changes/next-release/api-change-ivs-25500.json new file mode 100644 index 0000000000..59f62c4636 --- /dev/null +++ b/.changes/next-release/api-change-ivs-25500.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``ivs``", + "description": "Updated \"type\" description for CreateChannel, UpdateChannel, Channel, and ChannelSummary." +} diff --git a/.changes/next-release/api-change-kafkaconnect-57090.json b/.changes/next-release/api-change-kafkaconnect-57090.json new file mode 100644 index 0000000000..b4acab2e25 --- /dev/null +++ b/.changes/next-release/api-change-kafkaconnect-57090.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``kafkaconnect``", + "description": "Minor model changes for Kafka Connect as well as endpoint updates." +} diff --git a/.changes/next-release/api-change-paymentcryptographydata-20003.json b/.changes/next-release/api-change-paymentcryptographydata-20003.json new file mode 100644 index 0000000000..7143abf07e --- /dev/null +++ b/.changes/next-release/api-change-paymentcryptographydata-20003.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``payment-cryptography-data``", + "description": "Make KeyCheckValue field optional when using asymmetric keys as Key Check Values typically only apply to symmetric keys" +} diff --git a/.changes/next-release/api-change-sagemakerruntime-56964.json b/.changes/next-release/api-change-sagemakerruntime-56964.json new file mode 100644 index 0000000000..c2a38d6564 --- /dev/null +++ b/.changes/next-release/api-change-sagemakerruntime-56964.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``sagemaker-runtime``", + "description": "Update sagemaker-runtime client to latest version" +} diff --git a/botocore/data/chime-sdk-media-pipelines/2021-07-15/endpoint-rule-set-1.json b/botocore/data/chime-sdk-media-pipelines/2021-07-15/endpoint-rule-set-1.json index df6d5f828d..a451babf8a 100644 --- a/botocore/data/chime-sdk-media-pipelines/2021-07-15/endpoint-rule-set-1.json +++ b/botocore/data/chime-sdk-media-pipelines/2021-07-15/endpoint-rule-set-1.json @@ -58,52 +58,56 @@ "type": "error" }, { - "conditions": [], - "type": "tree", - "rules": [ + "conditions": [ { - "conditions": [ + "fn": "booleanEquals", + "argv": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" + "ref": "UseDualStack" }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" + true + ] } - ] + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, { - "conditions": [], + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Region" + } + ] + } + ], "type": "tree", "rules": [ { "conditions": [ { - "fn": "isSet", + "fn": "aws.partition", "argv": [ { "ref": "Region" } - ] + ], + "assign": "PartitionResult" } ], "type": "tree", @@ -111,13 +115,22 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "booleanEquals", "argv": [ { - "ref": "Region" - } - ], - "assign": "PartitionResult" + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] } ], "type": "tree", @@ -127,224 +140,175 @@ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] }, { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://media-pipelines-chime-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" + "endpoint": { + "url": "https://media-pipelines-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, { - "ref": "UseFIPS" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ { - "conditions": [], - "endpoint": { - "url": "https://media-pipelines-chime-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsFIPS" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" + "endpoint": { + "url": "https://media-pipelines-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, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://media-pipelines-chime.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } - ] - }, - { - "conditions": [], + ], "type": "tree", "rules": [ { "conditions": [], "endpoint": { - "url": "https://media-pipelines-chime.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://media-pipelines-chime.{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://media-pipelines-chime.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, - { - "conditions": [], - "error": "Invalid Configuration: Missing Region", - "type": "error" } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } \ No newline at end of file diff --git a/botocore/data/chime-sdk-media-pipelines/2021-07-15/service-2.json b/botocore/data/chime-sdk-media-pipelines/2021-07-15/service-2.json index 5a045f8a26..a3f640e04a 100644 --- a/botocore/data/chime-sdk-media-pipelines/2021-07-15/service-2.json +++ b/botocore/data/chime-sdk-media-pipelines/2021-07-15/service-2.json @@ -1940,6 +1940,10 @@ "CreatedTimestamp":{ "shape":"Iso8601Timestamp", "documentation":"

The time at which the media insights pipeline was created.

" + }, + "ElementStatuses":{ + "shape":"MediaInsightsPipelineElementStatuses", + "documentation":"

The statuses that the elements in a media insights pipeline can have during data processing.

" } }, "documentation":"

A media pipeline that streams call analytics data.

" @@ -2021,6 +2025,10 @@ "SnsTopicSinkConfiguration":{ "shape":"SnsTopicSinkConfiguration", "documentation":"

The configuration settings for an SNS topic sink in a media insights pipeline configuration element.

" + }, + "VoiceEnhancementSinkConfiguration":{ + "shape":"VoiceEnhancementSinkConfiguration", + "documentation":"

The configuration settings for the VoiceEnhancementSinkConfiguration element.

" } }, "documentation":"

An element in a media insights pipeline configuration.

" @@ -2035,7 +2043,8 @@ "LambdaFunctionSink", "SqsQueueSink", "SnsTopicSink", - "S3RecordingSink" + "S3RecordingSink", + "VoiceEnhancementSink" ] }, "MediaInsightsPipelineConfigurationElements":{ @@ -2070,6 +2079,24 @@ "type":"list", "member":{"shape":"MediaInsightsPipelineConfigurationSummary"} }, + "MediaInsightsPipelineElementStatus":{ + "type":"structure", + "members":{ + "Type":{ + "shape":"MediaInsightsPipelineConfigurationElementType", + "documentation":"

The type of status.

" + }, + "Status":{ + "shape":"MediaPipelineElementStatus", + "documentation":"

The element's status.

" + } + }, + "documentation":"

The status of the pipeline element.

" + }, + "MediaInsightsPipelineElementStatuses":{ + "type":"list", + "member":{"shape":"MediaInsightsPipelineElementStatus"} + }, "MediaInsightsRuntimeMetadata":{ "type":"map", "key":{"shape":"NonEmptyString"}, @@ -2132,6 +2159,19 @@ }, "documentation":"

A pipeline consisting of a media capture, media concatenation, or live-streaming pipeline.

" }, + "MediaPipelineElementStatus":{ + "type":"string", + "enum":[ + "NotStarted", + "NotSupported", + "Initializing", + "InProgress", + "Failed", + "Stopping", + "Stopped", + "Paused" + ] + }, "MediaPipelineList":{ "type":"list", "member":{"shape":"MediaPipelineSummary"} @@ -2152,7 +2192,8 @@ "Failed", "Stopping", "Stopped", - "Paused" + "Paused", + "NotStarted" ] }, "MediaPipelineStatusUpdate":{ @@ -2831,7 +2872,7 @@ "documentation":"

Sets the aspect ratio of the video tiles, such as 16:9.

" } }, - "documentation":"

Defines the configuration settings for a vertial layout.

" + "documentation":"

Defines the configuration settings for a vertical layout.

" }, "VerticalTilePosition":{ "type":"string", @@ -2944,6 +2985,16 @@ } }, "documentation":"

The configuration settings for a voice analytics processor.

" + }, + "VoiceEnhancementSinkConfiguration":{ + "type":"structure", + "members":{ + "Disabled":{ + "shape":"Boolean", + "documentation":"

Disables the VoiceEnhancementSinkConfiguration element.

" + } + }, + "documentation":"

A static structure that contains the configuration data for a VoiceEnhancementSinkConfiguration element.

" } }, "documentation":"

The Amazon Chime SDK media pipeline APIs in this section allow software developers to create Amazon Chime SDK media pipelines that capture, concatenate, or stream your Amazon Chime SDK meetings. For more information about media pipelines, see Amazon Chime SDK media pipelines.

" diff --git a/botocore/data/cloudhsm/2014-05-30/endpoint-rule-set-1.json b/botocore/data/cloudhsm/2014-05-30/endpoint-rule-set-1.json index 807bc8fae2..a0cd821bf7 100644 --- a/botocore/data/cloudhsm/2014-05-30/endpoint-rule-set-1.json +++ b/botocore/data/cloudhsm/2014-05-30/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,21 +45,69 @@ { "conditions": [ { - "fn": "isSet", + "fn": "booleanEquals", "argv": [ { - "ref": "Endpoint" - } + "ref": "UseFIPS" + }, + true + ] + } + ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true ] + } + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [ + { + "fn": "isSet", + "argv": [ { - "fn": "parseURL", + "ref": "Region" + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "aws.partition", "argv": [ { - "ref": "Endpoint" + "ref": "Region" } ], - "assign": "url" + "assign": "PartitionResult" } ], "type": "tree", @@ -75,13 +122,17 @@ }, true ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] } ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], "type": "tree", "rules": [ { @@ -89,143 +140,86 @@ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" }, - "properties": {}, - "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", + "fn": "booleanEquals", "argv": [ + true, { - "ref": "PartitionResult" - }, - "supportsFIPS" + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } ] } - ] - }, - { - "fn": "booleanEquals", - "argv": [ - true, + ], + "type": "tree", + "rules": [ { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] + "conditions": [], + "endpoint": { + "url": "https://cloudhsm-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [], - "endpoint": { - "url": "https://cloudhsm-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, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } + "ref": "UseFIPS" + }, + true ] } ], "type": "tree", "rules": [ { - "conditions": [], + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], "type": "tree", "rules": [ { @@ -238,78 +232,83 @@ "type": "endpoint" } ] + }, + { + "conditions": [], + "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, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } + "ref": "UseDualStack" + }, + true ] } ], "type": "tree", "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://cloudhsm.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, { "conditions": [], - "endpoint": { - "url": "https://cloudhsm.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] }, { "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" + "endpoint": { + "url": "https://cloudhsm.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, - { - "conditions": [], - "endpoint": { - "url": "https://cloudhsm.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } \ No newline at end of file diff --git a/botocore/data/cloudhsm/2014-05-30/service-2.json b/botocore/data/cloudhsm/2014-05-30/service-2.json index dc6f74aa78..541f1270b2 100644 --- a/botocore/data/cloudhsm/2014-05-30/service-2.json +++ b/botocore/data/cloudhsm/2014-05-30/service-2.json @@ -26,7 +26,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Adds or overwrites one or more tags for the specified AWS CloudHSM resource.

Each tag consists of a key and a value. Tag keys must be unique to each resource.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Adds or overwrites one or more tags for the specified AWS CloudHSM resource.

Each tag consists of a key and a value. Tag keys must be unique to each resource.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "CreateHapg":{ "name":"CreateHapg", @@ -41,7 +43,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Creates a high-availability partition group. A high-availability partition group is a group of partitions that spans multiple physical HSMs.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Creates a high-availability partition group. A high-availability partition group is a group of partitions that spans multiple physical HSMs.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "CreateHsm":{ "name":"CreateHsm", @@ -56,7 +60,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Creates an uninitialized HSM instance.

There is an upfront fee charged for each HSM instance that you create with the CreateHsm operation. If you accidentally provision an HSM and want to request a refund, delete the instance using the DeleteHsm operation, go to the AWS Support Center, create a new case, and select Account and Billing Support.

It can take up to 20 minutes to create and provision an HSM. You can monitor the status of the HSM with the DescribeHsm operation. The HSM is ready to be initialized when the status changes to RUNNING.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Creates an uninitialized HSM instance.

There is an upfront fee charged for each HSM instance that you create with the CreateHsm operation. If you accidentally provision an HSM and want to request a refund, delete the instance using the DeleteHsm operation, go to the AWS Support Center, create a new case, and select Account and Billing Support.

It can take up to 20 minutes to create and provision an HSM. You can monitor the status of the HSM with the DescribeHsm operation. The HSM is ready to be initialized when the status changes to RUNNING.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "CreateLunaClient":{ "name":"CreateLunaClient", @@ -71,7 +77,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Creates an HSM client.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Creates an HSM client.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "DeleteHapg":{ "name":"DeleteHapg", @@ -86,7 +94,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Deletes a high-availability partition group.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Deletes a high-availability partition group.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "DeleteHsm":{ "name":"DeleteHsm", @@ -101,7 +111,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Deletes an HSM. After completion, this operation cannot be undone and your key material cannot be recovered.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Deletes an HSM. After completion, this operation cannot be undone and your key material cannot be recovered.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "DeleteLunaClient":{ "name":"DeleteLunaClient", @@ -116,7 +128,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Deletes a client.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Deletes a client.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "DescribeHapg":{ "name":"DescribeHapg", @@ -131,7 +145,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Retrieves information about a high-availability partition group.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Retrieves information about a high-availability partition group.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "DescribeHsm":{ "name":"DescribeHsm", @@ -146,7 +162,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Retrieves information about an HSM. You can identify the HSM by its ARN or its serial number.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Retrieves information about an HSM. You can identify the HSM by its ARN or its serial number.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "DescribeLunaClient":{ "name":"DescribeLunaClient", @@ -161,7 +179,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Retrieves information about an HSM client.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Retrieves information about an HSM client.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "GetConfig":{ "name":"GetConfig", @@ -176,7 +196,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Gets the configuration files necessary to connect to all high availability partition groups the client is associated with.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Gets the configuration files necessary to connect to all high availability partition groups the client is associated with.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "ListAvailableZones":{ "name":"ListAvailableZones", @@ -191,7 +213,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Lists the Availability Zones that have available AWS CloudHSM capacity.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Lists the Availability Zones that have available AWS CloudHSM capacity.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "ListHapgs":{ "name":"ListHapgs", @@ -206,7 +230,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Lists the high-availability partition groups for the account.

This operation supports pagination with the use of the NextToken member. If more results are available, the NextToken member of the response contains a token that you pass in the next call to ListHapgs to retrieve the next set of items.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Lists the high-availability partition groups for the account.

This operation supports pagination with the use of the NextToken member. If more results are available, the NextToken member of the response contains a token that you pass in the next call to ListHapgs to retrieve the next set of items.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "ListHsms":{ "name":"ListHsms", @@ -221,7 +247,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Retrieves the identifiers of all of the HSMs provisioned for the current customer.

This operation supports pagination with the use of the NextToken member. If more results are available, the NextToken member of the response contains a token that you pass in the next call to ListHsms to retrieve the next set of items.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Retrieves the identifiers of all of the HSMs provisioned for the current customer.

This operation supports pagination with the use of the NextToken member. If more results are available, the NextToken member of the response contains a token that you pass in the next call to ListHsms to retrieve the next set of items.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "ListLunaClients":{ "name":"ListLunaClients", @@ -236,7 +264,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Lists all of the clients.

This operation supports pagination with the use of the NextToken member. If more results are available, the NextToken member of the response contains a token that you pass in the next call to ListLunaClients to retrieve the next set of items.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Lists all of the clients.

This operation supports pagination with the use of the NextToken member. If more results are available, the NextToken member of the response contains a token that you pass in the next call to ListLunaClients to retrieve the next set of items.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "ListTagsForResource":{ "name":"ListTagsForResource", @@ -251,7 +281,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Returns a list of all tags for the specified AWS CloudHSM resource.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Returns a list of all tags for the specified AWS CloudHSM resource.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "ModifyHapg":{ "name":"ModifyHapg", @@ -266,7 +298,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Modifies an existing high-availability partition group.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Modifies an existing high-availability partition group.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "ModifyHsm":{ "name":"ModifyHsm", @@ -281,7 +315,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Modifies an HSM.

This operation can result in the HSM being offline for up to 15 minutes while the AWS CloudHSM service is reconfigured. If you are modifying a production HSM, you should ensure that your AWS CloudHSM service is configured for high availability, and consider executing this operation during a maintenance window.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Modifies an HSM.

This operation can result in the HSM being offline for up to 15 minutes while the AWS CloudHSM service is reconfigured. If you are modifying a production HSM, you should ensure that your AWS CloudHSM service is configured for high availability, and consider executing this operation during a maintenance window.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "ModifyLunaClient":{ "name":"ModifyLunaClient", @@ -294,7 +330,9 @@ "errors":[ {"shape":"CloudHsmServiceException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Modifies the certificate used by the client.

This action can potentially start a workflow to install the new certificate on the client's HSMs.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Modifies the certificate used by the client.

This action can potentially start a workflow to install the new certificate on the client's HSMs.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." }, "RemoveTagsFromResource":{ "name":"RemoveTagsFromResource", @@ -309,7 +347,9 @@ {"shape":"CloudHsmInternalException"}, {"shape":"InvalidRequestException"} ], - "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Removes one or more tags from the specified AWS CloudHSM resource.

To remove a tag, specify only the tag key to remove (not the value). To overwrite the value for an existing tag, use AddTagsToResource.

" + "documentation":"

This is documentation for AWS CloudHSM Classic. For more information, see AWS CloudHSM Classic FAQs, the AWS CloudHSM Classic User Guide, and the AWS CloudHSM Classic API Reference.

For information about the current version of AWS CloudHSM, see AWS CloudHSM, the AWS CloudHSM User Guide, and the AWS CloudHSM API Reference.

Removes one or more tags from the specified AWS CloudHSM resource.

To remove a tag, specify only the tag key to remove (not the value). To overwrite the value for an existing tag, use AddTagsToResource.

", + "deprecated":true, + "deprecatedMessage":"This API is deprecated." } }, "shapes":{ diff --git a/botocore/data/connectcampaigns/2021-01-30/endpoint-rule-set-1.json b/botocore/data/connectcampaigns/2021-01-30/endpoint-rule-set-1.json index 53e8ed2565..59d03098d7 100644 --- a/botocore/data/connectcampaigns/2021-01-30/endpoint-rule-set-1.json +++ b/botocore/data/connectcampaigns/2021-01-30/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,21 +45,69 @@ { "conditions": [ { - "fn": "isSet", + "fn": "booleanEquals", "argv": [ { - "ref": "Endpoint" - } + "ref": "UseFIPS" + }, + true + ] + } + ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true ] + } + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [ + { + "fn": "isSet", + "argv": [ { - "fn": "parseURL", + "ref": "Region" + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "aws.partition", "argv": [ { - "ref": "Endpoint" + "ref": "Region" } ], - "assign": "url" + "assign": "PartitionResult" } ], "type": "tree", @@ -75,13 +122,17 @@ }, true ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] } ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], "type": "tree", "rules": [ { @@ -89,143 +140,86 @@ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" }, - "properties": {}, - "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", + "fn": "booleanEquals", "argv": [ + true, { - "ref": "PartitionResult" - }, - "supportsFIPS" + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } ] } - ] - }, - { - "fn": "booleanEquals", - "argv": [ - true, + ], + "type": "tree", + "rules": [ { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] + "conditions": [], + "endpoint": { + "url": "https://connect-campaigns-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [], - "endpoint": { - "url": "https://connect-campaigns-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, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } + "ref": "UseFIPS" + }, + true ] } ], "type": "tree", "rules": [ { - "conditions": [], + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], "type": "tree", "rules": [ { @@ -238,78 +232,83 @@ "type": "endpoint" } ] + }, + { + "conditions": [], + "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, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } + "ref": "UseDualStack" + }, + true ] } ], "type": "tree", "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://connect-campaigns.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, { "conditions": [], - "endpoint": { - "url": "https://connect-campaigns.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] }, { "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" + "endpoint": { + "url": "https://connect-campaigns.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, - { - "conditions": [], - "endpoint": { - "url": "https://connect-campaigns.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } \ No newline at end of file diff --git a/botocore/data/connectcampaigns/2021-01-30/service-2.json b/botocore/data/connectcampaigns/2021-01-30/service-2.json index fcabbb1d6f..34df4801e2 100644 --- a/botocore/data/connectcampaigns/2021-01-30/service-2.json +++ b/botocore/data/connectcampaigns/2021-01-30/service-2.json @@ -436,6 +436,13 @@ }, "exception":true }, + "AgentlessDialerConfig":{ + "type":"structure", + "members":{ + "dialingCapacity":{"shape":"DialingCapacity"} + }, + "documentation":"

Agentless Dialer config

" + }, "AnswerMachineDetectionConfig":{ "type":"structure", "required":["enableAnswerMachineDetection"], @@ -452,14 +459,14 @@ "documentation":"

Arn

", "max":500, "min":20, - "pattern":"^arn:.*" + "pattern":"arn:.*" }, "AttributeName":{ "type":"string", "documentation":"

The key of the attribute. Attribute keys can include only alphanumeric, dash, and underscore characters.

", "max":32767, "min":0, - "pattern":"^[a-zA-Z0-9\\-_]+$" + "pattern":"[a-zA-Z0-9\\-_]+" }, "AttributeValue":{ "type":"string", @@ -488,19 +495,19 @@ "Campaign":{ "type":"structure", "required":[ + "id", "arn", + "name", "connectInstanceId", "dialerConfig", - "id", - "name", "outboundCallConfig" ], "members":{ + "id":{"shape":"CampaignId"}, "arn":{"shape":"CampaignArn"}, + "name":{"shape":"CampaignName"}, "connectInstanceId":{"shape":"InstanceId"}, "dialerConfig":{"shape":"DialerConfig"}, - "id":{"shape":"CampaignId"}, - "name":{"shape":"CampaignName"}, "outboundCallConfig":{"shape":"OutboundCallConfig"}, "tags":{"shape":"TagMap"} }, @@ -545,16 +552,16 @@ "CampaignSummary":{ "type":"structure", "required":[ - "arn", - "connectInstanceId", "id", - "name" + "arn", + "name", + "connectInstanceId" ], "members":{ - "arn":{"shape":"CampaignArn"}, - "connectInstanceId":{"shape":"InstanceId"}, "id":{"shape":"CampaignId"}, - "name":{"shape":"CampaignName"} + "arn":{"shape":"CampaignArn"}, + "name":{"shape":"CampaignName"}, + "connectInstanceId":{"shape":"InstanceId"} }, "documentation":"

An Amazon Connect campaign summary.

" }, @@ -596,15 +603,15 @@ "CreateCampaignRequest":{ "type":"structure", "required":[ + "name", "connectInstanceId", "dialerConfig", - "name", "outboundCallConfig" ], "members":{ + "name":{"shape":"CampaignName"}, "connectInstanceId":{"shape":"InstanceId"}, "dialerConfig":{"shape":"DialerConfig"}, - "name":{"shape":"CampaignName"}, "outboundCallConfig":{"shape":"OutboundCallConfig"}, "tags":{"shape":"TagMap"} }, @@ -613,8 +620,8 @@ "CreateCampaignResponse":{ "type":"structure", "members":{ - "arn":{"shape":"CampaignArn"}, "id":{"shape":"CampaignId"}, + "arn":{"shape":"CampaignArn"}, "tags":{"shape":"TagMap"} }, "documentation":"

The response for Create Campaign API

" @@ -684,16 +691,16 @@ "DialRequest":{ "type":"structure", "required":[ - "attributes", "clientToken", + "phoneNumber", "expirationTime", - "phoneNumber" + "attributes" ], "members":{ - "attributes":{"shape":"Attributes"}, "clientToken":{"shape":"ClientToken"}, + "phoneNumber":{"shape":"DestinationPhoneNumber"}, "expirationTime":{"shape":"TimeStamp"}, - "phoneNumber":{"shape":"DestinationPhoneNumber"} + "attributes":{"shape":"Attributes"} }, "documentation":"

A dial request for a campaign.

" }, @@ -711,12 +718,20 @@ "DialerConfig":{ "type":"structure", "members":{ + "progressiveDialerConfig":{"shape":"ProgressiveDialerConfig"}, "predictiveDialerConfig":{"shape":"PredictiveDialerConfig"}, - "progressiveDialerConfig":{"shape":"ProgressiveDialerConfig"} + "agentlessDialerConfig":{"shape":"AgentlessDialerConfig"} }, "documentation":"

The possible types of dialer config parameters

", "union":true }, + "DialingCapacity":{ + "type":"double", + "documentation":"

Allocates dialing capacity for this campaign between multiple active campaigns

", + "box":true, + "max":1, + "min":0.01 + }, "Enabled":{ "type":"boolean", "documentation":"

Boolean to indicate if custom encryption has been enabled.

" @@ -761,8 +776,8 @@ "type":"structure", "members":{ "clientToken":{"shape":"ClientToken"}, - "failureCode":{"shape":"FailureCode"}, - "id":{"shape":"DialRequestId"} + "id":{"shape":"DialRequestId"}, + "failureCode":{"shape":"FailureCode"} }, "documentation":"

A failed request identified by the unique client token.

" }, @@ -808,8 +823,8 @@ "GetCampaignStateBatchResponse":{ "type":"structure", "members":{ - "failedRequests":{"shape":"FailedCampaignStateResponseList"}, - "successfulRequests":{"shape":"SuccessfulCampaignStateResponseList"} + "successfulRequests":{"shape":"SuccessfulCampaignStateResponseList"}, + "failedRequests":{"shape":"FailedCampaignStateResponseList"} }, "documentation":"

GetCampaignStateBatchResponse

" }, @@ -874,13 +889,13 @@ "type":"structure", "required":[ "connectInstanceId", - "encryptionConfig", - "serviceLinkedRoleArn" + "serviceLinkedRoleArn", + "encryptionConfig" ], "members":{ "connectInstanceId":{"shape":"InstanceId"}, - "encryptionConfig":{"shape":"EncryptionConfig"}, - "serviceLinkedRoleArn":{"shape":"ServiceLinkedRoleArn"} + "serviceLinkedRoleArn":{"shape":"ServiceLinkedRoleArn"}, + "encryptionConfig":{"shape":"EncryptionConfig"} }, "documentation":"

Instance config object

" }, @@ -893,12 +908,12 @@ "InstanceIdFilter":{ "type":"structure", "required":[ - "operator", - "value" + "value", + "operator" ], "members":{ - "operator":{"shape":"InstanceIdFilterOperator"}, - "value":{"shape":"InstanceId"} + "value":{"shape":"InstanceId"}, + "operator":{"shape":"InstanceIdFilterOperator"} }, "documentation":"

Connect instance identifier filter

" }, @@ -927,8 +942,8 @@ ], "members":{ "connectInstanceId":{"shape":"InstanceId"}, - "failureCode":{"shape":"InstanceOnboardingJobFailureCode"}, - "status":{"shape":"InstanceOnboardingJobStatusCode"} + "status":{"shape":"InstanceOnboardingJobStatusCode"}, + "failureCode":{"shape":"InstanceOnboardingJobFailureCode"} }, "documentation":"

Instance onboarding job status object

" }, @@ -961,12 +976,12 @@ "InvalidCampaignStateException":{ "type":"structure", "required":[ - "message", - "state" + "state", + "message" ], "members":{ - "message":{"shape":"String"}, "state":{"shape":"CampaignState"}, + "message":{"shape":"String"}, "xAmzErrorType":{ "shape":"XAmazonErrorType", "location":"header", @@ -1001,17 +1016,17 @@ "ListCampaignsRequest":{ "type":"structure", "members":{ - "filters":{"shape":"CampaignFilters"}, "maxResults":{"shape":"MaxResults"}, - "nextToken":{"shape":"NextToken"} + "nextToken":{"shape":"NextToken"}, + "filters":{"shape":"CampaignFilters"} }, "documentation":"

ListCampaignsRequest

" }, "ListCampaignsResponse":{ "type":"structure", "members":{ - "campaignSummaryList":{"shape":"CampaignSummaryList"}, - "nextToken":{"shape":"NextToken"} + "nextToken":{"shape":"NextToken"}, + "campaignSummaryList":{"shape":"CampaignSummaryList"} }, "documentation":"

ListCampaignsResponse

" }, @@ -1049,15 +1064,12 @@ }, "OutboundCallConfig":{ "type":"structure", - "required":[ - "connectContactFlowId", - "connectQueueId" - ], + "required":["connectContactFlowId"], "members":{ - "answerMachineDetectionConfig":{"shape":"AnswerMachineDetectionConfig"}, "connectContactFlowId":{"shape":"ContactFlowId"}, + "connectSourcePhoneNumber":{"shape":"SourcePhoneNumber"}, "connectQueueId":{"shape":"QueueId"}, - "connectSourcePhoneNumber":{"shape":"SourcePhoneNumber"} + "answerMachineDetectionConfig":{"shape":"AnswerMachineDetectionConfig"} }, "documentation":"

The configuration used for outbound calls.

" }, @@ -1077,7 +1089,8 @@ "type":"structure", "required":["bandwidthAllocation"], "members":{ - "bandwidthAllocation":{"shape":"BandwidthAllocation"} + "bandwidthAllocation":{"shape":"BandwidthAllocation"}, + "dialingCapacity":{"shape":"DialingCapacity"} }, "documentation":"

Predictive Dialer config

" }, @@ -1085,31 +1098,32 @@ "type":"structure", "required":["bandwidthAllocation"], "members":{ - "bandwidthAllocation":{"shape":"BandwidthAllocation"} + "bandwidthAllocation":{"shape":"BandwidthAllocation"}, + "dialingCapacity":{"shape":"DialingCapacity"} }, "documentation":"

Progressive Dialer config

" }, "PutDialRequestBatchRequest":{ "type":"structure", "required":[ - "dialRequests", - "id" + "id", + "dialRequests" ], "members":{ - "dialRequests":{"shape":"DialRequestList"}, "id":{ "shape":"CampaignId", "location":"uri", "locationName":"id" - } + }, + "dialRequests":{"shape":"DialRequestList"} }, "documentation":"

PutDialRequestBatchRequest

" }, "PutDialRequestBatchResponse":{ "type":"structure", "members":{ - "failedRequests":{"shape":"FailedRequestList"}, - "successfulRequests":{"shape":"SuccessfulRequestList"} + "successfulRequests":{"shape":"SuccessfulRequestList"}, + "failedRequests":{"shape":"FailedRequestList"} }, "documentation":"

PutDialRequestBatchResponse

" }, @@ -1262,7 +1276,7 @@ "documentation":"

Tag key.

", "max":128, "min":1, - "pattern":"^(?!aws:)[a-zA-Z+-=._:/]+$" + "pattern":"(?!aws:)[a-zA-Z+-=._:/]+" }, "TagKeyList":{ "type":"list", @@ -1346,16 +1360,16 @@ "UpdateCampaignDialerConfigRequest":{ "type":"structure", "required":[ - "dialerConfig", - "id" + "id", + "dialerConfig" ], "members":{ - "dialerConfig":{"shape":"DialerConfig"}, "id":{ "shape":"CampaignId", "location":"uri", "locationName":"id" - } + }, + "dialerConfig":{"shape":"DialerConfig"} }, "documentation":"

UpdateCampaignDialerConfigRequest

" }, @@ -1379,14 +1393,14 @@ "type":"structure", "required":["id"], "members":{ - "answerMachineDetectionConfig":{"shape":"AnswerMachineDetectionConfig"}, - "connectContactFlowId":{"shape":"ContactFlowId"}, - "connectSourcePhoneNumber":{"shape":"SourcePhoneNumber"}, "id":{ "shape":"CampaignId", "location":"uri", "locationName":"id" - } + }, + "connectContactFlowId":{"shape":"ContactFlowId"}, + "connectSourcePhoneNumber":{"shape":"SourcePhoneNumber"}, + "answerMachineDetectionConfig":{"shape":"AnswerMachineDetectionConfig"} }, "documentation":"

UpdateCampaignOutboundCallConfigRequest

" }, diff --git a/botocore/data/connectparticipant/2018-09-07/endpoint-rule-set-1.json b/botocore/data/connectparticipant/2018-09-07/endpoint-rule-set-1.json index 1662572daf..eaed7a9924 100644 --- a/botocore/data/connectparticipant/2018-09-07/endpoint-rule-set-1.json +++ b/botocore/data/connectparticipant/2018-09-07/endpoint-rule-set-1.json @@ -58,52 +58,56 @@ "type": "error" }, { - "conditions": [], - "type": "tree", - "rules": [ + "conditions": [ { - "conditions": [ + "fn": "booleanEquals", + "argv": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" + "ref": "UseDualStack" }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" + true + ] } - ] + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, { - "conditions": [], + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Region" + } + ] + } + ], "type": "tree", "rules": [ { "conditions": [ { - "fn": "isSet", + "fn": "aws.partition", "argv": [ { "ref": "Region" } - ] + ], + "assign": "PartitionResult" } ], "type": "tree", @@ -111,13 +115,22 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "booleanEquals", "argv": [ { - "ref": "Region" - } - ], - "assign": "PartitionResult" + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] } ], "type": "tree", @@ -127,92 +140,83 @@ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] }, { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://participant.connect-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" + "endpoint": { + "url": "https://participant.connect-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, { - "ref": "UseFIPS" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] } ], @@ -221,155 +225,115 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "stringEquals", "argv": [ - true, + "aws-us-gov", { "fn": "getAttr", "argv": [ { "ref": "PartitionResult" }, - "supportsFIPS" + "name" ] } ] } ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "stringEquals", - "argv": [ - "aws-us-gov", - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "name" - ] - } - ] - } - ], - "endpoint": { - "url": "https://participant.connect.{Region}.amazonaws.com", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - }, - { - "conditions": [], - "endpoint": { - "url": "https://participant.connect-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - } - ] + "endpoint": { + "url": "https://participant.connect.{Region}.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" }, { "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" + "endpoint": { + "url": "https://participant.connect-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, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://participant.connect.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } - ] - }, - { - "conditions": [], + ], "type": "tree", "rules": [ { "conditions": [], "endpoint": { - "url": "https://participant.connect.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://participant.connect.{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://participant.connect.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, - { - "conditions": [], - "error": "Invalid Configuration: Missing Region", - "type": "error" } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } \ No newline at end of file diff --git a/botocore/data/connectparticipant/2018-09-07/service-2.json b/botocore/data/connectparticipant/2018-09-07/service-2.json index 97d2c2e3bb..15131de43c 100644 --- a/botocore/data/connectparticipant/2018-09-07/service-2.json +++ b/botocore/data/connectparticipant/2018-09-07/service-2.json @@ -47,6 +47,23 @@ ], "documentation":"

Creates the participant's connection.

ParticipantToken is used for invoking this API instead of ConnectionToken.

The participant token is valid for the lifetime of the participant – until they are part of a contact.

The response URL for WEBSOCKET Type has a connect expiry timeout of 100s. Clients must manually connect to the returned websocket URL and subscribe to the desired topic.

For chat, you need to publish the following on the established websocket connection:

{\"topic\":\"aws/subscribe\",\"content\":{\"topics\":[\"aws/chat\"]}}

Upon websocket URL expiry, as specified in the response ConnectionExpiry parameter, clients need to call this API again to obtain a new websocket URL and perform the same steps as before.

Message streaming support: This API can also be used together with the StartContactStreaming API to create a participant connection for chat contacts that are not using a websocket. For more information about message streaming, Enable real-time chat message streaming in the Amazon Connect Administrator Guide.

Feature specifications: For information about feature specifications, such as the allowed number of open websocket connections per participant, see Feature specifications in the Amazon Connect Administrator Guide.

The Amazon Connect Participant Service APIs do not use Signature Version 4 authentication.

" }, + "DescribeView":{ + "name":"DescribeView", + "http":{ + "method":"GET", + "requestUri":"/participant/views/{ViewToken}" + }, + "input":{"shape":"DescribeViewRequest"}, + "output":{"shape":"DescribeViewResponse"}, + "errors":[ + {"shape":"AccessDeniedException"}, + {"shape":"InternalServerException"}, + {"shape":"ThrottlingException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"ValidationException"} + ], + "documentation":"

Retrieves the view for the specified view token.

" + }, "DisconnectParticipant":{ "name":"DisconnectParticipant", "http":{ @@ -146,6 +163,7 @@ } }, "shapes":{ + "ARN":{"type":"string"}, "AccessDeniedException":{ "type":"structure", "required":["Message"], @@ -329,7 +347,7 @@ "members":{ "Type":{ "shape":"ConnectionTypeList", - "documentation":"

Type of connection information required. This can be omitted if ConnectParticipant is true.

" + "documentation":"

Type of connection information required. If you need CONNECTION_CREDENTIALS along with marking participant as connected, pass CONNECTION_CREDENTIALS in Type.

" }, "ParticipantToken":{ "shape":"ParticipantToken", @@ -356,6 +374,36 @@ } } }, + "DescribeViewRequest":{ + "type":"structure", + "required":[ + "ViewToken", + "ConnectionToken" + ], + "members":{ + "ViewToken":{ + "shape":"ViewToken", + "documentation":"

An encrypted token originating from the interactive message of a ShowView block operation. Represents the desired view.

", + "location":"uri", + "locationName":"ViewToken" + }, + "ConnectionToken":{ + "shape":"ParticipantToken", + "documentation":"

The connection token.

", + "location":"header", + "locationName":"X-Amz-Bearer" + } + } + }, + "DescribeViewResponse":{ + "type":"structure", + "members":{ + "View":{ + "shape":"View", + "documentation":"

A view resource object. Contains metadata and content necessary to render the view.

" + } + } + }, "DisconnectParticipantRequest":{ "type":"structure", "required":["ConnectionToken"], @@ -585,7 +633,8 @@ "enum":[ "AGENT", "CUSTOMER", - "SYSTEM" + "SYSTEM", + "CUSTOM_BOT" ] }, "ParticipantToken":{ @@ -630,6 +679,36 @@ "type":"list", "member":{"shape":"Receipt"} }, + "ResourceId":{"type":"string"}, + "ResourceNotFoundException":{ + "type":"structure", + "members":{ + "Message":{"shape":"Message"}, + "ResourceId":{ + "shape":"ResourceId", + "documentation":"

The identifier of the resource.

" + }, + "ResourceType":{ + "shape":"ResourceType", + "documentation":"

The type of Amazon Connect resource.

" + } + }, + "documentation":"

The resource was not found.

", + "error":{"httpStatusCode":404}, + "exception":true + }, + "ResourceType":{ + "type":"string", + "enum":[ + "CONTACT", + "CONTACT_FLOW", + "INSTANCE", + "PARTICIPANT", + "HIERARCHY_LEVEL", + "HIERARCHY_GROUP", + "USER" + ] + }, "ScanDirection":{ "type":"string", "enum":[ @@ -865,6 +944,88 @@ "error":{"httpStatusCode":400}, "exception":true }, + "View":{ + "type":"structure", + "members":{ + "Id":{ + "shape":"ViewId", + "documentation":"

The identifier of the view.

" + }, + "Arn":{ + "shape":"ARN", + "documentation":"

The Amazon Resource Name (ARN) of the view.

" + }, + "Name":{ + "shape":"ViewName", + "documentation":"

The name of the view.

" + }, + "Version":{ + "shape":"ViewVersion", + "documentation":"

The current version of the view.

" + }, + "Content":{ + "shape":"ViewContent", + "documentation":"

View content containing all content necessary to render a view except for runtime input data.

" + } + }, + "documentation":"

A view resource object. Contains metadata and content necessary to render the view.

" + }, + "ViewAction":{ + "type":"string", + "max":255, + "min":1, + "pattern":"^([\\p{L}\\p{N}_.:\\/=+\\-@()']+[\\p{L}\\p{Z}\\p{N}_.:\\/=+\\-@()']*)$", + "sensitive":true + }, + "ViewActions":{ + "type":"list", + "member":{"shape":"ViewAction"} + }, + "ViewContent":{ + "type":"structure", + "members":{ + "InputSchema":{ + "shape":"ViewInputSchema", + "documentation":"

The schema representing the input data that the view template must be supplied to render.

" + }, + "Template":{ + "shape":"ViewTemplate", + "documentation":"

The view template representing the structure of the view.

" + }, + "Actions":{ + "shape":"ViewActions", + "documentation":"

A list of actions possible from the view

" + } + }, + "documentation":"

View content containing all content necessary to render a view except for runtime input data.

" + }, + "ViewId":{ + "type":"string", + "max":500, + "min":1, + "pattern":"^[a-zA-Z0-9\\_\\-:\\/$]+$" + }, + "ViewInputSchema":{ + "type":"string", + "sensitive":true + }, + "ViewName":{ + "type":"string", + "max":255, + "min":1, + "pattern":"^([\\p{L}\\p{N}_.:\\/=+\\-@()']+[\\p{L}\\p{Z}\\p{N}_.:\\/=+\\-@()']*)$", + "sensitive":true + }, + "ViewTemplate":{ + "type":"string", + "sensitive":true + }, + "ViewToken":{ + "type":"string", + "max":1000, + "min":1 + }, + "ViewVersion":{"type":"integer"}, "Websocket":{ "type":"structure", "members":{ diff --git a/botocore/data/customer-profiles/2020-08-15/endpoint-rule-set-1.json b/botocore/data/customer-profiles/2020-08-15/endpoint-rule-set-1.json index a70609892a..02edb0b68d 100644 --- a/botocore/data/customer-profiles/2020-08-15/endpoint-rule-set-1.json +++ b/botocore/data/customer-profiles/2020-08-15/endpoint-rule-set-1.json @@ -58,52 +58,56 @@ "type": "error" }, { - "conditions": [], - "type": "tree", - "rules": [ + "conditions": [ { - "conditions": [ + "fn": "booleanEquals", + "argv": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" + "ref": "UseDualStack" }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" + true + ] } - ] + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, { - "conditions": [], + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Region" + } + ] + } + ], "type": "tree", "rules": [ { "conditions": [ { - "fn": "isSet", + "fn": "aws.partition", "argv": [ { "ref": "Region" } - ] + ], + "assign": "PartitionResult" } ], "type": "tree", @@ -111,13 +115,22 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "booleanEquals", "argv": [ { - "ref": "Region" - } - ], - "assign": "PartitionResult" + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] } ], "type": "tree", @@ -127,224 +140,175 @@ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] }, { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://profile-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" + "endpoint": { + "url": "https://profile-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, { - "ref": "UseFIPS" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ { - "conditions": [], - "endpoint": { - "url": "https://profile-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsFIPS" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" + "endpoint": { + "url": "https://profile-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, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://profile.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } - ] - }, - { - "conditions": [], + ], "type": "tree", "rules": [ { "conditions": [], "endpoint": { - "url": "https://profile.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://profile.{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://profile.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, - { - "conditions": [], - "error": "Invalid Configuration: Missing Region", - "type": "error" } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } \ No newline at end of file diff --git a/botocore/data/customer-profiles/2020-08-15/service-2.json b/botocore/data/customer-profiles/2020-08-15/service-2.json index 2faa269c43..4d16bfabf8 100644 --- a/botocore/data/customer-profiles/2020-08-15/service-2.json +++ b/botocore/data/customer-profiles/2020-08-15/service-2.json @@ -995,7 +995,8 @@ "documentation":"

The postal code of a customer address.

" } }, - "documentation":"

A generic address associated with the customer that is not mailing, shipping, or billing.

" + "documentation":"

A generic address associated with the customer that is not mailing, shipping, or billing.

", + "sensitive":true }, "AddressList":{ "type":"list", @@ -1124,7 +1125,8 @@ "documentation":"

Mathematical expression that is performed on attribute items provided in the attribute list. Each element in the expression should follow the structure of \\\"{ObjectTypeName.AttributeName}\\\".

" } }, - "documentation":"

Mathematical expression and a list of attribute items specified in that expression.

" + "documentation":"

Mathematical expression and a list of attribute items specified in that expression.

", + "sensitive":true }, "AttributeItem":{ "type":"structure", @@ -1181,7 +1183,8 @@ "Attributes":{ "type":"map", "key":{"shape":"string1To255"}, - "value":{"shape":"string1To255"} + "value":{"shape":"string1To255"}, + "sensitive":true }, "AutoMerging":{ "type":"structure", @@ -1272,7 +1275,8 @@ "documentation":"

The threshold for the calculated attribute.

" } }, - "documentation":"

The conditions including range, object count, and threshold for the calculated attribute.

" + "documentation":"

The conditions including range, object count, and threshold for the calculated attribute.

", + "sensitive":true }, "ConflictResolution":{ "type":"structure", @@ -1622,11 +1626,11 @@ "locationName":"DomainName" }, "AccountNumber":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

A unique account number that you have given to the customer.

" }, "AdditionalInformation":{ - "shape":"string1To1000", + "shape":"sensitiveString1To1000", "documentation":"

Any additional information relevant to the customer’s profile.

" }, "PartyType":{ @@ -1634,23 +1638,23 @@ "documentation":"

The type of profile used to describe the customer.

" }, "BusinessName":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The name of the customer’s business.

" }, "FirstName":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s first name.

" }, "MiddleName":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s middle name.

" }, "LastName":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s last name.

" }, "BirthDate":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s birth date.

" }, "Gender":{ @@ -1658,31 +1662,31 @@ "documentation":"

The gender with which the customer identifies.

" }, "PhoneNumber":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s phone number, which has not been specified as a mobile, home, or business number.

" }, "MobilePhoneNumber":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s mobile phone number.

" }, "HomePhoneNumber":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s home phone number.

" }, "BusinessPhoneNumber":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s business phone number.

" }, "EmailAddress":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s email address, which has not been specified as a personal or business address.

" }, "PersonalEmailAddress":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s personal email address.

" }, "BusinessEmailAddress":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s business email address.

" }, "Address":{ @@ -1706,11 +1710,11 @@ "documentation":"

A key value pair of attributes of a customer profile.

" }, "PartyTypeString":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

An alternative to PartyType which accepts any string as input.

" }, "GenderString":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

An alternative to Gender which accepts any string as input.

" } } @@ -2184,7 +2188,8 @@ "FieldMap":{ "type":"map", "key":{"shape":"name"}, - "value":{"shape":"ObjectTypeField"} + "value":{"shape":"ObjectTypeField"}, + "sensitive":true }, "FieldNameList":{ "type":"list", @@ -2315,7 +2320,8 @@ "documentation":"

The trigger settings that determine how and when the flow runs.

" } }, - "documentation":"

The configurations that control how Customer Profiles retrieves data from the source, Amazon AppFlow. Customer Profiles uses this information to create an AppFlow flow on behalf of customers.

" + "documentation":"

The configurations that control how Customer Profiles retrieves data from the source, Amazon AppFlow. Customer Profiles uses this information to create an AppFlow flow on behalf of customers.

", + "sensitive":true }, "FlowDescription":{ "type":"string", @@ -2348,7 +2354,8 @@ "MALE", "FEMALE", "UNSPECIFIED" - ] + ], + "sensitive":true }, "GetAutoMergingPreviewRequest":{ "type":"structure", @@ -2848,7 +2855,7 @@ "documentation":"

The name of the profile object type.

" }, "Description":{ - "shape":"text", + "shape":"sensitiveText", "documentation":"

The description of the profile object type.

" }, "TemplateId":{ @@ -3265,7 +3272,8 @@ "KeyMap":{ "type":"map", "key":{"shape":"name"}, - "value":{"shape":"ObjectTypeKeyList"} + "value":{"shape":"ObjectTypeKeyList"}, + "sensitive":true }, "KmsArn":{ "type":"string", @@ -4302,7 +4310,8 @@ "INDIVIDUAL", "BUSINESS", "OTHER" - ] + ], + "sensitive":true }, "PhoneNumberList":{ "type":"list", @@ -4318,11 +4327,11 @@ "documentation":"

The unique identifier of a customer profile.

" }, "AccountNumber":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

A unique account number that you have given to the customer.

" }, "AdditionalInformation":{ - "shape":"string1To1000", + "shape":"sensitiveString1To1000", "documentation":"

Any additional information relevant to the customer’s profile.

" }, "PartyType":{ @@ -4330,23 +4339,23 @@ "documentation":"

The type of profile used to describe the customer.

" }, "BusinessName":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The name of the customer’s business.

" }, "FirstName":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s first name.

" }, "MiddleName":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s middle name.

" }, "LastName":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s last name.

" }, "BirthDate":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s birth date.

" }, "Gender":{ @@ -4354,31 +4363,31 @@ "documentation":"

The gender with which the customer identifies.

" }, "PhoneNumber":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer's phone number, which has not been specified as a mobile, home, or business number.

" }, "MobilePhoneNumber":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s mobile phone number.

" }, "HomePhoneNumber":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s home phone number.

" }, "BusinessPhoneNumber":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s home phone number.

" }, "EmailAddress":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s email address, which has not been specified as a personal or business address.

" }, "PersonalEmailAddress":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s personal email address.

" }, "BusinessEmailAddress":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

The customer’s business email address.

" }, "Address":{ @@ -4406,11 +4415,11 @@ "documentation":"

A list of items used to find a profile returned in a SearchProfiles response. An item is a key-value(s) pair that matches an attribute in the profile.

If the optional AdditionalSearchKeys parameter was included in the SearchProfiles request, the FoundByItems list should be interpreted based on the LogicalOperator used in the request:

The OR relationship is the default behavior if the LogicalOperator parameter is not included in the SearchProfiles request.

" }, "PartyTypeString":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

An alternative to PartyType which accepts any string as input.

" }, "GenderString":{ - "shape":"string1To255", + "shape":"sensitiveString1To255", "documentation":"

An alternative to Gender which accepts any string as input.

" } }, @@ -4436,7 +4445,8 @@ }, "ProfileObjectTypeList":{ "type":"list", - "member":{"shape":"ListProfileObjectTypeItem"} + "member":{"shape":"ListProfileObjectTypeItem"}, + "sensitive":true }, "ProfileObjectTypeTemplateList":{ "type":"list", @@ -4580,7 +4590,7 @@ "locationName":"ObjectTypeName" }, "Description":{ - "shape":"text", + "shape":"sensitiveText", "documentation":"

Description of the profile object type.

" }, "TemplateId":{ @@ -4629,7 +4639,7 @@ "documentation":"

The name of the profile object type.

" }, "Description":{ - "shape":"text", + "shape":"sensitiveText", "documentation":"

Description of the profile object type.

" }, "TemplateId":{ @@ -5128,7 +5138,8 @@ "MAXIMUM", "AVERAGE", "MAX_OCCURRENCE" - ] + ], + "sensitive":true }, "Status":{ "type":"string", @@ -5384,12 +5395,14 @@ "documentation":"

The postal code of a customer address.

" } }, - "documentation":"

Updates associated with the address properties of a customer profile.

" + "documentation":"

Updates associated with the address properties of a customer profile.

", + "sensitive":true }, "UpdateAttributes":{ "type":"map", "key":{"shape":"string1To255"}, - "value":{"shape":"string0To255"} + "value":{"shape":"string0To255"}, + "sensitive":true }, "UpdateCalculatedAttributeDefinitionRequest":{ "type":"structure", @@ -5565,11 +5578,11 @@ "documentation":"

The unique identifier of a customer profile.

" }, "AdditionalInformation":{ - "shape":"string0To1000", + "shape":"sensitiveString0To1000", "documentation":"

Any additional information relevant to the customer’s profile.

" }, "AccountNumber":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

A unique account number that you have given to the customer.

" }, "PartyType":{ @@ -5577,23 +5590,23 @@ "documentation":"

The type of profile used to describe the customer.

" }, "BusinessName":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

The name of the customer’s business.

" }, "FirstName":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

The customer’s first name.

" }, "MiddleName":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

The customer’s middle name.

" }, "LastName":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

The customer’s last name.

" }, "BirthDate":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

The customer’s birth date.

" }, "Gender":{ @@ -5601,31 +5614,31 @@ "documentation":"

The gender with which the customer identifies.

" }, "PhoneNumber":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

The customer’s phone number, which has not been specified as a mobile, home, or business number.

" }, "MobilePhoneNumber":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

The customer’s mobile phone number.

" }, "HomePhoneNumber":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

The customer’s home phone number.

" }, "BusinessPhoneNumber":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

The customer’s business phone number.

" }, "EmailAddress":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

The customer’s email address, which has not been specified as a personal or business address.

" }, "PersonalEmailAddress":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

The customer’s personal email address.

" }, "BusinessEmailAddress":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

The customer’s business email address.

" }, "Address":{ @@ -5649,11 +5662,11 @@ "documentation":"

A key value pair of attributes of a customer profile.

" }, "PartyTypeString":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

An alternative to PartyType which accepts any string as input.

" }, "GenderString":{ - "shape":"string0To255", + "shape":"sensitiveString0To255", "documentation":"

An alternative to Gender which accepts any string as input.

" } } @@ -5821,14 +5834,39 @@ "min":1, "pattern":".*" }, - "sqsQueueUrl":{ + "sensitiveString0To1000":{ + "type":"string", + "max":1000, + "min":0, + "sensitive":true + }, + "sensitiveString0To255":{ "type":"string", "max":255, - "min":0 + "min":0, + "sensitive":true }, - "string0To1000":{ + "sensitiveString1To1000":{ "type":"string", "max":1000, + "min":1, + "sensitive":true + }, + "sensitiveString1To255":{ + "type":"string", + "max":255, + "min":1, + "sensitive":true + }, + "sensitiveText":{ + "type":"string", + "max":1000, + "min":1, + "sensitive":true + }, + "sqsQueueUrl":{ + "type":"string", + "max":255, "min":0 }, "string0To255":{ @@ -5854,7 +5892,8 @@ "stringifiedJson":{ "type":"string", "max":256000, - "min":1 + "min":1, + "sensitive":true }, "text":{ "type":"string", diff --git a/botocore/data/ecs/2014-11-13/service-2.json b/botocore/data/ecs/2014-11-13/service-2.json index 6e93278b9d..e5b7587f05 100644 --- a/botocore/data/ecs/2014-11-13/service-2.json +++ b/botocore/data/ecs/2014-11-13/service-2.json @@ -572,7 +572,7 @@ {"shape":"ClientException"}, {"shape":"InvalidParameterException"} ], - "documentation":"

Modifies an account setting. Account settings are set on a per-Region basis.

If you change the root user account setting, the default settings are reset for users and roles that do not have specified individual account settings. For more information, see Account Settings in the Amazon Elastic Container Service Developer Guide.

When serviceLongArnFormat, taskLongArnFormat, or containerInstanceLongArnFormat are specified, the Amazon Resource Name (ARN) and resource ID format of the resource type for a specified user, role, or the root user for an account is affected. The opt-in and opt-out account setting must be set for each Amazon ECS resource separately. The ARN and resource ID format of a resource is defined by the opt-in status of the user or role that created the resource. You must turn on this setting to use Amazon ECS features such as resource tagging.

When awsvpcTrunking is specified, the elastic network interface (ENI) limit for any new container instances that support the feature is changed. If awsvpcTrunking is turned on, any new container instances that support the feature are launched have the increased ENI limits available to them. For more information, see Elastic Network Interface Trunking in the Amazon Elastic Container Service Developer Guide.

When containerInsights is specified, the default setting indicating whether Amazon Web Services CloudWatch Container Insights is turned on for your clusters is changed. If containerInsights is turned on, any new clusters that are created will have Container Insights turned on unless you disable it during cluster creation. For more information, see CloudWatch Container Insights in the Amazon Elastic Container Service Developer Guide.

Amazon ECS is introducing tagging authorization for resource creation. Users must have permissions for actions that create the resource, such as ecsCreateCluster. If tags are specified when you create a resource, Amazon Web Services performs additional authorization to verify if users or roles have permissions to create tags. Therefore, you must grant explicit permissions to use the ecs:TagResource action. For more information, see Grant permission to tag resources on creation in the Amazon ECS Developer Guide.

" + "documentation":"

Modifies an account setting. Account settings are set on a per-Region basis.

If you change the root user account setting, the default settings are reset for users and roles that do not have specified individual account settings. For more information, see Account Settings in the Amazon Elastic Container Service Developer Guide.

When you specify serviceLongArnFormat, taskLongArnFormat, or containerInstanceLongArnFormat, the Amazon Resource Name (ARN) and resource ID format of the resource type for a specified user, role, or the root user for an account is affected. The opt-in and opt-out account setting must be set for each Amazon ECS resource separately. The ARN and resource ID format of a resource is defined by the opt-in status of the user or role that created the resource. You must turn on this setting to use Amazon ECS features such as resource tagging.

When you specify awsvpcTrunking, the elastic network interface (ENI) limit for any new container instances that support the feature is changed. If awsvpcTrunking is turned on, any new container instances that support the feature are launched have the increased ENI limits available to them. For more information, see Elastic Network Interface Trunking in the Amazon Elastic Container Service Developer Guide.

When you specify containerInsights, the default setting indicating whether Amazon Web Services CloudWatch Container Insights is turned on for your clusters is changed. If containerInsights is turned on, any new clusters that are created will have Container Insights turned on unless you disable it during cluster creation. For more information, see CloudWatch Container Insights in the Amazon Elastic Container Service Developer Guide.

Amazon ECS is introducing tagging authorization for resource creation. Users must have permissions for actions that create the resource, such as ecsCreateCluster. If tags are specified when you create a resource, Amazon Web Services performs additional authorization to verify if users or roles have permissions to create tags. Therefore, you must grant explicit permissions to use the ecs:TagResource action. For more information, see Grant permission to tag resources on creation in the Amazon ECS Developer Guide.

When Amazon Web Services determines that a security or infrastructure update is needed for an Amazon ECS task hosted on Fargate, the tasks need to be stopped and new tasks launched to replace them. Use fargateTaskRetirementWaitPeriod to configure the wait time to retire a Fargate task. For information about the Fargate tasks maintenance, see Amazon Web Services Fargate task maintenance in the Amazon ECS Developer Guide.

" }, "PutAccountSettingDefault":{ "name":"PutAccountSettingDefault", @@ -1084,7 +1084,7 @@ }, "managedScaling":{ "shape":"ManagedScaling", - "documentation":"

he managed scaling settings for the Auto Scaling group capacity provider.

" + "documentation":"

The managed scaling settings for the Auto Scaling group capacity provider.

" }, "managedTerminationProtection":{ "shape":"ManagedTerminationProtection", @@ -1674,7 +1674,7 @@ }, "systemControls":{ "shape":"SystemControls", - "documentation":"

A list of namespaced kernel parameters to set in the container. This parameter maps to Sysctls in the Create a container section of the Docker Remote API and the --sysctl option to docker run.

We don't recommended that you specify network-related systemControls parameters for multiple containers in a single task that also uses either the awsvpc or host network modes. For tasks that use the awsvpc network mode, the container that's started last determines which systemControls parameters take effect. For tasks that use the host network mode, it changes the container instance's namespaced kernel parameters as well as the containers.

" + "documentation":"

A list of namespaced kernel parameters to set in the container. This parameter maps to Sysctls in the Create a container section of the Docker Remote API and the --sysctl option to docker run. For example, you can configure net.ipv4.tcp_keepalive_time setting to maintain longer lived connections.

We don't recommended that you specify network-related systemControls parameters for multiple containers in a single task that also uses either the awsvpc or host network modes. For tasks that use the awsvpc network mode, the container that's started last determines which systemControls parameters take effect. For tasks that use the host network mode, it changes the container instance's namespaced kernel parameters as well as the containers.

This parameter is not supported for Windows containers.

This parameter is only supported for tasks that are hosted on Fargate if the tasks are using platform version 1.4.0 or later (Linux). This isn't supported for Windows containers on Fargate.

" }, "resourceRequirements":{ "shape":"ResourceRequirements", @@ -1762,7 +1762,7 @@ }, "runningTasksCount":{ "shape":"Integer", - "documentation":"

The number of tasks on the container instance that are in the RUNNING status.

" + "documentation":"

The number of tasks on the container instance that have a desired status (desiredStatus) of RUNNING.

" }, "pendingTasksCount":{ "shape":"Integer", @@ -4327,11 +4327,11 @@ "members":{ "name":{ "shape":"SettingName", - "documentation":"

The resource name for which to modify the account setting. If serviceLongArnFormat is specified, the ARN for your Amazon ECS services is affected. If taskLongArnFormat is specified, the ARN and resource ID for your Amazon ECS tasks is affected. If containerInstanceLongArnFormat is specified, the ARN and resource ID for your Amazon ECS container instances is affected. If awsvpcTrunking is specified, the ENI limit for your Amazon ECS container instances is affected. If containerInsights is specified, the default setting for Amazon Web Services CloudWatch Container Insights for your clusters is affected. If tagResourceAuthorization is specified, the opt-in option for tagging resources on creation is affected. For information about the opt-in timeline, see Tagging authorization timeline in the Amazon ECS Developer Guide.

When you specify fargateFIPSMode for the name and enabled for the value, Fargate uses FIPS-140 compliant cryptographic algorithms on your tasks. For more information about FIPS-140 compliance with Fargate, see Amazon Web Services Fargate Federal Information Processing Standard (FIPS) 140-2 compliance in the Amazon Elastic Container Service Developer Guide.

" + "documentation":"

The resource name for which to modify the account setting. If you specify serviceLongArnFormat, the ARN for your Amazon ECS services is affected. If you specify taskLongArnFormat, the ARN and resource ID for your Amazon ECS tasks is affected. If you specify containerInstanceLongArnFormat, the ARN and resource ID for your Amazon ECS container instances is affected. If you specify awsvpcTrunking, the ENI limit for your Amazon ECS container instances is affected. If you specify containerInsights, the default setting for Amazon Web Services CloudWatch Container Insights for your clusters is affected. If you specify tagResourceAuthorization, the opt-in option for tagging resources on creation is affected. For information about the opt-in timeline, see Tagging authorization timeline in the Amazon ECS Developer Guide. If you specify fargateTaskRetirementWaitPeriod, the default wait time to retire a Fargate task due to required maintenance is affected.

When you specify fargateFIPSMode for the name and enabled for the value, Fargate uses FIPS-140 compliant cryptographic algorithms on your tasks. For more information about FIPS-140 compliance with Fargate, see Amazon Web Services Fargate Federal Information Processing Standard (FIPS) 140-2 compliance in the Amazon Elastic Container Service Developer Guide.

When Amazon Web Services determines that a security or infrastructure update is needed for an Amazon ECS task hosted on Fargate, the tasks need to be stopped and new tasks launched to replace them. Use fargateTaskRetirementWaitPeriod to set the wait time to retire a Fargate task to the default. For information about the Fargate tasks maintenance, see Amazon Web Services Fargate task maintenance in the Amazon ECS Developer Guide.

" }, "value":{ "shape":"String", - "documentation":"

The account setting value for the specified principal ARN. Accepted values are enabled, disabled, on, and off.

" + "documentation":"

The account setting value for the specified principal ARN. Accepted values are enabled, disabled, on, and off.

When you specify fargateTaskRetirementWaitPeriod for the name, the following are the valid values:

" } } }, @@ -4353,15 +4353,15 @@ "members":{ "name":{ "shape":"SettingName", - "documentation":"

The Amazon ECS resource name for which to modify the account setting. If serviceLongArnFormat is specified, the ARN for your Amazon ECS services is affected. If taskLongArnFormat is specified, the ARN and resource ID for your Amazon ECS tasks is affected. If containerInstanceLongArnFormat is specified, the ARN and resource ID for your Amazon ECS container instances is affected. If awsvpcTrunking is specified, the elastic network interface (ENI) limit for your Amazon ECS container instances is affected. If containerInsights is specified, the default setting for Amazon Web Services CloudWatch Container Insights for your clusters is affected. If fargateFIPSMode is specified, Fargate FIPS 140 compliance is affected. If tagResourceAuthorization is specified, the opt-in option for tagging resources on creation is affected. For information about the opt-in timeline, see Tagging authorization timeline in the Amazon ECS Developer Guide.

" + "documentation":"

The Amazon ECS resource name for which to modify the account setting. If you specify serviceLongArnFormat, the ARN for your Amazon ECS services is affected. If you specify taskLongArnFormat, the ARN and resource ID for your Amazon ECS tasks is affected. If you specify containerInstanceLongArnFormat, the ARN and resource ID for your Amazon ECS container instances is affected. If you specify awsvpcTrunking, the elastic network interface (ENI) limit for your Amazon ECS container instances is affected. If you specify containerInsights, the default setting for Amazon Web Services CloudWatch Container Insights for your clusters is affected. If you specify fargateFIPSMode, Fargate FIPS 140 compliance is affected. If you specify tagResourceAuthorization, the opt-in option for tagging resources on creation is affected. For information about the opt-in timeline, see Tagging authorization timeline in the Amazon ECS Developer Guide. If you specify fargateTaskRetirementWaitPeriod, the wait time to retire a Fargate task is affected.

" }, "value":{ "shape":"String", - "documentation":"

The account setting value for the specified principal ARN. Accepted values are enabled, disabled, on, and off.

" + "documentation":"

The account setting value for the specified principal ARN. Accepted values are enabled, disabled, on, and off.

When you specify fargateTaskRetirementWaitPeriod for the name, the following are the valid values:

" }, "principalArn":{ "shape":"String", - "documentation":"

The ARN of the principal, which can be a user, role, or the root user. If you specify the root user, it modifies the account setting for all users, roles, and the root user of the account unless a user or role explicitly overrides these settings. If this field is omitted, the setting is changed only for the authenticated user.

Federated users assume the account setting of the root user and can't have explicit account settings set for them.

" + "documentation":"

The ARN of the principal, which can be a user, role, or the root user. If you specify the root user, it modifies the account setting for all users, roles, and the root user of the account unless a user or role explicitly overrides these settings. If this field is omitted, the setting is changed only for the authenticated user.

You must use the root user when you set the Fargate wait time (fargateTaskRetirementWaitPeriod).

Federated users assume the account setting of the root user and can't have explicit account settings set for them.

" } } }, @@ -4531,7 +4531,7 @@ }, "pidMode":{ "shape":"PidMode", - "documentation":"

The process namespace to use for the containers in the task. The valid values are host or task. If host is specified, then all containers within the tasks that specified the host PID mode on the same container instance share the same process namespace with the host Amazon EC2 instance. If task is specified, all containers within the specified task share the same process namespace. If no value is specified, the default is a private namespace. For more information, see PID settings in the Docker run reference.

If the host PID mode is used, be aware that there is a heightened risk of undesired process namespace expose. For more information, see Docker security.

This parameter is not supported for Windows containers or tasks run on Fargate.

" + "documentation":"

The process namespace to use for the containers in the task. The valid values are host or task. On Fargate for Linux containers, the only valid value is task. For example, monitoring sidecars might need pidMode to access information about other containers running in the same task.

If host is specified, all containers within the tasks that specified the host PID mode on the same container instance share the same process namespace with the host Amazon EC2 instance.

If task is specified, all containers within the specified task share the same process namespace.

If no value is specified, the default is a private namespace for each container. For more information, see PID settings in the Docker run reference.

If the host PID mode is used, there's a heightened risk of undesired process namespace exposure. For more information, see Docker security.

This parameter is not supported for Windows containers.

This parameter is only supported for tasks that are hosted on Fargate if the tasks are using platform version 1.4.0 or later (Linux). This isn't supported for Windows containers on Fargate.

" }, "ipcMode":{ "shape":"IpcMode", @@ -5161,7 +5161,8 @@ "awsvpcTrunking", "containerInsights", "fargateFIPSMode", - "tagResourceAuthorization" + "tagResourceAuthorization", + "fargateTaskRetirementWaitPeriod" ] }, "Settings":{ @@ -5425,7 +5426,7 @@ }, "value":{ "shape":"String", - "documentation":"

The value for the namespaced kernel parameter that's specified in namespace.

" + "documentation":"

The namespaced kernel parameter to set a value for.

Valid IPC namespace values: \"kernel.msgmax\" | \"kernel.msgmnb\" | \"kernel.msgmni\" | \"kernel.sem\" | \"kernel.shmall\" | \"kernel.shmmax\" | \"kernel.shmmni\" | \"kernel.shm_rmid_forced\", and Sysctls that start with \"fs.mqueue.*\"

Valid network namespace values: Sysctls that start with \"net.*\"

All of these values are supported by Fargate.

" } }, "documentation":"

A list of namespaced kernel parameters to set in the container. This parameter maps to Sysctls in the Create a container section of the Docker Remote API and the --sysctl option to docker run.

We don't recommend that you specify network-related systemControls parameters for multiple containers in a single task. This task also uses either the awsvpc or host network mode. It does it for the following reasons.

" @@ -5733,7 +5734,7 @@ }, "pidMode":{ "shape":"PidMode", - "documentation":"

The process namespace to use for the containers in the task. The valid values are host or task. If host is specified, then all containers within the tasks that specified the host PID mode on the same container instance share the same process namespace with the host Amazon EC2 instance. If task is specified, all containers within the specified task share the same process namespace. If no value is specified, the default is a private namespace. For more information, see PID settings in the Docker run reference.

If the host PID mode is used, be aware that there is a heightened risk of undesired process namespace expose. For more information, see Docker security.

This parameter is not supported for Windows containers or tasks run on Fargate.

" + "documentation":"

The process namespace to use for the containers in the task. The valid values are host or task. On Fargate for Linux containers, the only valid value is task. For example, monitoring sidecars might need pidMode to access information about other containers running in the same task.

If host is specified, all containers within the tasks that specified the host PID mode on the same container instance share the same process namespace with the host Amazon EC2 instance.

If task is specified, all containers within the specified task share the same process namespace.

If no value is specified, the default is a private namespace for each container. For more information, see PID settings in the Docker run reference.

If the host PID mode is used, there's a heightened risk of undesired process namespace exposure. For more information, see Docker security.

This parameter is not supported for Windows containers.

This parameter is only supported for tasks that are hosted on Fargate if the tasks are using platform version 1.4.0 or later (Linux). This isn't supported for Windows containers on Fargate.

" }, "ipcMode":{ "shape":"IpcMode", diff --git a/botocore/data/grafana/2020-08-18/endpoint-rule-set-1.json b/botocore/data/grafana/2020-08-18/endpoint-rule-set-1.json index d448628703..6c513fce87 100644 --- a/botocore/data/grafana/2020-08-18/endpoint-rule-set-1.json +++ b/botocore/data/grafana/2020-08-18/endpoint-rule-set-1.json @@ -58,52 +58,56 @@ "type": "error" }, { - "conditions": [], - "type": "tree", - "rules": [ + "conditions": [ { - "conditions": [ + "fn": "booleanEquals", + "argv": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" + "ref": "UseDualStack" }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" + true + ] } - ] + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, { - "conditions": [], + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Region" + } + ] + } + ], "type": "tree", "rules": [ { "conditions": [ { - "fn": "isSet", + "fn": "aws.partition", "argv": [ { "ref": "Region" } - ] + ], + "assign": "PartitionResult" } ], "type": "tree", @@ -111,13 +115,22 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "booleanEquals", "argv": [ { - "ref": "Region" - } - ], - "assign": "PartitionResult" + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] } ], "type": "tree", @@ -127,224 +140,175 @@ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] }, { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://grafana-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" + "endpoint": { + "url": "https://grafana-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, { - "ref": "UseFIPS" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ { - "conditions": [], - "endpoint": { - "url": "https://grafana-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsFIPS" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" + "endpoint": { + "url": "https://grafana-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, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://grafana.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } - ] - }, - { - "conditions": [], + ], "type": "tree", "rules": [ { "conditions": [], "endpoint": { - "url": "https://grafana.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://grafana.{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://grafana.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, - { - "conditions": [], - "error": "Invalid Configuration: Missing Region", - "type": "error" } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } \ No newline at end of file diff --git a/botocore/data/grafana/2020-08-18/service-2.json b/botocore/data/grafana/2020-08-18/service-2.json index 270eaa0885..1b29063437 100644 --- a/botocore/data/grafana/2020-08-18/service-2.json +++ b/botocore/data/grafana/2020-08-18/service-2.json @@ -1252,7 +1252,8 @@ }, "RoleValueList":{ "type":"list", - "member":{"shape":"RoleValue"} + "member":{"shape":"RoleValue"}, + "sensitive":true }, "RoleValues":{ "type":"structure", @@ -1326,7 +1327,7 @@ "SecurityGroupIds":{ "type":"list", "member":{"shape":"SecurityGroupId"}, - "max":100, + "max":5, "min":1 }, "ServiceQuotaExceededException":{ @@ -1382,8 +1383,8 @@ "SubnetIds":{ "type":"list", "member":{"shape":"SubnetId"}, - "max":100, - "min":1 + "max":6, + "min":2 }, "TagKey":{ "type":"string", diff --git a/botocore/data/health/2016-08-04/endpoint-rule-set-1.json b/botocore/data/health/2016-08-04/endpoint-rule-set-1.json index d8ace323ea..407b069f5d 100644 --- a/botocore/data/health/2016-08-04/endpoint-rule-set-1.json +++ b/botocore/data/health/2016-08-04/endpoint-rule-set-1.json @@ -58,52 +58,56 @@ "type": "error" }, { - "conditions": [], - "type": "tree", - "rules": [ + "conditions": [ { - "conditions": [ + "fn": "booleanEquals", + "argv": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" + "ref": "UseDualStack" }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" + true + ] } - ] + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, { - "conditions": [], + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Region" + } + ] + } + ], "type": "tree", "rules": [ { "conditions": [ { - "fn": "isSet", + "fn": "aws.partition", "argv": [ { "ref": "Region" } - ] + ], + "assign": "PartitionResult" } ], "type": "tree", @@ -111,13 +115,22 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "booleanEquals", "argv": [ { - "ref": "Region" - } - ], - "assign": "PartitionResult" + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] } ], "type": "tree", @@ -127,278 +140,229 @@ { "fn": "booleanEquals", "argv": [ + true, { - "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", + "fn": "getAttr", "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ { - "conditions": [], - "endpoint": { - "url": "https://health-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsFIPS" ] } ] }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] - }, - { - "conditions": [ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ { - "conditions": [], - "endpoint": { - "url": "https://health-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" + "endpoint": { + "url": "https://health-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, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ { - "conditions": [], - "endpoint": { - "url": "https://health.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsFIPS" ] } ] - }, - { - "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" - ] - } - ], + "conditions": [], "endpoint": { - "url": "https://global.health.amazonaws.com", - "properties": { - "authSchemes": [ - { - "name": "sigv4", - "signingName": "health", - "signingRegion": "us-east-1" - } - ] - }, + "url": "https://health-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": [ { - "conditions": [ + "fn": "booleanEquals", + "argv": [ + true, { - "fn": "stringEquals", + "fn": "getAttr", "argv": [ { - "ref": "Region" + "ref": "PartitionResult" }, - "aws-cn-global" + "supportsDualStack" ] } - ], - "endpoint": { - "url": "https://global.health.amazonaws.com.cn", - "properties": { - "authSchemes": [ - { - "name": "sigv4", - "signingName": "health", - "signingRegion": "cn-northwest-1" - } - ] - }, - "headers": {} - }, - "type": "endpoint" - }, + ] + } + ], + "type": "tree", + "rules": [ { "conditions": [], "endpoint": { - "url": "https://health.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://health.{Region}.{PartitionResult#dualStackDnsSuffix}", "properties": {}, "headers": {} }, "type": "endpoint" } ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] + }, + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + { + "ref": "Region" + }, + "aws-global" + ] + } + ], + "endpoint": { + "url": "https://global.health.amazonaws.com", + "properties": { + "authSchemes": [ + { + "name": "sigv4", + "signingName": "health", + "signingRegion": "us-east-1" + } + ] + }, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + { + "ref": "Region" + }, + "aws-cn-global" + ] + } + ], + "endpoint": { + "url": "https://global.health.amazonaws.com.cn", + "properties": { + "authSchemes": [ + { + "name": "sigv4", + "signingName": "health", + "signingRegion": "cn-northwest-1" + } + ] + }, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [], + "endpoint": { + "url": "https://health.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, - { - "conditions": [], - "error": "Invalid Configuration: Missing Region", - "type": "error" } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } \ No newline at end of file diff --git a/botocore/data/health/2016-08-04/service-2.json b/botocore/data/health/2016-08-04/service-2.json index d0ba04c009..0097679b7d 100644 --- a/botocore/data/health/2016-08-04/service-2.json +++ b/botocore/data/health/2016-08-04/service-2.json @@ -68,6 +68,17 @@ "documentation":"

Returns the number of entities that are affected by each of the specified events.

", "idempotent":true }, + "DescribeEntityAggregatesForOrganization":{ + "name":"DescribeEntityAggregatesForOrganization", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"DescribeEntityAggregatesForOrganizationRequest"}, + "output":{"shape":"DescribeEntityAggregatesForOrganizationResponse"}, + "documentation":"

Returns a list of entity aggregates for your Organizations that are affected by each of the specified events.

", + "idempotent":true + }, "DescribeEventAggregates":{ "name":"DescribeEventAggregates", "http":{ @@ -191,6 +202,28 @@ } }, "shapes":{ + "AccountEntityAggregate":{ + "type":"structure", + "members":{ + "accountId":{ + "shape":"eventArn", + "documentation":"

The 12-digit Amazon Web Services account numbers that contains the affected entities.

" + }, + "count":{ + "shape":"count", + "documentation":"

The number of entities that match the filter criteria for the specified events.

" + }, + "statuses":{ + "shape":"entityStatuses", + "documentation":"

The number of affected entities aggregated by the entity status codes.

" + } + }, + "documentation":"

The number of entities in an account that are impacted by a specific event aggregated by the entity status codes.

" + }, + "AccountEntityAggregatesList":{ + "type":"list", + "member":{"shape":"AccountEntityAggregate"} + }, "AffectedEntity":{ "type":"structure", "members":{ @@ -292,11 +325,12 @@ }, "DescribeAffectedEntitiesForOrganizationRequest":{ "type":"structure", - "required":["organizationEntityFilters"], "members":{ "organizationEntityFilters":{ "shape":"OrganizationEntityFiltersList", - "documentation":"

A JSON set of elements including the awsAccountId and the eventArn.

" + "documentation":"

A JSON set of elements including the awsAccountId and the eventArn.

", + "deprecated":true, + "deprecatedMessage":"This property is deprecated, use organizationEntityAccountFilters instead." }, "locale":{ "shape":"locale", @@ -309,6 +343,10 @@ "maxResults":{ "shape":"maxResultsLowerRange", "documentation":"

The maximum number of items to return in one batch, between 10 and 100, inclusive.

" + }, + "organizationEntityAccountFilters":{ + "shape":"OrganizationEntityAccountFiltersList", + "documentation":"

A JSON set of elements including the awsAccountId, eventArn and a set of statusCodes.

" } } }, @@ -364,6 +402,29 @@ } } }, + "DescribeEntityAggregatesForOrganizationRequest":{ + "type":"structure", + "required":["eventArns"], + "members":{ + "eventArns":{ + "shape":"OrganizationEventArnsList", + "documentation":"

A list of event ARNs (unique identifiers). For example: \"arn:aws:health:us-east-1::event/EC2/EC2_INSTANCE_RETIREMENT_SCHEDULED/EC2_INSTANCE_RETIREMENT_SCHEDULED_ABC123-CDE456\", \"arn:aws:health:us-west-1::event/EBS/AWS_EBS_LOST_VOLUME/AWS_EBS_LOST_VOLUME_CHI789_JKL101\"

" + }, + "awsAccountIds":{ + "shape":"OrganizationAccountIdsList", + "documentation":"

A list of 12-digit Amazon Web Services account numbers that contains the affected entities.

" + } + } + }, + "DescribeEntityAggregatesForOrganizationResponse":{ + "type":"structure", + "members":{ + "organizationEntityAggregates":{ + "shape":"OrganizationEntityAggregatesList", + "documentation":"

The list of entity aggregates for each of the specified accounts that are affected by each of the specified events.

" + } + } + }, "DescribeEntityAggregatesRequest":{ "type":"structure", "members":{ @@ -598,6 +659,25 @@ } } }, + "EntityAccountFilter":{ + "type":"structure", + "required":["eventArn"], + "members":{ + "eventArn":{ + "shape":"eventArn", + "documentation":"

The unique identifier for the event. The event ARN has the arn:aws:health:event-region::event/SERVICE/EVENT_TYPE_CODE/EVENT_TYPE_PLUS_ID format.

For example, an event ARN might look like the following:

arn:aws:health:us-east-1::event/EC2/EC2_INSTANCE_RETIREMENT_SCHEDULED/EC2_INSTANCE_RETIREMENT_SCHEDULED_ABC123-DEF456

" + }, + "awsAccountId":{ + "shape":"accountId", + "documentation":"

The 12-digit Amazon Web Services account numbers that contains the affected entities.

" + }, + "statusCodes":{ + "shape":"entityStatusCodeList", + "documentation":"

A list of entity status codes.

" + } + }, + "documentation":"

A JSON set of elements including the awsAccountId, eventArn and a set of statusCodes.

" + }, "EntityAggregate":{ "type":"structure", "members":{ @@ -608,6 +688,10 @@ "count":{ "shape":"count", "documentation":"

The number of entities that match the criteria for the specified events.

" + }, + "statuses":{ + "shape":"entityStatuses", + "documentation":"

The number of affected entities aggregated by the entity status codes.

" } }, "documentation":"

The number of entities that are affected by one or more events. Returned by the DescribeEntityAggregates operation.

" @@ -908,6 +992,12 @@ "documentation":"

The specified pagination token (nextToken) is not valid.

", "exception":true }, + "OrganizationAccountIdsList":{ + "type":"list", + "member":{"shape":"accountId"}, + "max":25, + "min":1 + }, "OrganizationAffectedEntitiesErrorItem":{ "type":"structure", "members":{ @@ -930,6 +1020,38 @@ }, "documentation":"

Error information returned when a DescribeAffectedEntitiesForOrganization operation can't find or process a specific entity.

" }, + "OrganizationEntityAccountFiltersList":{ + "type":"list", + "member":{"shape":"EntityAccountFilter"}, + "max":10, + "min":1 + }, + "OrganizationEntityAggregate":{ + "type":"structure", + "members":{ + "eventArn":{ + "shape":"eventArn", + "documentation":"

A list of event ARNs (unique identifiers). For example: \"arn:aws:health:us-east-1::event/EC2/EC2_INSTANCE_RETIREMENT_SCHEDULED/EC2_INSTANCE_RETIREMENT_SCHEDULED_ABC123-CDE456\", \"arn:aws:health:us-west-1::event/EBS/AWS_EBS_LOST_VOLUME/AWS_EBS_LOST_VOLUME_CHI789_JKL101\"

" + }, + "count":{ + "shape":"count", + "documentation":"

The number of entities for the organization that match the filter criteria for the specified events.

" + }, + "statuses":{ + "shape":"entityStatuses", + "documentation":"

The number of affected entities aggregated by the entitiy status codes.

" + }, + "accounts":{ + "shape":"AccountEntityAggregatesList", + "documentation":"

A list of entity aggregates for each of the specified accounts in your organization that are affected by a specific event. If there are no awsAccountIds provided in the request, this field will be empty in the response.

" + } + }, + "documentation":"

The aggregate results of entities affected by the specified event in your organization. The results are aggregated by the entity status codes for the specified set of accountsIDs.

" + }, + "OrganizationEntityAggregatesList":{ + "type":"list", + "member":{"shape":"OrganizationEntityAggregate"} + }, "OrganizationEntityFiltersList":{ "type":"list", "member":{"shape":"EventAccountFilter"}, @@ -982,6 +1104,12 @@ }, "documentation":"

Summary information about an event, returned by the DescribeEventsForOrganization operation.

" }, + "OrganizationEventArnsList":{ + "type":"list", + "member":{"shape":"eventArn"}, + "max":25, + "min":1 + }, "OrganizationEventDetailFiltersList":{ "type":"list", "member":{"shape":"EventAccountFilter"}, @@ -1128,15 +1256,22 @@ "enum":[ "IMPAIRED", "UNIMPAIRED", - "UNKNOWN" + "UNKNOWN", + "PENDING", + "RESOLVED" ] }, "entityStatusCodeList":{ "type":"list", "member":{"shape":"entityStatusCode"}, - "max":3, + "max":5, "min":1 }, + "entityStatuses":{ + "type":"map", + "key":{"shape":"entityStatusCode"}, + "value":{"shape":"count"} + }, "entityUrl":{"type":"string"}, "entityValue":{ "type":"string", diff --git a/botocore/data/ivs/2020-07-14/endpoint-rule-set-1.json b/botocore/data/ivs/2020-07-14/endpoint-rule-set-1.json index ca8bf0f0e3..fe19a2be5b 100644 --- a/botocore/data/ivs/2020-07-14/endpoint-rule-set-1.json +++ b/botocore/data/ivs/2020-07-14/endpoint-rule-set-1.json @@ -58,52 +58,56 @@ "type": "error" }, { - "conditions": [], - "type": "tree", - "rules": [ + "conditions": [ { - "conditions": [ + "fn": "booleanEquals", + "argv": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" + "ref": "UseDualStack" }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" + true + ] } - ] + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, { - "conditions": [], + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Region" + } + ] + } + ], "type": "tree", "rules": [ { "conditions": [ { - "fn": "isSet", + "fn": "aws.partition", "argv": [ { "ref": "Region" } - ] + ], + "assign": "PartitionResult" } ], "type": "tree", @@ -111,13 +115,22 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "booleanEquals", "argv": [ { - "ref": "Region" - } - ], - "assign": "PartitionResult" + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] } ], "type": "tree", @@ -127,224 +140,175 @@ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] }, { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://ivs-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" + "endpoint": { + "url": "https://ivs-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, { - "ref": "UseFIPS" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ { - "conditions": [], - "endpoint": { - "url": "https://ivs-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsFIPS" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" + "endpoint": { + "url": "https://ivs-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, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://ivs.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } - ] - }, - { - "conditions": [], + ], "type": "tree", "rules": [ { "conditions": [], "endpoint": { - "url": "https://ivs.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://ivs.{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://ivs.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, - { - "conditions": [], - "error": "Invalid Configuration: Missing Region", - "type": "error" } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } \ No newline at end of file diff --git a/botocore/data/ivs/2020-07-14/service-2.json b/botocore/data/ivs/2020-07-14/service-2.json index b537826a47..88d0ea5f32 100644 --- a/botocore/data/ivs/2020-07-14/service-2.json +++ b/botocore/data/ivs/2020-07-14/service-2.json @@ -735,7 +735,7 @@ }, "type":{ "shape":"ChannelType", - "documentation":"

Channel type, which determines the allowable resolution and bitrate. If you exceed the allowable input resolution or bitrate, the stream probably will disconnect immediately. Some types generate multiple qualities (renditions) from the original input; this automatically gives viewers the best experience for their devices and network conditions. Some types provide transcoded video; transcoding allows higher playback quality across a range of download speeds. Default: STANDARD. Valid values:

Optional transcode presets (available for the ADVANCED types) allow you to trade off available download bandwidth and video quality, to optimize the viewing experience. There are two presets:

" + "documentation":"

Channel type, which determines the allowable resolution and bitrate. If you exceed the allowable input resolution or bitrate, the stream probably will disconnect immediately. Default: STANDARD. For details, see Channel Types.

" } }, "documentation":"

Object specifying a channel.

" @@ -827,7 +827,7 @@ }, "type":{ "shape":"ChannelType", - "documentation":"

Channel type, which determines the allowable resolution and bitrate. If you exceed the allowable input resolution or bitrate, the stream probably will disconnect immediately. Some types generate multiple qualities (renditions) from the original input; this automatically gives viewers the best experience for their devices and network conditions. Some types provide transcoded video; transcoding allows higher playback quality across a range of download speeds. Default: STANDARD. Valid values:

Optional transcode presets (available for the ADVANCED types) allow you to trade off available download bandwidth and video quality, to optimize the viewing experience. There are two presets:

" + "documentation":"

Channel type, which determines the allowable resolution and bitrate. If you exceed the allowable input resolution or bitrate, the stream probably will disconnect immediately. Default: STANDARD. For details, see Channel Types.

" } }, "documentation":"

Summary information about a channel.

" @@ -893,7 +893,7 @@ }, "type":{ "shape":"ChannelType", - "documentation":"

Channel type, which determines the allowable resolution and bitrate. If you exceed the allowable input resolution or bitrate, the stream probably will disconnect immediately. Some types generate multiple qualities (renditions) from the original input; this automatically gives viewers the best experience for their devices and network conditions. Some types provide transcoded video; transcoding allows higher playback quality across a range of download speeds. Default: STANDARD. Valid values:

Optional transcode presets (available for the ADVANCED types) allow you to trade off available download bandwidth and video quality, to optimize the viewing experience. There are two presets:

" + "documentation":"

Channel type, which determines the allowable resolution and bitrate. If you exceed the allowable input resolution or bitrate, the stream probably will disconnect immediately. Default: STANDARD. For details, see Channel Types.

" } } }, @@ -2221,7 +2221,7 @@ }, "type":{ "shape":"ChannelType", - "documentation":"

Channel type, which determines the allowable resolution and bitrate. If you exceed the allowable input resolution or bitrate, the stream probably will disconnect immediately. Some types generate multiple qualities (renditions) from the original input; this automatically gives viewers the best experience for their devices and network conditions. Some types provide transcoded video; transcoding allows higher playback quality across a range of download speeds. Default: STANDARD. Valid values:

Optional transcode presets (available for the ADVANCED types) allow you to trade off available download bandwidth and video quality, to optimize the viewing experience. There are two presets:

" + "documentation":"

Channel type, which determines the allowable resolution and bitrate. If you exceed the allowable input resolution or bitrate, the stream probably will disconnect immediately. Default: STANDARD. For details, see Channel Types.

" } } }, diff --git a/botocore/data/kafkaconnect/2021-09-14/endpoint-rule-set-1.json b/botocore/data/kafkaconnect/2021-09-14/endpoint-rule-set-1.json index fe885862d3..c5b90d3def 100644 --- a/botocore/data/kafkaconnect/2021-09-14/endpoint-rule-set-1.json +++ b/botocore/data/kafkaconnect/2021-09-14/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,21 +45,69 @@ { "conditions": [ { - "fn": "isSet", + "fn": "booleanEquals", "argv": [ { - "ref": "Endpoint" - } + "ref": "UseFIPS" + }, + true + ] + } + ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true ] + } + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [ + { + "fn": "isSet", + "argv": [ { - "fn": "parseURL", + "ref": "Region" + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "aws.partition", "argv": [ { - "ref": "Endpoint" + "ref": "Region" } ], - "assign": "url" + "assign": "PartitionResult" } ], "type": "tree", @@ -75,13 +122,17 @@ }, true ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] } ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], "type": "tree", "rules": [ { @@ -89,143 +140,86 @@ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" }, - "properties": {}, - "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", + "fn": "booleanEquals", "argv": [ + true, { - "ref": "PartitionResult" - }, - "supportsFIPS" + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } ] } - ] - }, - { - "fn": "booleanEquals", - "argv": [ - true, + ], + "type": "tree", + "rules": [ { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] + "conditions": [], + "endpoint": { + "url": "https://kafkaconnect-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [], - "endpoint": { - "url": "https://kafkaconnect-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, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } + "ref": "UseFIPS" + }, + true ] } ], "type": "tree", "rules": [ { - "conditions": [], + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], "type": "tree", "rules": [ { @@ -238,78 +232,83 @@ "type": "endpoint" } ] + }, + { + "conditions": [], + "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, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } + "ref": "UseDualStack" + }, + true ] } ], "type": "tree", "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://kafkaconnect.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, { "conditions": [], - "endpoint": { - "url": "https://kafkaconnect.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] }, { "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" + "endpoint": { + "url": "https://kafkaconnect.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, - { - "conditions": [], - "endpoint": { - "url": "https://kafkaconnect.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } \ No newline at end of file diff --git a/botocore/data/kafkaconnect/2021-09-14/service-2.json b/botocore/data/kafkaconnect/2021-09-14/service-2.json index 2d3b248f26..4ffaad6a1c 100644 --- a/botocore/data/kafkaconnect/2021-09-14/service-2.json +++ b/botocore/data/kafkaconnect/2021-09-14/service-2.json @@ -573,7 +573,7 @@ "documentation":"

Information about the capacity allocated to the connector. Exactly one of the two properties must be specified.

" }, "connectorConfiguration":{ - "shape":"SyntheticCreateConnectorRequest__mapOf__string", + "shape":"__sensitive__mapOf__string", "documentation":"

A map of keys to values that represent the configuration for the connector.

" }, "connectorDescription":{ @@ -698,7 +698,7 @@ "documentation":"

The name of the worker configuration.

" }, "propertiesFileContent":{ - "shape":"SyntheticCreateWorkerConfigurationRequest__string", + "shape":"__sensitiveString", "documentation":"

Base64 encoded contents of connect-distributed.properties file.

" } } @@ -949,7 +949,7 @@ "documentation":"

The Amazon Resource Name (ARN) of the connector.

" }, "connectorConfiguration":{ - "shape":"SyntheticDescribeConnectorResponse__mapOf__string", + "shape":"__sensitive__mapOf__string", "documentation":"

A map of keys to values that represent the configuration for the connector.

" }, "connectorDescription":{ @@ -1590,26 +1590,6 @@ }, "documentation":"

Details about the state of a resource.

" }, - "SyntheticCreateConnectorRequest__mapOf__string":{ - "type":"map", - "key":{"shape":"__string"}, - "value":{"shape":"__string"}, - "sensitive":true - }, - "SyntheticCreateWorkerConfigurationRequest__string":{ - "type":"string", - "sensitive":true - }, - "SyntheticDescribeConnectorResponse__mapOf__string":{ - "type":"map", - "key":{"shape":"__string"}, - "value":{"shape":"__string"}, - "sensitive":true - }, - "SyntheticWorkerConfigurationRevisionDescription__string":{ - "type":"string", - "sensitive":true - }, "TooManyRequestsException":{ "type":"structure", "members":{ @@ -1746,7 +1726,7 @@ "documentation":"

The description of the worker configuration revision.

" }, "propertiesFileContent":{ - "shape":"SyntheticWorkerConfigurationRevisionDescription__string", + "shape":"__sensitiveString", "documentation":"

Base64 encoded contents of the connect-distributed.properties file.

" }, "revision":{ @@ -1883,6 +1863,16 @@ "max":9223372036854775807, "min":1 }, + "__sensitiveString":{ + "type":"string", + "sensitive":true + }, + "__sensitive__mapOf__string":{ + "type":"map", + "key":{"shape":"__string"}, + "value":{"shape":"__string"}, + "sensitive":true + }, "__string":{"type":"string"}, "__stringMax1024":{ "type":"string", diff --git a/botocore/data/payment-cryptography-data/2022-02-03/service-2.json b/botocore/data/payment-cryptography-data/2022-02-03/service-2.json index 9c1f1d6303..d18b764145 100644 --- a/botocore/data/payment-cryptography-data/2022-02-03/service-2.json +++ b/botocore/data/payment-cryptography-data/2022-02-03/service-2.json @@ -670,8 +670,7 @@ "type":"structure", "required":[ "CipherText", - "KeyArn", - "KeyCheckValue" + "KeyArn" ], "members":{ "CipherText":{ @@ -783,7 +782,7 @@ "documentation":"

The length of a MAC under generation.

" }, "MessageData":{ - "shape":"HexLengthBetween2And4096", + "shape":"HexEvenLengthBetween2And4096", "documentation":"

The data for which a MAC is under generation.

" } } @@ -884,6 +883,13 @@ } } }, + "HexEvenLengthBetween16And32":{ + "type":"string", + "max":32, + "min":16, + "pattern":"^(?:[0-9a-fA-F][0-9a-fA-F])+$", + "sensitive":true + }, "HexEvenLengthBetween16And4064":{ "type":"string", "max":4064, @@ -898,6 +904,20 @@ "pattern":"^(?:[0-9a-fA-F][0-9a-fA-F])+$", "sensitive":true }, + "HexEvenLengthBetween2And4096":{ + "type":"string", + "max":4096, + "min":2, + "pattern":"^(?:[0-9a-fA-F][0-9a-fA-F])+$", + "sensitive":true + }, + "HexEvenLengthBetween4And128":{ + "type":"string", + "max":128, + "min":4, + "pattern":"^(?:[0-9a-fA-F][0-9a-fA-F])+$", + "sensitive":true + }, "HexLength16Or32":{ "type":"string", "max":32, @@ -941,12 +961,6 @@ "min":2, "pattern":"^[0-9a-fA-F]+$" }, - "HexLengthBetween2And4096":{ - "type":"string", - "max":4096, - "min":2, - "pattern":"^[0-9a-fA-F]+$" - }, "HexLengthBetween2And8":{ "type":"string", "max":8, @@ -1679,7 +1693,7 @@ ], "members":{ "EncryptedPinBlock":{ - "shape":"HexLengthBetween16And32", + "shape":"HexEvenLengthBetween16And32", "documentation":"

The encrypted PIN block data that Amazon Web Services Payment Cryptography translates.

" }, "IncomingDukptAttributes":{ @@ -1949,7 +1963,7 @@ "documentation":"

The keyARN of the encryption key that Amazon Web Services Payment Cryptography uses to verify MAC data.

" }, "Mac":{ - "shape":"HexLengthBetween4And128", + "shape":"HexEvenLengthBetween4And128", "documentation":"

The MAC being verified.

" }, "MacLength":{ @@ -1957,7 +1971,7 @@ "documentation":"

The length of the MAC.

" }, "MessageData":{ - "shape":"HexLengthBetween2And4096", + "shape":"HexEvenLengthBetween2And4096", "documentation":"

The data on for which MAC is under verification.

" }, "VerificationAttributes":{ diff --git a/botocore/data/sagemaker-runtime/2017-05-13/endpoint-rule-set-1.json b/botocore/data/sagemaker-runtime/2017-05-13/endpoint-rule-set-1.json index 1df2646e75..6abcf0015e 100644 --- a/botocore/data/sagemaker-runtime/2017-05-13/endpoint-rule-set-1.json +++ b/botocore/data/sagemaker-runtime/2017-05-13/endpoint-rule-set-1.json @@ -58,52 +58,56 @@ "type": "error" }, { - "conditions": [], - "type": "tree", - "rules": [ + "conditions": [ { - "conditions": [ + "fn": "booleanEquals", + "argv": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" + "ref": "UseDualStack" }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" + true + ] } - ] + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, { - "conditions": [], + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Region" + } + ] + } + ], "type": "tree", "rules": [ { "conditions": [ { - "fn": "isSet", + "fn": "aws.partition", "argv": [ { "ref": "Region" } - ] + ], + "assign": "PartitionResult" } ], "type": "tree", @@ -111,13 +115,22 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "booleanEquals", "argv": [ { - "ref": "Region" - } - ], - "assign": "PartitionResult" + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] } ], "type": "tree", @@ -127,92 +140,83 @@ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] }, { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://runtime.sagemaker-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" + "endpoint": { + "url": "https://runtime.sagemaker-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, { - "ref": "UseFIPS" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] } ], @@ -221,180 +225,140 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "stringEquals", "argv": [ - true, + "aws", { "fn": "getAttr", "argv": [ { "ref": "PartitionResult" }, - "supportsFIPS" + "name" ] } ] } ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "stringEquals", - "argv": [ - "aws", - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "name" - ] - } - ] - } - ], - "endpoint": { - "url": "https://runtime-fips.sagemaker.{Region}.amazonaws.com", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - }, - { - "conditions": [ - { - "fn": "stringEquals", - "argv": [ - "aws-us-gov", - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "name" - ] - } - ] - } - ], - "endpoint": { - "url": "https://runtime.sagemaker.{Region}.amazonaws.com", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - }, - { - "conditions": [], - "endpoint": { - "url": "https://runtime.sagemaker-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - } - ] + "endpoint": { + "url": "https://runtime-fips.sagemaker.{Region}.amazonaws.com", + "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", + "fn": "stringEquals", "argv": [ - true, + "aws-us-gov", { "fn": "getAttr", "argv": [ { "ref": "PartitionResult" }, - "supportsDualStack" + "name" ] } ] } ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://runtime.sagemaker.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - } - ] + "endpoint": { + "url": "https://runtime.sagemaker.{Region}.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" }, { "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" + "endpoint": { + "url": "https://runtime.sagemaker-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, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], "type": "tree", "rules": [ { "conditions": [], "endpoint": { - "url": "https://runtime.sagemaker.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://runtime.sagemaker.{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://runtime.sagemaker.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, - { - "conditions": [], - "error": "Invalid Configuration: Missing Region", - "type": "error" } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } \ No newline at end of file diff --git a/botocore/data/sagemaker-runtime/2017-05-13/service-2.json b/botocore/data/sagemaker-runtime/2017-05-13/service-2.json index 979a8fd8d4..8d5630c55a 100644 --- a/botocore/data/sagemaker-runtime/2017-05-13/service-2.json +++ b/botocore/data/sagemaker-runtime/2017-05-13/service-2.json @@ -44,7 +44,25 @@ {"shape":"ServiceUnavailable"}, {"shape":"ValidationError"} ], - "documentation":"

After you deploy a model into production using Amazon SageMaker hosting services, your client applications use this API to get inferences from the model hosted at the specified endpoint in an asynchronous manner.

Inference requests sent to this API are enqueued for asynchronous processing. The processing of the inference request may or may not complete before you receive a response from this API. The response from this API will not contain the result of the inference request but contain information about where you can locate it.

Amazon SageMaker strips all POST headers except those supported by the API. Amazon SageMaker might add additional headers. You should not rely on the behavior of headers outside those enumerated in the request syntax.

Calls to InvokeEndpointAsync are authenticated by using Amazon Web Services Signature Version 4. For information, see Authenticating Requests (Amazon Web Services Signature Version 4) in the Amazon S3 API Reference.

" + "documentation":"

After you deploy a model into production using Amazon SageMaker hosting services, your client applications use this API to get inferences from the model hosted at the specified endpoint in an asynchronous manner.

Inference requests sent to this API are enqueued for asynchronous processing. The processing of the inference request may or may not complete before you receive a response from this API. The response from this API will not contain the result of the inference request but contain information about where you can locate it.

Amazon SageMaker strips all POST headers except those supported by the API. Amazon SageMaker might add additional headers. You should not rely on the behavior of headers outside those enumerated in the request syntax.

Calls to InvokeEndpointAsync are authenticated by using Amazon Web Services Signature Version 4. For information, see Authenticating Requests (Amazon Web Services Signature Version 4) in the Amazon S3 API Reference.

" + }, + "InvokeEndpointWithResponseStream":{ + "name":"InvokeEndpointWithResponseStream", + "http":{ + "method":"POST", + "requestUri":"/endpoints/{EndpointName}/invocations-response-stream" + }, + "input":{"shape":"InvokeEndpointWithResponseStreamInput"}, + "output":{"shape":"InvokeEndpointWithResponseStreamOutput"}, + "errors":[ + {"shape":"InternalFailure"}, + {"shape":"ServiceUnavailable"}, + {"shape":"ValidationError"}, + {"shape":"ModelError"}, + {"shape":"ModelStreamError"}, + {"shape":"InternalStreamFailure"} + ], + "documentation":"

Invokes a model at the specified endpoint to return the inference response as a stream. The inference stream provides the response payload incrementally as a series of parts. Before you can get an inference stream, you must have access to a model that's deployed using Amazon SageMaker hosting services, and the container for that model must support inference streaming.

For more information that can help you use this API, see the following sections in the Amazon SageMaker Developer Guide:

Amazon SageMaker strips all POST headers except those supported by the API. Amazon SageMaker might add additional headers. You should not rely on the behavior of headers outside those enumerated in the request syntax.

Calls to InvokeEndpointWithResponseStream are authenticated by using Amazon Web Services Signature Version 4. For information, see Authenticating Requests (Amazon Web Services Signature Version 4) in the Amazon S3 API Reference.

" } }, "shapes":{ @@ -70,6 +88,7 @@ "max":63, "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*" }, + "ErrorCode":{"type":"string"}, "Header":{ "type":"string", "max":1024, @@ -109,6 +128,16 @@ "fault":true, "synthetic":true }, + "InternalStreamFailure":{ + "type":"structure", + "members":{ + "Message":{"shape":"Message"} + }, + "documentation":"

The stream processing failed because of an unknown error, exception or failure. Try your request again.

", + "exception":true, + "fault":true, + "synthetic":true + }, "InvocationTimeoutSecondsHeader":{ "type":"integer", "max":3600, @@ -123,7 +152,7 @@ "members":{ "EndpointName":{ "shape":"EndpointName", - "documentation":"

The name of the endpoint that you specified when you created the endpoint using the CreateEndpoint API.

", + "documentation":"

The name of the endpoint that you specified when you created the endpoint using the CreateEndpoint API.

", "location":"uri", "locationName":"EndpointName" }, @@ -135,13 +164,13 @@ }, "Accept":{ "shape":"Header", - "documentation":"

The desired MIME type of the inference in the response.

", + "documentation":"

The desired MIME type of the inference response from the model container.

", "location":"header", "locationName":"X-Amzn-SageMaker-Accept" }, "CustomAttributes":{ "shape":"CustomAttributesHeader", - "documentation":"

Provides additional information about a request for an inference submitted to a model hosted at an Amazon SageMaker endpoint. The information is an opaque value that is forwarded verbatim. You could use this value, for example, to provide an ID that you can use to track a request or to provide other metadata that a service endpoint was programmed to process. The value must consist of no more than 1024 visible US-ASCII characters as specified in Section 3.3.6. Field Value Components of the Hypertext Transfer Protocol (HTTP/1.1).

The code in your model is responsible for setting or updating any custom attributes in the response. If your code does not set this value in the response, an empty value is returned. For example, if a custom attribute represents the trace ID, your model can prepend the custom attribute with Trace ID: in your post-processing function.

This feature is currently supported in the Amazon Web Services SDKs but not in the Amazon SageMaker Python SDK.

", + "documentation":"

Provides additional information about a request for an inference submitted to a model hosted at an Amazon SageMaker endpoint. The information is an opaque value that is forwarded verbatim. You could use this value, for example, to provide an ID that you can use to track a request or to provide other metadata that a service endpoint was programmed to process. The value must consist of no more than 1024 visible US-ASCII characters as specified in Section 3.3.6. Field Value Components of the Hypertext Transfer Protocol (HTTP/1.1).

The code in your model is responsible for setting or updating any custom attributes in the response. If your code does not set this value in the response, an empty value is returned. For example, if a custom attribute represents the trace ID, your model can prepend the custom attribute with Trace ID: in your post-processing function.

This feature is currently supported in the Amazon Web Services SDKs but not in the Amazon SageMaker Python SDK.

", "location":"header", "locationName":"X-Amzn-SageMaker-Custom-Attributes" }, @@ -201,7 +230,7 @@ "members":{ "EndpointName":{ "shape":"EndpointName", - "documentation":"

The name of the endpoint that you specified when you created the endpoint using the CreateEndpoint API.

", + "documentation":"

The name of the endpoint that you specified when you created the endpoint using the CreateEndpoint API.

", "location":"uri", "locationName":"EndpointName" }, @@ -217,13 +246,13 @@ }, "Accept":{ "shape":"Header", - "documentation":"

The desired MIME type of the inference in the response.

", + "documentation":"

The desired MIME type of the inference response from the model container.

", "location":"header", "locationName":"Accept" }, "CustomAttributes":{ "shape":"CustomAttributesHeader", - "documentation":"

Provides additional information about a request for an inference submitted to a model hosted at an Amazon SageMaker endpoint. The information is an opaque value that is forwarded verbatim. You could use this value, for example, to provide an ID that you can use to track a request or to provide other metadata that a service endpoint was programmed to process. The value must consist of no more than 1024 visible US-ASCII characters as specified in Section 3.3.6. Field Value Components of the Hypertext Transfer Protocol (HTTP/1.1).

The code in your model is responsible for setting or updating any custom attributes in the response. If your code does not set this value in the response, an empty value is returned. For example, if a custom attribute represents the trace ID, your model can prepend the custom attribute with Trace ID: in your post-processing function.

This feature is currently supported in the Amazon Web Services SDKs but not in the Amazon SageMaker Python SDK.

", + "documentation":"

Provides additional information about a request for an inference submitted to a model hosted at an Amazon SageMaker endpoint. The information is an opaque value that is forwarded verbatim. You could use this value, for example, to provide an ID that you can use to track a request or to provide other metadata that a service endpoint was programmed to process. The value must consist of no more than 1024 visible US-ASCII characters as specified in Section 3.3.6. Field Value Components of the Hypertext Transfer Protocol (HTTP/1.1).

The code in your model is responsible for setting or updating any custom attributes in the response. If your code does not set this value in the response, an empty value is returned. For example, if a custom attribute represents the trace ID, your model can prepend the custom attribute with Trace ID: in your post-processing function.

This feature is currently supported in the Amazon Web Services SDKs but not in the Amazon SageMaker Python SDK.

", "location":"header", "locationName":"X-Amzn-SageMaker-Custom-Attributes" }, @@ -270,7 +299,7 @@ }, "ContentType":{ "shape":"Header", - "documentation":"

The MIME type of the inference returned in the response body.

", + "documentation":"

The MIME type of the inference returned from the model container.

", "location":"header", "locationName":"Content-Type" }, @@ -289,6 +318,88 @@ }, "payload":"Body" }, + "InvokeEndpointWithResponseStreamInput":{ + "type":"structure", + "required":[ + "EndpointName", + "Body" + ], + "members":{ + "EndpointName":{ + "shape":"EndpointName", + "documentation":"

The name of the endpoint that you specified when you created the endpoint using the CreateEndpoint API.

", + "location":"uri", + "locationName":"EndpointName" + }, + "Body":{ + "shape":"BodyBlob", + "documentation":"

Provides input data, in the format specified in the ContentType request header. Amazon SageMaker passes all of the data in the body to the model.

For information about the format of the request body, see Common Data Formats-Inference.

" + }, + "ContentType":{ + "shape":"Header", + "documentation":"

The MIME type of the input data in the request body.

", + "location":"header", + "locationName":"Content-Type" + }, + "Accept":{ + "shape":"Header", + "documentation":"

The desired MIME type of the inference response from the model container.

", + "location":"header", + "locationName":"X-Amzn-SageMaker-Accept" + }, + "CustomAttributes":{ + "shape":"CustomAttributesHeader", + "documentation":"

Provides additional information about a request for an inference submitted to a model hosted at an Amazon SageMaker endpoint. The information is an opaque value that is forwarded verbatim. You could use this value, for example, to provide an ID that you can use to track a request or to provide other metadata that a service endpoint was programmed to process. The value must consist of no more than 1024 visible US-ASCII characters as specified in Section 3.3.6. Field Value Components of the Hypertext Transfer Protocol (HTTP/1.1).

The code in your model is responsible for setting or updating any custom attributes in the response. If your code does not set this value in the response, an empty value is returned. For example, if a custom attribute represents the trace ID, your model can prepend the custom attribute with Trace ID: in your post-processing function.

This feature is currently supported in the Amazon Web Services SDKs but not in the Amazon SageMaker Python SDK.

", + "location":"header", + "locationName":"X-Amzn-SageMaker-Custom-Attributes" + }, + "TargetVariant":{ + "shape":"TargetVariantHeader", + "documentation":"

Specify the production variant to send the inference request to when invoking an endpoint that is running two or more variants. Note that this parameter overrides the default behavior for the endpoint, which is to distribute the invocation traffic based on the variant weights.

For information about how to use variant targeting to perform a/b testing, see Test models in production

", + "location":"header", + "locationName":"X-Amzn-SageMaker-Target-Variant" + }, + "TargetContainerHostname":{ + "shape":"TargetContainerHostnameHeader", + "documentation":"

If the endpoint hosts multiple containers and is configured to use direct invocation, this parameter specifies the host name of the container to invoke.

", + "location":"header", + "locationName":"X-Amzn-SageMaker-Target-Container-Hostname" + }, + "InferenceId":{ + "shape":"InferenceId", + "documentation":"

An identifier that you assign to your request.

", + "location":"header", + "locationName":"X-Amzn-SageMaker-Inference-Id" + } + }, + "payload":"Body" + }, + "InvokeEndpointWithResponseStreamOutput":{ + "type":"structure", + "required":["Body"], + "members":{ + "Body":{"shape":"ResponseStream"}, + "ContentType":{ + "shape":"Header", + "documentation":"

The MIME type of the inference returned from the model container.

", + "location":"header", + "locationName":"X-Amzn-SageMaker-Content-Type" + }, + "InvokedProductionVariant":{ + "shape":"Header", + "documentation":"

Identifies the production variant that was invoked.

", + "location":"header", + "locationName":"x-Amzn-Invoked-Production-Variant" + }, + "CustomAttributes":{ + "shape":"CustomAttributesHeader", + "documentation":"

Provides additional information in the response about the inference returned by a model hosted at an Amazon SageMaker endpoint. The information is an opaque value that is forwarded verbatim. You could use this value, for example, to return an ID received in the CustomAttributes header of a request or other metadata that a service endpoint was programmed to produce. The value must consist of no more than 1024 visible US-ASCII characters as specified in Section 3.3.6. Field Value Components of the Hypertext Transfer Protocol (HTTP/1.1). If the customer wants the custom attribute returned, the model must set the custom attribute to be included on the way back.

The code in your model is responsible for setting or updating any custom attributes in the response. If your code does not set this value in the response, an empty value is returned. For example, if a custom attribute represents the trace ID, your model can prepend the custom attribute with Trace ID: in your post-processing function.

This feature is currently supported in the Amazon Web Services SDKs but not in the Amazon SageMaker Python SDK.

", + "location":"header", + "locationName":"X-Amzn-SageMaker-Custom-Attributes" + } + }, + "payload":"Body" + }, "LogStreamArn":{"type":"string"}, "Message":{ "type":"string", @@ -325,11 +436,59 @@ "exception":true, "synthetic":true }, + "ModelStreamError":{ + "type":"structure", + "members":{ + "Message":{"shape":"Message"}, + "ErrorCode":{ + "shape":"ErrorCode", + "documentation":"

This error can have the following error codes:

ModelInvocationTimeExceeded

The model failed to finish sending the response within the timeout period allowed by Amazon SageMaker.

StreamBroken

The Transmission Control Protocol (TCP) connection between the client and the model was reset or closed.

" + } + }, + "documentation":"

An error occurred while streaming the response body. This error can have the following error codes:

ModelInvocationTimeExceeded

The model failed to finish sending the response within the timeout period allowed by Amazon SageMaker.

StreamBroken

The Transmission Control Protocol (TCP) connection between the client and the model was reset or closed.

", + "exception":true, + "synthetic":true + }, + "PartBlob":{ + "type":"blob", + "sensitive":true + }, + "PayloadPart":{ + "type":"structure", + "members":{ + "Bytes":{ + "shape":"PartBlob", + "documentation":"

A blob that contains part of the response for your streaming inference request.

", + "eventpayload":true + } + }, + "documentation":"

A wrapper for pieces of the payload that's returned in response to a streaming inference request. A streaming inference response consists of one or more payload parts.

", + "event":true + }, "RequestTTLSecondsHeader":{ "type":"integer", "max":21600, "min":60 }, + "ResponseStream":{ + "type":"structure", + "members":{ + "PayloadPart":{ + "shape":"PayloadPart", + "documentation":"

A wrapper for pieces of the payload that's returned in response to a streaming inference request. A streaming inference response consists of one or more payload parts.

" + }, + "ModelStreamError":{ + "shape":"ModelStreamError", + "documentation":"

An error occurred while streaming the response body. This error can have the following error codes:

ModelInvocationTimeExceeded

The model failed to finish sending the response within the timeout period allowed by Amazon SageMaker.

StreamBroken

The Transmission Control Protocol (TCP) connection between the client and the model was reset or closed.

" + }, + "InternalStreamFailure":{ + "shape":"InternalStreamFailure", + "documentation":"

The stream processing failed because of an unknown error, exception or failure. Try your request again.

" + } + }, + "documentation":"

A stream of payload parts. Each part contains a portion of the response for a streaming inference request.

", + "eventstream":true + }, "ServiceUnavailable":{ "type":"structure", "members":{ diff --git a/tests/functional/endpoint-rules/cloudhsm/endpoint-tests-1.json b/tests/functional/endpoint-rules/cloudhsm/endpoint-tests-1.json index ef29149184..b114cead1f 100644 --- a/tests/functional/endpoint-rules/cloudhsm/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/cloudhsm/endpoint-tests-1.json @@ -1,42 +1,107 @@ { "testCases": [ { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://cloudhsm-fips.us-gov-west-1.api.aws" + "url": "https://cloudhsm.us-east-1.amazonaws.com" } }, "params": { - "Region": "us-gov-west-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://cloudhsm-fips.us-gov-west-1.amazonaws.com" + "url": "https://cloudhsm-fips.us-east-1.api.aws" } }, "params": { - "Region": "us-gov-west-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://cloudhsm.us-gov-west-1.api.aws" + "url": "https://cloudhsm-fips.us-east-1.amazonaws.com" } }, "params": { - "Region": "us-gov-west-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://cloudhsm.us-east-1.api.aws" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://cloudhsm-fips.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://cloudhsm-fips.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://cloudhsm.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://cloudhsm.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": false } }, { @@ -48,64 +113,160 @@ }, "params": { "Region": "us-gov-west-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://cloudhsm-fips.us-east-1.api.aws" + "url": "https://cloudhsm-fips.us-gov-east-1.api.aws" } }, "params": { - "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://cloudhsm-fips.us-east-1.amazonaws.com" + "url": "https://cloudhsm-fips.us-gov-east-1.amazonaws.com" } }, "params": { - "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://cloudhsm.us-east-1.api.aws" + "url": "https://cloudhsm.us-gov-east-1.api.aws" } }, "params": { - "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://cloudhsm.us-east-1.amazonaws.com" + "url": "https://cloudhsm.us-gov-east-1.amazonaws.com" } }, "params": { - "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": false, + "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": { + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://cloudhsm-fips.us-iso-east-1.c2s.ic.gov" + } + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "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": { + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://cloudhsm.us-iso-east-1.c2s.ic.gov" + } + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-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": { + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://cloudhsm-fips.us-isob-east-1.sc2s.sgov.gov" + } + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": true, + "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": { + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://cloudhsm.us-isob-east-1.sc2s.sgov.gov" + } + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", "expect": { "endpoint": { "url": "https://example.com" @@ -113,8 +274,21 @@ }, "params": { "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -125,8 +299,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -137,10 +311,16 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, "UseFIPS": false, + "UseDualStack": true, "Endpoint": "https://example.com" } + }, + { + "documentation": "Missing region", + "expect": { + "error": "Invalid Configuration: Missing Region" + } } ], "version": "1.0" diff --git a/tests/functional/endpoint-rules/connectcampaigns/endpoint-tests-1.json b/tests/functional/endpoint-rules/connectcampaigns/endpoint-tests-1.json index 1d2280197f..724d5f23b5 100644 --- a/tests/functional/endpoint-rules/connectcampaigns/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/connectcampaigns/endpoint-tests-1.json @@ -1,42 +1,42 @@ { "testCases": [ { - "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://connect-campaigns-fips.us-west-2.api.aws" + "url": "https://connect-campaigns.ap-southeast-2.amazonaws.com" } }, "params": { - "Region": "us-west-2", - "UseDualStack": true, - "UseFIPS": true + "Region": "ap-southeast-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://connect-campaigns-fips.us-west-2.amazonaws.com" + "url": "https://connect-campaigns.eu-west-2.amazonaws.com" } }, "params": { - "Region": "us-west-2", - "UseDualStack": false, - "UseFIPS": true + "Region": "eu-west-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://connect-campaigns.us-west-2.api.aws" + "url": "https://connect-campaigns.us-east-1.amazonaws.com" } }, "params": { - "Region": "us-west-2", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { @@ -48,168 +48,251 @@ }, "params": { "Region": "us-west-2", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://connect-campaigns-fips.eu-west-2.api.aws" + "url": "https://connect-campaigns-fips.us-east-1.api.aws" } }, "params": { - "Region": "eu-west-2", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://connect-campaigns-fips.eu-west-2.amazonaws.com" + "url": "https://connect-campaigns-fips.us-east-1.amazonaws.com" } }, "params": { - "Region": "eu-west-2", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://connect-campaigns.eu-west-2.api.aws" + "url": "https://connect-campaigns.us-east-1.api.aws" } }, "params": { - "Region": "eu-west-2", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://connect-campaigns.eu-west-2.amazonaws.com" + "url": "https://connect-campaigns-fips.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "Region": "eu-west-2", - "UseDualStack": false, - "UseFIPS": false + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://connect-campaigns-fips.ap-southeast-2.api.aws" + "url": "https://connect-campaigns-fips.cn-north-1.amazonaws.com.cn" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": true, - "UseFIPS": true + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://connect-campaigns-fips.ap-southeast-2.amazonaws.com" + "url": "https://connect-campaigns.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": true + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://connect-campaigns.ap-southeast-2.api.aws" + "url": "https://connect-campaigns.cn-north-1.amazonaws.com.cn" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": true, - "UseFIPS": false + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://connect-campaigns.ap-southeast-2.amazonaws.com" + "url": "https://connect-campaigns-fips.us-gov-east-1.api.aws" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://connect-campaigns-fips.us-east-1.api.aws" + "url": "https://connect-campaigns-fips.us-gov-east-1.amazonaws.com" } }, "params": { - "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": 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 enabled", "expect": { "endpoint": { - "url": "https://connect-campaigns-fips.us-east-1.amazonaws.com" + "url": "https://connect-campaigns.us-gov-east-1.api.aws" } }, "params": { - "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://connect-campaigns.us-east-1.api.aws" + "url": "https://connect-campaigns.us-gov-east-1.amazonaws.com" } }, "params": { - "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": 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 enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://connect-campaigns.us-east-1.amazonaws.com" + "url": "https://connect-campaigns-fips.us-iso-east-1.c2s.ic.gov" } }, "params": { - "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "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": { + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://connect-campaigns.us-iso-east-1.c2s.ic.gov" + } + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-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": { + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://connect-campaigns-fips.us-isob-east-1.sc2s.sgov.gov" + } + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": true, + "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": { + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://connect-campaigns.us-isob-east-1.sc2s.sgov.gov" + } + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", "expect": { "endpoint": { "url": "https://example.com" @@ -217,8 +300,21 @@ }, "params": { "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -229,8 +325,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -241,10 +337,16 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, "UseFIPS": false, + "UseDualStack": true, "Endpoint": "https://example.com" } + }, + { + "documentation": "Missing region", + "expect": { + "error": "Invalid Configuration: Missing Region" + } } ], "version": "1.0" diff --git a/tests/functional/endpoint-rules/connectparticipant/endpoint-tests-1.json b/tests/functional/endpoint-rules/connectparticipant/endpoint-tests-1.json index 3811e928b3..3a270c6ff3 100644 --- a/tests/functional/endpoint-rules/connectparticipant/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/connectparticipant/endpoint-tests-1.json @@ -8,9 +8,9 @@ } }, "params": { - "UseDualStack": true, "Region": "us-east-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -21,9 +21,9 @@ } }, "params": { - "UseDualStack": false, "Region": "us-east-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -34,9 +34,9 @@ } }, "params": { - "UseDualStack": true, "Region": "us-east-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -47,9 +47,9 @@ } }, "params": { - "UseDualStack": false, "Region": "us-east-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -60,9 +60,9 @@ } }, "params": { - "UseDualStack": true, "Region": "cn-north-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -73,9 +73,9 @@ } }, "params": { - "UseDualStack": false, "Region": "cn-north-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -86,9 +86,9 @@ } }, "params": { - "UseDualStack": true, "Region": "cn-north-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -99,9 +99,9 @@ } }, "params": { - "UseDualStack": false, "Region": "cn-north-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -112,9 +112,9 @@ } }, "params": { - "UseDualStack": false, "Region": "us-gov-west-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -125,9 +125,9 @@ } }, "params": { - "UseDualStack": false, "Region": "us-gov-west-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -138,9 +138,9 @@ } }, "params": { - "UseDualStack": true, "Region": "us-gov-east-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -151,9 +151,9 @@ } }, "params": { - "UseDualStack": false, "Region": "us-gov-east-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -164,9 +164,9 @@ } }, "params": { - "UseDualStack": true, "Region": "us-gov-east-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -177,9 +177,9 @@ } }, "params": { - "UseDualStack": false, "Region": "us-gov-east-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -188,9 +188,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "UseDualStack": true, "Region": "us-iso-east-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -201,9 +201,9 @@ } }, "params": { - "UseDualStack": false, "Region": "us-iso-east-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -212,9 +212,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "UseDualStack": true, "Region": "us-iso-east-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -225,9 +225,9 @@ } }, "params": { - "UseDualStack": false, "Region": "us-iso-east-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -236,9 +236,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "UseDualStack": true, "Region": "us-isob-east-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -249,9 +249,9 @@ } }, "params": { - "UseDualStack": false, "Region": "us-isob-east-1", - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -260,9 +260,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "UseDualStack": true, "Region": "us-isob-east-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -273,9 +273,9 @@ } }, "params": { - "UseDualStack": false, "Region": "us-isob-east-1", - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -286,9 +286,9 @@ } }, "params": { - "UseDualStack": false, "Region": "us-east-1", "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -300,8 +300,8 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -311,9 +311,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "UseDualStack": false, "Region": "us-east-1", "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -323,9 +323,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "UseDualStack": true, "Region": "us-east-1", "UseFIPS": false, + "UseDualStack": true, "Endpoint": "https://example.com" } }, diff --git a/tests/functional/endpoint-rules/kafkaconnect/endpoint-tests-1.json b/tests/functional/endpoint-rules/kafkaconnect/endpoint-tests-1.json index a57c8703b6..85a1b319e4 100644 --- a/tests/functional/endpoint-rules/kafkaconnect/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/kafkaconnect/endpoint-tests-1.json @@ -1,614 +1,146 @@ { "testCases": [ { - "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.ap-south-1.api.aws" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.ap-south-1.amazonaws.com" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.ap-south-1.api.aws" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.ap-south-1.amazonaws.com" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.ca-central-1.api.aws" - } - }, - "params": { - "Region": "ca-central-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.ca-central-1.amazonaws.com" - } - }, - "params": { - "Region": "ca-central-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.ca-central-1.api.aws" - } - }, - "params": { - "Region": "ca-central-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.ca-central-1.amazonaws.com" - } - }, - "params": { - "Region": "ca-central-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.eu-central-1.api.aws" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.eu-central-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.eu-central-1.api.aws" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.eu-central-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.us-west-1.api.aws" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.us-west-1.amazonaws.com" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.us-west-1.api.aws" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.us-west-1.amazonaws.com" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.us-west-2.api.aws" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.us-west-2.amazonaws.com" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.us-west-2.api.aws" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.us-west-2.amazonaws.com" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.eu-north-1.api.aws" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.eu-north-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.eu-north-1.api.aws" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.eu-north-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.eu-west-3.api.aws" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.eu-west-3.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.eu-west-3.api.aws" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.eu-west-3.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.eu-west-2.api.aws" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.eu-west-2.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.eu-west-2.api.aws" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.eu-west-2.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.eu-west-1.api.aws" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.eu-west-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.eu-west-1.api.aws" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://kafkaconnect.eu-west-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.ap-northeast-2.api.aws" + "url": "https://kafkaconnect.ap-northeast-1.amazonaws.com" } }, "params": { - "Region": "ap-northeast-2", - "UseDualStack": true, - "UseFIPS": true + "Region": "ap-northeast-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.ap-northeast-2.amazonaws.com" + "url": "https://kafkaconnect.ap-northeast-2.amazonaws.com" } }, "params": { "Region": "ap-northeast-2", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", + "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.ap-northeast-2.api.aws" + "url": "https://kafkaconnect.ap-south-1.amazonaws.com" } }, "params": { - "Region": "ap-northeast-2", - "UseDualStack": true, - "UseFIPS": false + "Region": "ap-south-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.ap-northeast-2.amazonaws.com" + "url": "https://kafkaconnect.ap-southeast-1.amazonaws.com" } }, "params": { - "Region": "ap-northeast-2", - "UseDualStack": false, - "UseFIPS": false + "Region": "ap-southeast-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.ap-northeast-1.api.aws" + "url": "https://kafkaconnect.ap-southeast-2.amazonaws.com" } }, "params": { - "Region": "ap-northeast-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "ap-southeast-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.ap-northeast-1.amazonaws.com" + "url": "https://kafkaconnect.ca-central-1.amazonaws.com" } }, "params": { - "Region": "ap-northeast-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "ca-central-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.ap-northeast-1.api.aws" + "url": "https://kafkaconnect.eu-central-1.amazonaws.com" } }, "params": { - "Region": "ap-northeast-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "eu-central-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", + "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.ap-northeast-1.amazonaws.com" + "url": "https://kafkaconnect.eu-north-1.amazonaws.com" } }, "params": { - "Region": "ap-northeast-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "eu-north-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.sa-east-1.api.aws" + "url": "https://kafkaconnect.eu-west-1.amazonaws.com" } }, "params": { - "Region": "sa-east-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "eu-west-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.sa-east-1.amazonaws.com" + "url": "https://kafkaconnect.eu-west-2.amazonaws.com" } }, "params": { - "Region": "sa-east-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "eu-west-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.sa-east-1.api.aws" + "url": "https://kafkaconnect.eu-west-3.amazonaws.com" } }, "params": { - "Region": "sa-east-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "eu-west-3", + "UseFIPS": false, + "UseDualStack": false } }, { @@ -620,333 +152,325 @@ }, "params": { "Region": "sa-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.cn-north-1.api.amazonwebservices.com.cn" + "url": "https://kafkaconnect.us-east-1.amazonaws.com" } }, "params": { - "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.cn-north-1.amazonaws.com.cn" + "url": "https://kafkaconnect.us-east-2.amazonaws.com" } }, "params": { - "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-east-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.cn-north-1.api.amazonwebservices.com.cn" + "url": "https://kafkaconnect.us-west-1.amazonaws.com" } }, "params": { - "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-west-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.cn-north-1.amazonaws.com.cn" + "url": "https://kafkaconnect.us-west-2.amazonaws.com" } }, "params": { - "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-west-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.ap-southeast-1.api.aws" + "url": "https://kafkaconnect-fips.us-east-1.api.aws" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.ap-southeast-1.amazonaws.com" + "url": "https://kafkaconnect-fips.us-east-1.amazonaws.com" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.ap-southeast-1.api.aws" + "url": "https://kafkaconnect.us-east-1.api.aws" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.ap-southeast-1.amazonaws.com" + "url": "https://kafkaconnect-fips.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.ap-southeast-2.api.aws" + "url": "https://kafkaconnect-fips.cn-north-1.amazonaws.com.cn" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": true, - "UseFIPS": true + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.ap-southeast-2.amazonaws.com" + "url": "https://kafkaconnect.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": true + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.ap-southeast-2.api.aws" + "url": "https://kafkaconnect.cn-north-1.amazonaws.com.cn" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": true, - "UseFIPS": false + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.ap-southeast-2.amazonaws.com" + "url": "https://kafkaconnect-fips.us-gov-east-1.api.aws" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.us-east-1.api.aws" + "url": "https://kafkaconnect-fips.us-gov-east-1.amazonaws.com" } }, "params": { - "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": 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 enabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.us-east-1.amazonaws.com" + "url": "https://kafkaconnect.us-gov-east-1.api.aws" } }, "params": { - "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.us-east-1.api.aws" + "url": "https://kafkaconnect.us-gov-east-1.amazonaws.com" } }, "params": { - "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": 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 enabled", "expect": { - "endpoint": { - "url": "https://kafkaconnect.us-east-1.amazonaws.com" - } + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.us-east-2.api.aws" + "url": "https://kafkaconnect-fips.us-iso-east-1.c2s.ic.gov" } }, "params": { - "Region": "us-east-2", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.us-east-2.amazonaws.com" - } + "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "us-east-2", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.us-east-2.api.aws" + "url": "https://kafkaconnect.us-iso-east-1.c2s.ic.gov" } }, "params": { - "Region": "us-east-2", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://kafkaconnect.us-east-2.amazonaws.com" - } + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "us-east-2", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect-fips.cn-northwest-1.api.amazonwebservices.com.cn" + "url": "https://kafkaconnect-fips.us-isob-east-1.sc2s.sgov.gov" } }, "params": { - "Region": "cn-northwest-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://kafkaconnect-fips.cn-northwest-1.amazonaws.com.cn" - } + "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "cn-northwest-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.cn-northwest-1.api.amazonwebservices.com.cn" + "url": "https://kafkaconnect.us-isob-east-1.sc2s.sgov.gov" } }, "params": { - "Region": "cn-northwest-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", "expect": { "endpoint": { - "url": "https://kafkaconnect.cn-northwest-1.amazonaws.com.cn" + "url": "https://example.com" } }, "params": { - "Region": "cn-northwest-1", + "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": false, - "UseFIPS": false + "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": { - "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -957,8 +481,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -969,10 +493,16 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, "UseFIPS": false, + "UseDualStack": true, "Endpoint": "https://example.com" } + }, + { + "documentation": "Missing region", + "expect": { + "error": "Invalid Configuration: Missing Region" + } } ], "version": "1.0" diff --git a/tests/functional/endpoint-rules/payment-cryptography-data/endpoint-tests-1.json b/tests/functional/endpoint-rules/payment-cryptography-data/endpoint-tests-1.json index b78414e068..1c130cc08b 100644 --- a/tests/functional/endpoint-rules/payment-cryptography-data/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/payment-cryptography-data/endpoint-tests-1.json @@ -1,54 +1,54 @@ { "testCases": [ { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://dataplane.payment-cryptography-fips.us-gov-east-1.api.aws" + "url": "https://dataplane.payment-cryptography-fips.us-east-1.api.aws" } }, "params": { + "Region": "us-east-1", "UseFIPS": true, - "Region": "us-gov-east-1", "UseDualStack": true } }, { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://dataplane.payment-cryptography-fips.us-gov-east-1.amazonaws.com" + "url": "https://dataplane.payment-cryptography-fips.us-east-1.amazonaws.com" } }, "params": { + "Region": "us-east-1", "UseFIPS": true, - "Region": "us-gov-east-1", "UseDualStack": false } }, { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://dataplane.payment-cryptography.us-gov-east-1.api.aws" + "url": "https://dataplane.payment-cryptography.us-east-1.api.aws" } }, "params": { + "Region": "us-east-1", "UseFIPS": false, - "Region": "us-gov-east-1", "UseDualStack": true } }, { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://dataplane.payment-cryptography.us-gov-east-1.amazonaws.com" + "url": "https://dataplane.payment-cryptography.us-east-1.amazonaws.com" } }, "params": { + "Region": "us-east-1", "UseFIPS": false, - "Region": "us-gov-east-1", "UseDualStack": false } }, @@ -60,8 +60,8 @@ } }, "params": { - "UseFIPS": true, "Region": "cn-north-1", + "UseFIPS": true, "UseDualStack": true } }, @@ -73,8 +73,8 @@ } }, "params": { - "UseFIPS": true, "Region": "cn-north-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -86,8 +86,8 @@ } }, "params": { - "UseFIPS": false, "Region": "cn-north-1", + "UseFIPS": false, "UseDualStack": true } }, @@ -99,108 +99,108 @@ } }, "params": { - "UseFIPS": false, "Region": "cn-north-1", + "UseFIPS": false, "UseDualStack": false } }, { - "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { - "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + "endpoint": { + "url": "https://dataplane.payment-cryptography-fips.us-gov-east-1.api.aws" + } }, "params": { + "Region": "us-gov-east-1", "UseFIPS": true, - "Region": "us-iso-east-1", "UseDualStack": true } }, { - "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://dataplane.payment-cryptography-fips.us-iso-east-1.c2s.ic.gov" + "url": "https://dataplane.payment-cryptography-fips.us-gov-east-1.amazonaws.com" } }, "params": { + "Region": "us-gov-east-1", "UseFIPS": true, - "Region": "us-iso-east-1", "UseDualStack": false } }, { - "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", "expect": { - "error": "DualStack is enabled but this partition does not support DualStack" + "endpoint": { + "url": "https://dataplane.payment-cryptography.us-gov-east-1.api.aws" + } }, "params": { + "Region": "us-gov-east-1", "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-gov-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://dataplane.payment-cryptography.us-iso-east-1.c2s.ic.gov" + "url": "https://dataplane.payment-cryptography.us-gov-east-1.amazonaws.com" } }, "params": { + "Region": "us-gov-east-1", "UseFIPS": false, - "Region": "us-iso-east-1", "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://dataplane.payment-cryptography-fips.us-east-1.api.aws" - } + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { + "Region": "us-iso-east-1", "UseFIPS": true, - "Region": "us-east-1", "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://dataplane.payment-cryptography-fips.us-east-1.amazonaws.com" + "url": "https://dataplane.payment-cryptography-fips.us-iso-east-1.c2s.ic.gov" } }, "params": { + "Region": "us-iso-east-1", "UseFIPS": true, - "Region": "us-east-1", "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://dataplane.payment-cryptography.us-east-1.api.aws" - } + "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { + "Region": "us-iso-east-1", "UseFIPS": false, - "Region": "us-east-1", "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://dataplane.payment-cryptography.us-east-1.amazonaws.com" + "url": "https://dataplane.payment-cryptography.us-iso-east-1.c2s.ic.gov" } }, "params": { + "Region": "us-iso-east-1", "UseFIPS": false, - "Region": "us-east-1", "UseDualStack": false } }, @@ -210,8 +210,8 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "UseFIPS": true, "Region": "us-isob-east-1", + "UseFIPS": true, "UseDualStack": true } }, @@ -223,8 +223,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-isob-east-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -234,8 +234,8 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "UseFIPS": false, "Region": "us-isob-east-1", + "UseFIPS": false, "UseDualStack": true } }, @@ -247,21 +247,34 @@ } }, "params": { - "UseFIPS": false, "Region": "us-isob-east-1", + "UseFIPS": false, "UseDualStack": false } }, { - "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", "expect": { "endpoint": { "url": "https://example.com" } }, "params": { - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "UseFIPS": false, "UseDualStack": false, "Endpoint": "https://example.com" } @@ -272,8 +285,8 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "UseFIPS": true, "Region": "us-east-1", + "UseFIPS": true, "UseDualStack": false, "Endpoint": "https://example.com" } @@ -284,11 +297,17 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": true, "Endpoint": "https://example.com" } + }, + { + "documentation": "Missing region", + "expect": { + "error": "Invalid Configuration: Missing Region" + } } ], "version": "1.0" diff --git a/tests/functional/endpoint-rules/sagemaker-runtime/endpoint-tests-1.json b/tests/functional/endpoint-rules/sagemaker-runtime/endpoint-tests-1.json index 65c9d77c5c..3317c56fa5 100644 --- a/tests/functional/endpoint-rules/sagemaker-runtime/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/sagemaker-runtime/endpoint-tests-1.json @@ -8,8 +8,8 @@ } }, "params": { - "UseFIPS": false, "Region": "af-south-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -21,8 +21,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-east-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -34,8 +34,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-northeast-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -47,8 +47,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-northeast-2", + "UseFIPS": false, "UseDualStack": false } }, @@ -60,8 +60,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-northeast-3", + "UseFIPS": false, "UseDualStack": false } }, @@ -73,8 +73,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-south-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -86,8 +86,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-southeast-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -99,8 +99,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ap-southeast-2", + "UseFIPS": false, "UseDualStack": false } }, @@ -112,8 +112,8 @@ } }, "params": { - "UseFIPS": false, "Region": "ca-central-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -125,8 +125,8 @@ } }, "params": { - "UseFIPS": false, "Region": "eu-central-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -138,8 +138,8 @@ } }, "params": { - "UseFIPS": false, "Region": "eu-north-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -151,8 +151,8 @@ } }, "params": { - "UseFIPS": false, "Region": "eu-south-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -164,8 +164,8 @@ } }, "params": { - "UseFIPS": false, "Region": "eu-west-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -177,8 +177,8 @@ } }, "params": { - "UseFIPS": false, "Region": "eu-west-2", + "UseFIPS": false, "UseDualStack": false } }, @@ -190,8 +190,8 @@ } }, "params": { - "UseFIPS": false, "Region": "eu-west-3", + "UseFIPS": false, "UseDualStack": false } }, @@ -203,8 +203,8 @@ } }, "params": { - "UseFIPS": false, "Region": "me-south-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -216,8 +216,8 @@ } }, "params": { - "UseFIPS": false, "Region": "sa-east-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -229,8 +229,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -242,8 +242,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-east-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -255,8 +255,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-east-2", + "UseFIPS": false, "UseDualStack": false } }, @@ -268,8 +268,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-east-2", + "UseFIPS": true, "UseDualStack": false } }, @@ -281,8 +281,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-west-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -294,8 +294,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-west-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -307,8 +307,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-west-2", + "UseFIPS": false, "UseDualStack": false } }, @@ -320,8 +320,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-west-2", + "UseFIPS": true, "UseDualStack": false } }, @@ -333,8 +333,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-east-1", + "UseFIPS": true, "UseDualStack": true } }, @@ -346,8 +346,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": true } }, @@ -359,8 +359,8 @@ } }, "params": { - "UseFIPS": false, "Region": "cn-north-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -372,8 +372,8 @@ } }, "params": { - "UseFIPS": false, "Region": "cn-northwest-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -385,8 +385,8 @@ } }, "params": { - "UseFIPS": true, "Region": "cn-north-1", + "UseFIPS": true, "UseDualStack": true } }, @@ -398,8 +398,8 @@ } }, "params": { - "UseFIPS": true, "Region": "cn-north-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -411,8 +411,8 @@ } }, "params": { - "UseFIPS": false, "Region": "cn-north-1", + "UseFIPS": false, "UseDualStack": true } }, @@ -424,8 +424,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-gov-west-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -437,8 +437,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-gov-west-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -450,8 +450,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-gov-east-1", + "UseFIPS": true, "UseDualStack": true } }, @@ -463,8 +463,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-gov-east-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -476,8 +476,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-gov-east-1", + "UseFIPS": false, "UseDualStack": true } }, @@ -489,8 +489,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-gov-east-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -502,8 +502,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-iso-east-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -513,8 +513,8 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "UseFIPS": true, "Region": "us-iso-east-1", + "UseFIPS": true, "UseDualStack": true } }, @@ -526,8 +526,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-iso-east-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -537,8 +537,8 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "UseFIPS": false, "Region": "us-iso-east-1", + "UseFIPS": false, "UseDualStack": true } }, @@ -548,8 +548,8 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "UseFIPS": true, "Region": "us-isob-east-1", + "UseFIPS": true, "UseDualStack": true } }, @@ -561,8 +561,8 @@ } }, "params": { - "UseFIPS": true, "Region": "us-isob-east-1", + "UseFIPS": true, "UseDualStack": false } }, @@ -572,8 +572,8 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "UseFIPS": false, "Region": "us-isob-east-1", + "UseFIPS": false, "UseDualStack": true } }, @@ -585,8 +585,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-isob-east-1", + "UseFIPS": false, "UseDualStack": false } }, @@ -598,8 +598,8 @@ } }, "params": { - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": false, "Endpoint": "https://example.com" } @@ -623,8 +623,8 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "UseFIPS": true, "Region": "us-east-1", + "UseFIPS": true, "UseDualStack": false, "Endpoint": "https://example.com" } @@ -635,8 +635,8 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": true, "Endpoint": "https://example.com" } From 676f71adf621843bf9d8c23e448eb376991d3955 Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Thu, 31 Aug 2023 18:58:40 +0000 Subject: [PATCH 2/3] Update to latest partitions and endpoints --- botocore/data/endpoints.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/botocore/data/endpoints.json b/botocore/data/endpoints.json index a28a251971..6f0dffc32b 100644 --- a/botocore/data/endpoints.json +++ b/botocore/data/endpoints.json @@ -3349,6 +3349,7 @@ "endpoints" : { "ap-northeast-1" : { }, "ap-northeast-2" : { }, + "ap-northeast-3" : { }, "ap-south-1" : { }, "ap-southeast-1" : { }, "ap-southeast-2" : { }, @@ -3387,6 +3388,7 @@ "deprecated" : true, "hostname" : "cognito-identity-fips.us-west-2.amazonaws.com" }, + "il-central-1" : { }, "me-south-1" : { }, "sa-east-1" : { }, "us-east-1" : { @@ -3419,6 +3421,7 @@ "endpoints" : { "ap-northeast-1" : { }, "ap-northeast-2" : { }, + "ap-northeast-3" : { }, "ap-south-1" : { }, "ap-southeast-1" : { }, "ap-southeast-2" : { }, @@ -3457,6 +3460,7 @@ "deprecated" : true, "hostname" : "cognito-idp-fips.us-west-2.amazonaws.com" }, + "il-central-1" : { }, "me-south-1" : { }, "sa-east-1" : { }, "us-east-1" : { @@ -10084,6 +10088,7 @@ "ap-south-1" : { }, "ap-southeast-1" : { }, "ap-southeast-2" : { }, + "ap-southeast-3" : { }, "ca-central-1" : { }, "eu-central-1" : { }, "eu-north-1" : { }, @@ -10119,6 +10124,7 @@ "deprecated" : true, "hostname" : "license-manager-user-subscriptions-fips.us-west-2.amazonaws.com" }, + "il-central-1" : { }, "me-south-1" : { }, "sa-east-1" : { }, "us-east-1" : { @@ -12211,6 +12217,12 @@ }, "hostname" : "portal.sso.eu-west-3.amazonaws.com" }, + "il-central-1" : { + "credentialScope" : { + "region" : "il-central-1" + }, + "hostname" : "portal.sso.il-central-1.amazonaws.com" + }, "me-south-1" : { "credentialScope" : { "region" : "me-south-1" From ba0778bb45851f372866d7ee7ca4e622deb0c1e8 Mon Sep 17 00:00:00 2001 From: aws-sdk-python-automation Date: Thu, 31 Aug 2023 18:58:50 +0000 Subject: [PATCH 3/3] Bumping version to 1.31.39 --- .changes/1.31.39.json | 62 +++++++++++++++++++ ...i-change-chimesdkmediapipelines-27870.json | 5 -- .../api-change-cloudhsm-87878.json | 5 -- .../api-change-connectcampaigns-35324.json | 5 -- .../api-change-connectparticipant-9284.json | 5 -- .../api-change-customerprofiles-2304.json | 5 -- .../next-release/api-change-ecs-81774.json | 5 -- .../api-change-grafana-20686.json | 5 -- .../next-release/api-change-health-7143.json | 5 -- .../next-release/api-change-ivs-25500.json | 5 -- .../api-change-kafkaconnect-57090.json | 5 -- ...-change-paymentcryptographydata-20003.json | 5 -- .../api-change-sagemakerruntime-56964.json | 5 -- CHANGELOG.rst | 17 +++++ botocore/__init__.py | 2 +- docs/source/conf.py | 2 +- 16 files changed, 81 insertions(+), 62 deletions(-) create mode 100644 .changes/1.31.39.json delete mode 100644 .changes/next-release/api-change-chimesdkmediapipelines-27870.json delete mode 100644 .changes/next-release/api-change-cloudhsm-87878.json delete mode 100644 .changes/next-release/api-change-connectcampaigns-35324.json delete mode 100644 .changes/next-release/api-change-connectparticipant-9284.json delete mode 100644 .changes/next-release/api-change-customerprofiles-2304.json delete mode 100644 .changes/next-release/api-change-ecs-81774.json delete mode 100644 .changes/next-release/api-change-grafana-20686.json delete mode 100644 .changes/next-release/api-change-health-7143.json delete mode 100644 .changes/next-release/api-change-ivs-25500.json delete mode 100644 .changes/next-release/api-change-kafkaconnect-57090.json delete mode 100644 .changes/next-release/api-change-paymentcryptographydata-20003.json delete mode 100644 .changes/next-release/api-change-sagemakerruntime-56964.json diff --git a/.changes/1.31.39.json b/.changes/1.31.39.json new file mode 100644 index 0000000000..69f39d0f6f --- /dev/null +++ b/.changes/1.31.39.json @@ -0,0 +1,62 @@ +[ + { + "category": "``chime-sdk-media-pipelines``", + "description": "This release adds support for feature Voice Enhancement for Call Recording as part of Amazon Chime SDK call analytics.", + "type": "api-change" + }, + { + "category": "``cloudhsm``", + "description": "Deprecating CloudHSM Classic API Service.", + "type": "api-change" + }, + { + "category": "``connectcampaigns``", + "description": "Amazon Connect outbound campaigns has launched agentless dialing mode which enables customers to make automated outbound calls without agent engagement. This release updates three of the campaign management API's to support the new agentless dialing mode and the new dialing capacity field.", + "type": "api-change" + }, + { + "category": "``connectparticipant``", + "description": "Amazon Connect Participant Service adds the ability to get a view resource using a view token, which is provided in a participant message, with the release of the DescribeView API.", + "type": "api-change" + }, + { + "category": "``customer-profiles``", + "description": "Adds sensitive trait to various shapes in Customer Profiles API model.", + "type": "api-change" + }, + { + "category": "``ecs``", + "description": "This release adds support for an account-level setting that you can use to configure the number of days for AWS Fargate task retirement.", + "type": "api-change" + }, + { + "category": "``grafana``", + "description": "Marking SAML RoleValues attribute as sensitive and updating VpcConfiguration attributes to match documentation.", + "type": "api-change" + }, + { + "category": "``health``", + "description": "Adds new API DescribeEntityAggregatesForOrganization that retrieves entity aggregates across your organization. Also adds support for resource status filtering in DescribeAffectedEntitiesForOrganization, resource status aggregates in the DescribeEntityAggregates response, and new resource statuses.", + "type": "api-change" + }, + { + "category": "``ivs``", + "description": "Updated \"type\" description for CreateChannel, UpdateChannel, Channel, and ChannelSummary.", + "type": "api-change" + }, + { + "category": "``kafkaconnect``", + "description": "Minor model changes for Kafka Connect as well as endpoint updates.", + "type": "api-change" + }, + { + "category": "``payment-cryptography-data``", + "description": "Make KeyCheckValue field optional when using asymmetric keys as Key Check Values typically only apply to symmetric keys", + "type": "api-change" + }, + { + "category": "``sagemaker-runtime``", + "description": "Update sagemaker-runtime client to latest version", + "type": "api-change" + } +] \ No newline at end of file diff --git a/.changes/next-release/api-change-chimesdkmediapipelines-27870.json b/.changes/next-release/api-change-chimesdkmediapipelines-27870.json deleted file mode 100644 index a16b76af35..0000000000 --- a/.changes/next-release/api-change-chimesdkmediapipelines-27870.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``chime-sdk-media-pipelines``", - "description": "This release adds support for feature Voice Enhancement for Call Recording as part of Amazon Chime SDK call analytics." -} diff --git a/.changes/next-release/api-change-cloudhsm-87878.json b/.changes/next-release/api-change-cloudhsm-87878.json deleted file mode 100644 index faed28579f..0000000000 --- a/.changes/next-release/api-change-cloudhsm-87878.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``cloudhsm``", - "description": "Deprecating CloudHSM Classic API Service." -} diff --git a/.changes/next-release/api-change-connectcampaigns-35324.json b/.changes/next-release/api-change-connectcampaigns-35324.json deleted file mode 100644 index 4e2958f5d7..0000000000 --- a/.changes/next-release/api-change-connectcampaigns-35324.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``connectcampaigns``", - "description": "Amazon Connect outbound campaigns has launched agentless dialing mode which enables customers to make automated outbound calls without agent engagement. This release updates three of the campaign management API's to support the new agentless dialing mode and the new dialing capacity field." -} diff --git a/.changes/next-release/api-change-connectparticipant-9284.json b/.changes/next-release/api-change-connectparticipant-9284.json deleted file mode 100644 index 61dc4ad2d1..0000000000 --- a/.changes/next-release/api-change-connectparticipant-9284.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``connectparticipant``", - "description": "Amazon Connect Participant Service adds the ability to get a view resource using a view token, which is provided in a participant message, with the release of the DescribeView API." -} diff --git a/.changes/next-release/api-change-customerprofiles-2304.json b/.changes/next-release/api-change-customerprofiles-2304.json deleted file mode 100644 index b9750a512a..0000000000 --- a/.changes/next-release/api-change-customerprofiles-2304.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``customer-profiles``", - "description": "Adds sensitive trait to various shapes in Customer Profiles API model." -} diff --git a/.changes/next-release/api-change-ecs-81774.json b/.changes/next-release/api-change-ecs-81774.json deleted file mode 100644 index 52c1ffce00..0000000000 --- a/.changes/next-release/api-change-ecs-81774.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``ecs``", - "description": "This release adds support for an account-level setting that you can use to configure the number of days for AWS Fargate task retirement." -} diff --git a/.changes/next-release/api-change-grafana-20686.json b/.changes/next-release/api-change-grafana-20686.json deleted file mode 100644 index 8a4b83d77e..0000000000 --- a/.changes/next-release/api-change-grafana-20686.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``grafana``", - "description": "Marking SAML RoleValues attribute as sensitive and updating VpcConfiguration attributes to match documentation." -} diff --git a/.changes/next-release/api-change-health-7143.json b/.changes/next-release/api-change-health-7143.json deleted file mode 100644 index d2171f9c26..0000000000 --- a/.changes/next-release/api-change-health-7143.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``health``", - "description": "Adds new API DescribeEntityAggregatesForOrganization that retrieves entity aggregates across your organization. Also adds support for resource status filtering in DescribeAffectedEntitiesForOrganization, resource status aggregates in the DescribeEntityAggregates response, and new resource statuses." -} diff --git a/.changes/next-release/api-change-ivs-25500.json b/.changes/next-release/api-change-ivs-25500.json deleted file mode 100644 index 59f62c4636..0000000000 --- a/.changes/next-release/api-change-ivs-25500.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``ivs``", - "description": "Updated \"type\" description for CreateChannel, UpdateChannel, Channel, and ChannelSummary." -} diff --git a/.changes/next-release/api-change-kafkaconnect-57090.json b/.changes/next-release/api-change-kafkaconnect-57090.json deleted file mode 100644 index b4acab2e25..0000000000 --- a/.changes/next-release/api-change-kafkaconnect-57090.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``kafkaconnect``", - "description": "Minor model changes for Kafka Connect as well as endpoint updates." -} diff --git a/.changes/next-release/api-change-paymentcryptographydata-20003.json b/.changes/next-release/api-change-paymentcryptographydata-20003.json deleted file mode 100644 index 7143abf07e..0000000000 --- a/.changes/next-release/api-change-paymentcryptographydata-20003.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``payment-cryptography-data``", - "description": "Make KeyCheckValue field optional when using asymmetric keys as Key Check Values typically only apply to symmetric keys" -} diff --git a/.changes/next-release/api-change-sagemakerruntime-56964.json b/.changes/next-release/api-change-sagemakerruntime-56964.json deleted file mode 100644 index c2a38d6564..0000000000 --- a/.changes/next-release/api-change-sagemakerruntime-56964.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``sagemaker-runtime``", - "description": "Update sagemaker-runtime client to latest version" -} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fa265dfce3..838eb20195 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,23 @@ CHANGELOG ========= +1.31.39 +======= + +* api-change:``chime-sdk-media-pipelines``: This release adds support for feature Voice Enhancement for Call Recording as part of Amazon Chime SDK call analytics. +* api-change:``cloudhsm``: Deprecating CloudHSM Classic API Service. +* api-change:``connectcampaigns``: Amazon Connect outbound campaigns has launched agentless dialing mode which enables customers to make automated outbound calls without agent engagement. This release updates three of the campaign management API's to support the new agentless dialing mode and the new dialing capacity field. +* api-change:``connectparticipant``: Amazon Connect Participant Service adds the ability to get a view resource using a view token, which is provided in a participant message, with the release of the DescribeView API. +* api-change:``customer-profiles``: Adds sensitive trait to various shapes in Customer Profiles API model. +* api-change:``ecs``: This release adds support for an account-level setting that you can use to configure the number of days for AWS Fargate task retirement. +* api-change:``grafana``: Marking SAML RoleValues attribute as sensitive and updating VpcConfiguration attributes to match documentation. +* api-change:``health``: Adds new API DescribeEntityAggregatesForOrganization that retrieves entity aggregates across your organization. Also adds support for resource status filtering in DescribeAffectedEntitiesForOrganization, resource status aggregates in the DescribeEntityAggregates response, and new resource statuses. +* api-change:``ivs``: Updated "type" description for CreateChannel, UpdateChannel, Channel, and ChannelSummary. +* api-change:``kafkaconnect``: Minor model changes for Kafka Connect as well as endpoint updates. +* api-change:``payment-cryptography-data``: Make KeyCheckValue field optional when using asymmetric keys as Key Check Values typically only apply to symmetric keys +* api-change:``sagemaker-runtime``: Update sagemaker-runtime client to latest version + + 1.31.38 ======= diff --git a/botocore/__init__.py b/botocore/__init__.py index 84ec4dd2d2..a687fd7f26 100644 --- a/botocore/__init__.py +++ b/botocore/__init__.py @@ -16,7 +16,7 @@ import os import re -__version__ = '1.31.38' +__version__ = '1.31.39' class NullHandler(logging.Handler): diff --git a/docs/source/conf.py b/docs/source/conf.py index 497c086296..7e32e11e10 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -59,7 +59,7 @@ # The short X.Y version. version = '1.31.' # The full version, including alpha/beta/rc tags. -release = '1.31.38' +release = '1.31.39' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.