diff --git a/.changes/1.31.11.json b/.changes/1.31.11.json new file mode 100644 index 0000000000..beec9421e2 --- /dev/null +++ b/.changes/1.31.11.json @@ -0,0 +1,67 @@ +[ + { + "category": "``billingconductor``", + "description": "Added support for Auto-Assocate Billing Groups for CreateBillingGroup, UpdateBillingGroup, and ListBillingGroups.", + "type": "api-change" + }, + { + "category": "``customer-profiles``", + "description": "Amazon Connect Customer Profiles now supports rule-based resolution to match and merge similar profiles into unified profiles, helping companies deliver faster and more personalized customer service by providing access to relevant customer information for agents and automated experiences.", + "type": "api-change" + }, + { + "category": "``datasync``", + "description": "AWS DataSync now supports Microsoft Azure Blob Storage locations.", + "type": "api-change" + }, + { + "category": "``dynamodb``", + "description": "Documentation updates for DynamoDB", + "type": "api-change" + }, + { + "category": "``ec2``", + "description": "This release adds an instance's peak and baseline network bandwidth as well as the memory sizes of an instance's inference accelerators to DescribeInstanceTypes.", + "type": "api-change" + }, + { + "category": "``emr-serverless``", + "description": "This release adds support for publishing application logs to CloudWatch.", + "type": "api-change" + }, + { + "category": "``lambda``", + "description": "Add Python 3.11 (python3.11) support to AWS Lambda", + "type": "api-change" + }, + { + "category": "``rds``", + "description": "This release adds support for monitoring storage optimization progress on the DescribeDBInstances API.", + "type": "api-change" + }, + { + "category": "``sagemaker``", + "description": "Mark ContentColumn and TargetLabelColumn as required Targets in TextClassificationJobConfig in CreateAutoMLJobV2API", + "type": "api-change" + }, + { + "category": "``securityhub``", + "description": "Add support for CONTAINS and NOT_CONTAINS comparison operators for Automation Rules string filters and map filters", + "type": "api-change" + }, + { + "category": "``sts``", + "description": "API updates for the AWS Security Token Service", + "type": "api-change" + }, + { + "category": "``transfer``", + "description": "This release adds support for SFTP Connectors.", + "type": "api-change" + }, + { + "category": "``wisdom``", + "description": "This release added two new data types: AssistantIntegrationConfiguration, and SessionIntegrationConfiguration to support Wisdom integration with Amazon Connect Chat", + "type": "api-change" + } +] \ No newline at end of file diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b4d8fec3b3..c1ecb8cb08 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,24 @@ CHANGELOG ========= +1.31.11 +======= + +* api-change:``billingconductor``: Added support for Auto-Assocate Billing Groups for CreateBillingGroup, UpdateBillingGroup, and ListBillingGroups. +* api-change:``customer-profiles``: Amazon Connect Customer Profiles now supports rule-based resolution to match and merge similar profiles into unified profiles, helping companies deliver faster and more personalized customer service by providing access to relevant customer information for agents and automated experiences. +* api-change:``datasync``: AWS DataSync now supports Microsoft Azure Blob Storage locations. +* api-change:``dynamodb``: Documentation updates for DynamoDB +* api-change:``ec2``: This release adds an instance's peak and baseline network bandwidth as well as the memory sizes of an instance's inference accelerators to DescribeInstanceTypes. +* api-change:``emr-serverless``: This release adds support for publishing application logs to CloudWatch. +* api-change:``lambda``: Add Python 3.11 (python3.11) support to AWS Lambda +* api-change:``rds``: This release adds support for monitoring storage optimization progress on the DescribeDBInstances API. +* api-change:``sagemaker``: Mark ContentColumn and TargetLabelColumn as required Targets in TextClassificationJobConfig in CreateAutoMLJobV2API +* api-change:``securityhub``: Add support for CONTAINS and NOT_CONTAINS comparison operators for Automation Rules string filters and map filters +* api-change:``sts``: API updates for the AWS Security Token Service +* api-change:``transfer``: This release adds support for SFTP Connectors. +* api-change:``wisdom``: This release added two new data types: AssistantIntegrationConfiguration, and SessionIntegrationConfiguration to support Wisdom integration with Amazon Connect Chat + + 1.31.10 ======= diff --git a/botocore/__init__.py b/botocore/__init__.py index 141dd801f6..aeeb4aafad 100644 --- a/botocore/__init__.py +++ b/botocore/__init__.py @@ -16,7 +16,7 @@ import os import re -__version__ = '1.31.10' +__version__ = '1.31.11' class NullHandler(logging.Handler): diff --git a/botocore/data/billingconductor/2021-07-30/endpoint-rule-set-1.json b/botocore/data/billingconductor/2021-07-30/endpoint-rule-set-1.json index b4ea1f3843..a71edcaf08 100644 --- a/botocore/data/billingconductor/2021-07-30/endpoint-rule-set-1.json +++ b/botocore/data/billingconductor/2021-07-30/endpoint-rule-set-1.json @@ -138,208 +138,40 @@ }, "aws" ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://billingconductor-fips.{Region}.api.aws", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] }, { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - } - ], - "type": "tree", - "rules": [ + "fn": "booleanEquals", + "argv": [ { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://billingconductor-fips.{Region}.amazonaws.com", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "ref": "UseFIPS" }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } + false ] }, { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ + "fn": "booleanEquals", + "argv": [ { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://billingconductor.{Region}.api.aws", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "ref": "UseDualStack" }, + false + ] + } + ], + "endpoint": { + "url": "https://billingconductor.us-east-1.amazonaws.com", + "properties": { + "authSchemes": [ { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" + "name": "sigv4", + "signingName": "billingconductor", + "signingRegion": "us-east-1" } ] }, - { - "conditions": [], - "endpoint": { - "url": "https://billingconductor.us-east-1.amazonaws.com", - "properties": { - "authSchemes": [ - { - "name": "sigv4", - "signingName": "billingconductor", - "signingRegion": "us-east-1" - } - ] - }, - "headers": {} - }, - "type": "endpoint" - } - ] + "headers": {} + }, + "type": "endpoint" }, { "conditions": [ @@ -543,33 +375,6 @@ "conditions": [], "type": "tree", "rules": [ - { - "conditions": [ - { - "fn": "stringEquals", - "argv": [ - { - "ref": "Region" - }, - "aws-global" - ] - } - ], - "endpoint": { - "url": "https://billingconductor.us-east-1.amazonaws.com", - "properties": { - "authSchemes": [ - { - "name": "sigv4", - "signingName": "billingconductor", - "signingRegion": "us-east-1" - } - ] - }, - "headers": {} - }, - "type": "endpoint" - }, { "conditions": [], "endpoint": { diff --git a/botocore/data/billingconductor/2021-07-30/service-2.json b/botocore/data/billingconductor/2021-07-30/service-2.json index d51720264a..87d16cf395 100644 --- a/botocore/data/billingconductor/2021-07-30/service-2.json +++ b/botocore/data/billingconductor/2021-07-30/service-2.json @@ -625,22 +625,22 @@ "members":{ "AccountId":{ "shape":"AccountId", - "documentation":"

The associating array of account IDs.

" + "documentation":"

The associating array of account IDs.

" }, "BillingGroupArn":{ "shape":"BillingGroupArn", - "documentation":"

The Billing Group Arn that the linked account is associated to.

" + "documentation":"

The Billing Group Arn that the linked account is associated to.

" }, "AccountName":{ "shape":"AccountName", - "documentation":"

The Amazon Web Services account name.

" + "documentation":"

The Amazon Web Services account name.

" }, "AccountEmail":{ "shape":"AccountEmail", - "documentation":"

The Amazon Web Services account email.

" + "documentation":"

The Amazon Web Services account email.

" } }, - "documentation":"

A representation of a linked account.

" + "documentation":"

A representation of a linked account.

" }, "AccountEmail":{ "type":"string", @@ -652,10 +652,14 @@ "members":{ "LinkedAccountIds":{ "shape":"AccountIdList", - "documentation":"

The account IDs that make up the billing group. Account IDs must be a part of the consolidated billing family, and not associated with another billing group.

" + "documentation":"

The account IDs that make up the billing group. Account IDs must be a part of the consolidated billing family, and not associated with another billing group.

" + }, + "AutoAssociate":{ + "shape":"Boolean", + "documentation":"

Specifies if this billing group will automatically associate newly added Amazon Web Services accounts that join your consolidated billing family.

" } }, - "documentation":"

The set of accounts that will be under the billing group. The set of accounts resemble the linked accounts in a consolidated family.

" + "documentation":"

The set of accounts that will be under the billing group. The set of accounts resemble the linked accounts in a consolidated billing family.

" }, "AccountId":{ "type":"string", @@ -740,14 +744,14 @@ "members":{ "Message":{ "shape":"String", - "documentation":"

The reason why the resource association failed.

" + "documentation":"

The reason why the resource association failed.

" }, "Reason":{ "shape":"AssociateResourceErrorReason", - "documentation":"

A static error code that's used to classify the type of failure.

" + "documentation":"

A static error code that's used to classify the type of failure.

" } }, - "documentation":"

A representation of a resource association error.

" + "documentation":"

A representation of a resource association error.

" }, "AssociateResourceErrorReason":{ "type":"string", @@ -764,14 +768,14 @@ "members":{ "Arn":{ "shape":"CustomLineItemAssociationElement", - "documentation":"

The resource ARN that was associated to the custom line item.

" + "documentation":"

The resource ARN that was associated to the custom line item.

" }, "Error":{ "shape":"AssociateResourceError", - "documentation":"

An AssociateResourceError that will populate if the resource association fails.

" + "documentation":"

An AssociateResourceError that will populate if the resource association fails.

" } }, - "documentation":"

A resource association result for a percentage custom line item.

" + "documentation":"

A resource association result for a percentage custom line item.

" }, "AssociateResourcesResponseList":{ "type":"list", @@ -862,30 +866,30 @@ "members":{ "Arn":{ "shape":"BillingGroupArn", - "documentation":"

The Amazon Resource Name (ARN) of a billing group.

" + "documentation":"

The Amazon Resource Name (ARN) of a billing group.

" }, "AWSCost":{ "shape":"AWSCost", - "documentation":"

The actual Amazon Web Services charges for the billing group.

" + "documentation":"

The actual Amazon Web Services charges for the billing group.

" }, "ProformaCost":{ "shape":"ProformaCost", - "documentation":"

The hypothetical Amazon Web Services charges based on the associated pricing plan of a billing group.

" + "documentation":"

The hypothetical Amazon Web Services charges based on the associated pricing plan of a billing group.

" }, "Margin":{ "shape":"Margin", - "documentation":"

The billing group margin.

" + "documentation":"

The billing group margin.

" }, "MarginPercentage":{ "shape":"MarginPercentage", - "documentation":"

The percentage of billing group margin.

" + "documentation":"

The percentage of billing group margin.

" }, "Currency":{ "shape":"Currency", - "documentation":"

The displayed currency.

" + "documentation":"

The displayed currency.

" } }, - "documentation":"

A summary report of actual Amazon Web Services charges and calculated Amazon Web Services charges, based on the associated pricing plan of a billing group.

" + "documentation":"

A summary report of actual Amazon Web Services charges and calculated Amazon Web Services charges, based on the associated pricing plan of a billing group.

" }, "BillingGroupCostReportList":{ "type":"list", @@ -910,43 +914,47 @@ "members":{ "Name":{ "shape":"BillingGroupName", - "documentation":"

The name of the billing group.

" + "documentation":"

The name of the billing group.

" }, "Arn":{ "shape":"BillingGroupArn", - "documentation":"

The Amazon Resource Number (ARN) that can be used to uniquely identify the billing group.

" + "documentation":"

The Amazon Resource Number (ARN) that can be used to uniquely identify the billing group.

" }, "Description":{ "shape":"BillingGroupDescription", - "documentation":"

The description of the billing group.

" + "documentation":"

The description of the billing group.

" }, "PrimaryAccountId":{ "shape":"AccountId", - "documentation":"

The account ID that serves as the main account in a billing group.

" + "documentation":"

The account ID that serves as the main account in a billing group.

" }, "ComputationPreference":{"shape":"ComputationPreference"}, "Size":{ "shape":"NumberOfAccounts", - "documentation":"

The number of accounts in the particular billing group.

" + "documentation":"

The number of accounts in the particular billing group.

" }, "CreationTime":{ "shape":"Instant", - "documentation":"

The time when the billing group was created.

" + "documentation":"

The time when the billing group was created.

" }, "LastModifiedTime":{ "shape":"Instant", - "documentation":"

The most recent time when the billing group was modified.

" + "documentation":"

The most recent time when the billing group was modified.

" }, "Status":{ "shape":"BillingGroupStatus", - "documentation":"

The billing group status. Only one of the valid values can be used.

" + "documentation":"

The billing group status. Only one of the valid values can be used.

" }, "StatusReason":{ "shape":"BillingGroupStatusReason", - "documentation":"

The reason why the billing group is in its current status.

" + "documentation":"

The reason why the billing group is in its current status.

" + }, + "AccountGrouping":{ + "shape":"ListBillingGroupAccountGrouping", + "documentation":"

Specifies if the billing group has automatic account association (AutoAssociate) enabled.

" } }, - "documentation":"

A representation of a billing group.

" + "documentation":"

A representation of a billing group.

" }, "BillingGroupName":{ "type":"string", @@ -973,6 +981,10 @@ "type":"string", "pattern":"\\d{4}-(0?[1-9]|1[012])" }, + "Boolean":{ + "type":"boolean", + "box":true + }, "ClientToken":{ "type":"string", "max":64, @@ -988,7 +1000,7 @@ "documentation":"

The Amazon Resource Name (ARN) of the pricing plan that's used to compute the Amazon Web Services charges for a billing group.

" } }, - "documentation":"

The preferences and settings that will be used to compute the Amazon Web Services charges for a billing group.

" + "documentation":"

The preferences and settings that will be used to compute the Amazon Web Services charges for a billing group.

" }, "ConflictException":{ "type":"structure", @@ -1050,7 +1062,7 @@ }, "AccountGrouping":{ "shape":"AccountGrouping", - "documentation":"

The set of accounts that will be under the billing group. The set of accounts resemble the linked accounts in a consolidated family.

" + "documentation":"

The set of accounts that will be under the billing group. The set of accounts resemble the linked accounts in a consolidated billing family.

" }, "ComputationPreference":{ "shape":"ComputationPreference", @@ -1306,14 +1318,14 @@ "members":{ "InclusiveStartBillingPeriod":{ "shape":"BillingPeriod", - "documentation":"

The inclusive start billing period that defines a billing period range where a custom line is applied.

" + "documentation":"

The inclusive start billing period that defines a billing period range where a custom line is applied.

" }, "ExclusiveEndBillingPeriod":{ "shape":"BillingPeriod", - "documentation":"

The inclusive end billing period that defines a billing period range where a custom line is applied.

" + "documentation":"

The inclusive end billing period that defines a billing period range where a custom line is applied.

" } }, - "documentation":"

The billing period range in which the custom line item request will be applied.

" + "documentation":"

The billing period range in which the custom line item request will be applied.

" }, "CustomLineItemChargeDetails":{ "type":"structure", @@ -1321,18 +1333,18 @@ "members":{ "Flat":{ "shape":"CustomLineItemFlatChargeDetails", - "documentation":"

A CustomLineItemFlatChargeDetails that describes the charge details of a flat custom line item.

" + "documentation":"

A CustomLineItemFlatChargeDetails that describes the charge details of a flat custom line item.

" }, "Percentage":{ "shape":"CustomLineItemPercentageChargeDetails", - "documentation":"

A CustomLineItemPercentageChargeDetails that describes the charge details of a percentage custom line item.

" + "documentation":"

A CustomLineItemPercentageChargeDetails that describes the charge details of a percentage custom line item.

" }, "Type":{ "shape":"CustomLineItemType", - "documentation":"

The type of the custom line item that indicates whether the charge is a fee or credit.

" + "documentation":"

The type of the custom line item that indicates whether the charge is a fee or credit.

" } }, - "documentation":"

The charge details of a custom line item. It should contain only one of Flat or Percentage.

" + "documentation":"

The charge details of a custom line item. It should contain only one of Flat or Percentage.

" }, "CustomLineItemChargeValue":{ "type":"double", @@ -1352,10 +1364,10 @@ "members":{ "ChargeValue":{ "shape":"CustomLineItemChargeValue", - "documentation":"

The custom line item's fixed charge value in USD.

" + "documentation":"

The custom line item's fixed charge value in USD.

" } }, - "documentation":"

A representation of the charge details that are associated with a flat custom line item.

" + "documentation":"

A representation of the charge details that are associated with a flat custom line item.

" }, "CustomLineItemList":{ "type":"list", @@ -1366,46 +1378,46 @@ "members":{ "Arn":{ "shape":"CustomLineItemArn", - "documentation":"

The Amazon Resource Names (ARNs) for custom line items.

" + "documentation":"

The Amazon Resource Names (ARNs) for custom line items.

