diff --git a/.changes/1.29.158.json b/.changes/1.29.158.json new file mode 100644 index 0000000000..406fbfef5e --- /dev/null +++ b/.changes/1.29.158.json @@ -0,0 +1,37 @@ +[ + { + "category": "``dynamodb``", + "description": "Documentation updates for DynamoDB", + "type": "api-change" + }, + { + "category": "``emr``", + "description": "Update emr client to latest version", + "type": "api-change" + }, + { + "category": "``inspector2``", + "description": "This release adds support for Software Bill of Materials (SBOM) export and the general availability of code scanning for AWS Lambda functions.", + "type": "api-change" + }, + { + "category": "``mediaconvert``", + "description": "This release introduces the bandwidth reduction filter for the HEVC encoder, increases the limits of outputs per job, and updates support for the Nagra SDK to version 1.14.7.", + "type": "api-change" + }, + { + "category": "``mq``", + "description": "The Cross Region Disaster Recovery feature allows to replicate a brokers state from one region to another in order to provide customers with multi-region resiliency in the event of a regional outage.", + "type": "api-change" + }, + { + "category": "``sagemaker``", + "description": "This release provides support in SageMaker for output files in training jobs to be uploaded without compression and enable customer to deploy uncompressed model from S3 to real-time inference Endpoints. In addition, ml.trn1n.32xlarge is added to supported instance type list in training job.", + "type": "api-change" + }, + { + "category": "``transfer``", + "description": "This release adds a new parameter StructuredLogDestinations to CreateServer, UpdateServer APIs.", + "type": "api-change" + } +] \ No newline at end of file diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0e1ee3ce3b..aeb411c470 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,18 @@ CHANGELOG ========= +1.29.158 +======== + +* api-change:``dynamodb``: Documentation updates for DynamoDB +* api-change:``emr``: Update emr client to latest version +* api-change:``inspector2``: This release adds support for Software Bill of Materials (SBOM) export and the general availability of code scanning for AWS Lambda functions. +* api-change:``mediaconvert``: This release introduces the bandwidth reduction filter for the HEVC encoder, increases the limits of outputs per job, and updates support for the Nagra SDK to version 1.14.7. +* api-change:``mq``: The Cross Region Disaster Recovery feature allows to replicate a brokers state from one region to another in order to provide customers with multi-region resiliency in the event of a regional outage. +* api-change:``sagemaker``: This release provides support in SageMaker for output files in training jobs to be uploaded without compression and enable customer to deploy uncompressed model from S3 to real-time inference Endpoints. In addition, ml.trn1n.32xlarge is added to supported instance type list in training job. +* api-change:``transfer``: This release adds a new parameter StructuredLogDestinations to CreateServer, UpdateServer APIs. + + 1.29.157 ======== diff --git a/botocore/__init__.py b/botocore/__init__.py index 27667dd0b4..3656e4fb52 100644 --- a/botocore/__init__.py +++ b/botocore/__init__.py @@ -16,7 +16,7 @@ import os import re -__version__ = '1.29.157' +__version__ = '1.29.158' class NullHandler(logging.Handler): diff --git a/botocore/data/dynamodb/2012-08-10/service-2.json b/botocore/data/dynamodb/2012-08-10/service-2.json index 503507b449..888e338fc0 100644 --- a/botocore/data/dynamodb/2012-08-10/service-2.json +++ b/botocore/data/dynamodb/2012-08-10/service-2.json @@ -230,7 +230,7 @@ }, "input":{"shape":"DescribeEndpointsRequest"}, "output":{"shape":"DescribeEndpointsResponse"}, - "documentation":"

Returns the regional endpoint information. This action must be included in your VPC endpoint policies, or access to the DescribeEndpoints API will be denied. For more information on policy permissions, please see Internetwork traffic privacy.

", + "documentation":"

Returns the regional endpoint information. For more information on policy permissions, please see Internetwork traffic privacy.

", "endpointoperation":true }, "DescribeExport":{ diff --git a/botocore/data/emr/2009-03-31/service-2.json b/botocore/data/emr/2009-03-31/service-2.json index fe8f1ef2a3..403ad36750 100644 --- a/botocore/data/emr/2009-03-31/service-2.json +++ b/botocore/data/emr/2009-03-31/service-2.json @@ -476,6 +476,20 @@ ], "documentation":"

Returns a list of all Amazon EMR Studios associated with the Amazon Web Services account. The list includes details such as ID, Studio Access URL, and creation time for each Studio.

" }, + "ListSupportedInstanceTypes":{ + "name":"ListSupportedInstanceTypes", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"ListSupportedInstanceTypesInput"}, + "output":{"shape":"ListSupportedInstanceTypesOutput"}, + "errors":[ + {"shape":"InternalServerException"}, + {"shape":"InvalidRequestException"} + ], + "documentation":"

A list of the instance types that Amazon EMR supports. You can filter the list by Amazon Web Services Region and Amazon EMR release.

" + }, "ModifyCluster":{ "name":"ModifyCluster", "http":{ @@ -2100,6 +2114,7 @@ }, "documentation":"

The details of the step failure. The service attempts to detect the root cause for many common failures.

" }, + "Float":{"type":"float"}, "GetAutoTerminationPolicyInput":{ "type":"structure", "required":["ClusterId"], @@ -3803,6 +3818,33 @@ } } }, + "ListSupportedInstanceTypesInput":{ + "type":"structure", + "required":["ReleaseLabel"], + "members":{ + "ReleaseLabel":{ + "shape":"String", + "documentation":"

The Amazon EMR release label determines the versions of open-source application packages that Amazon EMR has installed on the cluster. Release labels are in the format emr-x.x.x, where x.x.x is an Amazon EMR release number such as emr-6.10.0. For more information about Amazon EMR releases and their included application versions and features, see the Amazon EMR Release Guide .

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

The pagination token that marks the next set of results to retrieve.

" + } + } + }, + "ListSupportedInstanceTypesOutput":{ + "type":"structure", + "members":{ + "SupportedInstanceTypes":{ + "shape":"SupportedInstanceTypesList", + "documentation":"

The list of instance types that the release specified in ListSupportedInstanceTypesInput$ReleaseLabel supports, filtered by Amazon Web Services Region.

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

The pagination token that marks the next set of results to retrieve.

" + } + } + }, "Long":{"type":"long"}, "ManagedScalingPolicy":{ "type":"structure", @@ -4887,7 +4929,7 @@ }, "AllocationStrategy":{ "shape":"SpotProvisioningAllocationStrategy", - "documentation":"

Specifies one of the following strategies to launch Spot Instance fleets: price-capacity-optimized, capacity-optimized, lowest-price, or diversified. For more information on the provisioning strategies, see Allocation strategies for Spot Instances in the Amazon EC2 User Guide for Linux Instances.

When you launch a Spot Instance fleet with the old console, it automatically launches with the capacity-optimized strategy. You can't change the allocation strategy from the old console.

" + "documentation":"

Specifies the strategy to use in launching Spot Instance fleets. Currently, the only option is capacity-optimized (the default), which launches instances from Spot Instance pools with optimal capacity for the number of instances that are launching.

" } }, "documentation":"

The launch specification for Spot Instances in the instance fleet, which determines the defined duration, provisioning timeout behavior, and allocation strategy.

The instance fleet configuration is available only in Amazon EMR releases 4.8.0 and later, excluding 5.0.x versions. Spot Instance allocation strategy is available in Amazon EMR releases 5.12.1 and later.

Spot Instances with a defined duration (also known as Spot blocks) are no longer available to new customers from July 1, 2021. For customers who have previously used the feature, we will continue to support Spot Instances with a defined duration until December 31, 2022.

" @@ -5358,6 +5400,60 @@ "type":"list", "member":{"shape":"String"} }, + "SupportedInstanceType":{ + "type":"structure", + "members":{ + "Type":{ + "shape":"String", + "documentation":"

The Amazon EC2 instance type, for example m5.xlarge, of the SupportedInstanceType.

" + }, + "MemoryGB":{ + "shape":"Float", + "documentation":"

The amount of memory that is available to Amazon EMR from the SupportedInstanceType. The kernel and hypervisor software consume some memory, so this value might be lower than the overall memory for the instance type.

" + }, + "StorageGB":{ + "shape":"Integer", + "documentation":"

StorageGB represents the storage capacity of the SupportedInstanceType. This value is 0 for Amazon EBS-only instance types.

" + }, + "VCPU":{ + "shape":"Integer", + "documentation":"

The number of vCPUs available for the SupportedInstanceType.

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

Indicates whether the SupportedInstanceType only supports 64-bit architecture.

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

The Amazon EC2 family and generation for the SupportedInstanceType.

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

Indicates whether the SupportedInstanceType supports Amazon EBS optimization.

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

Indicates whether the SupportedInstanceType uses Amazon EBS optimization by default.

" + }, + "NumberOfDisks":{ + "shape":"Integer", + "documentation":"

Number of disks for the SupportedInstanceType. This value is 0 for Amazon EBS-only instance types.

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

Indicates whether the SupportedInstanceType only supports Amazon EBS.

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

The CPU architecture, for example X86_64 or AARCH64.

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

An instance type that the specified Amazon EMR release supports.

" + }, + "SupportedInstanceTypesList":{ + "type":"list", + "member":{"shape":"SupportedInstanceType"} + }, "SupportedProductConfig":{ "type":"structure", "members":{ diff --git a/botocore/data/inspector2/2020-06-08/service-2.json b/botocore/data/inspector2/2020-06-08/service-2.json index 0c830d8974..26d23ea7d6 100644 --- a/botocore/data/inspector2/2020-06-08/service-2.json +++ b/botocore/data/inspector2/2020-06-08/service-2.json @@ -48,6 +48,23 @@ ], "documentation":"

Retrieves the Amazon Inspector status of multiple Amazon Web Services accounts within your environment.

" }, + "BatchGetCodeSnippet":{ + "name":"BatchGetCodeSnippet", + "http":{ + "method":"POST", + "requestUri":"/codesnippet/batchget", + "responseCode":200 + }, + "input":{"shape":"BatchGetCodeSnippetRequest"}, + "output":{"shape":"BatchGetCodeSnippetResponse"}, + "errors":[ + {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ThrottlingException"}, + {"shape":"InternalServerException"} + ], + "documentation":"

Retrieves code snippets from findings that Amazon Inspector detected code vulnerabilities in.

" + }, "BatchGetFreeTrialInfo":{ "name":"BatchGetFreeTrialInfo", "http":{ @@ -117,6 +134,25 @@ ], "documentation":"

Cancels the given findings report.

" }, + "CancelSbomExport":{ + "name":"CancelSbomExport", + "http":{ + "method":"POST", + "requestUri":"/sbomexport/cancel", + "responseCode":200 + }, + "input":{"shape":"CancelSbomExportRequest"}, + "output":{"shape":"CancelSbomExportResponse"}, + "errors":[ + {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ThrottlingException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"InternalServerException"} + ], + "documentation":"

Cancels a software bill of materials (SBOM) report.

", + "idempotent":true + }, "CreateFilter":{ "name":"CreateFilter", "http":{ @@ -154,6 +190,25 @@ ], "documentation":"

Creates a finding report. By default only ACTIVE findings are returned in the report. To see SUPRESSED or CLOSED findings you must specify a value for the findingStatus filter criteria.

" }, + "CreateSbomExport":{ + "name":"CreateSbomExport", + "http":{ + "method":"POST", + "requestUri":"/sbomexport/create", + "responseCode":200 + }, + "input":{"shape":"CreateSbomExportRequest"}, + "output":{"shape":"CreateSbomExportResponse"}, + "errors":[ + {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ThrottlingException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"InternalServerException"} + ], + "documentation":"

Creates a software bill of materials (SBOM) report.

", + "idempotent":true + }, "DeleteFilter":{ "name":"DeleteFilter", "http":{ @@ -331,6 +386,24 @@ ], "documentation":"

Retrieves the activation status of Amazon Inspector deep inspection and custom paths associated with your account.

" }, + "GetEncryptionKey":{ + "name":"GetEncryptionKey", + "http":{ + "method":"GET", + "requestUri":"/encryptionkey/get", + "responseCode":200 + }, + "input":{"shape":"GetEncryptionKeyRequest"}, + "output":{"shape":"GetEncryptionKeyResponse"}, + "errors":[ + {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ThrottlingException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"InternalServerException"} + ], + "documentation":"

Gets an encryption key.

" + }, "GetFindingsReportStatus":{ "name":"GetFindingsReportStatus", "http":{ @@ -367,6 +440,25 @@ ], "documentation":"

Gets member information for your organization.

" }, + "GetSbomExport":{ + "name":"GetSbomExport", + "http":{ + "method":"POST", + "requestUri":"/sbomexport/get", + "responseCode":200 + }, + "input":{"shape":"GetSbomExportRequest"}, + "output":{"shape":"GetSbomExportResponse"}, + "errors":[ + {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"ThrottlingException"}, + {"shape":"InternalServerException"} + ], + "documentation":"

Gets details of a software bill of materials (SBOM) report.

", + "idempotent":true + }, "ListAccountPermissions":{ "name":"ListAccountPermissions", "http":{ @@ -533,6 +625,25 @@ ], "documentation":"

Lists the Amazon Inspector usage totals over the last 30 days.

" }, + "ResetEncryptionKey":{ + "name":"ResetEncryptionKey", + "http":{ + "method":"PUT", + "requestUri":"/encryptionkey/reset", + "responseCode":200 + }, + "input":{"shape":"ResetEncryptionKeyRequest"}, + "output":{"shape":"ResetEncryptionKeyResponse"}, + "errors":[ + {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ThrottlingException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"InternalServerException"} + ], + "documentation":"

Resets an encryption key. After the key is reset your resources will be encrypted by an Amazon Web Services owned key.

", + "idempotent":true + }, "SearchVulnerabilities":{ "name":"SearchVulnerabilities", "http":{ @@ -620,6 +731,25 @@ ], "documentation":"

Activates, deactivates Amazon Inspector deep inspection, or updates custom paths for your account.

