diff --git a/.changes/1.29.165.json b/.changes/1.29.165.json new file mode 100644 index 0000000000..6093c1edf4 --- /dev/null +++ b/.changes/1.29.165.json @@ -0,0 +1,37 @@ +[ + { + "category": "``amp``", + "description": "AWS SDK service model generation tool version upgrade.", + "type": "api-change" + }, + { + "category": "``ecs``", + "description": "Added new field \"credentialspecs\" to the ecs task definition to support gMSA of windows/linux in both domainless and domain-joined mode", + "type": "api-change" + }, + { + "category": "``ivs``", + "description": "Corrects the HTTP response code in the generated docs for PutMetadata and DeleteRecordingConfiguration APIs.", + "type": "api-change" + }, + { + "category": "``mediaconvert``", + "description": "This release includes improved color handling of overlays and general updates to user documentation.", + "type": "api-change" + }, + { + "category": "``sagemaker``", + "description": "This release adds support for rolling deployment in SageMaker Inference.", + "type": "api-change" + }, + { + "category": "``transfer``", + "description": "Add outbound Basic authentication support to AS2 connectors", + "type": "api-change" + }, + { + "category": "``verifiedpermissions``", + "description": "This release corrects several broken links in the documentation.", + "type": "api-change" + } +] \ No newline at end of file diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 381277d2de..63b2793dab 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,18 @@ CHANGELOG ========= +1.29.165 +======== + +* api-change:``amp``: AWS SDK service model generation tool version upgrade. +* api-change:``ecs``: Added new field "credentialspecs" to the ecs task definition to support gMSA of windows/linux in both domainless and domain-joined mode +* api-change:``ivs``: Corrects the HTTP response code in the generated docs for PutMetadata and DeleteRecordingConfiguration APIs. +* api-change:``mediaconvert``: This release includes improved color handling of overlays and general updates to user documentation. +* api-change:``sagemaker``: This release adds support for rolling deployment in SageMaker Inference. +* api-change:``transfer``: Add outbound Basic authentication support to AS2 connectors +* api-change:``verifiedpermissions``: This release corrects several broken links in the documentation. + + 1.29.164 ======== diff --git a/botocore/__init__.py b/botocore/__init__.py index f18d51c0ae..8cb5bd1c58 100644 --- a/botocore/__init__.py +++ b/botocore/__init__.py @@ -16,7 +16,7 @@ import os import re -__version__ = '1.29.164' +__version__ = '1.29.165' class NullHandler(logging.Handler): diff --git a/botocore/data/amp/2020-08-01/endpoint-rule-set-1.json b/botocore/data/amp/2020-08-01/endpoint-rule-set-1.json index f1cac34566..08690bafa0 100644 --- a/botocore/data/amp/2020-08-01/endpoint-rule-set-1.json +++ b/botocore/data/amp/2020-08-01/endpoint-rule-set-1.json @@ -32,13 +32,12 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "isSet", "argv": [ { - "ref": "Region" + "ref": "Endpoint" } - ], - "assign": "PartitionResult" + ] } ], "type": "tree", @@ -46,23 +45,20 @@ { "conditions": [ { - "fn": "isSet", + "fn": "booleanEquals", "argv": [ { - "ref": "Endpoint" - } + "ref": "UseFIPS" + }, + true ] - }, - { - "fn": "parseURL", - "argv": [ - { - "ref": "Endpoint" - } - ], - "assign": "url" } ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], "type": "tree", "rules": [ { @@ -71,67 +67,42 @@ "fn": "booleanEquals", "argv": [ { - "ref": "UseFIPS" + "ref": "UseDualStack" }, true ] } ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", "type": "error" }, { "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" + "endpoint": { + "url": { + "ref": "Endpoint" }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" - }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, + } + ] + }, + { + "conditions": [], + "type": "tree", + "rules": [ { "conditions": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", + "fn": "isSet", "argv": [ { - "ref": "UseDualStack" - }, - true + "ref": "Region" + } ] } ], @@ -140,90 +111,215 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "aws.partition", "argv": [ - true, { - "fn": "getAttr", + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsFIPS" + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true ] } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://aps-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } ] }, { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsDualStack" + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://aps-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" } ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://aps-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" }, - "supportsFIPS" + true ] } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://aps.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" + } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [], "type": "tree", @@ -231,7 +327,7 @@ { "conditions": [], "endpoint": { - "url": "https://aps-fips.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://aps.{Region}.{PartitionResult#dnsSuffix}", "properties": {}, "headers": {} }, @@ -240,74 +336,13 @@ ] } ] - }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://aps.{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://aps.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } diff --git a/botocore/data/amp/2020-08-01/service-2.json b/botocore/data/amp/2020-08-01/service-2.json index a27f10060c..c53356e877 100644 --- a/botocore/data/amp/2020-08-01/service-2.json +++ b/botocore/data/amp/2020-08-01/service-2.json @@ -434,27 +434,27 @@ "AlertManagerDefinitionDescription":{ "type":"structure", "required":[ - "createdAt", + "status", "data", - "modifiedAt", - "status" + "createdAt", + "modifiedAt" ], "members":{ - "createdAt":{ - "shape":"Timestamp", - "documentation":"

The time when the alert manager definition was created.

" + "status":{ + "shape":"AlertManagerDefinitionStatus", + "documentation":"

The status of alert manager definition.

" }, "data":{ "shape":"AlertManagerDefinitionData", "documentation":"

The alert manager definition.

" }, + "createdAt":{ + "shape":"Timestamp", + "documentation":"

The time when the alert manager definition was created.

" + }, "modifiedAt":{ "shape":"Timestamp", "documentation":"

The time when the alert manager definition was modified.

" - }, - "status":{ - "shape":"AlertManagerDefinitionStatus", - "documentation":"

The status of alert manager definition.

" } }, "documentation":"

Represents the properties of an alert manager definition.

" @@ -517,24 +517,24 @@ "CreateAlertManagerDefinitionRequest":{ "type":"structure", "required":[ - "data", - "workspaceId" + "workspaceId", + "data" ], "members":{ - "clientToken":{ - "shape":"IdempotencyToken", - "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", - "idempotencyToken":true - }, - "data":{ - "shape":"AlertManagerDefinitionData", - "documentation":"

The alert manager definition data.

" - }, "workspaceId":{ "shape":"WorkspaceId", "documentation":"

The ID of the workspace in which to create the alert manager definition.

", "location":"uri", "locationName":"workspaceId" + }, + "data":{ + "shape":"AlertManagerDefinitionData", + "documentation":"

The alert manager definition data.

" + }, + "clientToken":{ + "shape":"IdempotencyToken", + "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", + "idempotencyToken":true } }, "documentation":"

Represents the input of a CreateAlertManagerDefinition operation.

" @@ -553,24 +553,24 @@ "CreateLoggingConfigurationRequest":{ "type":"structure", "required":[ - "logGroupArn", - "workspaceId" + "workspaceId", + "logGroupArn" ], "members":{ - "clientToken":{ - "shape":"IdempotencyToken", - "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", - "idempotencyToken":true - }, - "logGroupArn":{ - "shape":"LogGroupArn", - "documentation":"

The ARN of the CW log group to which the vended log data will be published.

" - }, "workspaceId":{ "shape":"WorkspaceId", "documentation":"

The ID of the workspace to vend logs to.

", "location":"uri", "locationName":"workspaceId" + }, + "logGroupArn":{ + "shape":"LogGroupArn", + "documentation":"

The ARN of the CW log group to which the vended log data will be published.

" + }, + "clientToken":{ + "shape":"IdempotencyToken", + "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", + "idempotencyToken":true } }, "documentation":"

Represents the input of a CreateLoggingConfiguration operation.

" @@ -589,33 +589,33 @@ "CreateRuleGroupsNamespaceRequest":{ "type":"structure", "required":[ - "data", + "workspaceId", "name", - "workspaceId" + "data" ], "members":{ - "clientToken":{ - "shape":"IdempotencyToken", - "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", - "idempotencyToken":true + "workspaceId":{ + "shape":"WorkspaceId", + "documentation":"

The ID of the workspace in which to create the rule group namespace.

", + "location":"uri", + "locationName":"workspaceId" + }, + "name":{ + "shape":"RuleGroupsNamespaceName", + "documentation":"

The rule groups namespace name.

" }, "data":{ "shape":"RuleGroupsNamespaceData", "documentation":"

The namespace data that define the rule groups.

" }, - "name":{ - "shape":"RuleGroupsNamespaceName", - "documentation":"

The rule groups namespace name.

" + "clientToken":{ + "shape":"IdempotencyToken", + "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", + "idempotencyToken":true }, "tags":{ "shape":"TagMap", "documentation":"

Optional, user-provided tags for this rule groups namespace.

" - }, - "workspaceId":{ - "shape":"WorkspaceId", - "documentation":"

The ID of the workspace in which to create the rule group namespace.

", - "location":"uri", - "locationName":"workspaceId" } }, "documentation":"

Represents the input of a CreateRuleGroupsNamespace operation.

" @@ -623,19 +623,19 @@ "CreateRuleGroupsNamespaceResponse":{ "type":"structure", "required":[ - "arn", "name", + "arn", "status" ], "members":{ - "arn":{ - "shape":"RuleGroupsNamespaceArn", - "documentation":"

The Amazon Resource Name (ARN) of this rule groups namespace.

" - }, "name":{ "shape":"RuleGroupsNamespaceName", "documentation":"

The rule groups namespace name.

" }, + "arn":{ + "shape":"RuleGroupsNamespaceArn", + "documentation":"

The Amazon Resource Name (ARN) of this rule groups namespace.

" + }, "status":{ "shape":"RuleGroupsNamespaceStatus", "documentation":"

The status of rule groups namespace.

" @@ -669,11 +669,15 @@ "CreateWorkspaceResponse":{ "type":"structure", "required":[ + "workspaceId", "arn", - "status", - "workspaceId" + "status" ], "members":{ + "workspaceId":{ + "shape":"WorkspaceId", + "documentation":"

The generated ID of the workspace that was just created.

" + }, "arn":{ "shape":"WorkspaceArn", "documentation":"

The ARN of the workspace that was just created.

" @@ -685,10 +689,6 @@ "tags":{ "shape":"TagMap", "documentation":"

The tags of this workspace.

" - }, - "workspaceId":{ - "shape":"WorkspaceId", - "documentation":"

The generated ID of the workspace that was just created.

" } }, "documentation":"

Represents the output of a CreateWorkspace operation.

" @@ -697,18 +697,18 @@ "type":"structure", "required":["workspaceId"], "members":{ + "workspaceId":{ + "shape":"WorkspaceId", + "documentation":"

The ID of the workspace in which to delete the alert manager definition.

", + "location":"uri", + "locationName":"workspaceId" + }, "clientToken":{ "shape":"IdempotencyToken", "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", "idempotencyToken":true, "location":"querystring", "locationName":"clientToken" - }, - "workspaceId":{ - "shape":"WorkspaceId", - "documentation":"

The ID of the workspace in which to delete the alert manager definition.

", - "location":"uri", - "locationName":"workspaceId" } }, "documentation":"

Represents the input of a DeleteAlertManagerDefinition operation.

" @@ -717,18 +717,18 @@ "type":"structure", "required":["workspaceId"], "members":{ + "workspaceId":{ + "shape":"WorkspaceId", + "documentation":"

The ID of the workspace to vend logs to.

", + "location":"uri", + "locationName":"workspaceId" + }, "clientToken":{ "shape":"IdempotencyToken", "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", "idempotencyToken":true, "location":"querystring", "locationName":"clientToken" - }, - "workspaceId":{ - "shape":"WorkspaceId", - "documentation":"

The ID of the workspace to vend logs to.

", - "location":"uri", - "locationName":"workspaceId" } }, "documentation":"

Represents the input of a DeleteLoggingConfiguration operation.

" @@ -736,16 +736,15 @@ "DeleteRuleGroupsNamespaceRequest":{ "type":"structure", "required":[ - "name", - "workspaceId" + "workspaceId", + "name" ], "members":{ - "clientToken":{ - "shape":"IdempotencyToken", - "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", - "idempotencyToken":true, - "location":"querystring", - "locationName":"clientToken" + "workspaceId":{ + "shape":"WorkspaceId", + "documentation":"

The ID of the workspace to delete rule group definition.

", + "location":"uri", + "locationName":"workspaceId" }, "name":{ "shape":"RuleGroupsNamespaceName", @@ -753,11 +752,12 @@ "location":"uri", "locationName":"name" }, - "workspaceId":{ - "shape":"WorkspaceId", - "documentation":"

The ID of the workspace to delete rule group definition.

", - "location":"uri", - "locationName":"workspaceId" + "clientToken":{ + "shape":"IdempotencyToken", + "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", + "idempotencyToken":true, + "location":"querystring", + "locationName":"clientToken" } }, "documentation":"

Represents the input of a DeleteRuleGroupsNamespace operation.

" @@ -766,18 +766,18 @@ "type":"structure", "required":["workspaceId"], "members":{ + "workspaceId":{ + "shape":"WorkspaceId", + "documentation":"

The ID of the workspace to delete.

", + "location":"uri", + "locationName":"workspaceId" + }, "clientToken":{ "shape":"IdempotencyToken", "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", "idempotencyToken":true, "location":"querystring", "locationName":"clientToken" - }, - "workspaceId":{ - "shape":"WorkspaceId", - "documentation":"

The ID of the workspace to delete.

", - "location":"uri", - "locationName":"workspaceId" } }, "documentation":"

Represents the input of a DeleteWorkspace operation.

" @@ -833,21 +833,21 @@ "DescribeRuleGroupsNamespaceRequest":{ "type":"structure", "required":[ - "name", - "workspaceId" + "workspaceId", + "name" ], "members":{ - "name":{ - "shape":"RuleGroupsNamespaceName", - "documentation":"

The rule groups namespace.

", - "location":"uri", - "locationName":"name" - }, "workspaceId":{ "shape":"WorkspaceId", "documentation":"

The ID of the workspace to describe.

", "location":"uri", "locationName":"workspaceId" + }, + "name":{ + "shape":"RuleGroupsNamespaceName", + "documentation":"

The rule groups namespace.

", + "location":"uri", + "locationName":"name" } }, "documentation":"

Represents the input of a DescribeRuleGroupsNamespace operation.

" @@ -923,11 +923,11 @@ "type":"structure", "required":["workspaceId"], "members":{ - "maxResults":{ - "shape":"ListRuleGroupsNamespacesRequestMaxResultsInteger", - "documentation":"

Maximum results to return in response (default=100, maximum=1000).

", - "location":"querystring", - "locationName":"maxResults" + "workspaceId":{ + "shape":"WorkspaceId", + "documentation":"

The ID of the workspace.

", + "location":"uri", + "locationName":"workspaceId" }, "name":{ "shape":"RuleGroupsNamespaceName", @@ -941,11 +941,11 @@ "location":"querystring", "locationName":"nextToken" }, - "workspaceId":{ - "shape":"WorkspaceId", - "documentation":"

The ID of the workspace.

", - "location":"uri", - "locationName":"workspaceId" + "maxResults":{ + "shape":"ListRuleGroupsNamespacesRequestMaxResultsInteger", + "documentation":"

Maximum results to return in response (default=100, maximum=1000).

", + "location":"querystring", + "locationName":"maxResults" } }, "documentation":"

Represents the input of a ListRuleGroupsNamespaces operation.

" @@ -960,13 +960,13 @@ "type":"structure", "required":["ruleGroupsNamespaces"], "members":{ - "nextToken":{ - "shape":"PaginationToken", - "documentation":"

Pagination token to use when requesting the next page in this list.

" - }, "ruleGroupsNamespaces":{ "shape":"RuleGroupsNamespaceSummaryList", "documentation":"

The list of the selected rule groups namespaces.

" + }, + "nextToken":{ + "shape":"PaginationToken", + "documentation":"

Pagination token to use when requesting the next page in this list.

" } }, "documentation":"

Represents the output of a ListRuleGroupsNamespaces operation.

" @@ -992,6 +992,12 @@ "ListWorkspacesRequest":{ "type":"structure", "members":{ + "nextToken":{ + "shape":"PaginationToken", + "documentation":"

Pagination token to request the next page in a paginated list. This token is obtained from the output of the previous ListWorkspaces request.

", + "location":"querystring", + "locationName":"nextToken" + }, "alias":{ "shape":"WorkspaceAlias", "documentation":"

Optional filter for workspace alias. Only the workspaces with aliases that begin with this value will be returned.

", @@ -1003,12 +1009,6 @@ "documentation":"

Maximum results to return in response (default=100, maximum=1000).

", "location":"querystring", "locationName":"maxResults" - }, - "nextToken":{ - "shape":"PaginationToken", - "documentation":"

Pagination token to request the next page in a paginated list. This token is obtained from the output of the previous ListWorkspaces request.

", - "location":"querystring", - "locationName":"nextToken" } }, "documentation":"

Represents the input of a ListWorkspaces operation.

" @@ -1023,50 +1023,50 @@ "type":"structure", "required":["workspaces"], "members":{ - "nextToken":{ - "shape":"PaginationToken", - "documentation":"

Pagination token to use when requesting the next page in this list.

" - }, "workspaces":{ "shape":"WorkspaceSummaryList", "documentation":"

The list of existing workspaces, including those undergoing creation or deletion.

" + }, + "nextToken":{ + "shape":"PaginationToken", + "documentation":"

Pagination token to use when requesting the next page in this list.

" } }, "documentation":"

Represents the output of a ListWorkspaces operation.

" }, "LogGroupArn":{ "type":"string", - "pattern":"^arn:aws[a-z0-9-]*:logs:[a-z0-9-]+:\\d{12}:log-group:[A-Za-z0-9\\.\\-\\_\\#/]{1,512}\\:\\*$" + "pattern":"arn:aws[a-z0-9-]*:logs:[a-z0-9-]+:\\d{12}:log-group:[A-Za-z0-9\\.\\-\\_\\#/]{1,512}\\:\\*" }, "LoggingConfigurationMetadata":{ "type":"structure", "required":[ - "createdAt", - "logGroupArn", - "modifiedAt", "status", - "workspace" + "workspace", + "logGroupArn", + "createdAt", + "modifiedAt" ], "members":{ - "createdAt":{ - "shape":"Timestamp", - "documentation":"

The time when the logging configuration was created.

" + "status":{ + "shape":"LoggingConfigurationStatus", + "documentation":"

The status of the logging configuration.

" + }, + "workspace":{ + "shape":"WorkspaceId", + "documentation":"

The workspace where the logging configuration exists.

" }, "logGroupArn":{ "shape":"LogGroupArn", "documentation":"

The ARN of the CW log group to which the vended log data will be published.

" }, + "createdAt":{ + "shape":"Timestamp", + "documentation":"

The time when the logging configuration was created.

" + }, "modifiedAt":{ "shape":"Timestamp", "documentation":"

The time when the logging configuration was modified.

" - }, - "status":{ - "shape":"LoggingConfigurationStatus", - "documentation":"

The status of the logging configuration.

" - }, - "workspace":{ - "shape":"WorkspaceId", - "documentation":"

The workspace where the logging configuration exists.

" } }, "documentation":"

Represents the properties of a logging configuration metadata.

" @@ -1105,24 +1105,24 @@ "PutAlertManagerDefinitionRequest":{ "type":"structure", "required":[ - "data", - "workspaceId" + "workspaceId", + "data" ], "members":{ - "clientToken":{ - "shape":"IdempotencyToken", - "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", - "idempotencyToken":true - }, - "data":{ - "shape":"AlertManagerDefinitionData", - "documentation":"

The alert manager definition data.

" - }, "workspaceId":{ "shape":"WorkspaceId", "documentation":"

The ID of the workspace in which to update the alert manager definition.

", "location":"uri", "locationName":"workspaceId" + }, + "data":{ + "shape":"AlertManagerDefinitionData", + "documentation":"

The alert manager definition data.

" + }, + "clientToken":{ + "shape":"IdempotencyToken", + "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", + "idempotencyToken":true } }, "documentation":"

Represents the input of a PutAlertManagerDefinition operation.

" @@ -1141,19 +1141,16 @@ "PutRuleGroupsNamespaceRequest":{ "type":"structure", "required":[ - "data", + "workspaceId", "name", - "workspaceId" + "data" ], "members":{ - "clientToken":{ - "shape":"IdempotencyToken", - "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", - "idempotencyToken":true - }, - "data":{ - "shape":"RuleGroupsNamespaceData", - "documentation":"

The namespace data that define the rule groups.

" + "workspaceId":{ + "shape":"WorkspaceId", + "documentation":"

The ID of the workspace in which to update the rule group namespace.

", + "location":"uri", + "locationName":"workspaceId" }, "name":{ "shape":"RuleGroupsNamespaceName", @@ -1161,11 +1158,14 @@ "location":"uri", "locationName":"name" }, - "workspaceId":{ - "shape":"WorkspaceId", - "documentation":"

The ID of the workspace in which to update the rule group namespace.

", - "location":"uri", - "locationName":"workspaceId" + "data":{ + "shape":"RuleGroupsNamespaceData", + "documentation":"

The namespace data that define the rule groups.

" + }, + "clientToken":{ + "shape":"IdempotencyToken", + "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", + "idempotencyToken":true } }, "documentation":"

Represents the input of a PutRuleGroupsNamespace operation.

" @@ -1173,19 +1173,19 @@ "PutRuleGroupsNamespaceResponse":{ "type":"structure", "required":[ - "arn", "name", + "arn", "status" ], "members":{ - "arn":{ - "shape":"RuleGroupsNamespaceArn", - "documentation":"

The Amazon Resource Name (ARN) of this rule groups namespace.

" - }, "name":{ "shape":"RuleGroupsNamespaceName", "documentation":"

The rule groups namespace name.

" }, + "arn":{ + "shape":"RuleGroupsNamespaceArn", + "documentation":"

The Amazon Resource Name (ARN) of this rule groups namespace.

" + }, "status":{ "shape":"RuleGroupsNamespaceStatus", "documentation":"

The status of rule groups namespace.

" @@ -1237,37 +1237,37 @@ "type":"structure", "required":[ "arn", - "createdAt", - "data", - "modifiedAt", "name", - "status" + "status", + "data", + "createdAt", + "modifiedAt" ], "members":{ "arn":{ "shape":"RuleGroupsNamespaceArn", "documentation":"

The Amazon Resource Name (ARN) of this rule groups namespace.

" }, - "createdAt":{ - "shape":"Timestamp", - "documentation":"

The time when the rule groups namespace was created.

" + "name":{ + "shape":"RuleGroupsNamespaceName", + "documentation":"

The rule groups namespace name.

" + }, + "status":{ + "shape":"RuleGroupsNamespaceStatus", + "documentation":"

The status of rule groups namespace.

" }, "data":{ "shape":"RuleGroupsNamespaceData", "documentation":"

The rule groups namespace data.

" }, + "createdAt":{ + "shape":"Timestamp", + "documentation":"

The time when the rule groups namespace was created.

" + }, "modifiedAt":{ "shape":"Timestamp", "documentation":"

The time when the rule groups namespace was modified.

" }, - "name":{ - "shape":"RuleGroupsNamespaceName", - "documentation":"

The rule groups namespace name.

" - }, - "status":{ - "shape":"RuleGroupsNamespaceStatus", - "documentation":"

The status of rule groups namespace.

" - }, "tags":{ "shape":"TagMap", "documentation":"

The tags of this rule groups namespace.

" @@ -1280,7 +1280,7 @@ "documentation":"

The namespace name that the rule group belong to.

", "max":64, "min":1, - "pattern":"[0-9A-Za-z][-.0-9A-Z_a-z]*" + "pattern":".*[0-9A-Za-z][-.0-9A-Z_a-z]*.*" }, "RuleGroupsNamespaceStatus":{ "type":"structure", @@ -1313,24 +1313,16 @@ "type":"structure", "required":[ "arn", - "createdAt", - "modifiedAt", "name", - "status" + "status", + "createdAt", + "modifiedAt" ], "members":{ "arn":{ "shape":"RuleGroupsNamespaceArn", "documentation":"

The Amazon Resource Name (ARN) of this rule groups namespace.

" }, - "createdAt":{ - "shape":"Timestamp", - "documentation":"

The time when the rule groups namespace was created.

" - }, - "modifiedAt":{ - "shape":"Timestamp", - "documentation":"

The time when the rule groups namespace was modified.

" - }, "name":{ "shape":"RuleGroupsNamespaceName", "documentation":"

The rule groups namespace name.

" @@ -1339,6 +1331,14 @@ "shape":"RuleGroupsNamespaceStatus", "documentation":"

The status of rule groups namespace.

" }, + "createdAt":{ + "shape":"Timestamp", + "documentation":"

The time when the rule groups namespace was created.

" + }, + "modifiedAt":{ + "shape":"Timestamp", + "documentation":"

The time when the rule groups namespace was modified.

" + }, "tags":{ "shape":"TagMap", "documentation":"

The tags of this rule groups namespace.

" @@ -1355,20 +1355,16 @@ "type":"structure", "required":[ "message", - "quotaCode", "resourceId", "resourceType", - "serviceCode" + "serviceCode", + "quotaCode" ], "members":{ "message":{ "shape":"String", "documentation":"

Description of the error.

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

Service Quotas requirement to identify originating quota.

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

Identifier of the resource affected.

" @@ -1380,6 +1376,10 @@ "serviceCode":{ "shape":"String", "documentation":"

Service Quotas requirement to identify originating service.

" + }, + "quotaCode":{ + "shape":"String", + "documentation":"

Service Quotas requirement to identify originating quota.

" } }, "documentation":"

Request would cause a service quota to be exceeded.

", @@ -1394,7 +1394,7 @@ "type":"string", "max":128, "min":1, - "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$" + "pattern":"([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)" }, "TagKeys":{ "type":"list", @@ -1439,7 +1439,7 @@ "type":"string", "max":256, "min":0, - "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$" + "pattern":"([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)" }, "ThrottlingException":{ "type":"structure", @@ -1449,6 +1449,10 @@ "shape":"String", "documentation":"

Description of the error.

" }, + "serviceCode":{ + "shape":"String", + "documentation":"

Service Quotas requirement to identify originating service.

" + }, "quotaCode":{ "shape":"String", "documentation":"

Service Quotas requirement to identify originating quota.

" @@ -1458,10 +1462,6 @@ "documentation":"

Advice to clients on when the call can be safely retried.

", "location":"header", "locationName":"Retry-After" - }, - "serviceCode":{ - "shape":"String", - "documentation":"

Service Quotas requirement to identify originating service.

" } }, "documentation":"

Request was denied due to request throttling.

", @@ -1502,24 +1502,24 @@ "UpdateLoggingConfigurationRequest":{ "type":"structure", "required":[ - "logGroupArn", - "workspaceId" + "workspaceId", + "logGroupArn" ], "members":{ - "clientToken":{ - "shape":"IdempotencyToken", - "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", - "idempotencyToken":true - }, - "logGroupArn":{ - "shape":"LogGroupArn", - "documentation":"

The ARN of the CW log group to which the vended log data will be published.

" - }, "workspaceId":{ "shape":"WorkspaceId", "documentation":"

The ID of the workspace to vend logs to.

", "location":"uri", "locationName":"workspaceId" + }, + "logGroupArn":{ + "shape":"LogGroupArn", + "documentation":"

The ARN of the CW log group to which the vended log data will be published.

" + }, + "clientToken":{ + "shape":"IdempotencyToken", + "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", + "idempotencyToken":true } }, "documentation":"

Represents the input of an UpdateLoggingConfiguration operation.

" @@ -1539,6 +1539,12 @@ "type":"structure", "required":["workspaceId"], "members":{ + "workspaceId":{ + "shape":"WorkspaceId", + "documentation":"

The ID of the workspace being updated.

", + "location":"uri", + "locationName":"workspaceId" + }, "alias":{ "shape":"WorkspaceAlias", "documentation":"

The new alias of the workspace.

" @@ -1547,12 +1553,6 @@ "shape":"IdempotencyToken", "documentation":"

Optional, unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.

", "idempotencyToken":true - }, - "workspaceId":{ - "shape":"WorkspaceId", - "documentation":"

The ID of the workspace being updated.

", - "location":"uri", - "locationName":"workspaceId" } }, "documentation":"

Represents the input of an UpdateWorkspaceAlias operation.

" @@ -1569,10 +1569,6 @@ "reason" ], "members":{ - "fieldList":{ - "shape":"ValidationExceptionFieldList", - "documentation":"

The field that caused the error, if applicable. If more than one field caused the error, pick one and elaborate in the message.

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

Description of the error.

" @@ -1580,6 +1576,10 @@ "reason":{ "shape":"ValidationExceptionReason", "documentation":"

Reason the request failed validation.

" + }, + "fieldList":{ + "shape":"ValidationExceptionFieldList", + "documentation":"

The field that caused the error, if applicable. If more than one field caused the error, pick one and elaborate in the message.

" } }, "documentation":"

The input fails to satisfy the constraints specified by an AWS service.

", @@ -1592,17 +1592,17 @@ "ValidationExceptionField":{ "type":"structure", "required":[ - "message", - "name" + "name", + "message" ], "members":{ - "message":{ - "shape":"String", - "documentation":"

Message describing why the field failed validation.

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

The field name.

" + }, + "message":{ + "shape":"String", + "documentation":"

Message describing why the field failed validation.

" } }, "documentation":"

Stores information about a field passed inside a request that resulted in an exception.

" @@ -1635,12 +1635,16 @@ "WorkspaceDescription":{ "type":"structure", "required":[ + "workspaceId", "arn", - "createdAt", "status", - "workspaceId" + "createdAt" ], "members":{ + "workspaceId":{ + "shape":"WorkspaceId", + "documentation":"

Unique string identifying this workspace.

" + }, "alias":{ "shape":"WorkspaceAlias", "documentation":"

Alias of this workspace.

" @@ -1649,25 +1653,21 @@ "shape":"WorkspaceArn", "documentation":"

The Amazon Resource Name (ARN) of this workspace.

" }, - "createdAt":{ - "shape":"Timestamp", - "documentation":"

The time when the workspace was created.

" + "status":{ + "shape":"WorkspaceStatus", + "documentation":"

The status of this workspace.

" }, "prometheusEndpoint":{ "shape":"Uri", "documentation":"

Prometheus endpoint URI.

" }, - "status":{ - "shape":"WorkspaceStatus", - "documentation":"

The status of this workspace.

" + "createdAt":{ + "shape":"Timestamp", + "documentation":"

The time when the workspace was created.

" }, "tags":{ "shape":"TagMap", "documentation":"

The tags of this workspace.

" - }, - "workspaceId":{ - "shape":"WorkspaceId", - "documentation":"

Unique string identifying this workspace.

" } }, "documentation":"

Represents the properties of a workspace.

" @@ -1677,7 +1677,7 @@ "documentation":"

A workspace ID.

", "max":64, "min":1, - "pattern":"[0-9A-Za-z][-.0-9A-Z_a-z]*" + "pattern":".*[0-9A-Za-z][-.0-9A-Z_a-z]*.*" }, "WorkspaceStatus":{ "type":"structure", @@ -1704,12 +1704,16 @@ "WorkspaceSummary":{ "type":"structure", "required":[ + "workspaceId", "arn", - "createdAt", "status", - "workspaceId" + "createdAt" ], "members":{ + "workspaceId":{ + "shape":"WorkspaceId", + "documentation":"

Unique string identifying this workspace.

" + }, "alias":{ "shape":"WorkspaceAlias", "documentation":"

Alias of this workspace.

" @@ -1718,21 +1722,17 @@ "shape":"WorkspaceArn", "documentation":"

The AmazonResourceName of this workspace.

" }, - "createdAt":{ - "shape":"Timestamp", - "documentation":"

The time when the workspace was created.

" - }, "status":{ "shape":"WorkspaceStatus", "documentation":"

The status of this workspace.

" }, + "createdAt":{ + "shape":"Timestamp", + "documentation":"

The time when the workspace was created.

" + }, "tags":{ "shape":"TagMap", "documentation":"

The tags of this workspace.

" - }, - "workspaceId":{ - "shape":"WorkspaceId", - "documentation":"

Unique string identifying this workspace.

" } }, "documentation":"

Represents a summary of the properties of a workspace.

" diff --git a/botocore/data/ecs/2014-11-13/service-2.json b/botocore/data/ecs/2014-11-13/service-2.json index 608d286bcb..3c6fb39aea 100644 --- a/botocore/data/ecs/2014-11-13/service-2.json +++ b/botocore/data/ecs/2014-11-13/service-2.json @@ -1683,6 +1683,10 @@ "firelensConfiguration":{ "shape":"FirelensConfiguration", "documentation":"

The FireLens configuration for the container. This is used to specify and configure a log router for container logs. For more information, see Custom Log Routing in the Amazon Elastic Container Service Developer Guide.

" + }, + "credentialSpecs":{ + "shape":"StringList", + "documentation":"

A list of ARNs in SSM or Amazon S3 to a credential spec (credspeccode>) file that configures a container for Active Directory authentication. This parameter is only used with domainless authentication.

The format for each ARN is credentialspecdomainless:MyARN. Replace MyARN with the ARN in SSM or Amazon S3.

The credspec must provide a ARN in Secrets Manager for a secret containing the username, password, and the domain to connect to. For better security, the instance isn't joined to the domain for domainless authentication. Other applications on the instance can't use the domainless credentials. You can use this parameter to run tasks on the same instance, even it the tasks need to join different domains. For more information, see Using gMSAs for Windows Containers and Using gMSAs for Linux Containers.

" } }, "documentation":"

Container definitions are used in task definitions to describe the different containers that are launched as part of a task.

" @@ -3231,7 +3235,7 @@ "documentation":"

The optional grace period to provide containers time to bootstrap before failed health checks count towards the maximum number of retries. You can specify between 0 and 300 seconds. By default, the startPeriod is off.

If a health check succeeds within the startPeriod, then the container is considered healthy and any subsequent failures count toward the maximum number of retries.

" } }, - "documentation":"

An object representing a container health check. Health check parameters that are specified in a container definition override any Docker health checks that exist in the container image (such as those specified in a parent image or from the image's Dockerfile). This configuration maps to the HEALTHCHECK parameter of docker run.

The Amazon ECS container agent only monitors and reports on the health checks specified in the task definition. Amazon ECS does not monitor Docker health checks that are embedded in a container image and not specified in the container definition. Health check parameters that are specified in a container definition override any Docker health checks that exist in the container image.

You can view the health status of both individual containers and a task with the DescribeTasks API operation or when viewing the task details in the console.

The following describes the possible healthStatus values for a container:

The following describes the possible healthStatus values for a task. The container health check status of non-essential containers don't have an effect on the health status of a task.

If a task is run manually, and not as part of a service, the task will continue its lifecycle regardless of its health status. For tasks that are part of a service, if the task reports as unhealthy then the task will be stopped and the service scheduler will replace it.

The following are notes about container health check support:

" + "documentation":"

An object representing a container health check. Health check parameters that are specified in a container definition override any Docker health checks that exist in the container image (such as those specified in a parent image or from the image's Dockerfile). This configuration maps to the HEALTHCHECK parameter of docker run.

The Amazon ECS container agent only monitors and reports on the health checks specified in the task definition. Amazon ECS does not monitor Docker health checks that are embedded in a container image and not specified in the container definition. Health check parameters that are specified in a container definition override any Docker health checks that exist in the container image.

You can view the health status of both individual containers and a task with the DescribeTasks API operation or when viewing the task details in the console.

The health check is designed to make sure that your containers survive agent restarts, upgrades, or temporary unavailability.

The following describes the possible healthStatus values for a container:

The following describes the possible healthStatus values for a task. The container health check status of non-essential containers don't have an effect on the health status of a task.

If a task is run manually, and not as part of a service, the task will continue its lifecycle regardless of its health status. For tasks that are part of a service, if the task reports as unhealthy then the task will be stopped and the service scheduler will replace it.

The following are notes about container health check support:

" }, "HealthStatus":{ "type":"string", diff --git a/botocore/data/ivs/2020-07-14/service-2.json b/botocore/data/ivs/2020-07-14/service-2.json index 9b04a07525..99786cecd5 100644 --- a/botocore/data/ivs/2020-07-14/service-2.json +++ b/botocore/data/ivs/2020-07-14/service-2.json @@ -143,7 +143,7 @@ "http":{ "method":"POST", "requestUri":"/DeleteRecordingConfiguration", - "responseCode":200 + "responseCode":204 }, "input":{"shape":"DeleteRecordingConfigurationRequest"}, "errors":[ @@ -402,7 +402,7 @@ "http":{ "method":"POST", "requestUri":"/PutMetadata", - "responseCode":200 + "responseCode":204 }, "input":{"shape":"PutMetadataRequest"}, "errors":[ diff --git a/botocore/data/mediaconvert/2017-08-29/service-2.json b/botocore/data/mediaconvert/2017-08-29/service-2.json index a26677a7c5..0b7a288c56 100644 --- a/botocore/data/mediaconvert/2017-08-29/service-2.json +++ b/botocore/data/mediaconvert/2017-08-29/service-2.json @@ -2741,12 +2741,12 @@ "CustomLanguageCode": { "shape": "__stringMin3Max3PatternAZaZ3", "locationName": "customLanguageCode", - "documentation": "The specific language to extract from source, using the ISO 639-2 or ISO 639-3 three-letter language code. If input is SCTE-27, complete this field and/or PID to select the caption language to extract. If input is DVB-Sub and output is Burn-in or SMPTE-TT, complete this field and/or PID to select the caption language to extract. If input is DVB-Sub that is being passed through, omit this field (and PID field); there is no way to extract a specific language with pass-through captions." + "documentation": "The specific language to extract from source, using the ISO 639-2 or ISO 639-3 three-letter language code. If input is SCTE-27, complete this field and/or PID to select the caption language to extract. If input is DVB-Sub and output is Burn-in, complete this field and/or PID to select the caption language to extract. If input is DVB-Sub that is being passed through, omit this field (and PID field); there is no way to extract a specific language with pass-through captions." }, "LanguageCode": { "shape": "LanguageCode", "locationName": "languageCode", - "documentation": "The specific language to extract from source. If input is SCTE-27, complete this field and/or PID to select the caption language to extract. If input is DVB-Sub and output is Burn-in or SMPTE-TT, complete this field and/or PID to select the caption language to extract. If input is DVB-Sub that is being passed through, omit this field (and PID field); there is no way to extract a specific language with pass-through captions." + "documentation": "The specific language to extract from source. If input is SCTE-27, complete this field and/or PID to select the caption language to extract. If input is DVB-Sub and output is Burn-in, complete this field and/or PID to select the caption language to extract. If input is DVB-Sub that is being passed through, omit this field (and PID field); there is no way to extract a specific language with pass-through captions." }, "SourceSettings": { "shape": "CaptionSourceSettings", @@ -4628,7 +4628,7 @@ "Pid": { "shape": "__integerMin1Max2147483647", "locationName": "pid", - "documentation": "When using DVB-Sub with Burn-In or SMPTE-TT, use this PID for the source content. Unused for DVB-Sub passthrough. All DVB-Sub content is passed through, regardless of selectors." + "documentation": "When using DVB-Sub with Burn-in, use this PID for the source content. Unused for DVB-Sub passthrough. All DVB-Sub content is passed through, regardless of selectors." } }, "documentation": "DVB Sub Source Settings" @@ -6919,7 +6919,7 @@ "SegmentsPerSubdirectory": { "shape": "__integerMin1Max2147483647", "locationName": "segmentsPerSubdirectory", - "documentation": "Specify the number of segments to write to a subdirectory before starting a new one. You must also set Directory structure to Subdirectory per stream for this setting to have an effect." + "documentation": "Specify the number of segments to write to a subdirectory before starting a new one. You must also set Directory structure to Subdirectory per stream for this setting to have an effect." }, "StreamInfResolution": { "shape": "HlsStreamInfResolution", @@ -9945,7 +9945,7 @@ }, "MxfProfile": { "type": "string", - "documentation": "Specify the MXF profile, also called shim, for this output. When you choose Auto, MediaConvert chooses a profile based on the video codec and resolution. For a list of codecs supported with each MXF profile, see https://docs.aws.amazon.com/mediaconvert/latest/ug/codecs-supported-with-each-mxf-profile.html. For more information about the automatic selection behavior, see https://docs.aws.amazon.com/mediaconvert/latest/ug/default-automatic-selection-of-mxf-profiles.html.", + "documentation": "Specify the MXF profile, also called shim, for this output. To automatically select a profile according to your output video codec and resolution, leave blank. For a list of codecs supported with each MXF profile, see https://docs.aws.amazon.com/mediaconvert/latest/ug/codecs-supported-with-each-mxf-profile.html. For more information about the automatic selection behavior, see https://docs.aws.amazon.com/mediaconvert/latest/ug/default-automatic-selection-of-mxf-profiles.html.", "enum": [ "D_10", "XDCAM", @@ -9965,7 +9965,7 @@ "Profile": { "shape": "MxfProfile", "locationName": "profile", - "documentation": "Specify the MXF profile, also called shim, for this output. When you choose Auto, MediaConvert chooses a profile based on the video codec and resolution. For a list of codecs supported with each MXF profile, see https://docs.aws.amazon.com/mediaconvert/latest/ug/codecs-supported-with-each-mxf-profile.html. For more information about the automatic selection behavior, see https://docs.aws.amazon.com/mediaconvert/latest/ug/default-automatic-selection-of-mxf-profiles.html." + "documentation": "Specify the MXF profile, also called shim, for this output. To automatically select a profile according to your output video codec and resolution, leave blank. For a list of codecs supported with each MXF profile, see https://docs.aws.amazon.com/mediaconvert/latest/ug/codecs-supported-with-each-mxf-profile.html. For more information about the automatic selection behavior, see https://docs.aws.amazon.com/mediaconvert/latest/ug/default-automatic-selection-of-mxf-profiles.html." }, "XavcProfileSettings": { "shape": "MxfXavcProfileSettings", @@ -11832,7 +11832,7 @@ "Codec": { "shape": "VideoCodec", "locationName": "codec", - "documentation": "Specifies the video codec. This must be equal to one of the enum values defined by the object VideoCodec. To passthrough the video stream of your input JPEG2000, VC-3, AVC-INTRA or Apple ProRes video without any video encoding: Choose Passthrough. If you have multiple input videos, note that they must have identical encoding attributes. When you choose Passthrough, your output container must be MXF or QuickTime MOV." + "documentation": "Specifies the video codec. This must be equal to one of the enum values defined by the object VideoCodec. To passthrough the video stream of your input JPEG2000, VC-3, AVC-INTRA or Apple ProRes video without any video encoding: Choose Passthrough. If you have multiple input videos, note that they must have identical encoding attributes. When you choose Passthrough, your output container must be MXF or QuickTime MOV." }, "FrameCaptureSettings": { "shape": "FrameCaptureSettings", @@ -12000,7 +12000,7 @@ "Hdr10Plus": { "shape": "Hdr10Plus", "locationName": "hdr10Plus", - "documentation": "Enable HDR10+ analyis and metadata injection. Compatible with HEVC only." + "documentation": "Enable HDR10+ analysis and metadata injection. Compatible with HEVC only." }, "ImageInserter": { "shape": "ImageInserter", diff --git a/botocore/data/sagemaker/2017-07-24/service-2.json b/botocore/data/sagemaker/2017-07-24/service-2.json index c129b22659..86183e8701 100644 --- a/botocore/data/sagemaker/2017-07-24/service-2.json +++ b/botocore/data/sagemaker/2017-07-24/service-2.json @@ -5853,7 +5853,7 @@ "documentation":"

Defines the capacity size, either as a number of instances or a capacity percentage.

" } }, - "documentation":"

Specifies the endpoint capacity to activate for production.

" + "documentation":"

Specifies the type and size of the endpoint capacity to activate for a blue/green deployment, a rolling deployment, or a rollback strategy. You can specify your batches as either instance count or the overall percentage or your fleet.

For a rollback strategy, if you don't specify the fields in this object, or if you set the Value to 100%, then SageMaker uses a blue/green rollback strategy and rolls all traffic back to the blue fleet.

" }, "CapacitySizeType":{ "type":"string", @@ -10679,7 +10679,6 @@ }, "DeploymentConfig":{ "type":"structure", - "required":["BlueGreenUpdatePolicy"], "members":{ "BlueGreenUpdatePolicy":{ "shape":"BlueGreenUpdatePolicy", @@ -10688,6 +10687,10 @@ "AutoRollbackConfiguration":{ "shape":"AutoRollbackConfig", "documentation":"

Automatic rollback configuration for handling endpoint deployment failures and recovery.

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

Specifies a rolling deployment strategy for updating a SageMaker endpoint.

" } }, "documentation":"

The deployment configuration for an endpoint, which contains the desired deployment strategy and rollback configurations.

" @@ -16050,7 +16053,8 @@ "RollingBack", "InService", "Deleting", - "Failed" + "Failed", + "UpdateRollbackFailed" ] }, "EndpointSummary":{ @@ -23567,7 +23571,7 @@ }, "MaximumExecutionTimeoutInSeconds":{ "type":"integer", - "max":14400, + "max":28800, "min":600 }, "MaximumRetryAttempts":{ @@ -29645,6 +29649,32 @@ "min":20, "pattern":"^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$" }, + "RollingUpdatePolicy":{ + "type":"structure", + "required":[ + "MaximumBatchSize", + "WaitIntervalInSeconds" + ], + "members":{ + "MaximumBatchSize":{ + "shape":"CapacitySize", + "documentation":"

Batch size for each rolling step to provision capacity and turn on traffic on the new endpoint fleet, and terminate capacity on the old endpoint fleet. Value must be between 5% to 50% of the variant's total instance count.

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

The length of the baking period, during which SageMaker monitors alarms for each batch on the new fleet.

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

The time limit for the total deployment. Exceeding this limit causes a timeout.

" + }, + "RollbackMaximumBatchSize":{ + "shape":"CapacitySize", + "documentation":"

Batch size for rollback to the old endpoint fleet. Each rolling step to provision capacity and turn on traffic on the old endpoint fleet, and terminate capacity on the new endpoint fleet. If this field is absent, the default value will be set to 100% of total capacity which means to bring up the whole capacity of the old fleet at once during rollback.

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

Specifies a rolling deployment strategy for updating a SageMaker endpoint.

" + }, "RootAccess":{ "type":"string", "enum":[ diff --git a/botocore/data/transfer/2018-11-05/service-2.json b/botocore/data/transfer/2018-11-05/service-2.json index cf2b8f4ac6..6e21589dde 100644 --- a/botocore/data/transfer/2018-11-05/service-2.json +++ b/botocore/data/transfer/2018-11-05/service-2.json @@ -1044,10 +1044,19 @@ "MdnResponse":{ "shape":"MdnResponse", "documentation":"

Used for outbound requests (from an Transfer Family server to a partner AS2 server) to determine whether the partner response for transfers is synchronous or asynchronous. Specify either of the following values:

" + }, + "BasicAuthSecretId":{ + "shape":"As2ConnectorSecretId", + "documentation":"

Provides Basic authentication support to the AS2 Connectors API. To use Basic authentication, you must provide the name or Amazon Resource Name (ARN) of a secret in Secrets Manager.

The default value for this parameter is null, which indicates that Basic authentication is not enabled for the connector.

If the connector should use Basic authentication, the secret needs to be in the following format:

{ \"Username\": \"user-name\", \"Password\": \"user-password\" }

Replace user-name and user-password with the credentials for the actual user that is being authenticated.

Note the following:

If you have previously enabled Basic authentication for a connector, you can disable it by using the UpdateConnector API call. For example, if you are using the CLI, you can run the following command to remove Basic authentication:

update-connector --connector-id my-connector-id --as2-config 'BasicAuthSecretId=\"\"'

" } }, "documentation":"

Contains the details for a connector object. The connector object is used for AS2 outbound processes, to connect the Transfer Family customer with the trading partner.

" }, + "As2ConnectorSecretId":{ + "type":"string", + "max":2048, + "min":0 + }, "As2Id":{ "type":"string", "max":128, @@ -1259,7 +1268,7 @@ }, "AccessRole":{ "shape":"Role", - "documentation":"

With AS2, you can send files by calling StartFileTransfer and specifying the file paths in the request parameter, SendFilePaths. We use the file’s parent directory (for example, for --send-file-paths /bucket/dir/file.txt, parent directory is /bucket/dir/) to temporarily store a processed AS2 message file, store the MDN when we receive them from the partner, and write a final JSON file containing relevant metadata of the transmission. So, the AccessRole needs to provide read and write access to the parent directory of the file location used in the StartFileTransfer request. Additionally, you need to provide read and write access to the parent directory of the files that you intend to send with StartFileTransfer.

" + "documentation":"

With AS2, you can send files by calling StartFileTransfer and specifying the file paths in the request parameter, SendFilePaths. We use the file’s parent directory (for example, for --send-file-paths /bucket/dir/file.txt, parent directory is /bucket/dir/) to temporarily store a processed AS2 message file, store the MDN when we receive them from the partner, and write a final JSON file containing relevant metadata of the transmission. So, the AccessRole needs to provide read and write access to the parent directory of the file location used in the StartFileTransfer request. Additionally, you need to provide read and write access to the parent directory of the files that you intend to send with StartFileTransfer.

If you are using Basic authentication for your AS2 connector, the access role requires the secretsmanager:GetSecretValue permission for the secret. If the secret is encrypted using a customer-managed key instead of the Amazon Web Services managed key in Secrets Manager, then the role also needs the kms:Decrypt permission for that key.

" }, "Status":{ "shape":"AgreementStatusType", @@ -1299,7 +1308,7 @@ }, "AccessRole":{ "shape":"Role", - "documentation":"

With AS2, you can send files by calling StartFileTransfer and specifying the file paths in the request parameter, SendFilePaths. We use the file’s parent directory (for example, for --send-file-paths /bucket/dir/file.txt, parent directory is /bucket/dir/) to temporarily store a processed AS2 message file, store the MDN when we receive them from the partner, and write a final JSON file containing relevant metadata of the transmission. So, the AccessRole needs to provide read and write access to the parent directory of the file location used in the StartFileTransfer request. Additionally, you need to provide read and write access to the parent directory of the files that you intend to send with StartFileTransfer.

" + "documentation":"

With AS2, you can send files by calling StartFileTransfer and specifying the file paths in the request parameter, SendFilePaths. We use the file’s parent directory (for example, for --send-file-paths /bucket/dir/file.txt, parent directory is /bucket/dir/) to temporarily store a processed AS2 message file, store the MDN when we receive them from the partner, and write a final JSON file containing relevant metadata of the transmission. So, the AccessRole needs to provide read and write access to the parent directory of the file location used in the StartFileTransfer request. Additionally, you need to provide read and write access to the parent directory of the files that you intend to send with StartFileTransfer.

If you are using Basic authentication for your AS2 connector, the access role requires the secretsmanager:GetSecretValue permission for the secret. If the secret is encrypted using a customer-managed key instead of the Amazon Web Services managed key in Secrets Manager, then the role also needs the kms:Decrypt permission for that key.

" }, "LoggingRole":{ "shape":"Role", @@ -2103,7 +2112,7 @@ }, "AccessRole":{ "shape":"Role", - "documentation":"

With AS2, you can send files by calling StartFileTransfer and specifying the file paths in the request parameter, SendFilePaths. We use the file’s parent directory (for example, for --send-file-paths /bucket/dir/file.txt, parent directory is /bucket/dir/) to temporarily store a processed AS2 message file, store the MDN when we receive them from the partner, and write a final JSON file containing relevant metadata of the transmission. So, the AccessRole needs to provide read and write access to the parent directory of the file location used in the StartFileTransfer request. Additionally, you need to provide read and write access to the parent directory of the files that you intend to send with StartFileTransfer.

" + "documentation":"

With AS2, you can send files by calling StartFileTransfer and specifying the file paths in the request parameter, SendFilePaths. We use the file’s parent directory (for example, for --send-file-paths /bucket/dir/file.txt, parent directory is /bucket/dir/) to temporarily store a processed AS2 message file, store the MDN when we receive them from the partner, and write a final JSON file containing relevant metadata of the transmission. So, the AccessRole needs to provide read and write access to the parent directory of the file location used in the StartFileTransfer request. Additionally, you need to provide read and write access to the parent directory of the files that you intend to send with StartFileTransfer.

If you are using Basic authentication for your AS2 connector, the access role requires the secretsmanager:GetSecretValue permission for the secret. If the secret is encrypted using a customer-managed key instead of the Amazon Web Services managed key in Secrets Manager, then the role also needs the kms:Decrypt permission for that key.

" }, "Tags":{ "shape":"Tags", @@ -2197,7 +2206,7 @@ }, "AccessRole":{ "shape":"Role", - "documentation":"

With AS2, you can send files by calling StartFileTransfer and specifying the file paths in the request parameter, SendFilePaths. We use the file’s parent directory (for example, for --send-file-paths /bucket/dir/file.txt, parent directory is /bucket/dir/) to temporarily store a processed AS2 message file, store the MDN when we receive them from the partner, and write a final JSON file containing relevant metadata of the transmission. So, the AccessRole needs to provide read and write access to the parent directory of the file location used in the StartFileTransfer request. Additionally, you need to provide read and write access to the parent directory of the files that you intend to send with StartFileTransfer.

" + "documentation":"

With AS2, you can send files by calling StartFileTransfer and specifying the file paths in the request parameter, SendFilePaths. We use the file’s parent directory (for example, for --send-file-paths /bucket/dir/file.txt, parent directory is /bucket/dir/) to temporarily store a processed AS2 message file, store the MDN when we receive them from the partner, and write a final JSON file containing relevant metadata of the transmission. So, the AccessRole needs to provide read and write access to the parent directory of the file location used in the StartFileTransfer request. Additionally, you need to provide read and write access to the parent directory of the files that you intend to send with StartFileTransfer.

If you are using Basic authentication for your AS2 connector, the access role requires the secretsmanager:GetSecretValue permission for the secret. If the secret is encrypted using a customer-managed key instead of the Amazon Web Services managed key in Secrets Manager, then the role also needs the kms:Decrypt permission for that key.

" }, "LoggingRole":{ "shape":"Role", @@ -4527,7 +4536,7 @@ }, "AccessRole":{ "shape":"Role", - "documentation":"

With AS2, you can send files by calling StartFileTransfer and specifying the file paths in the request parameter, SendFilePaths. We use the file’s parent directory (for example, for --send-file-paths /bucket/dir/file.txt, parent directory is /bucket/dir/) to temporarily store a processed AS2 message file, store the MDN when we receive them from the partner, and write a final JSON file containing relevant metadata of the transmission. So, the AccessRole needs to provide read and write access to the parent directory of the file location used in the StartFileTransfer request. Additionally, you need to provide read and write access to the parent directory of the files that you intend to send with StartFileTransfer.

" + "documentation":"

With AS2, you can send files by calling StartFileTransfer and specifying the file paths in the request parameter, SendFilePaths. We use the file’s parent directory (for example, for --send-file-paths /bucket/dir/file.txt, parent directory is /bucket/dir/) to temporarily store a processed AS2 message file, store the MDN when we receive them from the partner, and write a final JSON file containing relevant metadata of the transmission. So, the AccessRole needs to provide read and write access to the parent directory of the file location used in the StartFileTransfer request. Additionally, you need to provide read and write access to the parent directory of the files that you intend to send with StartFileTransfer.

If you are using Basic authentication for your AS2 connector, the access role requires the secretsmanager:GetSecretValue permission for the secret. If the secret is encrypted using a customer-managed key instead of the Amazon Web Services managed key in Secrets Manager, then the role also needs the kms:Decrypt permission for that key.

" } } }, @@ -4591,7 +4600,7 @@ }, "AccessRole":{ "shape":"Role", - "documentation":"

With AS2, you can send files by calling StartFileTransfer and specifying the file paths in the request parameter, SendFilePaths. We use the file’s parent directory (for example, for --send-file-paths /bucket/dir/file.txt, parent directory is /bucket/dir/) to temporarily store a processed AS2 message file, store the MDN when we receive them from the partner, and write a final JSON file containing relevant metadata of the transmission. So, the AccessRole needs to provide read and write access to the parent directory of the file location used in the StartFileTransfer request. Additionally, you need to provide read and write access to the parent directory of the files that you intend to send with StartFileTransfer.

" + "documentation":"

With AS2, you can send files by calling StartFileTransfer and specifying the file paths in the request parameter, SendFilePaths. We use the file’s parent directory (for example, for --send-file-paths /bucket/dir/file.txt, parent directory is /bucket/dir/) to temporarily store a processed AS2 message file, store the MDN when we receive them from the partner, and write a final JSON file containing relevant metadata of the transmission. So, the AccessRole needs to provide read and write access to the parent directory of the file location used in the StartFileTransfer request. Additionally, you need to provide read and write access to the parent directory of the files that you intend to send with StartFileTransfer.

If you are using Basic authentication for your AS2 connector, the access role requires the secretsmanager:GetSecretValue permission for the secret. If the secret is encrypted using a customer-managed key instead of the Amazon Web Services managed key in Secrets Manager, then the role also needs the kms:Decrypt permission for that key.

" }, "LoggingRole":{ "shape":"Role", diff --git a/botocore/data/verifiedpermissions/2021-12-01/service-2.json b/botocore/data/verifiedpermissions/2021-12-01/service-2.json index 31994806fb..04d8ee188f 100644 --- a/botocore/data/verifiedpermissions/2021-12-01/service-2.json +++ b/botocore/data/verifiedpermissions/2021-12-01/service-2.json @@ -605,7 +605,7 @@ "members":{ "clientToken":{ "shape":"IdempotencyToken", - "documentation":"

Specifies a unique, case-sensitive ID that you provide to ensure the idempotency of the request. This lets you safely retry the request without accidentally performing the same operation a second time. Passing the same value to a later call to an operation requires that you also pass the same value for all other parameters. We recommend that you use a UUID type of value..

If you don't provide this value, then Amazon Web Services generates a random one for you.

If you retry the operation with the same ClientToken, but with different parameters, the retry fails with an IdempotentParameterMismatch error.

", + "documentation":"

Specifies a unique, case-sensitive ID that you provide to ensure the idempotency of the request. This lets you safely retry the request without accidentally performing the same operation a second time. Passing the same value to a later call to an operation requires that you also pass the same value for all other parameters. We recommend that you use a UUID type of value..

If you don't provide this value, then Amazon Web Services generates a random one for you.

If you retry the operation with the same ClientToken, but with different parameters, the retry fails with an IdempotentParameterMismatch error.

", "idempotencyToken":true }, "policyStoreId":{ @@ -658,7 +658,7 @@ "members":{ "clientToken":{ "shape":"IdempotencyToken", - "documentation":"

Specifies a unique, case-sensitive ID that you provide to ensure the idempotency of the request. This lets you safely retry the request without accidentally performing the same operation a second time. Passing the same value to a later call to an operation requires that you also pass the same value for all other parameters. We recommend that you use a UUID type of value..

If you don't provide this value, then Amazon Web Services generates a random one for you.

If you retry the operation with the same ClientToken, but with different parameters, the retry fails with an IdempotentParameterMismatch error.

", + "documentation":"

Specifies a unique, case-sensitive ID that you provide to ensure the idempotency of the request. This lets you safely retry the request without accidentally performing the same operation a second time. Passing the same value to a later call to an operation requires that you also pass the same value for all other parameters. We recommend that you use a UUID type of value..

If you don't provide this value, then Amazon Web Services generates a random one for you.

If you retry the operation with the same ClientToken, but with different parameters, the retry fails with an IdempotentParameterMismatch error.

", "idempotencyToken":true }, "policyStoreId":{ @@ -717,7 +717,7 @@ "members":{ "clientToken":{ "shape":"IdempotencyToken", - "documentation":"

Specifies a unique, case-sensitive ID that you provide to ensure the idempotency of the request. This lets you safely retry the request without accidentally performing the same operation a second time. Passing the same value to a later call to an operation requires that you also pass the same value for all other parameters. We recommend that you use a UUID type of value..

If you don't provide this value, then Amazon Web Services generates a random one for you.

If you retry the operation with the same ClientToken, but with different parameters, the retry fails with an IdempotentParameterMismatch error.

", + "documentation":"

Specifies a unique, case-sensitive ID that you provide to ensure the idempotency of the request. This lets you safely retry the request without accidentally performing the same operation a second time. Passing the same value to a later call to an operation requires that you also pass the same value for all other parameters. We recommend that you use a UUID type of value..

If you don't provide this value, then Amazon Web Services generates a random one for you.

If you retry the operation with the same ClientToken, but with different parameters, the retry fails with an IdempotentParameterMismatch error.

", "idempotencyToken":true }, "validationSettings":{ @@ -762,7 +762,7 @@ "members":{ "clientToken":{ "shape":"IdempotencyToken", - "documentation":"

Specifies a unique, case-sensitive ID that you provide to ensure the idempotency of the request. This lets you safely retry the request without accidentally performing the same operation a second time. Passing the same value to a later call to an operation requires that you also pass the same value for all other parameters. We recommend that you use a UUID type of value..

If you don't provide this value, then Amazon Web Services generates a random one for you.

If you retry the operation with the same ClientToken, but with different parameters, the retry fails with an IdempotentParameterMismatch error.

", + "documentation":"

Specifies a unique, case-sensitive ID that you provide to ensure the idempotency of the request. This lets you safely retry the request without accidentally performing the same operation a second time. Passing the same value to a later call to an operation requires that you also pass the same value for all other parameters. We recommend that you use a UUID type of value..

If you don't provide this value, then Amazon Web Services generates a random one for you.

If you retry the operation with the same ClientToken, but with different parameters, the retry fails with an IdempotentParameterMismatch error.

", "idempotencyToken":true }, "policyStoreId":{ @@ -1010,7 +1010,7 @@ "documentation":"

The error description.

" } }, - "documentation":"

Contains a description of an evaluation error.

This data type is used as a request parameter in the IsAuthorized and IsAuthorizedWithToken operations.

" + "documentation":"

Contains a description of an evaluation error.

This data type is used as a request parameter in the IsAuthorized and IsAuthorizedWithToken operations.

" }, "EvaluationErrorList":{ "type":"list", diff --git a/docs/source/conf.py b/docs/source/conf.py index cda0ec3321..c68ec1f5cc 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -59,7 +59,7 @@ # The short X.Y version. version = '1.29.1' # The full version, including alpha/beta/rc tags. -release = '1.29.164' +release = '1.29.165' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/tests/functional/endpoint-rules/amp/endpoint-tests-1.json b/tests/functional/endpoint-rules/amp/endpoint-tests-1.json index f7de350082..24b2a120ad 100644 --- a/tests/functional/endpoint-rules/amp/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/amp/endpoint-tests-1.json @@ -1,42 +1,42 @@ { "testCases": [ { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps-fips.eu-central-1.api.aws" + "url": "https://aps.ap-northeast-1.amazonaws.com" } }, "params": { - "Region": "eu-central-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "ap-northeast-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps-fips.eu-central-1.amazonaws.com" + "url": "https://aps.ap-southeast-1.amazonaws.com" } }, "params": { - "Region": "eu-central-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "ap-southeast-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps.eu-central-1.api.aws" + "url": "https://aps.ap-southeast-2.amazonaws.com" } }, "params": { - "Region": "eu-central-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "ap-southeast-2", + "UseFIPS": false, + "UseDualStack": false } }, { @@ -48,99 +48,8 @@ }, "params": { "Region": "eu-central-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://aps-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://aps-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://aps.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://aps.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://aps-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://aps-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://aps.eu-north-1.api.aws" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -152,47 +61,21 @@ }, "params": { "Region": "eu-north-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://aps-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://aps-fips.eu-west-2.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps.eu-west-2.api.aws" + "url": "https://aps.eu-west-1.amazonaws.com" } }, "params": { - "Region": "eu-west-2", - "UseDualStack": true, - "UseFIPS": false + "Region": "eu-west-1", + "UseFIPS": false, + "UseDualStack": false } }, { @@ -204,333 +87,312 @@ }, "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://aps-fips.eu-west-1.api.aws" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps-fips.eu-west-1.amazonaws.com" + "url": "https://aps.us-east-1.amazonaws.com" } }, "params": { - "Region": "eu-west-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps.eu-west-1.api.aws" + "url": "https://aps.us-east-2.amazonaws.com" } }, "params": { - "Region": "eu-west-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-east-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps.eu-west-1.amazonaws.com" + "url": "https://aps.us-west-2.amazonaws.com" } }, "params": { - "Region": "eu-west-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-west-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://aps-fips.ap-northeast-1.api.aws" + "url": "https://aps-fips.us-east-1.api.aws" } }, "params": { - "Region": "ap-northeast-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps-fips.ap-northeast-1.amazonaws.com" + "url": "https://aps-fips.us-east-1.amazonaws.com" } }, "params": { - "Region": "ap-northeast-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://aps.ap-northeast-1.api.aws" + "url": "https://aps.us-east-1.api.aws" } }, "params": { - "Region": "ap-northeast-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://aps.ap-northeast-1.amazonaws.com" + "url": "https://aps-fips.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "Region": "ap-northeast-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps-fips.ap-southeast-1.api.aws" + "url": "https://aps-fips.cn-north-1.amazonaws.com.cn" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://aps-fips.ap-southeast-1.amazonaws.com" + "url": "https://aps.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps.ap-southeast-1.api.aws" + "url": "https://aps.cn-north-1.amazonaws.com.cn" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://aps.ap-southeast-1.amazonaws.com" + "url": "https://aps-fips.us-gov-east-1.api.aws" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps-fips.ap-southeast-2.api.aws" + "url": "https://aps-fips.us-gov-east-1.amazonaws.com" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://aps-fips.ap-southeast-2.amazonaws.com" + "url": "https://aps.us-gov-east-1.api.aws" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps.ap-southeast-2.api.aws" + "url": "https://aps.us-gov-east-1.amazonaws.com" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://aps.ap-southeast-2.amazonaws.com" - } + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps-fips.us-east-1.api.aws" + "url": "https://aps-fips.us-iso-east-1.c2s.ic.gov" } }, "params": { - "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://aps-fips.us-east-1.amazonaws.com" - } + "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps.us-east-1.api.aws" + "url": "https://aps.us-iso-east-1.c2s.ic.gov" } }, "params": { - "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://aps.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-isob-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps-fips.us-east-2.api.aws" + "url": "https://aps-fips.us-isob-east-1.sc2s.sgov.gov" } }, "params": { - "Region": "us-east-2", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://aps-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-isob-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://aps.us-east-2.api.aws" + "url": "https://aps.us-isob-east-1.sc2s.sgov.gov" } }, "params": { - "Region": "us-east-2", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", "expect": { "endpoint": { - "url": "https://aps.us-east-2.amazonaws.com" + "url": "https://example.com" } }, "params": { - "Region": "us-east-2", + "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" } }, @@ -541,8 +403,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -553,10 +415,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/verifiedpermissions/endpoint-tests-1.json b/tests/functional/endpoint-rules/verifiedpermissions/endpoint-tests-1.json index 722b079cbf..1ee1c6c839 100644 --- a/tests/functional/endpoint-rules/verifiedpermissions/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/verifiedpermissions/endpoint-tests-1.json @@ -9,8 +9,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-gov-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-gov-east-1" } }, { @@ -22,8 +22,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-gov-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-gov-east-1" } }, { @@ -35,8 +35,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-gov-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-gov-east-1" } }, { @@ -48,8 +48,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-gov-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-gov-east-1" } }, { @@ -61,8 +61,8 @@ }, "params": { "UseFIPS": true, - "Region": "cn-north-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "cn-north-1" } }, { @@ -74,8 +74,8 @@ }, "params": { "UseFIPS": true, - "Region": "cn-north-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "cn-north-1" } }, { @@ -87,8 +87,8 @@ }, "params": { "UseFIPS": false, - "Region": "cn-north-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "cn-north-1" } }, { @@ -100,8 +100,8 @@ }, "params": { "UseFIPS": false, - "Region": "cn-north-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "cn-north-1" } }, { @@ -111,8 +111,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-iso-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-iso-east-1" } }, { @@ -124,8 +124,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-iso-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-iso-east-1" } }, { @@ -135,8 +135,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-iso-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-iso-east-1" } }, { @@ -148,8 +148,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-iso-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-iso-east-1" } }, { @@ -161,8 +161,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-east-1" } }, { @@ -174,8 +174,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-east-1" } }, { @@ -187,8 +187,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-east-1" } }, { @@ -200,8 +200,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-east-1" } }, { @@ -211,8 +211,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-isob-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-isob-east-1" } }, { @@ -224,8 +224,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-isob-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-isob-east-1" } }, { @@ -235,8 +235,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-isob-east-1", - "UseDualStack": true + "UseDualStack": true, + "Region": "us-isob-east-1" } }, { @@ -248,8 +248,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-isob-east-1", - "UseDualStack": false + "UseDualStack": false, + "Region": "us-isob-east-1" } }, { @@ -261,8 +261,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-east-1", "UseDualStack": false, + "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -273,8 +273,8 @@ }, "params": { "UseFIPS": true, - "Region": "us-east-1", "UseDualStack": false, + "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -285,8 +285,8 @@ }, "params": { "UseFIPS": false, - "Region": "us-east-1", "UseDualStack": true, + "Region": "us-east-1", "Endpoint": "https://example.com" } }