" }, "Name":{ "shape":"CustomLineItemName", - "documentation":"

The custom line item's name.

" + "documentation":"

The custom line item's name.

" }, "ChargeDetails":{ "shape":"ListCustomLineItemChargeDetails", - "documentation":"

A ListCustomLineItemChargeDetails that describes the charge details of a custom line item.

" + "documentation":"

A ListCustomLineItemChargeDetails that describes the charge details of a custom line item.

" }, "CurrencyCode":{ "shape":"CurrencyCode", - "documentation":"

The custom line item's charge value currency. Only one of the valid values can be used.

" + "documentation":"

The custom line item's charge value currency. Only one of the valid values can be used.

" }, "Description":{ "shape":"CustomLineItemDescription", - "documentation":"

The custom line item's description. This is shown on the Bills page in association with the charge value.

" + "documentation":"

The custom line item's description. This is shown on the Bills page in association with the charge value.

" }, "ProductCode":{ "shape":"CustomLineItemProductCode", - "documentation":"

The product code that's associated with the custom line item.

" + "documentation":"

The product code that's associated with the custom line item.

" }, "BillingGroupArn":{ "shape":"BillingGroupArn", - "documentation":"

The Amazon Resource Name (ARN) that references the billing group where the custom line item applies to.

" + "documentation":"

The Amazon Resource Name (ARN) that references the billing group where the custom line item applies to.

" }, "CreationTime":{ "shape":"Instant", - "documentation":"

The time created.

" + "documentation":"

The time created.

" }, "LastModifiedTime":{ "shape":"Instant", - "documentation":"

The most recent time when the custom line item was modified.

" + "documentation":"

The most recent time when the custom line item was modified.

" }, "AssociationSize":{ "shape":"NumberOfAssociations", - "documentation":"

The number of resources that are associated to the custom line item.

" + "documentation":"

The number of resources that are associated to the custom line item.

" } }, - "documentation":"

A representation of a custom line item.

" + "documentation":"

A representation of a custom line item.

" }, "CustomLineItemName":{ "type":"string", @@ -1426,14 +1438,14 @@ "members":{ "PercentageValue":{ "shape":"CustomLineItemPercentageChargeValue", - "documentation":"

The custom line item's percentage value. This will be multiplied against the combined value of its associated resources to determine its charge value.

" + "documentation":"

The custom line item's percentage value. This will be multiplied against the combined value of its associated resources to determine its charge value.

" }, "AssociatedValues":{ "shape":"CustomLineItemAssociationsList", - "documentation":"

A list of resource ARNs to associate to the percentage custom line item.

" + "documentation":"

A list of resource ARNs to associate to the percentage custom line item.

" } }, - "documentation":"

A representation of the charge details that are associated with a percentage custom line item.

" + "documentation":"

A representation of the charge details that are associated with a percentage custom line item.

" }, "CustomLineItemPercentageChargeValue":{ "type":"double", @@ -1653,14 +1665,14 @@ "members":{ "Arn":{ "shape":"CustomLineItemAssociationElement", - "documentation":"

The resource ARN that was disassociated from the custom line item.

" + "documentation":"

The resource ARN that was disassociated from the custom line item.

" }, "Error":{ "shape":"AssociateResourceError", "documentation":"

An AssociateResourceError that's shown if the resource disassociation fails.

" } }, - "documentation":"

A resource disassociation result for a percentage custom line item.

" + "documentation":"

A resource disassociation result for a percentage custom line item.

" }, "DisassociateResourcesResponseList":{ "type":"list", @@ -1700,18 +1712,18 @@ "members":{ "Association":{ "shape":"Association", - "documentation":"

MONITORED: linked accounts that are associated to billing groups.

UNMONITORED: linked accounts that are not associated to billing groups.

Billing Group Arn: linked accounts that are associated to the provided Billing Group Arn.

" + "documentation":"

MONITORED: linked accounts that are associated to billing groups.

UNMONITORED: linked accounts that are not associated to billing groups.

Billing Group Arn: linked accounts that are associated to the provided Billing Group Arn.

" }, "AccountId":{ "shape":"AccountId", - "documentation":"

The Amazon Web Services account ID to filter on.

" + "documentation":"

The Amazon Web Services account ID to filter on.

" }, "AccountIds":{ "shape":"AccountIdFilterList", "documentation":"

The list of Amazon Web Services IDs to retrieve their associated billing group for a given time range.

" } }, - "documentation":"

The filter on the account ID of the linked account, or any of the following:

MONITORED: linked accounts that are associated to billing groups.

UNMONITORED: linked accounts that are not associated to billing groups.

Billing Group Arn: linked accounts that are associated to the provided Billing Group Arn.

" + "documentation":"

The filter on the account ID of the linked account, or any of the following:

MONITORED: linked accounts that are associated to billing groups.

UNMONITORED: linked accounts that are not associated to billing groups.

Billing Group Arn: linked accounts that are associated to the provided Billing Group Arn.

" }, "ListAccountAssociationsInput":{ "type":"structure", @@ -1743,6 +1755,16 @@ } } }, + "ListBillingGroupAccountGrouping":{ + "type":"structure", + "members":{ + "AutoAssociate":{ + "shape":"Boolean", + "documentation":"

Specifies if this billing group will automatically associate newly added Amazon Web Services accounts that join your consolidated billing family.

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

Specifies if the billing group has the following features enabled.

" + }, "ListBillingGroupCostReportsFilter":{ "type":"structure", "members":{ @@ -1751,7 +1773,7 @@ "documentation":"

The list of Amazon Resource Names (ARNs) used to filter billing groups to retrieve reports.

" } }, - "documentation":"

The filter used to retrieve specific BillingGroupCostReportElements.

" + "documentation":"

The filter used to retrieve specific BillingGroupCostReportElements.

" }, "ListBillingGroupCostReportsInput":{ "type":"structure", @@ -1792,18 +1814,22 @@ "members":{ "Arns":{ "shape":"BillingGroupArnList", - "documentation":"

The list of billing group Amazon Resource Names (ARNs) to retrieve information.

" + "documentation":"

The list of billing group Amazon Resource Names (ARNs) to retrieve information.

" }, "PricingPlan":{ "shape":"PricingPlanFullArn", - "documentation":"

The pricing plan Amazon Resource Names (ARNs) to retrieve information.

" + "documentation":"

The pricing plan Amazon Resource Names (ARNs) to retrieve information.

" }, "Statuses":{ "shape":"BillingGroupStatusList", "documentation":"

A list of billing groups to retrieve their current status for a specific time range

" + }, + "AutoAssociate":{ + "shape":"Boolean", + "documentation":"

Specifies if this billing group will automatically associate newly added Amazon Web Services accounts that join your consolidated billing family.

" } }, - "documentation":"

The filter that specifies the billing groups and pricing plans to retrieve billing group information.

" + "documentation":"

The filter that specifies the billing groups and pricing plans to retrieve billing group information.

" }, "ListBillingGroupsInput":{ "type":"structure", @@ -1944,18 +1970,18 @@ "members":{ "Names":{ "shape":"CustomLineItemNameList", - "documentation":"

A list of custom line items to retrieve information.

" + "documentation":"

A list of custom line items to retrieve information.

" }, "BillingGroups":{ "shape":"BillingGroupArnList", - "documentation":"

The billing group Amazon Resource Names (ARNs) to retrieve information.

" + "documentation":"

The billing group Amazon Resource Names (ARNs) to retrieve information.

" }, "Arns":{ "shape":"CustomLineItemArns", - "documentation":"

A list of custom line item ARNs to retrieve information.

" + "documentation":"

A list of custom line item ARNs to retrieve information.

" } }, - "documentation":"

A filter that specifies the custom line items and billing groups to retrieve FFLI information.

" + "documentation":"

A filter that specifies the custom line items and billing groups to retrieve FFLI information.

" }, "ListCustomLineItemsInput":{ "type":"structure", @@ -2039,10 +2065,10 @@ "members":{ "Arns":{ "shape":"PricingPlanArns", - "documentation":"

A list of pricing plan Amazon Resource Names (ARNs) to retrieve information.

" + "documentation":"

A list of pricing plan Amazon Resource Names (ARNs) to retrieve information.

" } }, - "documentation":"

The filter that specifies the Amazon Resource Names (ARNs) of pricing plans, to retrieve pricing plan information.

" + "documentation":"

The filter that specifies the Amazon Resource Names (ARNs) of pricing plans, to retrieve pricing plan information.

" }, "ListPricingPlansInput":{ "type":"structure", @@ -2130,10 +2156,10 @@ "members":{ "Arns":{ "shape":"PricingRuleArns", - "documentation":"

A list containing the pricing rule Amazon Resource Names (ARNs) to include in the API response.

" + "documentation":"

A list containing the pricing rule Amazon Resource Names (ARNs) to include in the API response.

" } }, - "documentation":"

The filter that specifies criteria that the pricing rules returned by the ListPricingRules API will adhere to.

" + "documentation":"

The filter that specifies criteria that the pricing rules returned by the ListPricingRules API will adhere to.

" }, "ListPricingRulesInput":{ "type":"structure", @@ -2351,30 +2377,30 @@ "members":{ "Name":{ "shape":"PricingPlanName", - "documentation":"

The name of a pricing plan.

" + "documentation":"

The name of a pricing plan.

" }, "Arn":{ "shape":"PricingPlanArn", - "documentation":"

The pricing plan Amazon Resource Names (ARN). This can be used to uniquely identify a pricing plan.

" + "documentation":"

The pricing plan Amazon Resource Names (ARN). This can be used to uniquely identify a pricing plan.

" }, "Description":{ "shape":"PricingPlanDescription", - "documentation":"

The pricing plan description.

" + "documentation":"

The pricing plan description.

" }, "Size":{ "shape":"NumberOfAssociatedPricingRules", - "documentation":"

The pricing rules count that's currently associated with this pricing plan list element.

" + "documentation":"

The pricing rules count that's currently associated with this pricing plan list element.

" }, "CreationTime":{ "shape":"Instant", - "documentation":"

The time when the pricing plan was created.

" + "documentation":"

The time when the pricing plan was created.

" }, "LastModifiedTime":{ "shape":"Instant", - "documentation":"

The most recent time when the pricing plan was modified.

" + "documentation":"

The most recent time when the pricing plan was modified.

" } }, - "documentation":"

A representation of a pricing plan.

" + "documentation":"

A representation of a pricing plan.

" }, "PricingPlanName":{ "type":"string", @@ -2420,43 +2446,43 @@ "members":{ "Name":{ "shape":"PricingRuleName", - "documentation":"

The name of a pricing rule.

" + "documentation":"

The name of a pricing rule.

" }, "Arn":{ "shape":"PricingRuleArn", - "documentation":"

The Amazon Resource Name (ARN) used to uniquely identify a pricing rule.

" + "documentation":"

The Amazon Resource Name (ARN) used to uniquely identify a pricing rule.

" }, "Description":{ "shape":"PricingRuleDescription", - "documentation":"

The pricing rule description.

" + "documentation":"

The pricing rule description.

" }, "Scope":{ "shape":"PricingRuleScope", - "documentation":"

The scope of pricing rule that indicates if it is globally applicable, or if it is service-specific.

" + "documentation":"

The scope of pricing rule that indicates if it is globally applicable, or if it is service-specific.

" }, "Type":{ "shape":"PricingRuleType", - "documentation":"

The type of pricing rule.

" + "documentation":"

The type of pricing rule.

" }, "ModifierPercentage":{ "shape":"ModifierPercentage", - "documentation":"

A percentage modifier applied on the public pricing rates.

" + "documentation":"

A percentage modifier applied on the public pricing rates.

" }, "Service":{ "shape":"Service", - "documentation":"

If the Scope attribute is SERVICE, this attribute indicates which service the PricingRule is applicable for.

" + "documentation":"

If the Scope attribute is SERVICE, this attribute indicates which service the PricingRule is applicable for.

" }, "AssociatedPricingPlanCount":{ "shape":"NumberOfPricingPlansAssociatedWith", - "documentation":"

The pricing plans count that this pricing rule is associated with.

" + "documentation":"

The pricing plans count that this pricing rule is associated with.

" }, "CreationTime":{ "shape":"Instant", - "documentation":"

The time when the pricing rule was created.

" + "documentation":"

The time when the pricing rule was created.

" }, "LastModifiedTime":{ "shape":"Instant", - "documentation":"

The most recent time when the pricing rule was modified.

" + "documentation":"

The most recent time when the pricing rule was modified.

" }, "BillingEntity":{ "shape":"BillingEntity", @@ -2475,7 +2501,7 @@ "documentation":"

Operation is the specific Amazon Web Services action covered by this line item. This describes the specific usage of the line item.

If the Scope attribute is set to SKU, this attribute indicates which operation the PricingRule is modifying. For example, a value of RunInstances:0202 indicates the operation of running an Amazon EC2 instance.

" } }, - "documentation":"

A representation of a pricing rule.

" + "documentation":"

A representation of a pricing rule.

" }, "PricingRuleName":{ "type":"string", @@ -2676,6 +2702,16 @@ "members":{ } }, + "UpdateBillingGroupAccountGrouping":{ + "type":"structure", + "members":{ + "AutoAssociate":{ + "shape":"Boolean", + "documentation":"

Specifies if this billing group will automatically associate newly added Amazon Web Services accounts that join your consolidated billing family.

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

Specifies if the billing group has the following features enabled.

" + }, "UpdateBillingGroupInput":{ "type":"structure", "required":["Arn"], @@ -2699,6 +2735,10 @@ "Description":{ "shape":"BillingGroupDescription", "documentation":"

A description of the billing group.

" + }, + "AccountGrouping":{ + "shape":"UpdateBillingGroupAccountGrouping", + "documentation":"

Specifies if the billing group has automatic account association (AutoAssociate) enabled.

" } } }, @@ -2740,6 +2780,10 @@ "StatusReason":{ "shape":"BillingGroupStatusReason", "documentation":"

The reason why the billing group is in its current status.

" + }, + "AccountGrouping":{ + "shape":"UpdateBillingGroupAccountGrouping", + "documentation":"

Specifies if the billing group has automatic account association (AutoAssociate) enabled.

" } } }, @@ -3007,7 +3051,7 @@ "documentation":"

The fields that caused the error, if applicable.

" } }, - "documentation":"

The input doesn't match with the constraints specified by Amazon Web Services services.

", + "documentation":"

The input doesn't match with the constraints specified by Amazon Web Services.

", "error":{ "httpStatusCode":400, "senderFault":true @@ -3023,14 +3067,14 @@ "members":{ "Name":{ "shape":"String", - "documentation":"

The field name.

" + "documentation":"

The field name.

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

The message describing why the field failed validation.

" + "documentation":"

The message describing why the field failed validation.

" } }, - "documentation":"

The field's information of a request that resulted in an exception.

" + "documentation":"

The field's information of a request that resulted in an exception.

" }, "ValidationExceptionFieldList":{ "type":"list", @@ -3095,7 +3139,9 @@ "ILLEGAL_OPERATION", "ILLEGAL_USAGE_TYPE", "INVALID_SKU_COMBO", - "INVALID_FILTER" + "INVALID_FILTER", + "TOO_MANY_AUTO_ASSOCIATE_BILLING_GROUPS", + "CANNOT_DELETE_AUTO_ASSOCIATE_BILLING_GROUP" ] } }, diff --git a/botocore/data/customer-profiles/2020-08-15/service-2.json b/botocore/data/customer-profiles/2020-08-15/service-2.json index dcd2477861..2faa269c43 100644 --- a/botocore/data/customer-profiles/2020-08-15/service-2.json +++ b/botocore/data/customer-profiles/2020-08-15/service-2.json @@ -62,7 +62,7 @@ {"shape":"ThrottlingException"}, {"shape":"InternalServerException"} ], - "documentation":"

Creates a domain, which is a container for all customer data, such as customer profile attributes, object types, profile keys, and encryption keys. You can create multiple domains, and each domain can have multiple third-party integrations.

Each Amazon Connect instance can be associated with only one domain. Multiple Amazon Connect instances can be associated with one domain.

Use this API or UpdateDomain to enable identity resolution: set Matching to true.

To prevent cross-service impersonation when you call this API, see Cross-service confused deputy prevention for sample policies that you should apply.

" + "documentation":"

Creates a domain, which is a container for all customer data, such as customer profile attributes, object types, profile keys, and encryption keys. You can create multiple domains, and each domain can have multiple third-party integrations.

Each Amazon Connect instance can be associated with only one domain. Multiple Amazon Connect instances can be associated with one domain.

Use this API or UpdateDomain to enable identity resolution: set Matching to true.

To prevent cross-service impersonation when you call this API, see Cross-service confused deputy prevention for sample policies that you should apply.

" }, "CreateEventStream":{ "name":"CreateEventStream", @@ -439,6 +439,23 @@ ], "documentation":"

Returns the template information for a specific object type.

A template is a predefined ProfileObjectType, such as “Salesforce-Account” or “Salesforce-Contact.” When a user sends a ProfileObject, using the PutProfileObject API, with an ObjectTypeName that matches one of the TemplateIds, it uses the mappings from the template.