" }, + "UpdateEncryptionKey":{ + "name":"UpdateEncryptionKey", + "http":{ + "method":"PUT", + "requestUri":"/encryptionkey/update", + "responseCode":200 + }, + "input":{"shape":"UpdateEncryptionKeyRequest"}, + "output":{"shape":"UpdateEncryptionKeyResponse"}, + "errors":[ + {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ThrottlingException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"InternalServerException"} + ], + "documentation":"

Updates an encryption key. A ResourceNotFoundException means that an AWS owned key is being used for encryption.

", + "idempotent":true + }, "UpdateFilter":{ "name":"UpdateFilter", "http":{ @@ -804,7 +934,8 @@ "type":"string", "enum":[ "NETWORK_REACHABILITY", - "PACKAGE_VULNERABILITY" + "PACKAGE_VULNERABILITY", + "CODE_VULNERABILITY" ] }, "AggregationRequest":{ @@ -1069,6 +1200,10 @@ "lambda":{ "shape":"Boolean", "documentation":"

Represents whether AWS Lambda standard scans are automatically enabled for new members of your Amazon Inspector organization.

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

Represents whether AWS Lambda code scans are automatically enabled for new members of your Amazon Inspector organization.

 </p> 
" } }, "documentation":"

Represents which scan types are automatically enabled for new members of your Amazon Inspector organization.

" @@ -1328,6 +1463,35 @@ } } }, + "BatchGetCodeSnippetRequest":{ + "type":"structure", + "required":["findingArns"], + "members":{ + "findingArns":{ + "shape":"BatchGetCodeSnippetRequestFindingArnsList", + "documentation":"

An array of finding ARNs for the findings you want to retrieve code snippets from.

" + } + } + }, + "BatchGetCodeSnippetRequestFindingArnsList":{ + "type":"list", + "member":{"shape":"FindingArn"}, + "max":10, + "min":1 + }, + "BatchGetCodeSnippetResponse":{ + "type":"structure", + "members":{ + "codeSnippetResults":{ + "shape":"CodeSnippetResultList", + "documentation":"

The retrieved code snippets associated with the provided finding ARNs.

" + }, + "errors":{ + "shape":"CodeSnippetErrorList", + "documentation":"

Any errors Amazon Inspector encountered while trying to retrieve the requested code snippets.

" + } + } + }, "BatchGetFreeTrialInfoRequest":{ "type":"structure", "required":["accountIds"], @@ -1430,6 +1594,25 @@ } } }, + "CancelSbomExportRequest":{ + "type":"structure", + "required":["reportId"], + "members":{ + "reportId":{ + "shape":"ReportId", + "documentation":"

The report ID of the SBOM export to cancel.

" + } + } + }, + "CancelSbomExportResponse":{ + "type":"structure", + "members":{ + "reportId":{ + "shape":"ReportId", + "documentation":"

The report ID of the canceled SBOM export.

" + } + } + }, "CisaAction":{ "type":"string", "min":0 @@ -1459,6 +1642,173 @@ "max":64, "min":1 }, + "CodeFilePath":{ + "type":"structure", + "required":[ + "endLine", + "fileName", + "filePath", + "startLine" + ], + "members":{ + "endLine":{ + "shape":"Integer", + "documentation":"

The line number of the last line of code that a vulnerability was found in.

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

The name of the file the code vulnerability was found in.

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

The file path to the code that a vulnerability was found in.

" + }, + "startLine":{ + "shape":"Integer", + "documentation":"

The line number of the first line of code that a vulnerability was found in.

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

Contains information on where a code vulnerability is located in your Lambda function.

" + }, + "CodeLine":{ + "type":"structure", + "required":[ + "content", + "lineNumber" + ], + "members":{ + "content":{ + "shape":"CodeLineContentString", + "documentation":"

The content of a line of code

" + }, + "lineNumber":{ + "shape":"Integer", + "documentation":"

The line number that a section of code is located at.

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

Contains information on the lines of code associated with a code snippet.

" + }, + "CodeLineContentString":{ + "type":"string", + "max":240, + "min":0 + }, + "CodeLineList":{ + "type":"list", + "member":{"shape":"CodeLine"}, + "max":20, + "min":1 + }, + "CodeSnippetError":{ + "type":"structure", + "required":[ + "errorCode", + "errorMessage", + "findingArn" + ], + "members":{ + "errorCode":{ + "shape":"CodeSnippetErrorCode", + "documentation":"

The error code for the error that prevented a code snippet from being retrieved.

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

The error message received when Amazon Inspector failed to retrieve a code snippet.

" + }, + "findingArn":{ + "shape":"FindingArn", + "documentation":"

The ARN of the finding that a code snippet couldn't be retrieved for.

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

Contains information about any errors encountered while trying to retrieve a code snippet.

" + }, + "CodeSnippetErrorCode":{ + "type":"string", + "enum":[ + "INTERNAL_ERROR", + "ACCESS_DENIED", + "CODE_SNIPPET_NOT_FOUND", + "INVALID_INPUT" + ] + }, + "CodeSnippetErrorList":{ + "type":"list", + "member":{"shape":"CodeSnippetError"} + }, + "CodeSnippetResult":{ + "type":"structure", + "members":{ + "codeSnippet":{ + "shape":"CodeLineList", + "documentation":"

Contains information on the retrieved code snippet.

" + }, + "endLine":{ + "shape":"Integer", + "documentation":"

The line number of the last line of a code snippet.

" + }, + "findingArn":{ + "shape":"FindingArn", + "documentation":"

The ARN of a finding that the code snippet is associated with.

" + }, + "startLine":{ + "shape":"Integer", + "documentation":"

The line number of the first line of a code snippet.

" + }, + "suggestedFixes":{ + "shape":"SuggestedFixes", + "documentation":"

Details of a suggested code fix.

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

Contains information on a code snippet retrieved by Amazon Inspector from a code vulnerability finding.

" + }, + "CodeSnippetResultList":{ + "type":"list", + "member":{"shape":"CodeSnippetResult"} + }, + "CodeVulnerabilityDetails":{ + "type":"structure", + "required":[ + "cwes", + "detectorId", + "detectorName", + "filePath" + ], + "members":{ + "cwes":{ + "shape":"CweList", + "documentation":"

The Common Weakness Enumeration (CWE) item associated with the detected vulnerability.

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

The ID for the Amazon CodeGuru detector associated with the finding. For more information on detectors see Amazon CodeGuru Detector Library.

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

The name of the detector used to identify the code vulnerability. For more information on detectors see CodeGuru Detector Library.

" + }, + "detectorTags":{ + "shape":"DetectorTagList", + "documentation":"

The detector tag associated with the vulnerability. Detector tags group related vulnerabilities by common themes or tactics. For a list of available tags by programming language, see Java tags, or Python tags.

" + }, + "filePath":{ + "shape":"CodeFilePath", + "documentation":"

Contains information on where the code vulnerability is located in your code.

" + }, + "referenceUrls":{ + "shape":"ReferenceUrls", + "documentation":"

A URL containing supporting documentation about the code vulnerability detected.

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

The identifier for a rule that was used to detect the code vulnerability.

" + }, + "sourceLambdaLayerArn":{ + "shape":"LambdaLayerArn", + "documentation":"

The Amazon Resource Name (ARN) of the Lambda layer that the code vulnerability was detected in.

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

Contains information on the code vulnerability identified in your Lambda function.

" + }, "Component":{"type":"string"}, "ComponentType":{"type":"string"}, "ConflictException":{ @@ -1779,6 +2129,33 @@ } } }, + "CreateSbomExportRequest":{ + "type":"structure", + "required":[ + "reportFormat", + "s3Destination" + ], + "members":{ + "reportFormat":{ + "shape":"SbomReportFormat", + "documentation":"

The output format for the software bill of materials (SBOM) report.

" + }, + "resourceFilterCriteria":{ + "shape":"ResourceFilterCriteria", + "documentation":"

The resource filter criteria for the software bill of materials (SBOM) report.

" + }, + "s3Destination":{"shape":"Destination"} + } + }, + "CreateSbomExportResponse":{ + "type":"structure", + "members":{ + "reportId":{ + "shape":"ReportId", + "documentation":"

The report ID for the software bill of materials (SBOM) report.

" + } + } + }, "Currency":{ "type":"string", "enum":["USD"] @@ -1915,6 +2292,12 @@ "type":"string", "min":0 }, + "CweList":{ + "type":"list", + "member":{"shape":"NonEmptyString"}, + "max":10, + "min":1 + }, "Cwes":{ "type":"list", "member":{"shape":"Cwe"}, @@ -2048,6 +2431,12 @@ "max":100, "min":0 }, + "DetectorTagList":{ + "type":"list", + "member":{"shape":"NonEmptyString"}, + "max":10, + "min":1 + }, "DisableDelegatedAdminAccountRequest":{ "type":"structure", "required":["delegatedAdminAccountId"], @@ -2395,7 +2784,22 @@ }, "documentation":"

Details about the Exploit Prediction Scoring System (EPSS) score.

" }, + "EpssDetails":{ + "type":"structure", + "members":{ + "score":{ + "shape":"EpssScoreValue", + "documentation":"

The EPSS score.

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

Details about the Exploit Prediction Scoring System (EPSS) score for a finding.

" + }, "EpssScore":{"type":"double"}, + "EpssScoreValue":{ + "type":"double", + "max":1.0, + "min":0.0 + }, "ErrorCode":{ "type":"string", "enum":[ @@ -2605,6 +3009,18 @@ "shape":"StringFilterList", "documentation":"

Details of the Amazon Web Services account IDs used to filter findings.

" }, + "codeVulnerabilityDetectorName":{ + "shape":"StringFilterList", + "documentation":"

The name of the detector used to identify a code vulnerability in a Lambda function used to filter findings.

" + }, + "codeVulnerabilityDetectorTags":{ + "shape":"StringFilterList", + "documentation":"

The detector type tag associated with the vulnerability used to filter findings. Detector tags group related vulnerabilities by common themes or tactics. For a list of available tags by programming language, see Java tags, or Python tags.

" + }, + "codeVulnerabilityFilePath":{ + "shape":"StringFilterList", + "documentation":"

The file path to the file in a Lambda function that contains a code vulnerability used to filter findings.

" + }, "componentId":{ "shape":"StringFilterList", "documentation":"

Details of the component IDs used to filter findings.

" @@ -2649,6 +3065,10 @@ "shape":"StringFilterList", "documentation":"

The tags attached to the Amazon ECR container image.

" }, + "epssScore":{ + "shape":"NumberFilterList", + "documentation":"

The EPSS score used to filter findings.

" + }, "exploitAvailable":{ "shape":"StringFilterList", "documentation":"

Filters the list of AWS Lambda findings by the availability of exploits.

" @@ -2794,10 +3214,18 @@ "shape":"AccountId", "documentation":"

The Amazon Web Services account ID associated with the finding.

" }, + "codeVulnerabilityDetails":{ + "shape":"CodeVulnerabilityDetails", + "documentation":"

Details about the code vulnerability identified in a Lambda function used to filter findings.

" + }, "description":{ "shape":"FindingDescription", "documentation":"

The description of the finding.

" }, + "epss":{ + "shape":"EpssDetails", + "documentation":"

The finding's EPSS score.

" + }, "exploitAvailable":{ "shape":"ExploitAvailable", "documentation":"

If a finding discovered in your environment has an exploit available.

" @@ -2903,7 +3331,8 @@ "type":"string", "enum":[ "NETWORK_REACHABILITY", - "PACKAGE_VULNERABILITY" + "PACKAGE_VULNERABILITY", + "CODE_VULNERABILITY" ] }, "FindingTypeAggregation":{ @@ -3059,7 +3488,8 @@ "enum":[ "EC2", "ECR", - "LAMBDA" + "LAMBDA", + "LAMBDA_CODE" ] }, "FunctionName":{ @@ -3120,6 +3550,37 @@ } } }, + "GetEncryptionKeyRequest":{ + "type":"structure", + "required":[ + "resourceType", + "scanType" + ], + "members":{ + "resourceType":{ + "shape":"ResourceType", + "documentation":"

The resource type the key encrypts.

", + "location":"querystring", + "locationName":"resourceType" + }, + "scanType":{ + "shape":"ScanType", + "documentation":"

The scan type the key encrypts.

", + "location":"querystring", + "locationName":"scanType" + } + } + }, + "GetEncryptionKeyResponse":{ + "type":"structure", + "required":["kmsKeyId"], + "members":{ + "kmsKeyId":{ + "shape":"KmsKeyArn", + "documentation":"

A kms key ID.

" + } + } + }, "GetFindingsReportStatusRequest":{ "type":"structure", "members":{ @@ -3177,6 +3638,46 @@ } } }, + "GetSbomExportRequest":{ + "type":"structure", + "required":["reportId"], + "members":{ + "reportId":{ + "shape":"ReportId", + "documentation":"

The report ID of the SBOM export to get details for.

" + } + } + }, + "GetSbomExportResponse":{ + "type":"structure", + "members":{ + "errorCode":{ + "shape":"ReportingErrorCode", + "documentation":"

An error code.

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

An error message.

" + }, + "filterCriteria":{ + "shape":"ResourceFilterCriteria", + "documentation":"

Contains details about the resource filter criteria used for the software bill of materials (SBOM) report.

" + }, + "format":{ + "shape":"SbomReportFormat", + "documentation":"

The format of the software bill of materials (SBOM) report.

" + }, + "reportId":{ + "shape":"ReportId", + "documentation":"

The report ID of the software bill of materials (SBOM) report.

" + }, + "s3Destination":{"shape":"Destination"}, + "status":{ + "shape":"ExternalReportStatus", + "documentation":"

The status of the software bill of materials (SBOM) report.

" + } + } + }, "GroupKey":{ "type":"string", "enum":[ @@ -3314,6 +3815,10 @@ "type":"list", "member":{"shape":"IpV6Address"} }, + "KmsKeyArn":{ + "type":"string", + "pattern":"^arn:aws(-(us-gov|cn))?:kms:([a-z0-9][-.a-z0-9]{0,62})?:[0-9]{12}?:key/(([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})|(mrk-[0-9a-zA-Z]{32}))$" + }, "LambdaFunctionAggregation":{ "type":"structure", "members":{ @@ -4372,6 +4877,12 @@ }, "documentation":"

Details about the recommended course of action to remediate the finding.