" }, + "GetSimilarProfiles":{ + "name":"GetSimilarProfiles", + "http":{ + "method":"POST", + "requestUri":"/domains/{DomainName}/matches" + }, + "input":{"shape":"GetSimilarProfilesRequest"}, + "output":{"shape":"GetSimilarProfilesResponse"}, + "errors":[ + {"shape":"BadRequestException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"ThrottlingException"}, + {"shape":"InternalServerException"} + ], + "documentation":"

Returns a set of profiles that belong to the same matching group using the matchId or profileId. You can also specify the type of matching that you want for finding similar profiles using either RULE_BASED_MATCHING or ML_BASED_MATCHING.

" + }, "GetWorkflow":{ "name":"GetWorkflow", "http":{ @@ -643,6 +660,23 @@ ], "documentation":"

Returns a list of objects associated with a profile of a given ProfileObjectType.

" }, + "ListRuleBasedMatches":{ + "name":"ListRuleBasedMatches", + "http":{ + "method":"GET", + "requestUri":"/domains/{DomainName}/profiles/ruleBasedMatches" + }, + "input":{"shape":"ListRuleBasedMatchesRequest"}, + "output":{"shape":"ListRuleBasedMatchesResponse"}, + "errors":[ + {"shape":"BadRequestException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"ThrottlingException"}, + {"shape":"InternalServerException"} + ], + "documentation":"

Returns a set of MatchIds that belong to the given domain.

" + }, "ListTagsForResource":{ "name":"ListTagsForResource", "http":{ @@ -821,7 +855,7 @@ {"shape":"ThrottlingException"}, {"shape":"InternalServerException"} ], - "documentation":"

Updates the properties of a domain, including creating or selecting a dead letter queue or an encryption key.

After a domain is created, the name can’t be changed.

Use this API or CreateDomain to enable identity resolution: set Matching to true.

To prevent cross-service impersonation when you call this API, see Cross-service confused deputy prevention for sample policies that you should apply.

To add or remove tags on an existing Domain, see TagResource/UntagResource.

" + "documentation":"

Updates the properties of a domain, including creating or selecting a dead letter queue or an encryption key.

After a domain is created, the name can’t be changed.

Use this API or CreateDomain to enable identity resolution: set Matching to true.

To prevent cross-service impersonation when you call this API, see Cross-service confused deputy prevention for sample policies that you should apply.

To add or remove tags on an existing Domain, see TagResource/UntagResource.

" }, "UpdateProfile":{ "name":"UpdateProfile", @@ -963,6 +997,12 @@ }, "documentation":"

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

" }, + "AddressList":{ + "type":"list", + "member":{"shape":"string1To255"}, + "max":4, + "min":1 + }, "AppflowIntegration":{ "type":"structure", "required":["FlowDefinition"], @@ -1103,11 +1143,41 @@ "max":2, "min":1 }, + "AttributeMatchingModel":{ + "type":"string", + "enum":[ + "ONE_TO_ONE", + "MANY_TO_MANY" + ] + }, "AttributeSourceIdMap":{ "type":"map", "key":{"shape":"string1To255"}, "value":{"shape":"uuid"} }, + "AttributeTypesSelector":{ + "type":"structure", + "required":["AttributeMatchingModel"], + "members":{ + "AttributeMatchingModel":{ + "shape":"AttributeMatchingModel", + "documentation":"

Configures the AttributeMatchingModel, you can either choose ONE_TO_ONE or MANY_TO_MANY.

" + }, + "Address":{ + "shape":"AddressList", + "documentation":"

The Address type. You can choose from Address, BusinessAddress, MaillingAddress, and ShippingAddress.

You only can use the Address type in the MatchingRule. For example, if you want to match profile based on BusinessAddress.City or MaillingAddress.City, you need to choose the BusinessAddress and the MaillingAddress to represent the Address type and specify the Address.City on the matching rule.

" + }, + "PhoneNumber":{ + "shape":"PhoneNumberList", + "documentation":"

The PhoneNumber type. You can choose from PhoneNumber, HomePhoneNumber, and MobilePhoneNumber.

You only can use the PhoneNumber type in the MatchingRule. For example, if you want to match a profile based on Phone or HomePhone, you need to choose the Phone and the HomePhone to represent the PhoneNumber type and only specify the PhoneNumber on the matching rule.

" + }, + "EmailAddress":{ + "shape":"EmailList", + "documentation":"

The Email type. You can choose from EmailAddress, BusinessEmailAddress and PersonalEmailAddress.

You only can use the EmailAddress type in the MatchingRule. For example, if you want to match profile based on PersonalEmailAddress or BusinessEmailAddress, you need to choose the PersonalEmailAddress and the BusinessEmailAddress to represent the EmailAddress type and only specify the EmailAddress on the matching rule.

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

Configuration information about the AttributeTypesSelector where the rule-based identity resolution uses to match profiles. You can choose how profiles are compared across attribute types and which attribute to use for matching from each type. There are three attribute types you can configure:

You can either choose ONE_TO_ONE or MANY_TO_MANY as the AttributeMatchingModel. When choosing MANY_TO_MANY, the system can match attribute across the sub-types of an attribute type. For example, if the value of the Email field of Profile A and the value of BusinessEmail field of Profile B matches, the two profiles are matched on the Email type. When choosing ONE_TO_ONE the system can only match if the sub-types are exact matches. For example, only when the value of the Email field of Profile A and the value of the Email field of Profile B matches, the two profiles are matched on the Email type.

" + }, "Attributes":{ "type":"map", "key":{"shape":"string1To255"}, @@ -1385,6 +1455,10 @@ "shape":"MatchingRequest", "documentation":"

The process of matching duplicate profiles. If Matching = true, Amazon Connect Customer Profiles starts a weekly batch process called Identity Resolution Job. If you do not specify a date and time for Identity Resolution Job to run, by default it runs every Saturday at 12AM UTC to detect duplicate profiles in your domains.

After the Identity Resolution Job completes, use the GetMatches API to return and review the results. Or, if you have configured ExportingConfig in the MatchingRequest, you can download the results from S3.

" }, + "RuleBasedMatching":{ + "shape":"RuleBasedMatchingRequest", + "documentation":"

The process of matching duplicate profiles using the Rule-Based matching. If RuleBasedMatching = true, Amazon Connect Customer Profiles will start to match and merge your profiles according to your configuration in the RuleBasedMatchingRequest. You can use the ListRuleBasedMatches and GetSimilarProfiles API to return and review the results. Also, if you have configured ExportingConfig in the RuleBasedMatchingRequest, you can download the results from S3.

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

The tags used to organize, track, or control access for this resource.

" @@ -1420,6 +1494,10 @@ "shape":"MatchingResponse", "documentation":"

The process of matching duplicate profiles. If Matching = true, Amazon Connect Customer Profiles starts a weekly batch process called Identity Resolution Job. If you do not specify a date and time for Identity Resolution Job to run, by default it runs every Saturday at 12AM UTC to detect duplicate profiles in your domains.

After the Identity Resolution Job completes, use the GetMatches API to return and review the results. Or, if you have configured ExportingConfig in the MatchingRequest, you can download the results from S3.

" }, + "RuleBasedMatching":{ + "shape":"RuleBasedMatchingResponse", + "documentation":"

The process of matching duplicate profiles using the Rule-Based matching. If RuleBasedMatching = true, Amazon Connect Customer Profiles will start to match and merge your profiles according to your configuration in the RuleBasedMatchingRequest. You can use the ListRuleBasedMatches and GetSimilarProfiles API to return and review the results. Also, if you have configured ExportingConfig in the RuleBasedMatchingRequest, you can download the results from S3.

" + }, "CreatedAt":{ "shape":"timestamp", "documentation":"

The timestamp of when the domain was created.

" @@ -1983,6 +2061,12 @@ "max":1.0, "min":0.0 }, + "EmailList":{ + "type":"list", + "member":{"shape":"string1To255"}, + "max":3, + "min":1 + }, "EventStreamDestinationDetails":{ "type":"structure", "required":[ @@ -2471,6 +2555,10 @@ "shape":"MatchingResponse", "documentation":"

The process of matching duplicate profiles. If Matching = true, Amazon Connect Customer Profiles starts a weekly batch process called Identity Resolution Job. If you do not specify a date and time for Identity Resolution Job to run, by default it runs every Saturday at 12AM UTC to detect duplicate profiles in your domains.

After the Identity Resolution Job completes, use the GetMatches API to return and review the results. Or, if you have configured ExportingConfig in the MatchingRequest, you can download the results from S3.

" }, + "RuleBasedMatching":{ + "shape":"RuleBasedMatchingResponse", + "documentation":"

The process of matching duplicate profiles using the Rule-Based matching. If RuleBasedMatching = true, Amazon Connect Customer Profiles will start to match and merge your profiles according to your configuration in the RuleBasedMatchingRequest. You can use the ListRuleBasedMatches and GetSimilarProfiles API to return and review the results. Also, if you have configured ExportingConfig in the RuleBasedMatchingRequest, you can download the results from S3.

" + }, "CreatedAt":{ "shape":"timestamp", "documentation":"

The timestamp of when the domain was created.

" @@ -2850,6 +2938,76 @@ } } }, + "GetSimilarProfilesRequest":{ + "type":"structure", + "required":[ + "DomainName", + "MatchType", + "SearchKey", + "SearchValue" + ], + "members":{ + "NextToken":{ + "shape":"token", + "documentation":"

The pagination token from the previous GetSimilarProfiles API call.

", + "location":"querystring", + "locationName":"next-token" + }, + "MaxResults":{ + "shape":"maxSize100", + "documentation":"

The maximum number of objects returned per page.

", + "location":"querystring", + "locationName":"max-results" + }, + "DomainName":{ + "shape":"name", + "documentation":"

The unique name of the domain.

", + "location":"uri", + "locationName":"DomainName" + }, + "MatchType":{ + "shape":"MatchType", + "documentation":"

Specify the type of matching to get similar profiles for.

" + }, + "SearchKey":{ + "shape":"string1To255", + "documentation":"

The string indicating the search key to be used.

" + }, + "SearchValue":{ + "shape":"string1To255", + "documentation":"

The string based on SearchKey to be searched for similar profiles.

" + } + } + }, + "GetSimilarProfilesResponse":{ + "type":"structure", + "members":{ + "ProfileIds":{ + "shape":"ProfileIdList", + "documentation":"

Set of profileIds that belong to the same matching group.

" + }, + "MatchId":{ + "shape":"string1To255", + "documentation":"

The string matchId that the similar profiles belong to.

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

Specify the type of matching to get similar profiles for.

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

The integer rule level that the profiles matched on.

" + }, + "ConfidenceScore":{ + "shape":"Double", + "documentation":"

It only has value when the MatchType is ML_BASED_MATCHING.A number between 0 and 1, where a higher score means higher similarity. Examining match confidence scores lets you distinguish between groups of similar records in which the system is highly confident (which you may decide to merge), groups of similar records about which the system is uncertain (which you may decide to have reviewed by a human), and groups of similar records that the system deems to be unlikely (which you may decide to reject). Given confidence scores vary as per the data input, it should not be used as an absolute measure of matching quality.

" + }, + "NextToken":{ + "shape":"token", + "documentation":"

The pagination token from the previous GetSimilarProfiles API call.

" + } + } + }, "GetWorkflowRequest":{ "type":"structure", "required":[ @@ -3699,6 +3857,43 @@ } } }, + "ListRuleBasedMatchesRequest":{ + "type":"structure", + "required":["DomainName"], + "members":{ + "NextToken":{ + "shape":"token", + "documentation":"

The pagination token from the previous ListRuleBasedMatches API call.

", + "location":"querystring", + "locationName":"next-token" + }, + "MaxResults":{ + "shape":"maxSize100", + "documentation":"

The maximum number of MatchIds returned per page.

", + "location":"querystring", + "locationName":"max-results" + }, + "DomainName":{ + "shape":"name", + "documentation":"

The unique name of the domain.

", + "location":"uri", + "locationName":"DomainName" + } + } + }, + "ListRuleBasedMatchesResponse":{ + "type":"structure", + "members":{ + "MatchIds":{ + "shape":"MatchIdList", + "documentation":"

The list of MatchIds for the given domain.

" + }, + "NextToken":{ + "shape":"token", + "documentation":"

The pagination token from the previous ListRuleBasedMatches API call.

" + } + } + }, "ListTagsForResourceRequest":{ "type":"structure", "required":["resourceArn"], @@ -3843,6 +4038,10 @@ }, "documentation":"

The properties that are applied when Marketo is being used as a source.

" }, + "MatchIdList":{ + "type":"list", + "member":{"shape":"string1To255"} + }, "MatchItem":{ "type":"structure", "members":{ @@ -3861,6 +4060,13 @@ }, "documentation":"

The Match group object.

" }, + "MatchType":{ + "type":"string", + "enum":[ + "RULE_BASED_MATCHING", + "ML_BASED_MATCHING" + ] + }, "MatchesList":{ "type":"list", "member":{"shape":"MatchItem"} @@ -3922,6 +4128,39 @@ }, "documentation":"

The flag that enables the matching process of duplicate profiles.

" }, + "MatchingRule":{ + "type":"structure", + "required":["Rule"], + "members":{ + "Rule":{ + "shape":"MatchingRuleAttributeList", + "documentation":"

A single rule level of the MatchRules. Configures how the rule-based matching process should match profiles.

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

Specifies how does the rule-based matching process should match profiles. You can choose from the following attributes to build the matching Rule:

" + }, + "MatchingRuleAttributeList":{ + "type":"list", + "member":{"shape":"string1To255"}, + "max":15, + "min":1 + }, + "MatchingRules":{ + "type":"list", + "member":{"shape":"MatchingRule"}, + "max":15, + "min":1 + }, + "MaxAllowedRuleLevelForMatching":{ + "type":"integer", + "max":15, + "min":1 + }, + "MaxAllowedRuleLevelForMerging":{ + "type":"integer", + "max":15, + "min":1 + }, "MergeProfilesRequest":{ "type":"structure", "required":[ @@ -4065,6 +4304,12 @@ "OTHER" ] }, + "PhoneNumberList":{ + "type":"list", + "member":{"shape":"string1To255"}, + "max":4, + "min":1 + }, "Profile":{ "type":"structure", "members":{ @@ -4461,6 +4706,80 @@ "max":512, "pattern":"arn:aws:iam:.*:[0-9]+:.*" }, + "RuleBasedMatchingRequest":{ + "type":"structure", + "required":["Enabled"], + "members":{ + "Enabled":{ + "shape":"optionalBoolean", + "documentation":"

The flag that enables the rule-based matching process of duplicate profiles.

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

Configures how the rule-based matching process should match profiles. You can have up to 15 MatchingRule in the MatchingRules.

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

MatchingRule

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

Indicates the maximum allowed rule level.

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

Configures information about the AttributeTypesSelector where the rule-based identity resolution uses to match profiles.

" + }, + "ConflictResolution":{"shape":"ConflictResolution"}, + "ExportingConfig":{"shape":"ExportingConfig"} + }, + "documentation":"

The request to enable the rule-based matching.

" + }, + "RuleBasedMatchingResponse":{ + "type":"structure", + "members":{ + "Enabled":{ + "shape":"optionalBoolean", + "documentation":"

The flag that enables the rule-based matching process of duplicate profiles.

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

Configures how the rule-based matching process should match profiles. You can have up to 15 MatchingRule in the MatchingRules.

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

PENDING

IN_PROGRESS

ACTIVE

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

MatchingRule

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

Indicates the maximum allowed rule level.

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

Configures information about the AttributeTypesSelector where the rule-based identity resolution uses to match profiles.

" + }, + "ConflictResolution":{"shape":"ConflictResolution"}, + "ExportingConfig":{"shape":"ExportingConfig"} + }, + "documentation":"

The response of the Rule-based matching request.

" + }, + "RuleBasedMatchingStatus":{ + "type":"string", + "enum":[ + "PENDING", + "IN_PROGRESS", + "ACTIVE" + ] + }, + "RuleLevel":{ + "type":"integer", + "max":15, + "min":1 + }, "S3ConnectorOperator":{ "type":"string", "enum":[ @@ -5172,6 +5491,10 @@ "shape":"MatchingRequest", "documentation":"

The process of matching duplicate profiles. If Matching = true, Amazon Connect Customer Profiles starts a weekly batch process called Identity Resolution Job. If you do not specify a date and time for Identity Resolution Job to run, by default it runs every Saturday at 12AM UTC to detect duplicate profiles in your domains.

After the Identity Resolution Job completes, use the GetMatches API to return and review the results. Or, if you have configured ExportingConfig in the MatchingRequest, you can download the results from S3.

" }, + "RuleBasedMatching":{ + "shape":"RuleBasedMatchingRequest", + "documentation":"

The process of matching duplicate profiles using the rule-Based matching. If RuleBasedMatching = true, Amazon Connect Customer Profiles will start to match and merge your profiles according to your configuration in the RuleBasedMatchingRequest. You can use the ListRuleBasedMatches and GetSimilarProfiles API to return and review the results. Also, if you have configured ExportingConfig in the RuleBasedMatchingRequest, you can download the results from S3.

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

The tags used to organize, track, or control access for this resource.

" @@ -5206,6 +5529,10 @@ "shape":"MatchingResponse", "documentation":"

The process of matching duplicate profiles. If Matching = true, Amazon Connect Customer Profiles starts a weekly batch process called Identity Resolution Job. If you do not specify a date and time for Identity Resolution Job to run, by default it runs every Saturday at 12AM UTC to detect duplicate profiles in your domains.

After the Identity Resolution Job completes, use the GetMatches API to return and review the results. Or, if you have configured ExportingConfig in the MatchingRequest, you can download the results from S3.

" }, + "RuleBasedMatching":{ + "shape":"RuleBasedMatchingResponse", + "documentation":"

The process of matching duplicate profiles using the rule-Based matching. If RuleBasedMatching = true, Amazon Connect Customer Profiles will start to match and merge your profiles according to your configuration in the RuleBasedMatchingRequest. You can use the ListRuleBasedMatches and GetSimilarProfiles API to return and review the results. Also, if you have configured ExportingConfig in the RuleBasedMatchingRequest, you can download the results from S3.

" + }, "CreatedAt":{ "shape":"timestamp", "documentation":"

The timestamp of when the domain was created.

" diff --git a/botocore/data/datasync/2018-11-09/service-2.json b/botocore/data/datasync/2018-11-09/service-2.json index 26461af8c8..db15acce77 100644 --- a/botocore/data/datasync/2018-11-09/service-2.json +++ b/botocore/data/datasync/2018-11-09/service-2.json @@ -57,6 +57,20 @@ ], "documentation":"

Activates an DataSync agent that you've deployed in your storage environment. The activation process associates the agent with your Amazon Web Services account.

If you haven't deployed an agent yet, see the following topics to learn more:

If you're transferring between Amazon Web Services storage services, you don't need a DataSync agent.

" }, + "CreateLocationAzureBlob":{ + "name":"CreateLocationAzureBlob", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"CreateLocationAzureBlobRequest"}, + "output":{"shape":"CreateLocationAzureBlobResponse"}, + "errors":[ + {"shape":"InvalidRequestException"}, + {"shape":"InternalException"} + ], + "documentation":"

Creates an endpoint for a Microsoft Azure Blob Storage container that DataSync can use as a transfer source or destination.

Before you begin, make sure you know how DataSync accesses Azure Blob Storage and works with access tiers and blob types. You also need a DataSync agent that can connect to your container.

" + }, "CreateLocationEfs":{ "name":"CreateLocationEfs", "http":{ @@ -153,7 +167,7 @@ {"shape":"InvalidRequestException"}, {"shape":"InternalException"} ], - "documentation":"

Defines a file system on a Network File System (NFS) server that can be read from or written to.

" + "documentation":"

Creates an endpoint for an Network File System (NFS) file server that DataSync can use for a data transfer.

" }, "CreateLocationObjectStorage":{ "name":"CreateLocationObjectStorage", @@ -195,7 +209,7 @@ {"shape":"InvalidRequestException"}, {"shape":"InternalException"} ], - "documentation":"

Creates an endpoint for a Server Message Block (SMB) file server that DataSync can access for a transfer. For more information, see Creating an SMB location.

" + "documentation":"

Creates an endpoint for a Server Message Block (SMB) file server that DataSync can use for a data transfer.

Before you begin, make sure that you understand how DataSync accesses an SMB file server.

" }, "CreateTask":{ "name":"CreateTask", @@ -282,6 +296,20 @@ "documentation":"

Returns information about a DataSync discovery job.

", "endpoint":{"hostPrefix":"discovery-"} }, + "DescribeLocationAzureBlob":{ + "name":"DescribeLocationAzureBlob", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"DescribeLocationAzureBlobRequest"}, + "output":{"shape":"DescribeLocationAzureBlobResponse"}, + "errors":[ + {"shape":"InvalidRequestException"}, + {"shape":"InternalException"} + ], + "documentation":"

Provides details about how an DataSync transfer location for Microsoft Azure Blob Storage is configured.

" + }, "DescribeLocationEfs":{ "name":"DescribeLocationEfs", "http":{ @@ -479,7 +507,7 @@ {"shape":"InvalidRequestException"}, {"shape":"InternalException"} ], - "documentation":"

Returns metadata about a task.

" + "documentation":"

Provides information about an DataSync transfer task.

" }, "DescribeTaskExecution":{ "name":"DescribeTaskExecution", @@ -493,7 +521,7 @@ {"shape":"InvalidRequestException"}, {"shape":"InternalException"} ], - "documentation":"

Returns detailed metadata about a task that is being executed.

" + "documentation":"

Provides information about an DataSync transfer task that's running.

" }, "GenerateRecommendations":{ "name":"GenerateRecommendations", @@ -726,6 +754,20 @@ "documentation":"

Edits a DataSync discovery job configuration.

", "endpoint":{"hostPrefix":"discovery-"} }, + "UpdateLocationAzureBlob":{ + "name":"UpdateLocationAzureBlob", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"UpdateLocationAzureBlobRequest"}, + "output":{"shape":"UpdateLocationAzureBlobResponse"}, + "errors":[ + {"shape":"InvalidRequestException"}, + {"shape":"InternalException"} + ], + "documentation":"

Modifies some configurations of the Microsoft Azure Blob Storage transfer location that you're using with DataSync.

" + }, "UpdateLocationHdfs":{ "name":"UpdateLocationHdfs", "http":{ @@ -852,7 +894,7 @@ }, "AgentArns":{ "shape":"DiscoveryAgentArnList", - "documentation":"

Specifies the Amazon Resource Name (ARN) of the DataSync agent that connects to and reads from your on-premises storage system's management interface.

" + "documentation":"

Specifies the Amazon Resource Name (ARN) of the DataSync agent that connects to and reads from your on-premises storage system's management interface. You can only specify one ARN.

" }, "CloudWatchLogGroupArn":{ "shape":"LogGroupArn", @@ -934,6 +976,50 @@ "BEST_EFFORT" ] }, + "AzureAccessTier":{ + "type":"string", + "enum":[ + "HOT", + "COOL", + "ARCHIVE" + ] + }, + "AzureBlobAuthenticationType":{ + "type":"string", + "enum":["SAS"] + }, + "AzureBlobContainerUrl":{ + "type":"string", + "max":325, + "pattern":"^https:\\/\\/[A-Za-z0-9]((\\.|-+)?[A-Za-z0-9]){0,252}\\/[a-z0-9](-?[a-z0-9]){2,62}$" + }, + "AzureBlobSasConfiguration":{ + "type":"structure", + "required":["Token"], + "members":{ + "Token":{ + "shape":"AzureBlobSasToken", + "documentation":"

Specifies a SAS token that provides permissions at the Azure storage account, container, or folder level.

The token is part of the SAS URI string that comes after the storage resource URI and a question mark. A token looks something like this:

sp=r&st=2023-12-20T14:54:52Z&se=2023-12-20T22:54:52Z&spr=https&sv=2021-06-08&sr=c&sig=aBBKDWQvyuVcTPH9EBp%2FXTI9E%2F%2Fmq171%2BZU178wcwqU%3D

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

The shared access signature (SAS) configuration that allows DataSync to access your Microsoft Azure Blob Storage.

For more information, see SAS tokens for accessing your Azure Blob Storage.

" + }, + "AzureBlobSasToken":{ + "type":"string", + "max":255, + "min":1, + "pattern":"^.+$", + "sensitive":true + }, + "AzureBlobSubdirectory":{ + "type":"string", + "max":1024, + "pattern":"^[\\p{L}\\p{M}\\p{Z}\\p{S}\\p{N}\\p{P}\\p{C}]*$" + }, + "AzureBlobType":{ + "type":"string", + "enum":["BLOCK"] + }, "BytesPerSecond":{ "type":"long", "min":-1 @@ -999,11 +1085,11 @@ }, "SubnetArns":{ "shape":"PLSubnetArnList", - "documentation":"

Specifies the ARN of the subnet where you want to run your DataSync task when using a VPC endpoint. This is the subnet where DataSync creates and manages the network interfaces for your transfer.

" + "documentation":"

Specifies the ARN of the subnet where you want to run your DataSync task when using a VPC endpoint. This is the subnet where DataSync creates and manages the network interfaces for your transfer. You can only specify one ARN.

" }, "SecurityGroupArns":{ "shape":"PLSecurityGroupArnList", - "documentation":"

Specifies the Amazon Resource Name (ARN) of the security group that protects your task's network interfaces when using a virtual private cloud (VPC) endpoint.

" + "documentation":"

Specifies the Amazon Resource Name (ARN) of the security group that protects your task's network interfaces when using a virtual private cloud (VPC) endpoint. You can only specify one ARN.

" } }, "documentation":"

CreateAgentRequest

" @@ -1018,6 +1104,57 @@ }, "documentation":"

CreateAgentResponse

" }, + "CreateLocationAzureBlobRequest":{ + "type":"structure", + "required":[ + "ContainerUrl", + "AuthenticationType", + "AgentArns" + ], + "members":{ + "ContainerUrl":{ + "shape":"AzureBlobContainerUrl", + "documentation":"

Specifies the URL of the Azure Blob Storage container involved in your transfer.

" + }, + "AuthenticationType":{ + "shape":"AzureBlobAuthenticationType", + "documentation":"

Specifies the authentication method DataSync uses to access your Azure Blob Storage. DataSync can access blob storage using a shared access signature (SAS).

" + }, + "SasConfiguration":{ + "shape":"AzureBlobSasConfiguration", + "documentation":"

Specifies the SAS configuration that allows DataSync to access your Azure Blob Storage.

" + }, + "BlobType":{ + "shape":"AzureBlobType", + "documentation":"

Specifies the type of blob that you want your objects or files to be when transferring them into Azure Blob Storage. Currently, DataSync only supports moving data into Azure Blob Storage as block blobs. For more information on blob types, see the Azure Blob Storage documentation.

" + }, + "AccessTier":{ + "shape":"AzureAccessTier", + "documentation":"

Specifies the access tier that you want your objects or files transferred into. This only applies when using the location as a transfer destination. For more information, see Access tiers.

" + }, + "Subdirectory":{ + "shape":"AzureBlobSubdirectory", + "documentation":"

Specifies path segments if you want to limit your transfer to a virtual directory in your container (for example, /my/images).

" + }, + "AgentArns":{ + "shape":"AgentArnList", + "documentation":"

Specifies the Amazon Resource Name (ARN) of the DataSync agent that can connect with your Azure Blob Storage container.

You can specify more than one agent. For more information, see Using multiple agents for your transfer.

" + }, + "Tags":{ + "shape":"InputTagList", + "documentation":"

Specifies labels that help you categorize, filter, and search for your Amazon Web Services resources. We recommend creating at least a name tag for your transfer location.

" + } + } + }, + "CreateLocationAzureBlobResponse":{ + "type":"structure", + "members":{ + "LocationArn":{ + "shape":"LocationArn", + "documentation":"

The ARN of the Azure Blob Storage transfer location that you created.

" + } + } + }, "CreateLocationEfsRequest":{ "type":"structure", "required":[ @@ -1304,23 +1441,23 @@ "members":{ "Subdirectory":{ "shape":"NfsSubdirectory", - "documentation":"

The subdirectory in the NFS file system that is used to read data from the NFS source location or write data to the NFS destination. The NFS path should be a path that's exported by the NFS server, or a subdirectory of that path. The path should be such that it can be mounted by other NFS clients in your network.

To see all the paths exported by your NFS server, run \"showmount -e nfs-server-name\" from an NFS client that has access to your server. You can specify any directory that appears in the results, and any subdirectory of that directory. Ensure that the NFS export is accessible without Kerberos authentication.

To transfer all the data in the folder you specified, DataSync needs to have permissions to read all the data. To ensure this, either configure the NFS export with no_root_squash, or ensure that the permissions for all of the files that you want DataSync allow read access for all users. Doing either enables the agent to read the files. For the agent to access directories, you must additionally enable all execute access.

If you are copying data to or from your Snowcone device, see NFS Server on Snowcone for more information.

For information about NFS export configuration, see 18.7. The /etc/exports Configuration File in the Red Hat Enterprise Linux documentation.

" + "documentation":"

Specifies the subdirectory in the NFS file server that DataSync transfers to or from. The NFS path should be a path that's exported by the NFS server, or a subdirectory of that path. The path should be such that it can be mounted by other NFS clients in your network.

To see all the paths exported by your NFS server, run \"showmount -e nfs-server-name\" from an NFS client that has access to your server. You can specify any directory that appears in the results, and any subdirectory of that directory. Ensure that the NFS export is accessible without Kerberos authentication.

To transfer all the data in the folder you specified, DataSync needs to have permissions to read all the data. To ensure this, either configure the NFS export with no_root_squash, or ensure that the permissions for all of the files that you want DataSync allow read access for all users. Doing either enables the agent to read the files. For the agent to access directories, you must additionally enable all execute access.

If you are copying data to or from your Snowcone device, see NFS Server on Snowcone for more information.

" }, "ServerHostname":{ "shape":"ServerHostname", - "documentation":"

The name of the NFS server. This value is the IP address or Domain Name Service (DNS) name of the NFS server. An agent that is installed on-premises uses this hostname to mount the NFS server in a network.

If you are copying data to or from your Snowcone device, see NFS Server on Snowcone for more information.

This name must either be DNS-compliant or must be an IP version 4 (IPv4) address.

" + "documentation":"

Specifies the IP address or domain name of your NFS file server. An agent that is installed on-premises uses this hostname to mount the NFS server in a network.

If you are copying data to or from your Snowcone device, see NFS Server on Snowcone for more information.

You must specify be an IP version 4 address or Domain Name System (DNS)-compliant name.

" }, "OnPremConfig":{ "shape":"OnPremConfig", - "documentation":"

Contains a list of Amazon Resource Names (ARNs) of agents that are used to connect to an NFS server.

If you are copying data to or from your Snowcone device, see NFS Server on Snowcone for more information.

" + "documentation":"

Specifies the Amazon Resource Names (ARNs) of agents that DataSync uses to connect to your NFS file server.

If you are copying data to or from your Snowcone device, see NFS Server on Snowcone for more information.

" }, "MountOptions":{ "shape":"NfsMountOptions", - "documentation":"

The NFS mount options that DataSync can use to mount your NFS share.

" + "documentation":"

Specifies the mount options that DataSync can use to mount your NFS share.

" }, "Tags":{ "shape":"InputTagList", - "documentation":"

The key-value pair that represents the tag that you want to add to the location. The value can be an empty string. We recommend using tags to name your resources.

" + "documentation":"

Specifies labels that help you categorize, filter, and search for your Amazon Web Services resources. We recommend creating at least a name tag for your location.

" } }, "documentation":"

CreateLocationNfsRequest

" @@ -1330,7 +1467,7 @@ "members":{ "LocationArn":{ "shape":"LocationArn", - "documentation":"

The Amazon Resource Name (ARN) of the source NFS file system location that is created.

" + "documentation":"

The ARN of the transfer location that you created for your NFS file server.

" } }, "documentation":"

CreateLocationNfsResponse

" @@ -1698,6 +1835,49 @@ } } }, + "DescribeLocationAzureBlobRequest":{ + "type":"structure", + "required":["LocationArn"], + "members":{ + "LocationArn":{ + "shape":"LocationArn", + "documentation":"

Specifies the Amazon Resource Name (ARN) of your Azure Blob Storage transfer location.

" + } + } + }, + "DescribeLocationAzureBlobResponse":{ + "type":"structure", + "members":{ + "LocationArn":{ + "shape":"LocationArn", + "documentation":"

The ARN of your Azure Blob Storage transfer location.

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

The URL of the Azure Blob Storage container involved in your transfer.

" + }, + "AuthenticationType":{ + "shape":"AzureBlobAuthenticationType", + "documentation":"

The authentication method DataSync uses to access your Azure Blob Storage. DataSync can access blob storage using a shared access signature (SAS).

" + }, + "BlobType":{ + "shape":"AzureBlobType", + "documentation":"

The type of blob that you want your objects or files to be when transferring them into Azure Blob Storage. Currently, DataSync only supports moving data into Azure Blob Storage as block blobs. For more information on blob types, see the Azure Blob Storage documentation.

" + }, + "AccessTier":{ + "shape":"AzureAccessTier", + "documentation":"

The access tier that you want your objects or files transferred into. This only applies when using the location as a transfer destination. For more information, see Access tiers.

" + }, + "AgentArns":{ + "shape":"AgentArnList", + "documentation":"

The ARNs of the DataSync agents that can connect with your Azure Blob Storage container.

" + }, + "CreationTime":{ + "shape":"Time", + "documentation":"

The time that your Azure Blob Storage transfer location was created.

" + } + } + }, "DescribeLocationEfsRequest":{ "type":"structure", "required":["LocationArn"], @@ -1973,7 +2153,7 @@ "OnPremConfig":{"shape":"OnPremConfig"}, "MountOptions":{ "shape":"NfsMountOptions", - "documentation":"