" }, + "ReferenceUrls":{ + "type":"list", + "member":{"shape":"NonEmptyString"}, + "max":10, + "min":1 + }, "RelatedVulnerabilities":{ "type":"list", "member":{"shape":"RelatedVulnerability"}, @@ -4481,6 +4992,28 @@ "AFFECTED_IMAGES" ] }, + "ResetEncryptionKeyRequest":{ + "type":"structure", + "required":[ + "resourceType", + "scanType" + ], + "members":{ + "resourceType":{ + "shape":"ResourceType", + "documentation":"

The resource type the key encrypts.

" + }, + "scanType":{ + "shape":"ScanType", + "documentation":"

The scan type the key encrypts.

" + } + } + }, + "ResetEncryptionKeyResponse":{ + "type":"structure", + "members":{ + } + }, "Resource":{ "type":"structure", "required":[ @@ -4533,6 +5066,44 @@ }, "documentation":"

Contains details about the resource involved in the finding.

" }, + "ResourceFilterCriteria":{ + "type":"structure", + "members":{ + "accountId":{ + "shape":"ResourceStringFilterList", + "documentation":"

The account IDs used as resource filter criteria.

" + }, + "ec2InstanceTags":{ + "shape":"ResourceMapFilterList", + "documentation":"

The EC2 instance tags used as resource filter criteria.

" + }, + "ecrImageTags":{ + "shape":"ResourceStringFilterList", + "documentation":"

The ECR image tags used as resource filter criteria.

" + }, + "ecrRepositoryName":{ + "shape":"ResourceStringFilterList", + "documentation":"

The ECR repository names used as resource filter criteria.

" + }, + "lambdaFunctionName":{ + "shape":"ResourceStringFilterList", + "documentation":"

The AWS Lambda function name used as resource filter criteria.

" + }, + "lambdaFunctionTags":{ + "shape":"ResourceMapFilterList", + "documentation":"

The AWS Lambda function tags used as resource filter criteria.

" + }, + "resourceId":{ + "shape":"ResourceStringFilterList", + "documentation":"

The resource IDs used as resource filter criteria.

" + }, + "resourceType":{ + "shape":"ResourceStringFilterList", + "documentation":"

The resource types used as resource filter criteria.

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

The resource filter criteria for a Software bill of materials (SBOM) report.

" + }, "ResourceId":{ "type":"string", "max":341, @@ -4545,6 +5116,38 @@ "max":10, "min":1 }, + "ResourceMapComparison":{ + "type":"string", + "enum":["EQUALS"] + }, + "ResourceMapFilter":{ + "type":"structure", + "required":[ + "comparison", + "key" + ], + "members":{ + "comparison":{ + "shape":"ResourceMapComparison", + "documentation":"

The filter's comparison.

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

The filter's key.

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

The filter's value.

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

A resource map filter for a software bill of material report.

" + }, + "ResourceMapFilterList":{ + "type":"list", + "member":{"shape":"ResourceMapFilter"}, + "max":10, + "min":1 + }, "ResourceNotFoundException":{ "type":"structure", "required":["message"], @@ -4585,7 +5188,8 @@ "enum":[ "EC2", "ECR", - "LAMBDA" + "LAMBDA", + "LAMBDA_CODE" ] }, "ResourceState":{ @@ -4603,7 +5207,8 @@ "shape":"State", "documentation":"

An object detailing the state of Amazon Inspector scanning for Amazon ECR resources.

" }, - "lambda":{"shape":"State"} + "lambda":{"shape":"State"}, + "lambdaCode":{"shape":"State"} }, "documentation":"

Details the state of Amazon Inspector for each resource type Amazon Inspector scans.

" }, @@ -4625,10 +5230,50 @@ "lambda":{ "shape":"Status", "documentation":"

The status of Amazon Inspector scanning for AWS Lambda function.

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

The status of Amazon Inspector scanning for custom application code for Amazon Web Services Lambda functions.

" } }, "documentation":"

Details the status of Amazon Inspector for each resource type Amazon Inspector scans.

" }, + "ResourceStringComparison":{ + "type":"string", + "enum":[ + "EQUALS", + "NOT_EQUALS" + ] + }, + "ResourceStringFilter":{ + "type":"structure", + "required":[ + "comparison", + "value" + ], + "members":{ + "comparison":{ + "shape":"ResourceStringComparison", + "documentation":"

The filter's comparison.

" + }, + "value":{ + "shape":"ResourceStringInput", + "documentation":"

The filter's value.

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

A resource string filter for a software bill of materials report.

" + }, + "ResourceStringFilterList":{ + "type":"list", + "member":{"shape":"ResourceStringFilter"}, + "max":10, + "min":1 + }, + "ResourceStringInput":{ + "type":"string", + "max":1024, + "min":1 + }, "ResourceType":{ "type":"string", "enum":[ @@ -4653,7 +5298,16 @@ "PYTHON_3_9", "UNSUPPORTED", "NODEJS_18_X", - "GO_1_X" + "GO_1_X", + "JAVA_17", + "PYTHON_3_10" + ] + }, + "SbomReportFormat":{ + "type":"string", + "enum":[ + "CYCLONEDX_1_4", + "SPDX_2_3" ] }, "ScanStatus":{ @@ -4714,7 +5368,8 @@ "type":"string", "enum":[ "NETWORK", - "PACKAGE" + "PACKAGE", + "CODE" ] }, "SearchVulnerabilitiesFilterCriteria":{ @@ -4863,7 +5518,8 @@ "VULNERABILITY_ID", "VULNERABILITY_SOURCE", "INSPECTOR_SCORE", - "VENDOR_SEVERITY" + "VENDOR_SEVERITY", + "EPSS_SCORE" ] }, "SortOrder":{ @@ -4989,6 +5645,36 @@ "max":16, "min":0 }, + "SuggestedFix":{ + "type":"structure", + "members":{ + "code":{ + "shape":"SuggestedFixCodeString", + "documentation":"

The fix's code.

" + }, + "description":{ + "shape":"SuggestedFixDescriptionString", + "documentation":"

The fix's description.

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

A suggested fix for a vulnerability in your Lambda function code.

" + }, + "SuggestedFixCodeString":{ + "type":"string", + "max":2500, + "min":1 + }, + "SuggestedFixDescriptionString":{ + "type":"string", + "max":1000, + "min":1 + }, + "SuggestedFixes":{ + "type":"list", + "member":{"shape":"SuggestedFix"}, + "max":5, + "min":1 + }, "TagKey":{ "type":"string", "max":128, @@ -5068,6 +5754,10 @@ "TitleAggregation":{ "type":"structure", "members":{ + "findingType":{ + "shape":"AggregationFindingType", + "documentation":"

The type of finding to aggregate on.

" + }, "resourceType":{ "shape":"AggregationResourceType", "documentation":"

The resource type to aggregate on.

" @@ -5207,6 +5897,33 @@ } } }, + "UpdateEncryptionKeyRequest":{ + "type":"structure", + "required":[ + "kmsKeyId", + "resourceType", + "scanType" + ], + "members":{ + "kmsKeyId":{ + "shape":"KmsKeyArn", + "documentation":"

A KMS key ID for the encryption key.

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

The resource type for the encryption key.

" + }, + "scanType":{ + "shape":"ScanType", + "documentation":"

The scan type for the encryption key.

" + } + } + }, + "UpdateEncryptionKeyResponse":{ + "type":"structure", + "members":{ + } + }, "UpdateFilterRequest":{ "type":"structure", "required":["filterArn"], @@ -5342,7 +6059,8 @@ "EC2_INSTANCE_HOURS", "ECR_INITIAL_SCAN", "ECR_RESCAN", - "LAMBDA_FUNCTION_HOURS" + "LAMBDA_FUNCTION_HOURS", + "LAMBDA_FUNCTION_CODE_HOURS" ] }, "UsageValue":{ @@ -5468,7 +6186,7 @@ }, "epss":{ "shape":"Epss", - "documentation":"

An object that contains the Exploit Prediction Scoring System (EPSS) score.

" + "documentation":"

An object that contains the Exploit Prediction Scoring System (EPSS) score for a vulnerability.