The NFS mount options that DataSync used to mount your NFS share.

" + "documentation":"

The mount options that DataSync uses to mount your NFS share.

" }, "CreationTime":{ "shape":"Time", @@ -2272,7 +2452,7 @@ "members":{ "TaskExecutionArn":{ "shape":"TaskExecutionArn", - "documentation":"

The Amazon Resource Name (ARN) of the task that is being executed.

" + "documentation":"

Specifies the Amazon Resource Name (ARN) of the transfer task that's running.

" } }, "documentation":"

DescribeTaskExecutionRequest

" @@ -2338,7 +2518,7 @@ "members":{ "TaskArn":{ "shape":"TaskArn", - "documentation":"

The Amazon Resource Name (ARN) of the task to describe.

" + "documentation":"

Specifies the Amazon Resource Name (ARN) of the transfer task.

" } }, "documentation":"

DescribeTaskRequest

" @@ -3725,22 +3905,22 @@ "members":{ "VpcEndpointId":{ "shape":"VpcEndpointId", - "documentation":"

The ID of the VPC endpoint that is configured for an agent. An agent that is configured with a VPC endpoint will not be accessible over the public internet.

" + "documentation":"

Specifies the ID of the VPC endpoint that your agent connects to.

" }, "PrivateLinkEndpoint":{ "shape":"Endpoint", - "documentation":"

The private endpoint that is configured for an agent that has access to IP addresses in a PrivateLink. An agent that is configured with this endpoint will not be accessible over the public internet.

" + "documentation":"

Specifies the VPC endpoint provided by Amazon Web Services PrivateLink that your agent connects to.

" }, "SubnetArns":{ "shape":"PLSubnetArnList", - "documentation":"

The Amazon Resource Names (ARNs) of the subnets that are configured for an agent activated in a VPC or an agent that has access to a VPC endpoint.

" + "documentation":"

Specifies the ARN of the subnet where your VPC endpoint is located. You can only specify one ARN.

" }, "SecurityGroupArns":{ "shape":"PLSecurityGroupArnList", - "documentation":"

The Amazon Resource Names (ARNs) of the security groups that are configured for the EC2 resource that hosts an agent activated in a VPC or an agent that has access to a VPC endpoint.

" + "documentation":"

Specifies the Amazon Resource Names (ARN) of the security group that provides DataSync access to your VPC endpoint. You can only specify one ARN.

" } }, - "documentation":"

The VPC endpoint, subnet, and security group that an agent uses to access IP addresses in a VPC (Virtual Private Cloud).

" + "documentation":"

Specifies how your DataSync agent connects to Amazon Web Services using a virtual private cloud (VPC) service endpoint. An agent that uses a VPC endpoint isn't accessible over the public internet.

" }, "PtolemyBoolean":{"type":"boolean"}, "PtolemyPassword":{ @@ -4443,6 +4623,45 @@ "members":{ } }, + "UpdateLocationAzureBlobRequest":{ + "type":"structure", + "required":["LocationArn"], + "members":{ + "LocationArn":{ + "shape":"LocationArn", + "documentation":"

Specifies the ARN of the Azure Blob Storage transfer location that you're updating.

" + }, + "Subdirectory":{ + "shape":"AzureBlobSubdirectory", + "documentation":"

Specifies path segments if you want to limit your transfer to a virtual directory in your container (for example, /my/images).

" + }, + "AuthenticationType":{ + "shape":"AzureBlobAuthenticationType", + "documentation":"

Specifies the authentication method DataSync uses to access your Azure Blob Storage. DataSync can access blob storage using a shared access signature (SAS).

" + }, + "SasConfiguration":{ + "shape":"AzureBlobSasConfiguration", + "documentation":"

Specifies the SAS configuration that allows DataSync to access your Azure Blob Storage.

" + }, + "BlobType":{ + "shape":"AzureBlobType", + "documentation":"

Specifies the type of blob that you want your objects or files to be when transferring them into Azure Blob Storage. Currently, DataSync only supports moving data into Azure Blob Storage as block blobs. For more information on blob types, see the Azure Blob Storage documentation.

" + }, + "AccessTier":{ + "shape":"AzureAccessTier", + "documentation":"

Specifies the access tier that you want your objects or files transferred into. This only applies when using the location as a transfer destination. For more information, see Access tiers.

" + }, + "AgentArns":{ + "shape":"AgentArnList", + "documentation":"

Specifies the Amazon Resource Name (ARN) of the DataSync agent that can connect with your Azure Blob Storage container.

You can specify more than one agent. For more information, see Using multiple agents for your transfer.

" + } + } + }, + "UpdateLocationAzureBlobResponse":{ + "type":"structure", + "members":{ + } + }, "UpdateLocationHdfsRequest":{ "type":"structure", "required":["LocationArn"], @@ -4512,11 +4731,11 @@ "members":{ "LocationArn":{ "shape":"LocationArn", - "documentation":"

The Amazon Resource Name (ARN) of the NFS location to update.

" + "documentation":"

Specifies the Amazon Resource Name (ARN) of the NFS location that you want to update.

" }, "Subdirectory":{ "shape":"NfsSubdirectory", - "documentation":"

The subdirectory in the NFS file system that is used to read data from the NFS source location or write data to the NFS destination. The NFS path should be a path that's exported by the NFS server, or a subdirectory of that path. The path should be such that it can be mounted by other NFS clients in your network.

To see all the paths exported by your NFS server, run \"showmount -e nfs-server-name\" from an NFS client that has access to your server. You can specify any directory that appears in the results, and any subdirectory of that directory. Ensure that the NFS export is accessible without Kerberos authentication.

To transfer all the data in the folder that you specified, DataSync must have permissions to read all the data. To ensure this, either configure the NFS export with no_root_squash, or ensure that the files you want DataSync to access have permissions that allow read access for all users. Doing either option enables the agent to read the files. For the agent to access directories, you must additionally enable all execute access.

If you are copying data to or from your Snowcone device, see NFS Server on Snowcone for more information.

For information about NFS export configuration, see 18.7. The /etc/exports Configuration File in the Red Hat Enterprise Linux documentation.

" + "documentation":"

Specifies the subdirectory in your NFS file system that DataSync uses to read from or write to during a transfer. The NFS path should be exported by the NFS server, or a subdirectory of that path. The path should be such that it can be mounted by other NFS clients in your network.

To see all the paths exported by your NFS server, run \"showmount -e nfs-server-name\" from an NFS client that has access to your server. You can specify any directory that appears in the results, and any subdirectory of that directory. Ensure that the NFS export is accessible without Kerberos authentication.

To transfer all the data in the folder that you specified, DataSync must have permissions to read all the data. To ensure this, either configure the NFS export with no_root_squash, or ensure that the files you want DataSync to access have permissions that allow read access for all users. Doing either option enables the agent to read the files. For the agent to access directories, you must additionally enable all execute access.

If you are copying data to or from your Snowcone device, see NFS Server on Snowcone for more information.

" }, "OnPremConfig":{"shape":"OnPremConfig"}, "MountOptions":{"shape":"NfsMountOptions"} @@ -4620,7 +4839,7 @@ }, "AgentArns":{ "shape":"DiscoveryAgentArnList", - "documentation":"

Specifies the Amazon Resource Name (ARN) of the DataSync agent that connects to and reads your on-premises storage system.

" + "documentation":"

Specifies the Amazon Resource Name (ARN) of the DataSync agent that connects to and reads your on-premises storage system. You can only specify one ARN.

" }, "Name":{ "shape":"Name", diff --git a/botocore/data/dynamodb/2012-08-10/service-2.json b/botocore/data/dynamodb/2012-08-10/service-2.json index c8a697c155..78bc5ce6f4 100644 --- a/botocore/data/dynamodb/2012-08-10/service-2.json +++ b/botocore/data/dynamodb/2012-08-10/service-2.json @@ -692,7 +692,7 @@ {"shape":"RequestLimitExceeded"}, {"shape":"InternalServerError"} ], - "documentation":"

The Scan operation returns one or more items and item attributes by accessing every item in a table or a secondary index. To have DynamoDB return fewer items, you can provide a FilterExpression operation.

If the total number of scanned items exceeds the maximum dataset size limit of 1 MB, the scan stops and results are returned to the user as a LastEvaluatedKey value to continue the scan in a subsequent operation. The results also include the number of items exceeding the limit. A scan can result in no table data meeting the filter criteria.

A single Scan operation reads up to the maximum number of items set (if using the Limit parameter) or a maximum of 1 MB of data and then apply any filtering to the results using FilterExpression. If LastEvaluatedKey is present in the response, you need to paginate the result set. For more information, see Paginating the Results in the Amazon DynamoDB Developer Guide.

Scan operations proceed sequentially; however, for faster performance on a large table or secondary index, applications can request a parallel Scan operation by providing the Segment and TotalSegments parameters. For more information, see Parallel Scan in the Amazon DynamoDB Developer Guide.

Scan uses eventually consistent reads when accessing the data in a table; therefore, the result set might not include the changes to data in the table immediately before the operation began. If you need a consistent copy of the data, as of the time that the Scan begins, you can set the ConsistentRead parameter to true.

", + "documentation":"

The Scan operation returns one or more items and item attributes by accessing every item in a table or a secondary index. To have DynamoDB return fewer items, you can provide a FilterExpression operation.

If the total size of scanned items exceeds the maximum dataset size limit of 1 MB, the scan completes and results are returned to the user. The LastEvaluatedKey value is also returned and the requestor can use the LastEvaluatedKey to continue the scan in a subsequent operation. Each scan response also includes number of items that were scanned (ScannedCount) as part of the request. If using a FilterExpression, a scan result can result in no items meeting the criteria and the Count will result in zero. If you did not use a FilterExpression in the scan request, then Count is the same as ScannedCount.

Count and ScannedCount only return the count of items specific to a single scan request and, unless the table is less than 1MB, do not represent the total number of items in the table.

A single Scan operation first reads up to the maximum number of items set (if using the Limit parameter) or a maximum of 1 MB of data and then applies any filtering to the results if a FilterExpression is provided. If LastEvaluatedKey is present in the response, pagination is required to complete the full table scan. For more information, see Paginating the Results in the Amazon DynamoDB Developer Guide.

Scan operations proceed sequentially; however, for faster performance on a large table or secondary index, applications can request a parallel Scan operation by providing the Segment and TotalSegments parameters. For more information, see Parallel Scan in the Amazon DynamoDB Developer Guide.

By default, a Scan uses eventually consistent reads when accessing the items in a table. Therefore, the results from an eventually consistent Scan may not include the latest item changes at the time the scan iterates through each item in the table. If you require a strongly consistent read of each item as the scan iterates through the items in the table, you can set the ConsistentRead parameter to true. Strong consistency only relates to the consistency of the read at the item level.

DynamoDB does not provide snapshot isolation for a scan operation when the ConsistentRead parameter is set to true. Thus, a DynamoDB scan operation does not guarantee that all reads in a scan see a consistent snapshot of the table when the scan operation was requested.

", "endpointdiscovery":{ } }, @@ -1378,7 +1378,7 @@ "members":{ "Responses":{ "shape":"PartiQLBatchResponse", - "documentation":"

The response to each PartiQL statement in the batch.

" + "documentation":"

The response to each PartiQL statement in the batch. The values of the list are ordered according to the ordering of the request statements.

" }, "ConsumedCapacity":{ "shape":"ConsumedCapacityMultiple", @@ -5938,7 +5938,7 @@ }, "ReturnValuesOnConditionCheckFailure":{ "shape":"ReturnValuesOnConditionCheckFailure", - "documentation":"

Use ReturnValuesOnConditionCheckFailure to get the item attributes if the Update condition fails. For ReturnValuesOnConditionCheckFailure, the valid values are: NONE, ALL_OLD, UPDATED_OLD, ALL_NEW, UPDATED_NEW.

" + "documentation":"

Use ReturnValuesOnConditionCheckFailure to get the item attributes if the Update condition fails. For ReturnValuesOnConditionCheckFailure, the valid values are: NONE and ALL_OLD.

" } }, "documentation":"

Represents a request to perform an UpdateItem operation.

" diff --git a/botocore/data/ec2/2016-11-15/service-2.json b/botocore/data/ec2/2016-11-15/service-2.json index ce2907650a..9793e60d3d 100644 --- a/botocore/data/ec2/2016-11-15/service-2.json +++ b/botocore/data/ec2/2016-11-15/service-2.json @@ -8950,6 +8950,7 @@ ] }, "BareMetalFlag":{"type":"boolean"}, + "BaselineBandwidthInGbps":{"type":"double"}, "BaselineBandwidthInMbps":{"type":"integer"}, "BaselineEbsBandwidthMbps":{ "type":"structure", @@ -32633,6 +32634,11 @@ "shape":"InferenceDeviceInfoList", "documentation":"

Describes the Inference accelerators for the instance type.

", "locationName":"accelerators" + }, + "TotalInferenceMemoryInMiB":{ + "shape":"totalInferenceMemory", + "documentation":"

The total size of the memory for the inference accelerators for the instance type, in MiB.

", + "locationName":"totalInferenceMemoryInMiB" } }, "documentation":"

Describes the Inference accelerators for the instance type.

" @@ -32655,6 +32661,11 @@ "shape":"InferenceDeviceManufacturerName", "documentation":"

The manufacturer of the Inference accelerator.

", "locationName":"manufacturer" + }, + "MemoryInfo":{ + "shape":"InferenceDeviceMemoryInfo", + "documentation":"

Describes the memory available to the inference accelerator.

", + "locationName":"memoryInfo" } }, "documentation":"

Describes the Inference accelerators for the instance type.

" @@ -32665,6 +32676,18 @@ "locationName":"item" }, "InferenceDeviceManufacturerName":{"type":"string"}, + "InferenceDeviceMemoryInfo":{ + "type":"structure", + "members":{ + "SizeInMiB":{ + "shape":"InferenceDeviceMemorySize", + "documentation":"

The size of the memory available to the inference accelerator, in MiB.

", + "locationName":"sizeInMiB" + } + }, + "documentation":"

Describes the memory available to the inference accelerator.

" + }, + "InferenceDeviceMemorySize":{"type":"integer"}, "InferenceDeviceName":{"type":"string"}, "InsideCidrBlocksStringList":{ "type":"list", @@ -42754,6 +42777,16 @@ "shape":"MaxNetworkInterfaces", "documentation":"

The maximum number of network interfaces for the network card.

", "locationName":"maximumNetworkInterfaces" + }, + "BaselineBandwidthInGbps":{ + "shape":"BaselineBandwidthInGbps", + "documentation":"

The baseline network performance of the network card, in Gbps.

", + "locationName":"baselineBandwidthInGbps" + }, + "PeakBandwidthInGbps":{ + "shape":"PeakBandwidthInGbps", + "documentation":"

The peak (burst) network performance of the network card, in Gbps.

", + "locationName":"peakBandwidthInGbps" } }, "documentation":"

Describes the network card support of the instance type.

" @@ -44197,6 +44230,7 @@ }, "documentation":"

Describes the data that identifies an Amazon FPGA image (AFI) on the PCI bus.

" }, + "PeakBandwidthInGbps":{"type":"double"}, "PeeringAttachmentStatus":{ "type":"structure", "members":{ @@ -58193,7 +58227,8 @@ } }, "totalFpgaMemory":{"type":"integer"}, - "totalGpuMemory":{"type":"integer"} + "totalGpuMemory":{"type":"integer"}, + "totalInferenceMemory":{"type":"integer"} }, "documentation":"Amazon Elastic Compute Cloud

Amazon Elastic Compute Cloud (Amazon EC2) provides secure and resizable computing capacity in the Amazon Web Services Cloud. Using Amazon EC2 eliminates the need to invest in hardware up front, so you can develop and deploy applications faster. Amazon Virtual Private Cloud (Amazon VPC) enables you to provision a logically isolated section of the Amazon Web Services Cloud where you can launch Amazon Web Services resources in a virtual network that you've defined. Amazon Elastic Block Store (Amazon EBS) provides block level storage volumes for use with EC2 instances. EBS volumes are highly available and reliable storage volumes that can be attached to any running instance and used like a hard drive.

To learn more, see the following resources:

" } diff --git a/botocore/data/emr-serverless/2021-07-13/service-2.json b/botocore/data/emr-serverless/2021-07-13/service-2.json index 1b77304cc3..a4437ef55a 100644 --- a/botocore/data/emr-serverless/2021-07-13/service-2.json +++ b/botocore/data/emr-serverless/2021-07-13/service-2.json @@ -94,7 +94,7 @@ {"shape":"ResourceNotFoundException"}, {"shape":"InternalServerException"} ], - "documentation":"

Returns a URL to access the job run dashboard. The generated URL is valid for one hour, after which you must invoke the API again to generate a new URL.

" + "documentation":"

Creates and returns a URL that you can use to access the application UIs for a job run.

For jobs in a running state, the application UI is a live user interface such as the Spark or Tez web UI. For completed jobs, the application UI is a persistent application user interface such as the Spark History Server or persistent Tez UI.