" }, "exploitObserved":{ "shape":"ExploitObserved", diff --git a/botocore/data/mediaconvert/2017-08-29/service-2.json b/botocore/data/mediaconvert/2017-08-29/service-2.json index e72c3ec909..a26677a7c5 100644 --- a/botocore/data/mediaconvert/2017-08-29/service-2.json +++ b/botocore/data/mediaconvert/2017-08-29/service-2.json @@ -2754,7 +2754,7 @@ "documentation": "If your input captions are SCC, TTML, STL, SMI, SRT, or IMSC in an xml file, specify the URI of the input captions source file. If your input captions are IMSC in an IMF package, use TrackSourceSettings instead of FileSoureSettings." } }, - "documentation": "Use captions selectors to specify the captions data from your input that you use in your outputs. You can use up to 20 captions selectors per input." + "documentation": "Use captions selectors to specify the captions data from your input that you use in your outputs. You can use up to 100 captions selectors per input." }, "CaptionSourceConvertPaintOnToPopOn": { "type": "string", @@ -6251,6 +6251,11 @@ "locationName": "alternateTransferFunctionSei", "documentation": "Enables Alternate Transfer Function SEI message for outputs using Hybrid Log Gamma (HLG) Electro-Optical Transfer Function (EOTF)." }, + "BandwidthReductionFilter": { + "shape": "BandwidthReductionFilter", + "locationName": "bandwidthReductionFilter", + "documentation": "The Bandwidth reduction filter increases the video quality of your output relative to its bitrate. Use to lower the bitrate of your constant quality QVBR output, with little or no perceptual decrease in quality. Or, use to increase the video quality of outputs with other rate control modes relative to the bitrate that you specify. Bandwidth reduction increases further when your input is low quality or noisy. Outputs that use this feature incur pro-tier pricing. When you include Bandwidth reduction filter, you cannot include the Noise reducer preprocessor." + }, "Bitrate": { "shape": "__integerMin1000Max1466400000", "locationName": "bitrate", @@ -6891,6 +6896,11 @@ "locationName": "programDateTimePeriod", "documentation": "Period of insertion of EXT-X-PROGRAM-DATE-TIME entry, in seconds." }, + "ProgressiveWriteHlsManifest": { + "shape": "HlsProgressiveWriteHlsManifest", + "locationName": "progressiveWriteHlsManifest", + "documentation": "Specify whether MediaConvert generates HLS manifests while your job is running or when your job is complete. To generate HLS manifests while your job is running: Choose Enabled. Use if you want to play back your content as soon as it's available. MediaConvert writes the parent and child manifests after the first three media segments are written to your destination S3 bucket. It then writes new updated manifests after each additional segment is written. The parent manifest includes the latest BANDWIDTH and AVERAGE-BANDWIDTH attributes, and child manifests include the latest available media segment. When your job completes, the final child playlists include an EXT-X-ENDLIST tag. To generate HLS manifests only when your job completes: Choose Disabled." + }, "SegmentControl": { "shape": "HlsSegmentControl", "locationName": "segmentControl", @@ -7057,6 +7067,14 @@ "EXCLUDE" ] }, + "HlsProgressiveWriteHlsManifest": { + "type": "string", + "documentation": "Specify whether MediaConvert generates HLS manifests while your job is running or when your job is complete. To generate HLS manifests while your job is running: Choose Enabled. Use if you want to play back your content as soon as it's available. MediaConvert writes the parent and child manifests after the first three media segments are written to your destination S3 bucket. It then writes new updated manifests after each additional segment is written. The parent manifest includes the latest BANDWIDTH and AVERAGE-BANDWIDTH attributes, and child manifests include the latest available media segment. When your job completes, the final child playlists include an EXT-X-ENDLIST tag. To generate HLS manifests only when your job completes: Choose Disabled.", + "enum": [ + "ENABLED", + "DISABLED" + ] + }, "HlsRenditionGroupSettings": { "type": "structure", "members": { @@ -7271,7 +7289,7 @@ "CaptionSelectors": { "shape": "__mapOfCaptionSelector", "locationName": "captionSelectors", - "documentation": "Use captions selectors to specify the captions data from your input that you use in your outputs. You can use up to 20 captions selectors per input." + "documentation": "Use captions selectors to specify the captions data from your input that you use in your outputs. You can use up to 100 captions selectors per input." }, "Crop": { "shape": "Rectangle", @@ -7508,7 +7526,7 @@ "CaptionSelectors": { "shape": "__mapOfCaptionSelector", "locationName": "captionSelectors", - "documentation": "Use captions selectors to specify the captions data from your input that you use in your outputs. You can use up to 20 captions selectors per input." + "documentation": "Use captions selectors to specify the captions data from your input that you use in your outputs. You can use up to 100 captions selectors per input." }, "Crop": { "shape": "Rectangle", diff --git a/botocore/data/mq/2017-11-27/endpoint-rule-set-1.json b/botocore/data/mq/2017-11-27/endpoint-rule-set-1.json index 896427a06b..d18215d800 100644 --- a/botocore/data/mq/2017-11-27/endpoint-rule-set-1.json +++ b/botocore/data/mq/2017-11-27/endpoint-rule-set-1.json @@ -32,13 +32,12 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "isSet", "argv": [ { - "ref": "Region" + "ref": "Endpoint" } - ], - "assign": "PartitionResult" + ] } ], "type": "tree", @@ -46,23 +45,20 @@ { "conditions": [ { - "fn": "isSet", + "fn": "booleanEquals", "argv": [ { - "ref": "Endpoint" - } + "ref": "UseFIPS" + }, + true ] - }, - { - "fn": "parseURL", - "argv": [ - { - "ref": "Endpoint" - } - ], - "assign": "url" } ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], "type": "tree", "rules": [ { @@ -71,67 +67,42 @@ "fn": "booleanEquals", "argv": [ { - "ref": "UseFIPS" + "ref": "UseDualStack" }, true ] } ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", "type": "error" }, { "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" + "endpoint": { + "url": { + "ref": "Endpoint" }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" - }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, + } + ] + }, + { + "conditions": [], + "type": "tree", + "rules": [ { "conditions": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", + "fn": "isSet", "argv": [ { - "ref": "UseDualStack" - }, - true + "ref": "Region" + } ] } ], @@ -140,90 +111,215 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "aws.partition", "argv": [ - true, { - "fn": "getAttr", + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsFIPS" + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true ] } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://mq-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } ] }, { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsDualStack" + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://mq-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" } ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://mq-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" }, - "supportsFIPS" + true ] } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://mq.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" + } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [], "type": "tree", @@ -231,7 +327,7 @@ { "conditions": [], "endpoint": { - "url": "https://mq-fips.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://mq.{Region}.{PartitionResult#dnsSuffix}", "properties": {}, "headers": {} }, @@ -240,74 +336,13 @@ ] } ] - }, - { - "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" - } - ] - }, - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://mq.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } ] }, { "conditions": [], - "endpoint": { - "url": "https://mq.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } diff --git a/botocore/data/mq/2017-11-27/service-2.json b/botocore/data/mq/2017-11-27/service-2.json index e16cfd04b5..f10c53475e 100644 --- a/botocore/data/mq/2017-11-27/service-2.json +++ b/botocore/data/mq/2017-11-27/service-2.json @@ -41,7 +41,7 @@ "shape" : "ForbiddenException", "documentation" : "

HTTP Status Code 403: Access forbidden. Correct your credentials and then retry your request.

" } ], - "documentation" : "

Creates a broker. Note: This API is asynchronous.

To create a broker, you must either use the AmazonMQFullAccess IAM policy or include the following EC2 permissions in your IAM policy.

For more information, see Create an IAM User and Get Your AWS Credentials and Never Modify or Delete the Amazon MQ Elastic Network Interface in the Amazon MQ Developer Guide.

" + "documentation" : "

Creates a broker. Note: This API is asynchronous.

To create a broker, you must either use the AmazonMQFullAccess IAM policy or include the following EC2 permissions in your IAM policy.

For more information, see Create an IAM User and Get Your Amazon Web Services Credentials and Never Modify or Delete the Amazon MQ Elastic Network Interface in the Amazon MQ Developer Guide.

" }, "CreateConfiguration" : { "name" : "CreateConfiguration", @@ -127,7 +127,7 @@ "shape" : "ForbiddenException", "documentation" : "

HTTP Status Code 403: Access forbidden. Correct your credentials and then retry your request.

" } ], - "documentation" : "

Creates an ActiveMQ user.

" + "documentation" : "

Creates an ActiveMQ user.

Do not add personally identifiable information (PII) or other confidential or sensitive information in broker usernames. Broker usernames are accessible to other Amazon Web Services services, including CloudWatch Logs. Broker usernames are not intended to be used for private or sensitive data.

" }, "DeleteBroker" : { "name" : "DeleteBroker", @@ -519,6 +519,35 @@ } ], "documentation" : "

Returns a list of all ActiveMQ users.

" }, + "Promote" : { + "name" : "Promote", + "http" : { + "method" : "POST", + "requestUri" : "/v1/brokers/{broker-id}/promote", + "responseCode" : 200 + }, + "input" : { + "shape" : "PromoteRequest" + }, + "output" : { + "shape" : "PromoteResponse", + "documentation" : "

HTTP Status Code 200: OK.

" + }, + "errors" : [ { + "shape" : "NotFoundException", + "documentation" : "

HTTP Status Code 404: Resource not found due to incorrect input. Correct your request and then retry it.

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

HTTP Status Code 400: Bad request due to incorrect input. Correct your request and then retry it.

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

HTTP Status Code 500: Unexpected internal server error. Retrying your request might resolve the issue.

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

HTTP Status Code 403: Access forbidden. Correct your credentials and then retry your request.

" + } ], + "documentation" : "

Promotes a data replication replica broker to the primary broker role.

" + }, "RebootBroker" : { "name" : "RebootBroker", "http" : { @@ -652,15 +681,15 @@ "ActionRequiredCode" : { "shape" : "__string", "locationName" : "actionRequiredCode", - "documentation" : "

The code you can use to resolve your broker issue when the broker is in a CRITICAL_ACTION_REQUIRED state. You can find instructions by choosing the link for your code from the list of action required codes in Amazon MQ action required codes. Each code references a topic with detailed information, instructions, and recommendations for how to resolve the issue and prevent future occurrences.

" + "documentation" : "

The code you can use to find instructions on the action required to resolve your broker issue.

" }, "ActionRequiredInfo" : { "shape" : "__string", "locationName" : "actionRequiredInfo", - "documentation" : "

Information about the action required to resolve your broker issue when the broker is in a CRITICAL_ACTION_REQUIRED state.

" + "documentation" : "

Information about the action required to resolve your broker issue.

" } }, - "documentation" : "

The action required to resolve a broker issue when the broker is in a CRITICAL_ACTION_REQUIRED state.

" + "documentation" : "

Action required for a broker.

" }, "AuthenticationStrategy" : { "type" : "string", @@ -818,7 +847,7 @@ "BrokerState" : { "type" : "string", "documentation" : "

The broker's status.

", - "enum" : [ "CREATION_IN_PROGRESS", "CREATION_FAILED", "DELETION_IN_PROGRESS", "RUNNING", "REBOOT_IN_PROGRESS", "CRITICAL_ACTION_REQUIRED" ] + "enum" : [ "CREATION_IN_PROGRESS", "CREATION_FAILED", "DELETION_IN_PROGRESS", "RUNNING", "REBOOT_IN_PROGRESS", "CRITICAL_ACTION_REQUIRED", "REPLICA" ] }, "BrokerStorageType" : { "type" : "string", @@ -841,7 +870,7 @@ "BrokerName" : { "shape" : "__string", "locationName" : "brokerName", - "documentation" : "

The broker's name. This value is unique in your AWS account, 1-50 characters long, and containing only letters, numbers, dashes, and underscores, and must not contain white spaces, brackets, wildcard characters, or special characters.

" + "documentation" : "

The broker's name. This value is unique in your Amazon Web Services account, 1-50 characters long, and containing only letters, numbers, dashes, and underscores, and must not contain white spaces, brackets, wildcard characters, or special characters.

" }, "BrokerState" : { "shape" : "BrokerState", @@ -948,7 +977,7 @@ "documentation" : "

The revision number of the configuration.

" } }, - "documentation" : "

A list of information about the configuration.

Does not apply to RabbitMQ brokers.

", + "documentation" : "

A list of information about the configuration.

", "required" : [ "Id" ] }, "ConfigurationRevision" : { @@ -1030,7 +1059,7 @@ "BrokerName" : { "shape" : "__string", "locationName" : "brokerName", - "documentation" : "

Required. The broker's name. This value must be unique in your AWS account, 1-50 characters long, must contain only letters, numbers, dashes, and underscores, and must not contain white spaces, brackets, wildcard characters, or special characters.

" + "documentation" : "

Required. The broker's name. This value must be unique in your Amazon Web Services account, 1-50 characters long, must contain only letters, numbers, dashes, and underscores, and must not contain white spaces, brackets, wildcard characters, or special characters.

Do not add personally identifiable information (PII) or other confidential or sensitive information in broker names. Broker names are accessible to other Amazon Web Services services, including CloudWatch Logs. Broker names are not intended to be used for private or sensitive data.

" }, "Configuration" : { "shape" : "ConfigurationId", @@ -1040,7 +1069,7 @@ "CreatorRequestId" : { "shape" : "__string", "locationName" : "creatorRequestId", - "documentation" : "

The unique ID that the requester receives for the created broker. Amazon MQ passes your ID with the API action. Note: We recommend using a Universally Unique Identifier (UUID) for the creatorRequestId. You may omit the creatorRequestId if your application doesn't require idempotency.

", + "documentation" : "

The unique ID that the requester receives for the created broker. Amazon MQ passes your ID with the API action.

We recommend using a Universally Unique Identifier (UUID) for the creatorRequestId. You may omit the creatorRequestId if your application doesn't require idempotency.

", "idempotencyToken" : true }, "DeploymentMode" : { @@ -1048,10 +1077,20 @@ "locationName" : "deploymentMode", "documentation" : "

Required. The broker's deployment mode.

" }, + "DataReplicationMode" : { + "shape" : "DataReplicationMode", + "locationName" : "dataReplicationMode", + "documentation" : "

Defines whether this broker is a part of a data replication pair.

" + }, + "DataReplicationPrimaryBrokerArn" : { + "shape" : "__string", + "locationName" : "dataReplicationPrimaryBrokerArn", + "documentation" : "

The Amazon Resource Name (ARN) of the primary broker that is used to replicate data from in a data replication pair, and is applied to the replica broker. Must be set when dataReplicationMode is set to CRDR.

" + }, "EncryptionOptions" : { "shape" : "EncryptionOptions", "locationName" : "encryptionOptions", - "documentation" : "

Encryption options for the broker. Does not apply to RabbitMQ brokers.

" + "documentation" : "

Encryption options for the broker.

" }, "EngineType" : { "shape" : "EngineType", @@ -1101,7 +1140,7 @@ "SubnetIds" : { "shape" : "__listOf__string", "locationName" : "subnetIds", - "documentation" : "

The list of groups that define which subnets and IP ranges the broker can use from different Availability Zones. If you specify more than one subnet, the subnets must be in different Availability Zones. Amazon MQ will not be able to create VPC endpoints for your broker with multiple subnets in the same Availability Zone. A SINGLE_INSTANCE deployment requires one subnet (for example, the default subnet). An ACTIVE_STANDBY_MULTI_AZ Amazon MQ for ActiveMQ deployment requires two subnets. A CLUSTER_MULTI_AZ Amazon MQ for RabbitMQ deployment has no subnet requirements when deployed with public accessibility. Deployment without public accessibility requires at least one subnet.

If you specify subnets in a shared VPC for a RabbitMQ broker, the associated VPC to which the specified subnets belong must be owned by your AWS account. Amazon MQ will not be able to create VPC endpoints in VPCs that are not owned by your AWS account.

" + "documentation" : "

The list of groups that define which subnets and IP ranges the broker can use from different Availability Zones. If you specify more than one subnet, the subnets must be in different Availability Zones. Amazon MQ will not be able to create VPC endpoints for your broker with multiple subnets in the same Availability Zone. A SINGLE_INSTANCE deployment requires one subnet (for example, the default subnet). An ACTIVE_STANDBY_MULTI_AZ Amazon MQ for ActiveMQ deployment requires two subnets. A CLUSTER_MULTI_AZ Amazon MQ for RabbitMQ deployment has no subnet requirements when deployed with public accessibility. Deployment without public accessibility requires at least one subnet.

If you specify subnets in a shared VPC for a RabbitMQ broker, the associated VPC to which the specified subnets belong must be owned by your Amazon Web Services account. Amazon MQ will not be able to create VPC endpoints in VPCs that are not owned by your Amazon Web Services account.

" }, "Tags" : { "shape" : "__mapOf__string", @@ -1111,7 +1150,7 @@ "Users" : { "shape" : "__listOfUser", "locationName" : "users", - "documentation" : "

Required. The list of broker users (persons or applications) who can access queues and topics. This value can contain only alphanumeric characters, dashes, periods, underscores, and tildes (- . _ ~). This value must be 2-100 characters long.

Amazon MQ for RabbitMQ

When you create an Amazon MQ for RabbitMQ broker, one and only one administrative user is accepted and created when a broker is first provisioned. All subsequent broker users are created by making RabbitMQ API calls directly to brokers or via the RabbitMQ web console.

" + "documentation" : "

The list of broker users (persons or applications) who can access queues and topics. For Amazon MQ for RabbitMQ brokers, one and only one administrative user is accepted and created when a broker is first provisioned. All subsequent broker users are created by making RabbitMQ API calls directly to brokers or via the RabbitMQ web console.

" } }, "documentation" : "

Creates a broker.

", @@ -1149,7 +1188,7 @@ "BrokerName" : { "shape" : "__string", "locationName" : "brokerName", - "documentation" : "

Required. The broker's name. This value must be unique in your AWS account, 1-50 characters long, must contain only letters, numbers, dashes, and underscores, and must not contain white spaces, brackets, wildcard characters, or special characters.

" + "documentation" : "

Required. The broker's name. This value must be unique in your Amazon Web Services account, 1-50 characters long, must contain only letters, numbers, dashes, and underscores, and must not contain white spaces, brackets, wildcard characters, or special characters.

Do not add personally identifiable information (PII) or other confidential or sensitive information in broker names. Broker names are accessible to other Amazon Web Services services, including CloudWatch Logs. Broker names are not intended to be used for private or sensitive data.

" }, "Configuration" : { "shape" : "ConfigurationId", @@ -1159,7 +1198,7 @@ "CreatorRequestId" : { "shape" : "__string", "locationName" : "creatorRequestId", - "documentation" : "

The unique ID that the requester receives for the created broker. Amazon MQ passes your ID with the API action. Note: We recommend using a Universally Unique Identifier (UUID) for the creatorRequestId. You may omit the creatorRequestId if your application doesn't require idempotency.

", + "documentation" : "

The unique ID that the requester receives for the created broker. Amazon MQ passes your ID with the API action.

We recommend using a Universally Unique Identifier (UUID) for the creatorRequestId. You may omit the creatorRequestId if your application doesn't require idempotency.

", "idempotencyToken" : true }, "DeploymentMode" : { @@ -1170,7 +1209,7 @@ "EncryptionOptions" : { "shape" : "EncryptionOptions", "locationName" : "encryptionOptions", - "documentation" : "

Encryption options for the broker. Does not apply to RabbitMQ brokers.

" + "documentation" : "

Encryption options for the broker.

" }, "EngineType" : { "shape" : "EngineType", @@ -1220,7 +1259,7 @@ "SubnetIds" : { "shape" : "__listOf__string", "locationName" : "subnetIds", - "documentation" : "

The list of groups that define which subnets and IP ranges the broker can use from different Availability Zones. If you specify more than one subnet, the subnets must be in different Availability Zones. Amazon MQ will not be able to create VPC endpoints for your broker with multiple subnets in the same Availability Zone. A SINGLE_INSTANCE deployment requires one subnet (for example, the default subnet). An ACTIVE_STANDBY_MULTI_AZ Amazon MQ for ActiveMQ deployment requires two subnets. A CLUSTER_MULTI_AZ Amazon MQ for RabbitMQ deployment has no subnet requirements when deployed with public accessibility. Deployment without public accessibility requires at least one subnet.

If you specify subnets in a shared VPC for a RabbitMQ broker, the associated VPC to which the specified subnets belong must be owned by your AWS account. Amazon MQ will not be able to create VPC endpoints in VPCs that are not owned by your AWS account.

" + "documentation" : "

The list of groups that define which subnets and IP ranges the broker can use from different Availability Zones. If you specify more than one subnet, the subnets must be in different Availability Zones. Amazon MQ will not be able to create VPC endpoints for your broker with multiple subnets in the same Availability Zone. A SINGLE_INSTANCE deployment requires one subnet (for example, the default subnet). An ACTIVE_STANDBY_MULTI_AZ Amazon MQ for ActiveMQ deployment requires two subnets. A CLUSTER_MULTI_AZ Amazon MQ for RabbitMQ deployment has no subnet requirements when deployed with public accessibility. Deployment without public accessibility requires at least one subnet.

If you specify subnets in a shared VPC for a RabbitMQ broker, the associated VPC to which the specified subnets belong must be owned by your Amazon Web Services account. Amazon MQ will not be able to create VPC endpoints in VPCs that are not owned by your Amazon Web Services account.

" }, "Tags" : { "shape" : "__mapOf__string", @@ -1230,7 +1269,17 @@ "Users" : { "shape" : "__listOfUser", "locationName" : "users", - "documentation" : "

Required. The list of broker users (persons or applications) who can access queues and topics. This value can contain only alphanumeric characters, dashes, periods, underscores, and tildes (- . _ ~). This value must be 2-100 characters long.

Amazon MQ for RabbitMQ

When you create an Amazon MQ for RabbitMQ broker, one and only one administrative user is accepted and created when a broker is first provisioned. All subsequent broker users are created by making RabbitMQ API calls directly to brokers or via the RabbitMQ web console.

" + "documentation" : "

The list of broker users (persons or applications) who can access queues and topics. For Amazon MQ for RabbitMQ brokers, one and only one administrative user is accepted and created when a broker is first provisioned. All subsequent broker users are created by making RabbitMQ API calls directly to brokers or via the RabbitMQ web console.

" + }, + "DataReplicationMode" : { + "shape" : "DataReplicationMode", + "locationName" : "dataReplicationMode", + "documentation" : "

Defines whether this broker is a part of a data replication pair.

" + }, + "DataReplicationPrimaryBrokerArn" : { + "shape" : "__string", + "locationName" : "dataReplicationPrimaryBrokerArn", + "documentation" : "

The Amazon Resource Name (ARN) of the primary broker that is used to replicate data from in a data replication pair, and is applied to the replica broker. Must be set when dataReplicationMode is set to CRDR.

" } }, "documentation" : "

Creates a broker using the specified properties.

", @@ -1422,6 +1471,11 @@ "shape" : "__string", "locationName" : "password", "documentation" : "

Required. The password of the user. This value must be at least 12 characters long, must contain at least 4 unique characters, and must not contain commas, colons, or equal signs (,:=).

" + }, + "ReplicationUser" : { + "shape" : "__boolean", + "locationName" : "replicationUser", + "documentation" : "

Defines if this user is intended for CRDR replication purposes.

" } }, "documentation" : "

Creates a new ActiveMQ user.

", @@ -1456,6 +1510,11 @@ "location" : "uri", "locationName" : "username", "documentation" : "

The username of the ActiveMQ user. This value can contain only alphanumeric characters, dashes, periods, underscores, and tildes (- . _ ~). This value must be 2-100 characters long.

" + }, + "ReplicationUser" : { + "shape" : "__boolean", + "locationName" : "replicationUser", + "documentation" : "

Defines if this user is intended for CRDR replication purposes.

" } }, "documentation" : "

Creates a new ActiveMQ user.

", @@ -1465,6 +1524,45 @@ "type" : "structure", "members" : { } }, + "DataReplicationCounterpart" : { + "type" : "structure", + "members" : { + "BrokerId" : { + "shape" : "__string", + "locationName" : "brokerId", + "documentation" : "

Required. The unique broker id generated by Amazon MQ.

" + }, + "Region" : { + "shape" : "__string", + "locationName" : "region", + "documentation" : "

Required. The region of the broker.

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

Specifies a broker in a data replication pair.

", + "required" : [ "BrokerId", "Region" ] + }, + "DataReplicationMetadataOutput" : { + "type" : "structure", + "members" : { + "DataReplicationCounterpart" : { + "shape" : "DataReplicationCounterpart", + "locationName" : "dataReplicationCounterpart", + "documentation" : "

Describes the replica/primary broker. Only returned if this broker is currently set as a primary or replica in the broker's dataReplicationRole property.

" + }, + "DataReplicationRole" : { + "shape" : "__string", + "locationName" : "dataReplicationRole", + "documentation" : "

Defines the role of this broker in a data replication pair. When a replica broker is promoted to primary, this role is interchanged.

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

The replication details of the data replication-enabled broker. Only returned if dataReplicationMode or pendingDataReplicationMode is set to CRDR.

", + "required" : [ "DataReplicationRole" ] + }, + "DataReplicationMode" : { + "type" : "string", + "documentation" : "

Specifies whether a broker is a part of a data replication pair.

", + "enum" : [ "NONE", "CRDR" ] + }, "DayOfWeek" : { "type" : "string", "enum" : [ "MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY", "SUNDAY" ] @@ -1651,7 +1749,7 @@ "ActionsRequired" : { "shape" : "__listOfActionRequired", "locationName" : "actionsRequired", - "documentation" : "

A list of actions required for a broker.

" + "documentation" : "

Actions required for a broker.

" }, "AuthenticationStrategy" : { "shape" : "AuthenticationStrategy", @@ -1681,7 +1779,7 @@ "BrokerName" : { "shape" : "__string", "locationName" : "brokerName", - "documentation" : "

The broker's name. This value must be unique in your AWS account, 1-50 characters long, must contain only letters, numbers, dashes, and underscores, and must not contain white spaces, brackets, wildcard characters, or special characters.

" + "documentation" : "

The broker's name. This value must be unique in your Amazon Web Services account account, 1-50 characters long, must contain only letters, numbers, dashes, and underscores, and must not contain white spaces, brackets, wildcard characters, or special characters.

" }, "BrokerState" : { "shape" : "BrokerState", @@ -1703,10 +1801,20 @@ "locationName" : "deploymentMode", "documentation" : "

The broker's deployment mode.

" }, + "DataReplicationMetadata" : { + "shape" : "DataReplicationMetadataOutput", + "locationName" : "dataReplicationMetadata", + "documentation" : "

The replication details of the data replication-enabled broker. Only returned if dataReplicationMode is set to CRDR.

" + }, + "DataReplicationMode" : { + "shape" : "DataReplicationMode", + "locationName" : "dataReplicationMode", + "documentation" : "

Describes whether this broker is a part of a data replication pair.

" + }, "EncryptionOptions" : { "shape" : "EncryptionOptions", "locationName" : "encryptionOptions", - "documentation" : "

Encryption options for the broker. Does not apply to RabbitMQ brokers.

" + "documentation" : "

Encryption options for the broker.

" }, "EngineType" : { "shape" : "EngineType", @@ -1743,6 +1851,16 @@ "locationName" : "pendingAuthenticationStrategy", "documentation" : "

The authentication strategy that will be applied when the broker is rebooted. The default is SIMPLE.

" }, + "PendingDataReplicationMetadata" : { + "shape" : "DataReplicationMetadataOutput", + "locationName" : "pendingDataReplicationMetadata", + "documentation" : "

The pending replication details of the data replication-enabled broker. Only returned if pendingDataReplicationMode is set to CRDR.

" + }, + "PendingDataReplicationMode" : { + "shape" : "DataReplicationMode", + "locationName" : "pendingDataReplicationMode", + "documentation" : "

Describes whether this broker will be a part of a data replication pair after reboot.

" + }, "PendingEngineVersion" : { "shape" : "__string", "locationName" : "pendingEngineVersion", @@ -1815,7 +1933,7 @@ "ActionsRequired" : { "shape" : "__listOfActionRequired", "locationName" : "actionsRequired", - "documentation" : "

A list of actions required for a broker.

" + "documentation" : "

Actions required for a broker.

" }, "AuthenticationStrategy" : { "shape" : "AuthenticationStrategy", @@ -1845,7 +1963,7 @@ "BrokerName" : { "shape" : "__string", "locationName" : "brokerName", - "documentation" : "

The broker's name. This value must be unique in your AWS account, 1-50 characters long, must contain only letters, numbers, dashes, and underscores, and must not contain white spaces, brackets, wildcard characters, or special characters.

" + "documentation" : "

The broker's name. This value must be unique in your Amazon Web Services account account, 1-50 characters long, must contain only letters, numbers, dashes, and underscores, and must not contain white spaces, brackets, wildcard characters, or special characters.

" }, "BrokerState" : { "shape" : "BrokerState", @@ -1870,7 +1988,7 @@ "EncryptionOptions" : { "shape" : "EncryptionOptions", "locationName" : "encryptionOptions", - "documentation" : "

Encryption options for the broker. Does not apply to RabbitMQ brokers.

" + "documentation" : "

Encryption options for the broker.

" }, "EngineType" : { "shape" : "EngineType", @@ -1956,6 +2074,26 @@ "shape" : "__listOfUserSummary", "locationName" : "users", "documentation" : "

The list of all broker usernames for the specified broker.

" + }, + "DataReplicationMetadata" : { + "shape" : "DataReplicationMetadataOutput", + "locationName" : "dataReplicationMetadata", + "documentation" : "

The replication details of the data replication-enabled broker. Only returned if dataReplicationMode is set to CRDR.

" + }, + "DataReplicationMode" : { + "shape" : "DataReplicationMode", + "locationName" : "dataReplicationMode", + "documentation" : "

Describes whether this broker is a part of a data replication pair.

" + }, + "PendingDataReplicationMetadata" : { + "shape" : "DataReplicationMetadataOutput", + "locationName" : "pendingDataReplicationMetadata", + "documentation" : "

The pending replication details of the data replication-enabled broker. Only returned if pendingDataReplicationMode is set to CRDR.

" + }, + "PendingDataReplicationMode" : { + "shape" : "DataReplicationMode", + "locationName" : "pendingDataReplicationMode", + "documentation" : "

Describes whether this broker will be a part of a data replication pair after reboot.

" } } }, @@ -2042,7 +2180,7 @@ "Data" : { "shape" : "__string", "locationName" : "data", - "documentation" : "

Required. The base64-encoded XML configuration.

" + "documentation" : "

Amazon MQ for ActiveMQ: the base64-encoded XML configuration. Amazon MQ for RabbitMQ: base64-encoded Cuttlefish.

" }, "Description" : { "shape" : "__string", @@ -2087,7 +2225,7 @@ "Data" : { "shape" : "__string", "locationName" : "data", - "documentation" : "

Required. The base64-encoded XML configuration.

" + "documentation" : "

Amazon MQ for ActiveMQ: the base64-encoded XML configuration. Amazon MQ for RabbitMQ: base64-encoded Cuttlefish.

" }, "Description" : { "shape" : "__string", @@ -2119,6 +2257,11 @@ "locationName" : "pending", "documentation" : "

The status of the changes pending for the ActiveMQ user.

" }, + "ReplicationUser" : { + "shape" : "__boolean", + "locationName" : "replicationUser", + "documentation" : "

Describes whether the user is intended for data replication

" + }, "Username" : { "shape" : "__string", "locationName" : "username", @@ -2173,6 +2316,11 @@ "shape" : "__string", "locationName" : "username", "documentation" : "

Required. The username of the ActiveMQ user. This value can contain only alphanumeric characters, dashes, periods, underscores, and tildes (- . _ ~). This value must be 2-100 characters long.

" + }, + "ReplicationUser" : { + "shape" : "__boolean", + "locationName" : "replicationUser", + "documentation" : "

Describes whether the user is intended for data replication

" } } }, @@ -2182,15 +2330,15 @@ "KmsKeyId" : { "shape" : "__string", "locationName" : "kmsKeyId", - "documentation" : "

The customer master key (CMK) to use for the AWS Key Management Service (KMS). This key is used to encrypt your data at rest. If not provided, Amazon MQ will use a default CMK to encrypt your data.

" + "documentation" : "

The customer master key (CMK) to use for the A KMS (KMS). This key is used to encrypt your data at rest. If not provided, Amazon MQ will use a default CMK to encrypt your data.

" }, "UseAwsOwnedKey" : { "shape" : "__boolean", "locationName" : "useAwsOwnedKey", - "documentation" : "

Enables the use of an AWS owned CMK using AWS Key Management Service (KMS). Set to true by default, if no value is provided, for example, for RabbitMQ brokers.

" + "documentation" : "

Enables the use of an Amazon Web Services owned CMK using KMS (KMS). Set to true by default, if no value is provided, for example, for RabbitMQ brokers.

" } }, - "documentation" : "

Does not apply to RabbitMQ brokers.

Encryption options for the broker.

", + "documentation" : "

Encryption options for the broker.

", "required" : [ "UseAwsOwnedKey" ] }, "EngineType" : { @@ -2271,7 +2419,7 @@ "Hosts" : { "shape" : "__listOf__string", "locationName" : "hosts", - "documentation" : "

Specifies the location of the LDAP server such as AWS Directory Service for Microsoft Active Directory . Optional failover server.

" + "documentation" : "

Specifies the location of the LDAP server such as Directory Service for Microsoft Active Directory. Optional failover server.

" }, "RoleBase" : { "shape" : "__string", @@ -2333,7 +2481,7 @@ "Hosts" : { "shape" : "__listOf__string", "locationName" : "hosts", - "documentation" : "

Specifies the location of the LDAP server such as AWS Directory Service for Microsoft Active Directory . Optional failover server.

" + "documentation" : "

Specifies the location of the LDAP server such as Directory Service for Microsoft Active Directory. Optional failover server.

" }, "RoleBase" : { "shape" : "__string", @@ -2397,7 +2545,8 @@ "locationName" : "nextToken", "documentation" : "

The token that specifies the next page of results Amazon MQ should return. To request the first page, leave nextToken empty.

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

A list of information about all brokers.

" }, "ListBrokersRequest" : { "type" : "structure", @@ -2751,6 +2900,62 @@ }, "documentation" : "

The list of information about logs to be enabled for the specified broker.

" }, + "PromoteInput" : { + "type" : "structure", + "members" : { + "Mode" : { + "shape" : "PromoteMode", + "locationName" : "mode", + "documentation" : "

The Promote mode requested. Note: Valid values for the parameter are SWITCHOVER, FAILOVER.

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

Creates a Promote request with the properties specified.

", + "required" : [ "Mode" ] + }, + "PromoteMode" : { + "type" : "string", + "documentation" : "

The Promote mode requested.

", + "enum" : [ "SWITCHOVER", "FAILOVER" ] + }, + "PromoteOutput" : { + "type" : "structure", + "members" : { + "BrokerId" : { + "shape" : "__string", + "locationName" : "brokerId", + "documentation" : "

The unique ID that Amazon MQ generates for the broker.

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

Returns information about the updated broker.

" + }, + "PromoteRequest" : { + "type" : "structure", + "members" : { + "BrokerId" : { + "shape" : "__string", + "location" : "uri", + "locationName" : "broker-id", + "documentation" : "

The unique ID that Amazon MQ generates for the broker.

" + }, + "Mode" : { + "shape" : "PromoteMode", + "locationName" : "mode", + "documentation" : "

The Promote mode requested. Note: Valid values for the parameter are SWITCHOVER, FAILOVER.

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

Promotes a data replication replica broker to the primary broker role.

", + "required" : [ "BrokerId", "Mode" ] + }, + "PromoteResponse" : { + "type" : "structure", + "members" : { + "BrokerId" : { + "shape" : "__string", + "locationName" : "brokerId", + "documentation" : "

The unique ID that Amazon MQ generates for the broker.

" + } + } + }, "RebootBrokerRequest" : { "type" : "structure", "members" : { @@ -2773,25 +2978,25 @@ "AttributeName" : { "shape" : "__string", "locationName" : "attributeName", - "documentation" : "

The name of the XML attribute that has been sanitized.

" + "documentation" : "

The name of the configuration attribute that has been sanitized.

" }, "ElementName" : { "shape" : "__string", "locationName" : "elementName", - "documentation" : "

The name of the XML element that has been sanitized.

" + "documentation" : "

The name of the configuration element that has been sanitized.

" }, "Reason" : { "shape" : "SanitizationWarningReason", "locationName" : "reason", - "documentation" : "

Required. The reason for which the XML elements or attributes were sanitized.

" + "documentation" : "

The reason for which the configuration elements or attributes were sanitized.

" } }, - "documentation" : "

Returns information about the XML element or attribute that was sanitized in the configuration.

", + "documentation" : "

Returns information about the configuration element or attribute that was sanitized in the configuration.

", "required" : [ "Reason" ] }, "SanitizationWarningReason" : { "type" : "string", - "documentation" : "

The reason for which the XML elements or attributes were sanitized.

", + "documentation" : "

The reason for which the configuration elements or attributes were sanitized.

", "enum" : [ "DISALLOWED_ELEMENT_REMOVED", "DISALLOWED_ATTRIBUTE_REMOVED", "INVALID_ATTRIBUTE_VALUE_REMOVED" ] }, "Tags" : { @@ -2843,6 +3048,11 @@ "locationName" : "configuration", "documentation" : "

A list of information about the configuration.

" }, + "DataReplicationMode" : { + "shape" : "DataReplicationMode", + "locationName" : "dataReplicationMode", + "documentation" : "

Defines whether this broker is a part of a data replication pair.

" + }, "EngineVersion" : { "shape" : "__string", "locationName" : "engineVersion", @@ -2899,6 +3109,16 @@ "locationName" : "configuration", "documentation" : "

The ID of the updated configuration.

" }, + "DataReplicationMetadata" : { + "shape" : "DataReplicationMetadataOutput", + "locationName" : "dataReplicationMetadata", + "documentation" : "

The replication details of the data replication-enabled broker. Only returned if dataReplicationMode is set to CRDR.

" + }, + "DataReplicationMode" : { + "shape" : "DataReplicationMode", + "locationName" : "dataReplicationMode", + "documentation" : "

Describes whether this broker is a part of a data replication pair.

" + }, "EngineVersion" : { "shape" : "__string", "locationName" : "engineVersion", @@ -2924,6 +3144,16 @@ "locationName" : "maintenanceWindowStartTime", "documentation" : "

The parameters that determine the WeeklyStartTime.

" }, + "PendingDataReplicationMetadata" : { + "shape" : "DataReplicationMetadataOutput", + "locationName" : "pendingDataReplicationMetadata", + "documentation" : "

The pending replication details of the data replication-enabled broker. Only returned if pendingDataReplicationMode is set to CRDR.

" + }, + "PendingDataReplicationMode" : { + "shape" : "DataReplicationMode", + "locationName" : "pendingDataReplicationMode", + "documentation" : "

Describes whether this broker will be a part of a data replication pair after reboot.

" + }, "SecurityGroups" : { "shape" : "__listOf__string", "locationName" : "securityGroups", @@ -2986,6 +3216,11 @@ "shape" : "__listOf__string", "locationName" : "securityGroups", "documentation" : "

The list of security groups (1 minimum, 5 maximum) that authorizes connections to brokers.

" + }, + "DataReplicationMode" : { + "shape" : "DataReplicationMode", + "locationName" : "dataReplicationMode", + "documentation" : "

Defines whether this broker is a part of a data replication pair.

" } }, "documentation" : "

Updates the broker using the specified properties.

", @@ -3043,6 +3278,26 @@ "shape" : "__listOf__string", "locationName" : "securityGroups", "documentation" : "

The list of security groups (1 minimum, 5 maximum) that authorizes connections to brokers.

" + }, + "DataReplicationMetadata" : { + "shape" : "DataReplicationMetadataOutput", + "locationName" : "dataReplicationMetadata", + "documentation" : "

The replication details of the data replication-enabled broker. Only returned if dataReplicationMode is set to CRDR.

" + }, + "DataReplicationMode" : { + "shape" : "DataReplicationMode", + "locationName" : "dataReplicationMode", + "documentation" : "

Describes whether this broker is a part of a data replication pair.

" + }, + "PendingDataReplicationMetadata" : { + "shape" : "DataReplicationMetadataOutput", + "locationName" : "pendingDataReplicationMetadata", + "documentation" : "

The pending replication details of the data replication-enabled broker. Only returned if pendingDataReplicationMode is set to CRDR.

" + }, + "PendingDataReplicationMode" : { + "shape" : "DataReplicationMode", + "locationName" : "pendingDataReplicationMode", + "documentation" : "

Describes whether this broker will be a part of a data replication pair after reboot.

" } } }, @@ -3052,7 +3307,7 @@ "Data" : { "shape" : "__string", "locationName" : "data", - "documentation" : "

Required. The base64-encoded XML configuration.

" + "documentation" : "

Amazon MQ for Active MQ: The base64-encoded XML configuration. Amazon MQ for RabbitMQ: the base64-encoded Cuttlefish configuration.

" }, "Description" : { "shape" : "__string", @@ -3069,7 +3324,7 @@ "Arn" : { "shape" : "__string", "locationName" : "arn", - "documentation" : "

Required. The Amazon Resource Name (ARN) of the configuration.

" + "documentation" : "

The Amazon Resource Name (ARN) of the configuration.

" }, "Created" : { "shape" : "__timestampIso8601", @@ -3079,7 +3334,7 @@ "Id" : { "shape" : "__string", "locationName" : "id", - "documentation" : "

Required. The unique ID that Amazon MQ generates for the configuration.

" + "documentation" : "

The unique ID that Amazon MQ generates for the configuration.

" }, "LatestRevision" : { "shape" : "ConfigurationRevision", @@ -3089,12 +3344,12 @@ "Name" : { "shape" : "__string", "locationName" : "name", - "documentation" : "

Required. The name of the configuration. This value can contain only alphanumeric characters, dashes, periods, underscores, and tildes (- . _ ~). This value must be 1-150 characters long.

" + "documentation" : "

The name of the configuration. This value can contain only alphanumeric characters, dashes, periods, underscores, and tildes (- . _ ~). This value must be 1-150 characters long.

" }, "Warnings" : { "shape" : "__listOfSanitizationWarning", "locationName" : "warnings", - "documentation" : "

The list of the first 20 warnings about the configuration XML elements or attributes that were sanitized.

" + "documentation" : "

The list of the first 20 warnings about the configuration elements or attributes that were sanitized.

" } }, "documentation" : "

Returns information about the updated configuration.

", @@ -3112,7 +3367,7 @@ "Data" : { "shape" : "__string", "locationName" : "data", - "documentation" : "

Required. The base64-encoded XML configuration.

" + "documentation" : "

Amazon MQ for Active MQ: The base64-encoded XML configuration. Amazon MQ for RabbitMQ: the base64-encoded Cuttlefish configuration.

" }, "Description" : { "shape" : "__string", @@ -3129,7 +3384,7 @@ "Arn" : { "shape" : "__string", "locationName" : "arn", - "documentation" : "

Required. The Amazon Resource Name (ARN) of the configuration.

" + "documentation" : "

The Amazon Resource Name (ARN) of the configuration.

" }, "Created" : { "shape" : "__timestampIso8601", @@ -3139,7 +3394,7 @@ "Id" : { "shape" : "__string", "locationName" : "id", - "documentation" : "

Required. The unique ID that Amazon MQ generates for the configuration.

" + "documentation" : "

The unique ID that Amazon MQ generates for the configuration.

" }, "LatestRevision" : { "shape" : "ConfigurationRevision", @@ -3149,12 +3404,12 @@ "Name" : { "shape" : "__string", "locationName" : "name", - "documentation" : "

Required. The name of the configuration. This value can contain only alphanumeric characters, dashes, periods, underscores, and tildes (- . _ ~). This value must be 1-150 characters long.

" + "documentation" : "

The name of the configuration. This value can contain only alphanumeric characters, dashes, periods, underscores, and tildes (- . _ ~). This value must be 1-150 characters long.

" }, "Warnings" : { "shape" : "__listOfSanitizationWarning", "locationName" : "warnings", - "documentation" : "

The list of the first 20 warnings about the configuration XML elements or attributes that were sanitized.

" + "documentation" : "

The list of the first 20 warnings about the configuration elements or attributes that were sanitized.

" } } }, @@ -3175,6 +3430,11 @@ "shape" : "__string", "locationName" : "password", "documentation" : "

The password of the user. This value must be at least 12 characters long, must contain at least 4 unique characters, and must not contain commas, colons, or equal signs (,:=).

" + }, + "ReplicationUser" : { + "shape" : "__boolean", + "locationName" : "replicationUser", + "documentation" : "

Defines whether the user is intended for data replication.

" } }, "documentation" : "

Updates the information for an ActiveMQ user.

" @@ -3208,6 +3468,11 @@ "location" : "uri", "locationName" : "username", "documentation" : "

The username of the ActiveMQ user. This value can contain only alphanumeric characters, dashes, periods, underscores, and tildes (- . _ ~). This value must be 2-100 characters long.

" + }, + "ReplicationUser" : { + "shape" : "__boolean", + "locationName" : "replicationUser", + "documentation" : "

Defines whether the user is intended for data replication.

" } }, "documentation" : "

Updates the information for an ActiveMQ user.

", @@ -3238,10 +3503,15 @@ "Username" : { "shape" : "__string", "locationName" : "username", - "documentation" : "

important>Amazon MQ for ActiveMQ For ActiveMQ brokers, this value can contain only alphanumeric characters, dashes, periods, underscores, and tildes (- . _ ~). This value must be 2-100 characters long.

/important> Amazon MQ for RabbitMQ

For RabbitMQ brokers, this value can contain only alphanumeric characters, dashes, periods, underscores (- . _). This value must not contain a tilde (~) character. Amazon MQ prohibts using guest as a valid usename. This value must be 2-100 characters long.

" + "documentation" : "

The username of the broker user. The following restrictions apply to broker usernames:

Do not add personally identifiable information (PII) or other confidential or sensitive information in broker usernames. Broker usernames are accessible to other Amazon Web Services services, including CloudWatch Logs. Broker usernames are not intended to be used for private or sensitive data.

" + }, + "ReplicationUser" : { + "shape" : "__boolean", + "locationName" : "replicationUser", + "documentation" : "

Defines if this user is intended for CRDR replication purposes.

" } }, - "documentation" : "

A user associated with the broker. For RabbitMQ brokers, one and only one administrative user is accepted and created when a broker is first provisioned. All subsequent broker users are created by making RabbitMQ API calls directly to brokers or via the RabbitMQ web console.

", + "documentation" : "

A user associated with the broker. For Amazon MQ for RabbitMQ brokers, one and only one administrative user is accepted and created when a broker is first provisioned. All subsequent broker users are created by making RabbitMQ API calls directly to brokers or via the RabbitMQ web console.

", "required" : [ "Username", "Password" ] }, "UserPendingChanges" : { @@ -3433,15 +3703,5 @@ "timestampFormat" : "unixTimestamp" } }, - "authorizers" : { - "authorization_strategy" : { - "name" : "authorization_strategy", - "type" : "provided", - "placement" : { - "location" : "header", - "name" : "Authorization" - } - } - }, "documentation" : "

Amazon MQ is a managed message broker service for Apache ActiveMQ and RabbitMQ that makes it easy to set up and operate message brokers in the cloud. A message broker allows software applications and components to communicate using various programming languages, operating systems, and formal messaging protocols.

" } \ No newline at end of file diff --git a/botocore/data/sagemaker/2017-07-24/service-2.json b/botocore/data/sagemaker/2017-07-24/service-2.json index 33d19e91f1..6e60773c5c 100644 --- a/botocore/data/sagemaker/2017-07-24/service-2.json +++ b/botocore/data/sagemaker/2017-07-24/service-2.json @@ -137,7 +137,7 @@ {"shape":"ResourceInUse"}, {"shape":"ResourceLimitExceeded"} ], - "documentation":"

Creates an Autopilot job also referred to as Autopilot experiment or AutoML job.

Find the best-performing model after you run an AutoML job by calling DescribeAutoMLJobV2 (recommended) or DescribeAutoMLJob.

CreateAutoMLJob only accepts tabular input data. We recommend using CreateAutoMLJobV2 for all problem types. CreateAutoMLJobV2 can process the same tabular data as its previous version CreateAutoMLJob, as well as non-tabular data for problem types such as image or text classification.

Find guidelines about how to migrate CreateAutoMLJob to CreateAutoMLJobV2 in Migrate a CreateAutoMLJob to CreateAutoMLJobV2.

" + "documentation":"

Creates an Autopilot job also referred to as Autopilot experiment or AutoML job.

We recommend using the new versions CreateAutoMLJobV2 and DescribeAutoMLJobV2, which offer backward compatibility.

CreateAutoMLJobV2 can manage tabular problem types identical to those of its previous version CreateAutoMLJob, as well as non-tabular problem types such as image or text classification.

Find guidelines about how to migrate a CreateAutoMLJob to CreateAutoMLJobV2 in Migrate a CreateAutoMLJob to CreateAutoMLJobV2.

You can find the best-performing model after you run an AutoML job by calling DescribeAutoMLJobV2 (recommended) or DescribeAutoMLJob.

" }, "CreateAutoMLJobV2":{ "name":"CreateAutoMLJobV2", @@ -151,7 +151,7 @@ {"shape":"ResourceInUse"}, {"shape":"ResourceLimitExceeded"} ], - "documentation":"

Creates an Autopilot job also referred to as Autopilot experiment or AutoML job V2.

We recommend using CreateAutoMLJobV2 for all problem types. CreateAutoMLJobV2 can process the same tabular data as its previous version CreateAutoMLJob, as well as non-tabular data for problem types such as image or text classification.

Find guidelines about how to migrate CreateAutoMLJob to CreateAutoMLJobV2 in Migrate a CreateAutoMLJob to CreateAutoMLJobV2.

For the list of available problem types supported by CreateAutoMLJobV2, see AutoMLProblemTypeConfig.

Find the best-performing model after you run an AutoML job V2 by calling DescribeAutoMLJobV2. Calling DescribeAutoMLJob on a AutoML job V2 results in an error.

" + "documentation":"

Creates an Autopilot job also referred to as Autopilot experiment or AutoML job V2.

CreateAutoMLJobV2 and DescribeAutoMLJobV2 are new versions of CreateAutoMLJob and DescribeAutoMLJob which offer backward compatibility.

CreateAutoMLJobV2 can manage tabular problem types identical to those of its previous version CreateAutoMLJob, as well as non-tabular problem types such as image or text classification.

Find guidelines about how to migrate a CreateAutoMLJob to CreateAutoMLJobV2 in Migrate a CreateAutoMLJob to CreateAutoMLJobV2.

For the list of available problem types supported by CreateAutoMLJobV2, see AutoMLProblemTypeConfig.

You can find the best-performing model after you run an AutoML job V2 by calling DescribeAutoMLJobV2.

" }, "CreateCodeRepository":{ "name":"CreateCodeRepository", @@ -1406,7 +1406,7 @@ "errors":[ {"shape":"ResourceNotFound"} ], - "documentation":"

Returns information about an AutoML job created by calling CreateAutoMLJob.

" + "documentation":"

Returns information about an AutoML job created by calling CreateAutoMLJob.

AutoML jobs created by calling CreateAutoMLJobV2 cannot be described by DescribeAutoMLJob.

" }, "DescribeAutoMLJobV2":{ "name":"DescribeAutoMLJobV2", @@ -1419,7 +1419,7 @@ "errors":[ {"shape":"ResourceNotFound"} ], - "documentation":"

Returns information about an AutoML job V2 created by calling CreateAutoMLJobV2.

" + "documentation":"

Returns information about an AutoML job created by calling CreateAutoMLJobV2 or CreateAutoMLJob.

" }, "DescribeCodeRepository":{ "name":"DescribeCodeRepository", @@ -6777,6 +6777,10 @@ "MultiModelConfig":{ "shape":"MultiModelConfig", "documentation":"

Specifies additional configuration for multi-model endpoints.

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

Specifies the location of ML model data to deploy.

Currently you cannot use ModelDataSource in conjuction with SageMaker batch transform, SageMaker serverless endpoints, SageMaker multi-model endpoints, and SageMaker Marketplace.

" } }, "documentation":"

Describes the container, as part of model definition.

" @@ -7249,7 +7253,7 @@ }, "AutoMLJobInputDataConfig":{ "shape":"AutoMLJobInputDataConfig", - "documentation":"

An array of channel objects describing the input data and their location. Each channel is a named input source. Similar to InputDataConfig supported by CreateAutoMLJob. The supported formats depend on the problem type:

" + "documentation":"

An array of channel objects describing the input data and their location. Each channel is a named input source. Similar to the InputDataConfig attribute in the CreateAutoMLJob input parameters. The supported formats depend on the problem type:

" }, "OutputDataConfig":{ "shape":"AutoMLOutputDataConfig", @@ -7257,7 +7261,7 @@ }, "AutoMLProblemTypeConfig":{ "shape":"AutoMLProblemTypeConfig", - "documentation":"

Defines the configuration settings of one of the supported problem types.

For tabular problem types, you must either specify the type of supervised learning problem in AutoMLProblemTypeConfig (TabularJobConfig.ProblemType) and provide the AutoMLJobObjective, or none at all.

" + "documentation":"

Defines the configuration settings of one of the supported problem types.

" }, "RoleArn":{ "shape":"RoleArn", @@ -7273,7 +7277,7 @@ }, "AutoMLJobObjective":{ "shape":"AutoMLJobObjective", - "documentation":"

Specifies a metric to minimize or maximize as the objective of a job. If not specified, the default objective metric depends on the problem type. For the list of default values per problem type, see AutoMLJobObjective.

For tabular problem types, you must either provide the AutoMLJobObjective and indicate the type of supervised learning problem in AutoMLProblemTypeConfig (TabularJobConfig.ProblemType), or none.

" + "documentation":"

Specifies a metric to minimize or maximize as the objective of a job. If not specified, the default objective metric depends on the problem type. For the list of default values per problem type, see AutoMLJobObjective.

For tabular problem types, you must either provide both the AutoMLJobObjective and indicate the type of supervised learning problem in AutoMLProblemTypeConfig (TabularJobConfig.ProblemType), or none at all.

" }, "ModelDeployConfig":{ "shape":"ModelDeployConfig", @@ -24054,6 +24058,13 @@ }, "documentation":"

Configures the timeout and maximum number of retries for processing a transform job invocation.

" }, + "ModelCompressionType":{ + "type":"string", + "enum":[ + "None", + "Gzip" + ] + }, "ModelConfiguration":{ "type":"structure", "members":{ @@ -24252,6 +24263,17 @@ }, "documentation":"

Data quality constraints and statistics for a model.

" }, + "ModelDataSource":{ + "type":"structure", + "required":["S3DataSource"], + "members":{ + "S3DataSource":{ + "shape":"S3ModelDataSource", + "documentation":"

Specifies the S3 location of ML model data to deploy.

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

Specifies the location of ML model data to deploy. If specified, you must specify one and only one of the available data sources.

" + }, "ModelDeployConfig":{ "type":"structure", "members":{ @@ -26440,6 +26462,13 @@ "Descending" ] }, + "OutputCompressionType":{ + "type":"string", + "enum":[ + "GZIP", + "NONE" + ] + }, "OutputConfig":{ "type":"structure", "required":["S3OutputLocation"], @@ -26478,6 +26507,10 @@ "S3OutputPath":{ "shape":"S3Uri", "documentation":"

Identifies the S3 path where you want SageMaker to store the model artifacts. For example, s3://bucket-name/key-name-prefix.

" + }, + "CompressionType":{ + "shape":"OutputCompressionType", + "documentation":"

The model output compression type. Select None to output an uncompressed model, recommended for large model outputs. Defaults to gzip.

" } }, "documentation":"

Provides information about how to store model training results (model artifacts).

" @@ -29560,6 +29593,41 @@ "AugmentedManifestFile" ] }, + "S3ModelDataSource":{ + "type":"structure", + "required":[ + "S3Uri", + "S3DataType", + "CompressionType" + ], + "members":{ + "S3Uri":{ + "shape":"S3ModelUri", + "documentation":"

Specifies the S3 path of ML model data to deploy.

" + }, + "S3DataType":{ + "shape":"S3ModelDataType", + "documentation":"

Specifies the type of ML model data to deploy.

If you choose S3Prefix, S3Uri identifies a key name prefix. SageMaker uses all objects that match the specified key name prefix as part of the ML model data to deploy. A valid key name prefix identified by S3Uri always ends with a forward slash (/).

If you choose S3Object, S3Uri identifies an object that is the ML model data to deploy.

" + }, + "CompressionType":{ + "shape":"ModelCompressionType", + "documentation":"

Specifies how the ML model data is prepared.

If you choose Gzip and choose S3Object as the value of S3DataType, S3Uri identifies an object that is a gzip-compressed TAR archive. SageMaker will attempt to decompress and untar the object during model deployment.

If you choose None and chooose S3Object as the value of S3DataType, S3Uri identifies an object that represents an uncompressed ML model to deploy.

If you choose None and choose S3Prefix as the value of S3DataType, S3Uri identifies a key name prefix, under which all objects represents the uncompressed ML model to deploy.

If you choose None, then SageMaker will follow rules below when creating model data files under /opt/ml/model directory for use by your inference code:

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

Specifies the S3 location of ML model data to deploy.

" + }, + "S3ModelDataType":{ + "type":"string", + "enum":[ + "S3Prefix", + "S3Object" + ] + }, + "S3ModelUri":{ + "type":"string", + "max":1024, + "pattern":"^(https|s3)://([^/]+)/?(.*)$" + }, "S3OutputPath":{ "type":"string", "max":1024, @@ -30873,7 +30941,7 @@ }, "ProblemType":{ "shape":"ProblemType", - "documentation":"

The type of supervised learning problem available for the model candidates of the AutoML job V2. For more information, see Amazon SageMaker Autopilot problem types.

" + "documentation":"

The type of supervised learning problem available for the model candidates of the AutoML job V2. For more information, see Amazon SageMaker Autopilot problem types.

You must either specify the type of supervised learning problem in ProblemType and provide the AutoMLJobObjective metric, or none at all.

" }, "TargetAttributeName":{ "shape":"TargetAttributeName", @@ -31339,7 +31407,8 @@ "ml.g5.24xlarge", "ml.g5.48xlarge", "ml.trn1.2xlarge", - "ml.trn1.32xlarge" + "ml.trn1.32xlarge", + "ml.trn1n.32xlarge" ] }, "TrainingInstanceTypes":{ diff --git a/botocore/data/transfer/2018-11-05/service-2.json b/botocore/data/transfer/2018-11-05/service-2.json index 5baaf6a3d7..cf2b8f4ac6 100644 --- a/botocore/data/transfer/2018-11-05/service-2.json +++ b/botocore/data/transfer/2018-11-05/service-2.json @@ -1418,6 +1418,10 @@ "WorkflowDetails":{ "shape":"WorkflowDetails", "documentation":"

Specifies the workflow ID for the workflow to assign and the execution role that's used for executing the workflow.

In addition to a workflow to execute when a file is uploaded completely, WorkflowDetails can also contain a workflow ID (and execution role) for a workflow to execute on partial upload. A partial upload occurs when the server session disconnects while the file is still being uploaded.

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

Specifies the log groups to which your server logs are sent.

To specify a log group, you must provide the ARN for an existing log group. In this case, the format of the log group is as follows:

arn:aws:logs:region-name:amazon-account-id:log-group:log-group-name:*

For example, arn:aws:logs:us-east-1:111122223333:log-group:mytestgroup:*

If you have previously specified a log group for a server, you can clear it, and in effect turn off structured logging, by providing an empty value for this parameter in an update-server call. For example:

update-server --server-id s-1234567890abcdef0 --structured-log-destinations

" } } }, @@ -2417,6 +2421,10 @@ "WorkflowDetails":{ "shape":"WorkflowDetails", "documentation":"

Specifies the workflow ID for the workflow to assign and the execution role that's used for executing the workflow.

In addition to a workflow to execute when a file is uploaded completely, WorkflowDetails can also contain a workflow ID (and execution role) for a workflow to execute on partial upload. A partial upload occurs when the server session disconnects while the file is still being uploaded.

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

Specifies the log groups to which your server logs are sent.

To specify a log group, you must provide the ARN for an existing log group. In this case, the format of the log group is as follows:

arn:aws:logs:region-name:amazon-account-id:log-group:log-group-name:*

For example, arn:aws:logs:us-east-1:111122223333:log-group:mytestgroup:*

If you have previously specified a log group for a server, you can clear it, and in effect turn off structured logging, by providing an empty value for this parameter in an update-server call. For example:

update-server --server-id s-1234567890abcdef0 --structured-log-destinations

" } }, "documentation":"

Describes the properties of a file transfer protocol-enabled server that was specified.

" @@ -4250,6 +4258,12 @@ } } }, + "StructuredLogDestinations":{ + "type":"list", + "member":{"shape":"Arn"}, + "max":1, + "min":0 + }, "SubnetId":{"type":"string"}, "SubnetIds":{ "type":"list", @@ -4713,6 +4727,10 @@ "WorkflowDetails":{ "shape":"WorkflowDetails", "documentation":"

Specifies the workflow ID for the workflow to assign and the execution role that's used for executing the workflow.

In addition to a workflow to execute when a file is uploaded completely, WorkflowDetails can also contain a workflow ID (and execution role) for a workflow to execute on partial upload. A partial upload occurs when the server session disconnects while the file is still being uploaded.

To remove an associated workflow from a server, you can provide an empty OnUpload object, as in the following example.

aws transfer update-server --server-id s-01234567890abcdef --workflow-details '{\"OnUpload\":[]}'

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

Specifies the log groups to which your server logs are sent.

To specify a log group, you must provide the ARN for an existing log group. In this case, the format of the log group is as follows:

arn:aws:logs:region-name:amazon-account-id:log-group:log-group-name:*

For example, arn:aws:logs:us-east-1:111122223333:log-group:mytestgroup:*

If you have previously specified a log group for a server, you can clear it, and in effect turn off structured logging, by providing an empty value for this parameter in an update-server call. For example:

update-server --server-id s-1234567890abcdef0 --structured-log-destinations

" } } }, diff --git a/docs/source/conf.py b/docs/source/conf.py index 11d3eddff1..7493a4d5c3 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -59,7 +59,7 @@ # The short X.Y version. version = '1.29.1' # The full version, including alpha/beta/rc tags. -release = '1.29.157' +release = '1.29.158' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/tests/functional/endpoint-rules/mq/endpoint-tests-1.json b/tests/functional/endpoint-rules/mq/endpoint-tests-1.json index 857a822e2a..58b22f3c27 100644 --- a/tests/functional/endpoint-rules/mq/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/mq/endpoint-tests-1.json @@ -1,250 +1,120 @@ { "testCases": [ { - "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.ap-south-1.api.aws" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.ap-south-1.amazonaws.com" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.ap-south-1.api.aws" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.ap-south-1.amazonaws.com" - } - }, - "params": { - "Region": "ap-south-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.eu-south-1.api.aws" - } - }, - "params": { - "Region": "eu-south-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.eu-south-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-south-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.eu-south-1.api.aws" - } - }, - "params": { - "Region": "eu-south-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.eu-south-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-south-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.us-gov-east-1.api.aws" - } - }, - "params": { - "Region": "us-gov-east-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.us-gov-east-1.amazonaws.com" - } - }, - "params": { - "Region": "us-gov-east-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.us-gov-east-1.api.aws" + "url": "https://mq.af-south-1.amazonaws.com" } }, "params": { - "Region": "us-gov-east-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "af-south-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.us-gov-east-1.amazonaws.com" + "url": "https://mq.ap-east-1.amazonaws.com" } }, "params": { - "Region": "us-gov-east-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "ap-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region me-central-1 with FIPS enabled and DualStack enabled", + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.me-central-1.api.aws" + "url": "https://mq.ap-northeast-1.amazonaws.com" } }, "params": { - "Region": "me-central-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "ap-northeast-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region me-central-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.me-central-1.amazonaws.com" + "url": "https://mq.ap-northeast-2.amazonaws.com" } }, "params": { - "Region": "me-central-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "ap-northeast-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region me-central-1 with FIPS disabled and DualStack enabled", + "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.me-central-1.api.aws" + "url": "https://mq.ap-northeast-3.amazonaws.com" } }, "params": { - "Region": "me-central-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "ap-northeast-3", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region me-central-1 with FIPS disabled and DualStack disabled", + "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.me-central-1.amazonaws.com" + "url": "https://mq.ap-south-1.amazonaws.com" } }, "params": { - "Region": "me-central-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "ap-south-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.ca-central-1.api.aws" + "url": "https://mq.ap-southeast-1.amazonaws.com" } }, "params": { - "Region": "ca-central-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "ap-southeast-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.ca-central-1.amazonaws.com" + "url": "https://mq.ap-southeast-2.amazonaws.com" } }, "params": { - "Region": "ca-central-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "ap-southeast-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", + "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.ca-central-1.api.aws" + "url": "https://mq.ap-southeast-3.amazonaws.com" } }, "params": { - "Region": "ca-central-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "ap-southeast-3", + "UseFIPS": false, + "UseDualStack": false } }, { @@ -256,47 +126,8 @@ }, "params": { "Region": "ca-central-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.eu-central-1.api.aws" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.eu-central-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.eu-central-1.api.aws" - } - }, - "params": { - "Region": "eu-central-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { @@ -308,1148 +139,420 @@ }, "params": { "Region": "eu-central-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.us-west-1.api.aws" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.us-west-1.amazonaws.com" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.us-west-1.api.aws" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.us-west-1.amazonaws.com" - } - }, - "params": { - "Region": "us-west-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.us-west-2.api.aws" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", + "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.us-west-2.amazonaws.com" + "url": "https://mq.eu-north-1.amazonaws.com" } }, "params": { - "Region": "us-west-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.us-west-2.api.aws" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.us-west-2.amazonaws.com" - } - }, - "params": { - "Region": "us-west-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region af-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.af-south-1.api.aws" - } - }, - "params": { - "Region": "af-south-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region af-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.af-south-1.amazonaws.com" - } - }, - "params": { - "Region": "af-south-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region af-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.af-south-1.api.aws" - } - }, - "params": { - "Region": "af-south-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.af-south-1.amazonaws.com" - } - }, - "params": { - "Region": "af-south-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.eu-north-1.api.aws" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.eu-north-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.eu-north-1.api.aws" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.eu-north-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-north-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.eu-west-3.api.aws" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.eu-west-3.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.eu-west-3.api.aws" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.eu-west-3.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-3", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.eu-west-2.api.aws" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.eu-west-2.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.eu-west-2.api.aws" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.eu-west-2.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.eu-west-1.api.aws" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.eu-west-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.eu-west-1.api.aws" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.eu-west-1.amazonaws.com" - } - }, - "params": { - "Region": "eu-west-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.ap-northeast-3.api.aws" - } - }, - "params": { - "Region": "ap-northeast-3", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.ap-northeast-3.amazonaws.com" - } - }, - "params": { - "Region": "ap-northeast-3", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.ap-northeast-3.api.aws" - } - }, - "params": { - "Region": "ap-northeast-3", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.ap-northeast-3.amazonaws.com" - } - }, - "params": { - "Region": "ap-northeast-3", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.ap-northeast-2.api.aws" - } - }, - "params": { - "Region": "ap-northeast-2", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.ap-northeast-2.amazonaws.com" - } - }, - "params": { - "Region": "ap-northeast-2", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.ap-northeast-2.api.aws" - } - }, - "params": { - "Region": "ap-northeast-2", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.ap-northeast-2.amazonaws.com" - } - }, - "params": { - "Region": "ap-northeast-2", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.ap-northeast-1.api.aws" - } - }, - "params": { - "Region": "ap-northeast-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.ap-northeast-1.amazonaws.com" - } - }, - "params": { - "Region": "ap-northeast-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.ap-northeast-1.api.aws" - } - }, - "params": { - "Region": "ap-northeast-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.ap-northeast-1.amazonaws.com" - } - }, - "params": { - "Region": "ap-northeast-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region me-south-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.me-south-1.api.aws" - } - }, - "params": { - "Region": "me-south-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region me-south-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.me-south-1.amazonaws.com" - } - }, - "params": { - "Region": "me-south-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region me-south-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.me-south-1.api.aws" - } - }, - "params": { - "Region": "me-south-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.me-south-1.amazonaws.com" - } - }, - "params": { - "Region": "me-south-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.sa-east-1.api.aws" - } - }, - "params": { - "Region": "sa-east-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.sa-east-1.amazonaws.com" - } - }, - "params": { - "Region": "sa-east-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.sa-east-1.api.aws" - } - }, - "params": { - "Region": "sa-east-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.sa-east-1.amazonaws.com" - } - }, - "params": { - "Region": "sa-east-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.ap-east-1.api.aws" - } - }, - "params": { - "Region": "ap-east-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-east-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.ap-east-1.amazonaws.com" - } - }, - "params": { - "Region": "ap-east-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region ap-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.ap-east-1.api.aws" - } - }, - "params": { - "Region": "ap-east-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.ap-east-1.amazonaws.com" - } - }, - "params": { - "Region": "ap-east-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.cn-north-1.api.amazonwebservices.com.cn" - } - }, - "params": { - "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": true - } - }, - { - "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.cn-north-1.amazonaws.com.cn" - } - }, - "params": { - "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": true - } - }, - { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq.cn-north-1.api.amazonwebservices.com.cn" - } - }, - "params": { - "Region": "cn-north-1", - "UseDualStack": true, - "UseFIPS": false - } - }, - { - "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://mq.cn-north-1.amazonaws.com.cn" - } - }, - "params": { - "Region": "cn-north-1", - "UseDualStack": false, - "UseFIPS": false - } - }, - { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://mq-fips.us-gov-west-1.api.aws" - } - }, - "params": { - "Region": "us-gov-west-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "eu-north-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", + "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.us-gov-west-1.amazonaws.com" + "url": "https://mq.eu-south-1.amazonaws.com" } }, "params": { - "Region": "us-gov-west-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "eu-south-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled", + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.us-gov-west-1.api.aws" + "url": "https://mq.eu-west-1.amazonaws.com" } }, "params": { - "Region": "us-gov-west-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "eu-west-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.us-gov-west-1.amazonaws.com" + "url": "https://mq.eu-west-2.amazonaws.com" } }, "params": { - "Region": "us-gov-west-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "eu-west-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.ap-southeast-1.api.aws" + "url": "https://mq.eu-west-3.amazonaws.com" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "eu-west-3", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.ap-southeast-1.amazonaws.com" + "url": "https://mq.me-south-1.amazonaws.com" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "me-south-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.ap-southeast-1.api.aws" + "url": "https://mq.sa-east-1.amazonaws.com" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "sa-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.ap-southeast-1.amazonaws.com" + "url": "https://mq.us-east-1.amazonaws.com" } }, "params": { - "Region": "ap-southeast-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.ap-southeast-2.api.aws" + "url": "https://mq-fips.us-east-1.amazonaws.com" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.ap-southeast-2.amazonaws.com" + "url": "https://mq.us-east-2.amazonaws.com" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-east-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.ap-southeast-2.api.aws" + "url": "https://mq-fips.us-east-2.amazonaws.com" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-east-2", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.ap-southeast-2.amazonaws.com" + "url": "https://mq.us-west-1.amazonaws.com" } }, "params": { - "Region": "ap-southeast-2", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-west-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", "expect": { - "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + "endpoint": { + "url": "https://mq-fips.us-west-1.amazonaws.com" + } }, "params": { - "Region": "us-iso-east-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-west-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.us-iso-east-1.c2s.ic.gov" + "url": "https://mq.us-west-2.amazonaws.com" } }, "params": { - "Region": "us-iso-east-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-west-2", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", "expect": { - "error": "DualStack is enabled but this partition does not support DualStack" + "endpoint": { + "url": "https://mq-fips.us-west-2.amazonaws.com" + } }, "params": { - "Region": "us-iso-east-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-west-2", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://mq.us-iso-east-1.c2s.ic.gov" + "url": "https://mq-fips.us-east-1.api.aws" } }, "params": { - "Region": "us-iso-east-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack enabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://mq-fips.ap-southeast-3.api.aws" + "url": "https://mq.us-east-1.api.aws" } }, "params": { - "Region": "ap-southeast-3", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.ap-southeast-3.amazonaws.com" + "url": "https://mq.cn-north-1.amazonaws.com.cn" } }, "params": { - "Region": "ap-southeast-3", - "UseDualStack": false, - "UseFIPS": true + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack enabled", + "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.ap-southeast-3.api.aws" + "url": "https://mq.cn-northwest-1.amazonaws.com.cn" } }, "params": { - "Region": "ap-southeast-3", - "UseDualStack": true, - "UseFIPS": false + "Region": "cn-northwest-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://mq.ap-southeast-3.amazonaws.com" + "url": "https://mq-fips.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "Region": "ap-southeast-3", - "UseDualStack": false, - "UseFIPS": false + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.us-east-1.api.aws" + "url": "https://mq-fips.cn-north-1.amazonaws.com.cn" } }, "params": { - "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://mq-fips.us-east-1.amazonaws.com" + "url": "https://mq.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { - "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.us-east-1.api.aws" + "url": "https://mq.us-gov-east-1.amazonaws.com" } }, "params": { - "Region": "us-east-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.us-east-1.amazonaws.com" + "url": "https://mq-fips.us-gov-east-1.amazonaws.com" } }, "params": { - "Region": "us-east-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.us-east-2.api.aws" + "url": "https://mq.us-gov-west-1.amazonaws.com" } }, "params": { - "Region": "us-east-2", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-gov-west-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.us-east-2.amazonaws.com" + "url": "https://mq-fips.us-gov-west-1.amazonaws.com" } }, "params": { - "Region": "us-east-2", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-gov-west-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://mq.us-east-2.api.aws" + "url": "https://mq-fips.us-gov-east-1.api.aws" } }, "params": { - "Region": "us-east-2", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://mq.us-east-2.amazonaws.com" + "url": "https://mq.us-gov-east-1.api.aws" } }, "params": { - "Region": "us-east-2", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://mq-fips.cn-northwest-1.api.amazonwebservices.com.cn" - } + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "cn-northwest-1", - "UseDualStack": true, - "UseFIPS": true + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": true } }, { - "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq-fips.cn-northwest-1.amazonaws.com.cn" + "url": "https://mq-fips.us-iso-east-1.c2s.ic.gov" } }, "params": { - "Region": "cn-northwest-1", - "UseDualStack": false, - "UseFIPS": true + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": false } }, { - "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://mq.cn-northwest-1.api.amazonwebservices.com.cn" - } + "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "cn-northwest-1", - "UseDualStack": true, - "UseFIPS": false + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://mq.cn-northwest-1.amazonaws.com.cn" + "url": "https://mq.us-iso-east-1.c2s.ic.gov" } }, "params": { - "Region": "cn-northwest-1", - "UseDualStack": false, - "UseFIPS": false + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { @@ -1459,8 +562,8 @@ }, "params": { "Region": "us-isob-east-1", - "UseDualStack": true, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": true } }, { @@ -1472,8 +575,8 @@ }, "params": { "Region": "us-isob-east-1", - "UseDualStack": false, - "UseFIPS": true + "UseFIPS": true, + "UseDualStack": false } }, { @@ -1483,8 +586,8 @@ }, "params": { "Region": "us-isob-east-1", - "UseDualStack": true, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": true } }, { @@ -1496,12 +599,12 @@ }, "params": { "Region": "us-isob-east-1", - "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", "expect": { "endpoint": { "url": "https://example.com" @@ -1509,8 +612,21 @@ }, "params": { "Region": "us-east-1", + "UseFIPS": false, "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { "UseFIPS": false, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -1521,8 +637,8 @@ }, "params": { "Region": "us-east-1", - "UseDualStack": false, "UseFIPS": true, + "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -1533,10 +649,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"