The URL is valid for one hour after you generate it. To access the application UI after that hour elapses, you must invoke the API again to generate a new URL.

" }, "GetJobRun":{ "name":"GetJobRun", @@ -529,6 +529,33 @@ "min":1, "pattern":"[A-Za-z0-9._-]+" }, + "CloudWatchLoggingConfiguration":{ + "type":"structure", + "required":["enabled"], + "members":{ + "enabled":{ + "shape":"Boolean", + "documentation":"

Enables CloudWatch logging.

" + }, + "logGroupName":{ + "shape":"LogGroupName", + "documentation":"

The name of the log group in Amazon CloudWatch Logs where you want to publish your logs.

" + }, + "logStreamNamePrefix":{ + "shape":"LogStreamNamePrefix", + "documentation":"

Prefix for the CloudWatch log stream name.

" + }, + "encryptionKeyArn":{ + "shape":"EncryptionKeyArn", + "documentation":"

The Key Management Service (KMS) key ARN to encrypt the logs that you store in CloudWatch Logs.

" + }, + "logTypes":{ + "shape":"LogTypeMap", + "documentation":"

The types of logs that you want to publish to CloudWatch. If you don't specify any log types, driver STDOUT and STDERR logs will be published to CloudWatch Logs by default. For more information including the supported worker types for Hive and Spark, see Logging for EMR Serverless with CloudWatch.

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

The Amazon CloudWatch configuration for monitoring logs. You can configure your jobs to send log information to CloudWatch.

" + }, "Configuration":{ "type":"structure", "required":["classification"], @@ -1263,6 +1290,38 @@ } } }, + "LogGroupName":{ + "type":"string", + "max":512, + "min":1, + "pattern":"[\\.\\-_/#A-Za-z0-9]+" + }, + "LogStreamNamePrefix":{ + "type":"string", + "max":512, + "min":1, + "pattern":"[^:*]*" + }, + "LogTypeList":{ + "type":"list", + "member":{"shape":"LogTypeString"}, + "max":5, + "min":1 + }, + "LogTypeMap":{ + "type":"map", + "key":{"shape":"WorkerTypeString"}, + "value":{"shape":"LogTypeList"}, + "max":4, + "min":1 + }, + "LogTypeString":{ + "type":"string", + "documentation":"

Log type for a Spark/Hive job-run.

", + "max":50, + "min":1, + "pattern":"[a-zA-Z]+[-_]*[a-zA-Z]+" + }, "ManagedPersistenceMonitoringConfiguration":{ "type":"structure", "members":{ @@ -1315,6 +1374,10 @@ "managedPersistenceMonitoringConfiguration":{ "shape":"ManagedPersistenceMonitoringConfiguration", "documentation":"

The managed log persistence configuration for a job run.

" + }, + "cloudWatchLoggingConfiguration":{ + "shape":"CloudWatchLoggingConfiguration", + "documentation":"

The Amazon CloudWatch configuration for monitoring logs. You can configure your jobs to send log information to CloudWatch.

" } }, "documentation":"

The configuration setting for monitoring.

" @@ -1833,6 +1896,7 @@ }, "WorkerTypeString":{ "type":"string", + "documentation":"

Worker type for an analytics framework.

", "max":50, "min":1, "pattern":"[a-zA-Z]+[-_]*[a-zA-Z]+" diff --git a/botocore/data/lambda/2015-03-31/service-2.json b/botocore/data/lambda/2015-03-31/service-2.json index cce6d7d736..2b93c96071 100644 --- a/botocore/data/lambda/2015-03-31/service-2.json +++ b/botocore/data/lambda/2015-03-31/service-2.json @@ -5229,7 +5229,8 @@ "nodejs18.x", "python3.10", "java17", - "ruby3.2" + "ruby3.2", + "python3.11" ] }, "RuntimeVersionArn":{ diff --git a/botocore/data/rds/2014-10-31/service-2.json b/botocore/data/rds/2014-10-31/service-2.json index cdef596c92..ea473cbf6d 100644 --- a/botocore/data/rds/2014-10-31/service-2.json +++ b/botocore/data/rds/2014-10-31/service-2.json @@ -604,7 +604,7 @@ {"shape":"InvalidDBClusterStateFault"}, {"shape":"DBClusterNotFoundFault"} ], - "documentation":"

Creates an Aurora global database spread across multiple Amazon Web Services Regions. The global database contains a single primary cluster with read-write capability, and a read-only secondary cluster that receives data from the primary cluster through high-speed replication performed by the Aurora storage subsystem.

You can create a global database that is initially empty, and then add a primary cluster and a secondary cluster to it. Or you can specify an existing Aurora cluster during the create operation, and this cluster becomes the primary cluster of the global database.

This operation applies only to Aurora DB clusters.

" + "documentation":"

Creates an Aurora global database spread across multiple Amazon Web Services Regions. The global database contains a single primary cluster with read-write capability, and a read-only secondary cluster that receives data from the primary cluster through high-speed replication performed by the Aurora storage subsystem.

You can create a global database that is initially empty, and then create the primary and secondary DB clusters in the global database. Or you can specify an existing Aurora cluster during the create operation, and this cluster becomes the primary cluster of the global database.

This operation applies only to Aurora DB clusters.

" }, "CreateOptionGroup":{ "name":"CreateOptionGroup", @@ -1952,7 +1952,7 @@ {"shape":"InvalidDBClusterStateFault"}, {"shape":"InvalidDBInstanceStateFault"} ], - "documentation":"

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

This action only applies to Aurora DB clusters.

" + "documentation":"

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

This operation only applies to Aurora global database clusters.

" }, "ModifyOptionGroup":{ "name":"ModifyOptionGroup", @@ -6176,6 +6176,10 @@ "ReadReplicaSourceDBClusterIdentifier":{ "shape":"String", "documentation":"

The identifier of the source DB cluster if this DB instance is a read replica.

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

The progress of the storage optimization operation as a percentage.

" } }, "documentation":"

Contains the details of an Amazon RDS DB instance.

This data type is used as a response element in the operations CreateDBInstance, CreateDBInstanceReadReplica, DeleteDBInstance, DescribeDBInstances, ModifyDBInstance, PromoteReadReplica, RebootDBInstance, RestoreDBInstanceFromDBSnapshot, RestoreDBInstanceFromS3, RestoreDBInstanceToPointInTime, StartDBInstance, and StopDBInstance.

", @@ -10672,7 +10676,7 @@ }, "CACertificateIdentifier":{ "shape":"String", - "documentation":"

The CA certificate identifier to use for the DB instance6's server certificate.

This setting doesn't apply to RDS Custom DB instances.

For more information, see Using SSL/TLS to encrypt a connection to a DB instance in the Amazon RDS User Guide and Using SSL/TLS to encrypt a connection to a DB cluster in the Amazon Aurora User Guide.

" + "documentation":"

The CA certificate identifier to use for the DB instance's server certificate.

This setting doesn't apply to RDS Custom DB instances.

For more information, see Using SSL/TLS to encrypt a connection to a DB instance in the Amazon RDS User Guide and Using SSL/TLS to encrypt a connection to a DB cluster in the Amazon Aurora User Guide.

" }, "Domain":{ "shape":"String", @@ -11067,23 +11071,23 @@ "members":{ "GlobalClusterIdentifier":{ "shape":"String", - "documentation":"

The DB cluster identifier for the global cluster being modified. This parameter isn't case-sensitive.

Constraints:

" + "documentation":"

The cluster identifier for the global cluster to modify. This parameter isn't case-sensitive.

Constraints:

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

The new cluster identifier for the global database cluster when modifying a global database cluster. This value is stored as a lowercase string.

Constraints:

Example: my-cluster2

" + "documentation":"

The new cluster identifier for the global database cluster. This value is stored as a lowercase string.

Constraints:

Example: my-cluster2

" }, "DeletionProtection":{ "shape":"BooleanOptional", - "documentation":"

Indicates if the global database cluster has deletion protection enabled. The global database cluster can't be deleted when deletion protection is enabled.

" + "documentation":"

Specifies whether to enable deletion protection for the global database cluster. The global database cluster can't be deleted when deletion protection is enabled.

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

The version number of the database engine to which you want to upgrade. Changing this parameter results in an outage. The change is applied during the next maintenance window unless ApplyImmediately is enabled.

To list all of the available engine versions for aurora-mysql (for MySQL-based Aurora global databases), use the following command:

aws rds describe-db-engine-versions --engine aurora-mysql --query '*[]|[?SupportsGlobalDatabases == `true`].[EngineVersion]'

To list all of the available engine versions for aurora-postgresql (for PostgreSQL-based Aurora global databases), use the following command:

aws rds describe-db-engine-versions --engine aurora-postgresql --query '*[]|[?SupportsGlobalDatabases == `true`].[EngineVersion]'

" + "documentation":"

The version number of the database engine to which you want to upgrade.

To list all of the available engine versions for aurora-mysql (for MySQL-based Aurora global databases), use the following command:

aws rds describe-db-engine-versions --engine aurora-mysql --query '*[]|[?SupportsGlobalDatabases == `true`].[EngineVersion]'

To list all of the available engine versions for aurora-postgresql (for PostgreSQL-based Aurora global databases), use the following command:

aws rds describe-db-engine-versions --engine aurora-postgresql --query '*[]|[?SupportsGlobalDatabases == `true`].[EngineVersion]'

" }, "AllowMajorVersionUpgrade":{ "shape":"BooleanOptional", - "documentation":"

A value that indicates whether major version upgrades are allowed.

Constraints: You must allow major version upgrades when specifying a value for the EngineVersion parameter that is a different major version than the DB cluster's current version.

If you upgrade the major version of a global database, the cluster and DB instance parameter groups are set to the default parameter groups for the new version. Apply any custom parameter groups after completing the upgrade.

" + "documentation":"

Specifies whether to allow major version upgrades.

Constraints: Must be enabled if you specify a value for the EngineVersion parameter that's a different major version than the global cluster's current version.

If you upgrade the major version of a global database, the cluster and DB instance parameter groups are set to the default parameter groups for the new version. Apply any custom parameter groups after completing the upgrade.

" } } }, diff --git a/botocore/data/sagemaker/2017-07-24/service-2.json b/botocore/data/sagemaker/2017-07-24/service-2.json index 91ea56331f..f9f4442f24 100644 --- a/botocore/data/sagemaker/2017-07-24/service-2.json +++ b/botocore/data/sagemaker/2017-07-24/service-2.json @@ -31512,6 +31512,10 @@ }, "TextClassificationJobConfig":{ "type":"structure", + "required":[ + "ContentColumn", + "TargetLabelColumn" + ], "members":{ "CompletionCriteria":{ "shape":"AutoMLJobCompletionCriteria", @@ -31519,11 +31523,11 @@ }, "ContentColumn":{ "shape":"ContentColumn", - "documentation":"

The name of the column used to provide the sentences to be classified. It should not be the same as the target column (Required).

" + "documentation":"

The name of the column used to provide the sentences to be classified. It should not be the same as the target column.

" }, "TargetLabelColumn":{ "shape":"TargetLabelColumn", - "documentation":"

The name of the column used to provide the class labels. It should not be same as the content column (Required).

" + "documentation":"

The name of the column used to provide the class labels. It should not be same as the content column.

" } }, "documentation":"

Stores the configuration information for the text classification problem of an AutoML job V2.

" diff --git a/botocore/data/securityhub/2018-10-26/service-2.json b/botocore/data/securityhub/2018-10-26/service-2.json index b6f2a5044c..db6338f2b7 100644 --- a/botocore/data/securityhub/2018-10-26/service-2.json +++ b/botocore/data/securityhub/2018-10-26/service-2.json @@ -1504,7 +1504,7 @@ }, "IsTerminal":{ "shape":"Boolean", - "documentation":"

Specifies whether a rule is the last to be applied with respect to a finding that matches the rule criteria. This is useful when a finding matches the criteria for multiple rules, and each rule has different actions. If the value of this field is set to true for a rule, Security Hub applies the rule action to a finding that matches the rule criteria and doesn't evaluate other rules for the finding.
 The default value of this field is false.

" + "documentation":"

Specifies whether a rule is the last to be applied with respect to a finding that matches the rule criteria. This is useful when a finding matches the criteria for multiple rules, and each rule has different actions. If a rule is terminal, Security Hub applies the rule action to a finding that matches the rule criteria and doesn't evaluate other rules for the finding. By default, a rule isn't terminal.

" }, "Criteria":{ "shape":"AutomationRulesFindingFilters", @@ -1737,7 +1737,7 @@ }, "IsTerminal":{ "shape":"Boolean", - "documentation":"

Specifies whether a rule is the last to be applied with respect to a finding that matches the rule criteria. This is useful when a finding matches the criteria for multiple rules, and each rule has different actions. If the value of this field is set to true for a rule, Security Hub applies the rule action to a finding that matches the rule criteria and doesn't evaluate other rules for the finding.
 The default value of this field is false.

" + "documentation":"

Specifies whether a rule is the last to be applied with respect to a finding that matches the rule criteria. This is useful when a finding matches the criteria for multiple rules, and each rule has different actions. If a rule is terminal, Security Hub applies the rule action to a finding that matches the rule criteria and doesn't evaluate other rules for the finding. By default, a rule isn't terminal.

" }, "CreatedAt":{ "shape":"Timestamp", @@ -2544,6 +2544,62 @@ }, "documentation":"

Specifies the authorization configuration for using Amazon Cognito user pools with your AppSync GraphQL API endpoint.

" }, + "AwsAthenaWorkGroupConfigurationDetails":{ + "type":"structure", + "members":{ + "ResultConfiguration":{ + "shape":"AwsAthenaWorkGroupConfigurationResultConfigurationDetails", + "documentation":"

The location in Amazon S3 where query and calculation results are stored and the encryption option, if any, used for query and calculation results. These are known as client-side settings. If workgroup settings override client-side settings, then the query uses the workgroup settings.

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

The configuration of the workgroup, which includes the location in Amazon Simple Storage Service (Amazon S3) where query results are stored, the encryption option, if any, used for query results, whether Amazon CloudWatch metrics are enabled for the workgroup, and the limit for the amount of bytes scanned (cutoff) per query, if it is specified.

" + }, + "AwsAthenaWorkGroupConfigurationResultConfigurationDetails":{ + "type":"structure", + "members":{ + "EncryptionConfiguration":{ + "shape":"AwsAthenaWorkGroupConfigurationResultConfigurationEncryptionConfigurationDetails", + "documentation":"

Specifies the method used to encrypt the user’s data stores in the Athena workgroup.

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

The location in Amazon Simple Storage Service (Amazon S3) where query and calculation results are stored and the encryption option, if any, used for query and calculation results. These are known as client-side settings. If workgroup settings override client-side settings, then the query uses the workgroup settings.

" + }, + "AwsAthenaWorkGroupConfigurationResultConfigurationEncryptionConfigurationDetails":{ + "type":"structure", + "members":{ + "EncryptionOption":{ + "shape":"NonEmptyString", + "documentation":"

Indicates whether Amazon Simple Storage Service (Amazon S3) server-side encryption with Amazon S3 managed keys (SSE_S3), server-side encryption with KMS keys (SSE_KMS), or client-side encryption with KMS customer managed keys (CSE_KMS) is used.

" + }, + "KmsKey":{ + "shape":"NonEmptyString", + "documentation":"

For SSE_KMS and CSE_KMS, this is the KMS key Amazon Resource Name (ARN) or ID.

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

Specifies the method used to encrypt the user’s data stores in the Athena workgroup.

" + }, + "AwsAthenaWorkGroupDetails":{ + "type":"structure", + "members":{ + "Name":{ + "shape":"NonEmptyString", + "documentation":"

The workgroup name.

" + }, + "Description":{ + "shape":"NonEmptyString", + "documentation":"

The workgroup description.

" + }, + "State":{ + "shape":"NonEmptyString", + "documentation":"

Whether the workgroup is enabled or disabled.

" + }, + "Configuration":{ + "shape":"AwsAthenaWorkGroupConfigurationDetails", + "documentation":"

The configuration of the workgroup, which includes the location in Amazon Simple Storage Service (Amazon S3) where query results are stored, the encryption option, if any, used for query results, whether Amazon CloudWatch metrics are enabled for the workgroup, and the limit for the amount of bytes scanned (cutoff) per query, if it is specified.

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

Provides information about an Amazon Athena workgroup.

" + }, "AwsAutoScalingAutoScalingGroupAvailabilityZonesList":{ "type":"list", "member":{"shape":"AwsAutoScalingAutoScalingGroupAvailabilityZonesListDetails"} @@ -10406,6 +10462,24 @@ "type":"list", "member":{"shape":"AwsRdsDbClusterOptionGroupMembership"} }, + "AwsRdsDbClusterSnapshotDbClusterSnapshotAttribute":{ + "type":"structure", + "members":{ + "AttributeName":{ + "shape":"NonEmptyString", + "documentation":"

The name of the manual DB cluster snapshot attribute. The attribute named restore refers to the list of Amazon Web Services accounts that have permission to copy or restore the manual DB cluster snapshot.

" + }, + "AttributeValues":{ + "shape":"NonEmptyStringList", + "documentation":"

The value(s) for the manual DB cluster snapshot attribute. If the AttributeName field is set to restore, then this element returns a list of IDs of the Amazon Web Services accounts that are authorized to copy or restore the manual DB cluster snapshot. If a value of all is in the list, then the manual DB cluster snapshot is public and available for any Amazon Web Services account to copy or restore.

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

Contains the name and values of a manual Amazon Relational Database Service (RDS) DB cluster snapshot attribute.

" + }, + "AwsRdsDbClusterSnapshotDbClusterSnapshotAttributes":{ + "type":"list", + "member":{"shape":"AwsRdsDbClusterSnapshotDbClusterSnapshotAttribute"} + }, "AwsRdsDbClusterSnapshotDetails":{ "type":"structure", "members":{ @@ -10480,6 +10554,10 @@ "IamDatabaseAuthenticationEnabled":{ "shape":"Boolean", "documentation":"

Whether mapping of IAM accounts to database accounts is enabled.

" + }, + "DbClusterSnapshotAttributes":{ + "shape":"AwsRdsDbClusterSnapshotDbClusterSnapshotAttributes", + "documentation":"

Contains the name and values of a manual DB cluster snapshot attribute.

" } }, "documentation":"

Information about an Amazon RDS DB cluster snapshot.

" @@ -14712,7 +14790,7 @@ }, "IsTerminal":{ "shape":"Boolean", - "documentation":"

Specifies whether a rule is the last to be applied with respect to a finding that matches the rule criteria. This is useful when a finding matches the criteria for multiple rules, and each rule has different actions. If the value of this field is set to true for a rule, Security Hub applies the rule action to a finding that matches the rule criteria and doesn't evaluate other rules for the finding. The default value of this field is false.

" + "documentation":"

Specifies whether a rule is the last to be applied with respect to a finding that matches the rule criteria. This is useful when a finding matches the criteria for multiple rules, and each rule has different actions. If a rule is terminal, Security Hub applies the rule action to a finding that matches the rule criteria and doesn't evaluate other rules for the finding. By default, a rule isn't terminal.

" }, "Criteria":{ "shape":"AutomationRulesFindingFilters", @@ -16558,20 +16636,22 @@ }, "Value":{ "shape":"NonEmptyString", - "documentation":"

The value for the key in the map filter. Filter values are case sensitive. For example, one of the values for a tag called Department might be Security. If you provide security as the filter value, then there is no match.

" + "documentation":"

The value for the key in the map filter. Filter values are case sensitive. For example, one of the values for a tag called Department might be Security. If you provide security as the filter value, then there's no match.

" }, "Comparison":{ "shape":"MapFilterComparison", - "documentation":"

The condition to apply to the key value when querying for findings with a map filter.

To search for values that exactly match the filter value, use EQUALS. For example, for the ResourceTags field, the filter Department EQUALS Security matches findings that have the value Security for the tag Department.

To search for values other than the filter value, use NOT_EQUALS. For example, for the ResourceTags field, the filter Department NOT_EQUALS Finance matches findings that do not have the value Finance for the tag Department.

EQUALS filters on the same field are joined by OR. A finding matches if it matches any one of those filters.

NOT_EQUALS filters on the same field are joined by AND. A finding matches only if it matches all of those filters.

You cannot have both an EQUALS filter and a NOT_EQUALS filter on the same field.

" + "documentation":"

The condition to apply to the key value when filtering Security Hub findings with a map filter.

To search for values that have the filter value, use one of the following comparison operators:

CONTAINS and EQUALS filters on the same field are joined by OR. A finding matches if it matches any one of those filters. For example, the filters Department CONTAINS Security OR Department CONTAINS Finance match a finding that includes either Security, Finance, or both values.

To search for values that don't have the filter value, use one of the following comparison operators:

NOT_CONTAINS and NOT_EQUALS filters on the same field are joined by AND. A finding matches only if it matches all of those filters. For example, the filters Department NOT_CONTAINS Security AND Department NOT_CONTAINS Finance match a finding that excludes both the Security and Finance values.

CONTAINS filters can only be used with other CONTAINS filters. NOT_CONTAINS filters can only be used with other NOT_CONTAINS filters.

You can’t have both a CONTAINS filter and a NOT_CONTAINS filter on the same field. Similarly, you can’t have both an EQUALS filter and a NOT_EQUALS filter on the same field. Combining filters in this way returns an error.

CONTAINS and NOT_CONTAINS operators can be used only with automation rules. For more information, see Automation rules in the Security Hub User Guide.

" } }, - "documentation":"

A map filter for querying findings. Each map filter provides the field to check, the value to look for, and the comparison operator.

" + "documentation":"

A map filter for filtering Security Hub findings. Each map filter provides the field to check for, the value to check for, and the comparison operator.

" }, "MapFilterComparison":{ "type":"string", "enum":[ "EQUALS", - "NOT_EQUALS" + "NOT_EQUALS", + "CONTAINS", + "NOT_CONTAINS" ] }, "MapFilterList":{ @@ -17625,6 +17705,10 @@ "AwsStepFunctionStateMachine":{ "shape":"AwsStepFunctionStateMachineDetails", "documentation":"

Provides details about an Step Functions state machine, which is a workflow consisting of a series of event-driven steps.

" + }, + "AwsAthenaWorkGroup":{ + "shape":"AwsAthenaWorkGroupDetails", + "documentation":"

Provides information about an Amazon Athena workgroup. A workgroup helps you separate users, teams, applications, or workloads. It also helps you set limits on data processing and track costs.

" } }, "documentation":"

Additional details about a resource related to a finding.

To provide the details, use the object that corresponds to the resource type. For example, if the resource type is AwsEc2Instance, then you use the AwsEc2Instance object to provide the details.

If the type-specific object does not contain all of the fields you want to populate, then you use the Other object to populate those additional fields.

You also use the Other object to populate the details when the selected type does not have a corresponding object.

" @@ -18778,14 +18862,14 @@ "members":{ "Value":{ "shape":"NonEmptyString", - "documentation":"

The string filter value. Filter values are case sensitive. For example, the product name for control-based findings is Security Hub. If you provide security hub as the filter text, then there is no match.

" + "documentation":"

The string filter value. Filter values are case sensitive. For example, the product name for control-based findings is Security Hub. If you provide security hub as the filter value, there's no match.

" }, "Comparison":{ "shape":"StringFilterComparison", - "documentation":"

The condition to apply to a string value when querying for findings. To search for values that contain the filter criteria value, use one of the following comparison operators:

EQUALS and PREFIX filters on the same field are joined by OR. A finding matches if it matches any one of those filters.

To search for values that do not contain the filter criteria value, use one of the following comparison operators:

NOT_EQUALS and PREFIX_NOT_EQUALS filters on the same field are joined by AND. A finding matches only if it matches all of those filters.

For filters on the same field, you cannot provide both an EQUALS filter and a NOT_EQUALS or PREFIX_NOT_EQUALS filter. Combining filters in this way always returns an error, even if the provided filter values would return valid results.

You can combine PREFIX filters with NOT_EQUALS or PREFIX_NOT_EQUALS filters for the same field. Security Hub first processes the PREFIX filters, then the NOT_EQUALS or PREFIX_NOT_EQUALS filters.

For example, for the following filter, Security Hub first identifies findings that have resource types that start with either AwsIAM or AwsEc2. It then excludes findings that have a resource type of AwsIamPolicy and findings that have a resource type of AwsEc2NetworkInterface.

" + "documentation":"

The condition to apply to a string value when filtering Security Hub findings.

To search for values that have the filter value, use one of the following comparison operators:

CONTAINS, EQUALS, and PREFIX filters on the same field are joined by OR. A finding matches if it matches any one of those filters. For example, the filters Title CONTAINS CloudFront OR Title CONTAINS CloudWatch match a finding that includes either CloudFront, CloudWatch, or both strings in the title.

To search for values that don’t have the filter value, use one of the following comparison operators:

NOT_CONTAINS, NOT_EQUALS, and PREFIX_NOT_EQUALS filters on the same field are joined by AND. A finding matches only if it matches all of those filters. For example, the filters Title NOT_CONTAINS CloudFront AND Title NOT_CONTAINS CloudWatch match a finding that excludes both CloudFront and CloudWatch in the title.

You can’t have both a CONTAINS filter and a NOT_CONTAINS filter on the same field. Similarly, you can't provide both an EQUALS filter and a NOT_EQUALS or PREFIX_NOT_EQUALS filter on the same field. Combining filters in this way returns an error. CONTAINS filters can only be used with other CONTAINS filters. NOT_CONTAINS filters can only be used with other NOT_CONTAINS filters.

You can combine PREFIX filters with NOT_EQUALS or PREFIX_NOT_EQUALS filters for the same field. Security Hub first processes the PREFIX filters, and then the NOT_EQUALS or PREFIX_NOT_EQUALS filters.

For example, for the following filters, Security Hub first identifies findings that have resource types that start with either AwsIam or AwsEc2. It then excludes findings that have a resource type of AwsIamPolicy and findings that have a resource type of AwsEc2NetworkInterface.

CONTAINS and NOT_CONTAINS operators can be used only with automation rules. For more information, see Automation rules in the Security Hub User Guide.

" } }, - "documentation":"

A string filter for querying findings.

" + "documentation":"

A string filter for filtering Security Hub findings.

" }, "StringFilterComparison":{ "type":"string", @@ -18793,7 +18877,9 @@ "EQUALS", "PREFIX", "NOT_EQUALS", - "PREFIX_NOT_EQUALS" + "PREFIX_NOT_EQUALS", + "CONTAINS", + "NOT_CONTAINS" ] }, "StringFilterList":{ @@ -19132,7 +19218,7 @@ }, "IsTerminal":{ "shape":"Boolean", - "documentation":"

Specifies whether a rule is the last to be applied with respect to a finding that matches the rule criteria. This is useful when a finding matches the criteria for multiple rules, and each rule has different actions. If the value of this field is set to true for a rule, Security Hub applies the rule action to a finding that matches the rule criteria and doesn't evaluate other rules for the finding.
 The default value of this field is false.

" + "documentation":"

Specifies whether a rule is the last to be applied with respect to a finding that matches the rule criteria. This is useful when a finding matches the criteria for multiple rules, and each rule has different actions. If a rule is terminal, Security Hub applies the rule action to a finding that matches the rule criteria and doesn't evaluate other rules for the finding. By default, a rule isn't terminal.

" }, "Criteria":{ "shape":"AutomationRulesFindingFilters", diff --git a/botocore/data/sts/2011-06-15/service-2.json b/botocore/data/sts/2011-06-15/service-2.json index cb44d617c9..42f0067587 100644 --- a/botocore/data/sts/2011-06-15/service-2.json +++ b/botocore/data/sts/2011-06-15/service-2.json @@ -203,6 +203,10 @@ "SourceIdentity":{ "shape":"sourceIdentityType", "documentation":"

The source identity specified by the principal that is calling the AssumeRole operation.

You can require users to specify a source identity when they assume a role. You do this by using the sts:SourceIdentity condition key in a role trust policy. You can use source identity information in CloudTrail logs to determine who took actions with a role. You can use the aws:SourceIdentity condition key to further control access to Amazon Web Services resources based on the value of source identity. For more information about using source identity, see Monitor and control actions taken with assumed roles in the IAM User Guide.

The regex used to validate this parameter is a string of characters consisting of upper- and lower-case alphanumeric characters with no spaces. You can also include underscores or any of the following characters: =,.@-. You cannot use a value that begins with the text aws:. This prefix is reserved for Amazon Web Services internal use.

" + }, + "ProvidedContexts":{ + "shape":"ProvidedContextsListType", + "documentation":"

Reserved for future use.

" } } }, @@ -322,7 +326,7 @@ }, "WebIdentityToken":{ "shape":"clientTokenType", - "documentation":"

The OAuth 2.0 access token or OpenID Connect ID token that is provided by the identity provider. Your application must get this token by authenticating the user who is using your application with a web identity provider before the application makes an AssumeRoleWithWebIdentity call.

" + "documentation":"

The OAuth 2.0 access token or OpenID Connect ID token that is provided by the identity provider. Your application must get this token by authenticating the user who is using your application with a web identity provider before the application makes an AssumeRoleWithWebIdentity call. Only tokens with RSA algorithms (RS256) are supported.

" }, "ProviderId":{ "shape":"urlType", @@ -677,6 +681,25 @@ }, "documentation":"

A reference to the IAM managed policy that is passed as a session policy for a role session or a federated user session.

" }, + "ProvidedContext":{ + "type":"structure", + "members":{ + "ProviderArn":{ + "shape":"arnType", + "documentation":"

Reserved for future use.

" + }, + "ContextAssertion":{ + "shape":"contextAssertionType", + "documentation":"

Reserved for future use.

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

Reserved for future use.

" + }, + "ProvidedContextsListType":{ + "type":"list", + "member":{"shape":"ProvidedContext"}, + "max":5 + }, "RegionDisabledException":{ "type":"structure", "members":{ @@ -745,6 +768,11 @@ "min":4, "sensitive":true }, + "contextAssertionType":{ + "type":"string", + "max":2048, + "min":4 + }, "dateType":{"type":"timestamp"}, "decodedMessageType":{"type":"string"}, "durationSecondsType":{ diff --git a/botocore/data/transfer/2018-11-05/service-2.json b/botocore/data/transfer/2018-11-05/service-2.json index 6e21589dde..916b886bef 100644 --- a/botocore/data/transfer/2018-11-05/service-2.json +++ b/botocore/data/transfer/2018-11-05/service-2.json @@ -65,7 +65,7 @@ {"shape":"ResourceNotFoundException"}, {"shape":"ThrottlingException"} ], - "documentation":"

Creates the connector, which captures the parameters for an outbound connection for the AS2 protocol. The connector is required for sending files to an externally hosted AS2 server. For more details about connectors, see Create AS2 connectors.

" + "documentation":"

Creates the connector, which captures the parameters for an outbound connection for the AS2 or SFTP protocol. The connector is required for sending files to an externally hosted AS2 or SFTP server. For more details about AS2 connectors, see Create AS2 connectors.

You must specify exactly one configuration object: either for AS2 (As2Config) or SFTP (SftpConfig).

" }, "CreateProfile":{ "name":"CreateProfile", @@ -196,7 +196,7 @@ {"shape":"InvalidRequestException"}, {"shape":"ResourceNotFoundException"} ], - "documentation":"

Deletes the agreement that's specified in the provided ConnectorId.

" + "documentation":"

Deletes the connector that's specified in the provided ConnectorId.

" }, "DeleteHostKey":{ "name":"DeleteHostKey", @@ -753,7 +753,7 @@ {"shape":"ResourceNotFoundException"}, {"shape":"ThrottlingException"} ], - "documentation":"

Begins an outbound file transfer to a remote AS2 server. You specify the ConnectorId and the file paths for where to send the files.

" + "documentation":"

Begins a file transfer between local Amazon Web Services storage and a remote AS2 or SFTP server.

" }, "StartServer":{ "name":"StartServer", @@ -802,6 +802,22 @@ ], "documentation":"

Attaches a key-value pair to a resource, as identified by its Amazon Resource Name (ARN). Resources are users, servers, roles, and other entities.

There is no response returned from this call.

" }, + "TestConnection":{ + "name":"TestConnection", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"TestConnectionRequest"}, + "output":{"shape":"TestConnectionResponse"}, + "errors":[ + {"shape":"ServiceUnavailableException"}, + {"shape":"InternalServiceError"}, + {"shape":"InvalidRequestException"}, + {"shape":"ResourceNotFoundException"} + ], + "documentation":"

Tests whether your SFTP connector is set up successfully. We highly recommend that you call this operation to test your ability to transfer files between a Transfer Family server and a trading partner's SFTP server.

" + }, "TestIdentityProvider":{ "name":"TestIdentityProvider", "http":{ @@ -1050,7 +1066,7 @@ "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.

" + "documentation":"

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

" }, "As2ConnectorSecretId":{ "type":"string", @@ -1294,17 +1310,16 @@ "type":"structure", "required":[ "Url", - "As2Config", "AccessRole" ], "members":{ "Url":{ "shape":"Url", - "documentation":"

The URL of the partner's AS2 endpoint.

" + "documentation":"

The URL of the partner's AS2 or SFTP endpoint.

" }, "As2Config":{ "shape":"As2ConnectorConfig", - "documentation":"

A structure that contains the parameters for a connector object.

" + "documentation":"

A structure that contains the parameters for an AS2 connector object.

" }, "AccessRole":{ "shape":"Role", @@ -1317,6 +1332,10 @@ "Tags":{ "shape":"Tags", "documentation":"

Key-value pairs that can be used to group and search for connectors. Tags are metadata attached to connectors for any purpose.

" + }, + "SftpConfig":{ + "shape":"SftpConnectorConfig", + "documentation":"

A structure that contains the parameters for an SFTP connector object.

" } } }, @@ -1462,7 +1481,7 @@ }, "HomeDirectoryMappings":{ "shape":"HomeDirectoryMappings", - "documentation":"

Logical directory mappings that specify what Amazon S3 or Amazon EFS paths and keys should be visible to your user and how you want to make them visible. You must specify the Entry and Target pair, where Entry shows how the path is made visible and Target is the actual Amazon S3 or Amazon EFS path. If you only specify a target, it is displayed as is. You also must ensure that your Identity and Access Management (IAM) role provides access to paths in Target. This value can be set only when HomeDirectoryType is set to LOGICAL.

The following is an Entry and Target pair example.

[ { \"Entry\": \"/directory1\", \"Target\": \"/bucket_name/home/mydirectory\" } ]

In most cases, you can use this value instead of the session policy to lock your user down to the designated home directory (\"chroot\"). To do this, you can set Entry to / and set Target to the HomeDirectory parameter value.

The following is an Entry and Target pair example for chroot.

[ { \"Entry\": \"/\", \"Target\": \"/bucket_name/home/mydirectory\" } ]

" + "documentation":"

Logical directory mappings that specify what Amazon S3 or Amazon EFS paths and keys should be visible to your user and how you want to make them visible. You must specify the Entry and Target pair, where Entry shows how the path is made visible and Target is the actual Amazon S3 or Amazon EFS path. If you only specify a target, it is displayed as is. You also must ensure that your Identity and Access Management (IAM) role provides access to paths in Target. This value can be set only when HomeDirectoryType is set to LOGICAL.

The following is an Entry and Target pair example.

[ { \"Entry\": \"/directory1\", \"Target\": \"/bucket_name/home/mydirectory\" } ]

In most cases, you can use this value instead of the session policy to lock your user down to the designated home directory (\"chroot\"). To do this, you can set Entry to / and set Target to the value the user should see for their home directory when they log in.

The following is an Entry and Target pair example for chroot.

[ { \"Entry\": \"/\", \"Target\": \"/bucket_name/home/mydirectory\" } ]

" }, "Policy":{ "shape":"Policy", @@ -2198,11 +2217,11 @@ }, "Url":{ "shape":"Url", - "documentation":"

The URL of the partner's AS2 endpoint.

" + "documentation":"

The URL of the partner's AS2 or SFTP endpoint.

" }, "As2Config":{ "shape":"As2ConnectorConfig", - "documentation":"

A structure that contains the parameters for a connector object.

" + "documentation":"

A structure that contains the parameters for an AS2 connector object.

" }, "AccessRole":{ "shape":"Role", @@ -2215,6 +2234,10 @@ "Tags":{ "shape":"Tags", "documentation":"

Key-value pairs that can be used to group and search for connectors.

" + }, + "SftpConfig":{ + "shape":"SftpConnectorConfig", + "documentation":"

A structure that contains the parameters for an SFTP connector object.

" } }, "documentation":"

Describes the parameters for the connector, as identified by the ConnectorId.

" @@ -3510,7 +3533,7 @@ }, "Url":{ "shape":"Url", - "documentation":"

The URL of the partner's AS2 endpoint.

" + "documentation":"

The URL of the partner's AS2 or SFTP endpoint.

" } }, "documentation":"

Returns details of the connector that is specified.

" @@ -4035,6 +4058,11 @@ "max":16, "min":0 }, + "SecretId":{ + "type":"string", + "max":2048, + "min":1 + }, "SecurityGroupId":{ "type":"string", "max":20, @@ -4144,6 +4172,31 @@ "PUBLIC_KEY_AND_PASSWORD" ] }, + "SftpConnectorConfig":{ + "type":"structure", + "members":{ + "UserSecretId":{ + "shape":"SecretId", + "documentation":"

The identifiers for the secrets (in Amazon Web Services Secrets Manager) that contain the SFTP user's private keys or passwords.

" + }, + "TrustedHostKeys":{ + "shape":"SftpConnectorTrustedHostKeyList", + "documentation":"

The public portion of the host key, or keys, that are used to authenticate the user to the external server to which you are connecting. You can use the ssh-keyscan command against the SFTP server to retrieve the necessary key.

The three standard SSH public key format elements are <key type>, <body base64>, and an optional <comment>, with spaces between each element.

For the trusted host key, Transfer Family accepts RSA and ECDSA keys.

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

Contains the details for an SFTP connector object. The connector object is used for transferring files to and from a partner's SFTP server.

" + }, + "SftpConnectorTrustedHostKey":{ + "type":"string", + "max":2048, + "min":1 + }, + "SftpConnectorTrustedHostKeyList":{ + "type":"list", + "member":{"shape":"SftpConnectorTrustedHostKey"}, + "max":10, + "min":1 + }, "SigningAlg":{ "type":"string", "enum":[ @@ -4205,18 +4258,27 @@ }, "StartFileTransferRequest":{ "type":"structure", - "required":[ - "ConnectorId", - "SendFilePaths" - ], + "required":["ConnectorId"], "members":{ "ConnectorId":{ "shape":"ConnectorId", - "documentation":"

The unique identifier for the connector.

" + "documentation":"

The unique identifier for the connector.

" }, "SendFilePaths":{ "shape":"FilePaths", - "documentation":"

An array of strings. Each string represents the absolute path for one outbound file transfer. For example, DOC-EXAMPLE-BUCKET/myfile.txt .

" + "documentation":"

One or more source paths for the Transfer Family server. Each string represents a source file path for one outbound file transfer. For example, DOC-EXAMPLE-BUCKET/myfile.txt .

" + }, + "RetrieveFilePaths":{ + "shape":"FilePaths", + "documentation":"

One or more source paths for the partner's SFTP server. Each string represents a source file path for one inbound file transfer.

" + }, + "LocalDirectoryPath":{ + "shape":"FilePath", + "documentation":"

For an inbound transfer, the LocaDirectoryPath specifies the destination for one or more files that are transferred from the partner's SFTP server.

" + }, + "RemoteDirectoryPath":{ + "shape":"FilePath", + "documentation":"

For an outbound transfer, the RemoteDirectoryPath specifies the destination for one or more files that are transferred to the partner's SFTP server. If you don't specify a RemoteDirectoryPath, the destination for transferred files is the SFTP user's home directory.

" } } }, @@ -4226,7 +4288,7 @@ "members":{ "TransferId":{ "shape":"TransferId", - "documentation":"

Returns the unique identifier for this file transfer.

" + "documentation":"

Returns the unique identifier for the file transfer.

" } } }, @@ -4252,6 +4314,7 @@ "STOP_FAILED" ] }, + "Status":{"type":"string"}, "StatusCode":{"type":"integer"}, "StepResultOutputsJson":{ "type":"string", @@ -4351,6 +4414,33 @@ "max":50, "min":1 }, + "TestConnectionRequest":{ + "type":"structure", + "required":["ConnectorId"], + "members":{ + "ConnectorId":{ + "shape":"ConnectorId", + "documentation":"

The unique identifier for the connector.

" + } + } + }, + "TestConnectionResponse":{ + "type":"structure", + "members":{ + "ConnectorId":{ + "shape":"ConnectorId", + "documentation":"

Returns the identifier of the connector object that you are testing.

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

Returns OK for successful test, or ERROR if the test fails.

" + }, + "StatusMessage":{ + "shape":"Message", + "documentation":"

Returns Connection succeeded if the test is successful. Or, returns a descriptive error message if the test fails. The following list provides the details for some error messages and troubleshooting steps for each.

" + } + } + }, "TestIdentityProviderRequest":{ "type":"structure", "required":[ @@ -4592,11 +4682,11 @@ }, "Url":{ "shape":"Url", - "documentation":"

The URL of the partner's AS2 endpoint.

" + "documentation":"

The URL of the partner's AS2 or SFTP endpoint.

" }, "As2Config":{ "shape":"As2ConnectorConfig", - "documentation":"

A structure that contains the parameters for a connector object.

" + "documentation":"

A structure that contains the parameters for an AS2 connector object.

" }, "AccessRole":{ "shape":"Role", @@ -4605,6 +4695,10 @@ "LoggingRole":{ "shape":"Role", "documentation":"

The Amazon Resource Name (ARN) of the Identity and Access Management (IAM) role that allows a connector to turn on CloudWatch logging for Amazon S3 events. When set, you can view connector activity in your CloudWatch logs.

" + }, + "SftpConfig":{ + "shape":"SftpConnectorConfig", + "documentation":"

A structure that contains the parameters for an SFTP connector object.

" } } }, diff --git a/botocore/data/wisdom/2020-10-19/service-2.json b/botocore/data/wisdom/2020-10-19/service-2.json index c4c4b9ccfa..1f3cd3e59d 100644 --- a/botocore/data/wisdom/2020-10-19/service-2.json +++ b/botocore/data/wisdom/2020-10-19/service-2.json @@ -686,6 +686,10 @@ "shape":"Description", "documentation":"

The description.

" }, + "integrationConfiguration":{ + "shape":"AssistantIntegrationConfiguration", + "documentation":"

The configuration information for the Wisdom assistant integration.

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

The name.

" @@ -709,6 +713,16 @@ }, "documentation":"

The assistant data.

" }, + "AssistantIntegrationConfiguration":{ + "type":"structure", + "members":{ + "topicIntegrationArn":{ + "shape":"GenericArn", + "documentation":"

The Amazon Resource Name (ARN) of the integrated Amazon SNS topic used for streaming chat messages.

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

The configuration information for the Wisdom assistant integration.

" + }, "AssistantList":{ "type":"list", "member":{"shape":"AssistantSummary"} @@ -746,6 +760,10 @@ "shape":"Description", "documentation":"

The description of the assistant.

" }, + "integrationConfiguration":{ + "shape":"AssistantIntegrationConfiguration", + "documentation":"

The configuration information for the Wisdom assistant integration.

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

The name of the assistant.

" @@ -2400,6 +2418,10 @@ "shape":"Description", "documentation":"

The description of the session.

" }, + "integrationConfiguration":{ + "shape":"SessionIntegrationConfiguration", + "documentation":"

The configuration information for the session integration.

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

The name of the session.

" @@ -2419,6 +2441,16 @@ }, "documentation":"

Information about the session.

" }, + "SessionIntegrationConfiguration":{ + "type":"structure", + "members":{ + "topicIntegrationArn":{ + "shape":"GenericArn", + "documentation":"

The Amazon Resource Name (ARN) of the integrated Amazon SNS topic used for streaming chat messages.

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

The configuration information for the session integration.

" + }, "SessionSummaries":{ "type":"list", "member":{"shape":"SessionSummary"} diff --git a/docs/source/conf.py b/docs/source/conf.py index 261c7f0ebf..00543279c6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -59,7 +59,7 @@ # The short X.Y version. version = '1.31.' # The full version, including alpha/beta/rc tags. -release = '1.31.10' +release = '1.31.11' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/tests/functional/endpoint-rules/billingconductor/endpoint-tests-1.json b/tests/functional/endpoint-rules/billingconductor/endpoint-tests-1.json index b9c1c6c379..05fb6f36f4 100644 --- a/tests/functional/endpoint-rules/billingconductor/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/billingconductor/endpoint-tests-1.json @@ -18,8 +18,8 @@ }, "params": { "Region": "aws-global", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -31,8 +31,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -44,8 +44,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -57,8 +57,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -79,8 +79,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -92,8 +92,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -105,8 +105,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -118,8 +118,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -131,8 +131,8 @@ }, "params": { "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -144,8 +144,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -157,8 +157,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -170,8 +170,8 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -183,8 +183,19 @@ }, "params": { "Region": "us-gov-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { @@ -196,8 +207,19 @@ }, "params": { "Region": "us-iso-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { @@ -209,8 +231,19 @@ }, "params": { "Region": "us-iso-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { @@ -222,8 +255,19 @@ }, "params": { "Region": "us-isob-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { @@ -235,8 +279,8 @@ }, "params": { "Region": "us-isob-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -248,8 +292,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -261,8 +305,8 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -273,8 +317,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -285,10 +329,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/sts/endpoint-tests-1.json b/tests/functional/endpoint-rules/sts/endpoint-tests-1.json index b566f4aac4..5e12a28e22 100644 --- a/tests/functional/endpoint-rules/sts/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/sts/endpoint-tests-1.json @@ -702,9 +702,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -734,9 +734,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -766,9 +766,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -798,9 +798,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -830,9 +830,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -862,9 +862,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -894,9 +894,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -926,9 +926,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -958,9 +958,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -990,9 +990,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -1022,9 +1022,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -1054,9 +1054,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -1086,9 +1086,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -1118,9 +1118,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -1150,9 +1150,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -1182,9 +1182,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-1" } ] }, @@ -1214,9 +1214,9 @@ "properties": { "authSchemes": [ { - "signingRegion": "us-east-3", "signingName": "sts", - "name": "sigv4" + "name": "sigv4", + "signingRegion": "us-east-3" } ] }, diff --git a/tests/functional/endpoint-rules/wisdom/endpoint-tests-1.json b/tests/functional/endpoint-rules/wisdom/endpoint-tests-1.json index 992d992733..d3307f81d1 100644 --- a/tests/functional/endpoint-rules/wisdom/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/wisdom/endpoint-tests-1.json @@ -8,9 +8,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "ap-northeast-1", "UseFIPS": false, - "Region": "ap-northeast-1" + "UseDualStack": false } }, { @@ -21,9 +21,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "ap-southeast-2", "UseFIPS": false, - "Region": "ap-southeast-2" + "UseDualStack": false } }, { @@ -34,9 +34,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "eu-central-1", "UseFIPS": false, - "Region": "eu-central-1" + "UseDualStack": false } }, { @@ -47,9 +47,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "eu-west-2", "UseFIPS": false, - "Region": "eu-west-2" + "UseDualStack": false } }, { @@ -60,9 +60,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-east-1", "UseFIPS": false, - "Region": "us-east-1" + "UseDualStack": false } }, { @@ -73,9 +73,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-west-2", "UseFIPS": false, - "Region": "us-west-2" + "UseDualStack": false } }, { @@ -86,9 +86,9 @@ } }, "params": { - "UseDualStack": true, + "Region": "us-east-1", "UseFIPS": true, - "Region": "us-east-1" + "UseDualStack": true } }, { @@ -99,9 +99,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-east-1", "UseFIPS": true, - "Region": "us-east-1" + "UseDualStack": false } }, { @@ -112,9 +112,9 @@ } }, "params": { - "UseDualStack": true, + "Region": "us-east-1", "UseFIPS": false, - "Region": "us-east-1" + "UseDualStack": true } }, { @@ -125,9 +125,9 @@ } }, "params": { - "UseDualStack": true, + "Region": "cn-north-1", "UseFIPS": true, - "Region": "cn-north-1" + "UseDualStack": true } }, { @@ -138,9 +138,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "cn-north-1", "UseFIPS": true, - "Region": "cn-north-1" + "UseDualStack": false } }, { @@ -151,9 +151,9 @@ } }, "params": { - "UseDualStack": true, + "Region": "cn-north-1", "UseFIPS": false, - "Region": "cn-north-1" + "UseDualStack": true } }, { @@ -164,9 +164,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "cn-north-1", "UseFIPS": false, - "Region": "cn-north-1" + "UseDualStack": false } }, { @@ -177,9 +177,9 @@ } }, "params": { - "UseDualStack": true, + "Region": "us-gov-east-1", "UseFIPS": true, - "Region": "us-gov-east-1" + "UseDualStack": true } }, { @@ -190,9 +190,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-gov-east-1", "UseFIPS": true, - "Region": "us-gov-east-1" + "UseDualStack": false } }, { @@ -203,9 +203,9 @@ } }, "params": { - "UseDualStack": true, + "Region": "us-gov-east-1", "UseFIPS": false, - "Region": "us-gov-east-1" + "UseDualStack": true } }, { @@ -216,9 +216,20 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-gov-east-1", "UseFIPS": false, - "Region": "us-gov-east-1" + "UseDualStack": false + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { @@ -229,9 +240,20 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-iso-east-1", "UseFIPS": true, - "Region": "us-iso-east-1" + "UseDualStack": false + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { @@ -242,9 +264,20 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-iso-east-1", "UseFIPS": false, - "Region": "us-iso-east-1" + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { @@ -255,9 +288,20 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-isob-east-1", "UseFIPS": true, - "Region": "us-isob-east-1" + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { @@ -268,9 +312,9 @@ } }, "params": { - "UseDualStack": false, + "Region": "us-isob-east-1", "UseFIPS": false, - "Region": "us-isob-east-1" + "UseDualStack": false } }, { @@ -281,9 +325,9 @@ } }, "params": { - "UseDualStack": false, - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -295,8 +339,8 @@ } }, "params": { - "UseDualStack": false, "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -306,9 +350,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "UseDualStack": false, - "UseFIPS": true, "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -318,11 +362,17 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "UseDualStack": true, - "UseFIPS": false, "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true, "Endpoint": "https://example.com" } + }, + { + "documentation": "Missing region", + "expect": { + "error": "Invalid Configuration: Missing Region" + } } ], "version": "1.0"