diff --git a/.changes/1.35.4.json b/.changes/1.35.4.json new file mode 100644 index 0000000000..92bc4cf3c7 --- /dev/null +++ b/.changes/1.35.4.json @@ -0,0 +1,32 @@ +[ + { + "category": "``autoscaling``", + "description": "Amazon EC2 Auto Scaling now provides EBS health check to manage EC2 instance replacement", + "type": "api-change" + }, + { + "category": "``bedrock``", + "description": "Amazon Bedrock Evaluation BatchDeleteEvaluationJob API allows customers to delete evaluation jobs under terminated evaluation job statuses - Stopped, Failed, or Completed. Customers can submit a batch of 25 evaluation jobs to be deleted at once.", + "type": "api-change" + }, + { + "category": "``emr-containers``", + "description": "Correct endpoint for FIPS is configured for US Gov Regions.", + "type": "api-change" + }, + { + "category": "``inspector2``", + "description": "Add enums for Agentless scan statuses and EC2 enablement error states", + "type": "api-change" + }, + { + "category": "``quicksight``", + "description": "Explicit query for authors and dashboard viewing sharing for embedded users", + "type": "api-change" + }, + { + "category": "``route53``", + "description": "Amazon Route 53 now supports the Asia Pacific (Malaysia) Region (ap-southeast-5) for latency records, geoproximity records, and private DNS for Amazon VPCs in that region.", + "type": "api-change" + } +] \ No newline at end of file diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a8c90c9573..67d407f895 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,17 @@ CHANGELOG ========= +1.35.4 +====== + +* api-change:``autoscaling``: Amazon EC2 Auto Scaling now provides EBS health check to manage EC2 instance replacement +* api-change:``bedrock``: Amazon Bedrock Evaluation BatchDeleteEvaluationJob API allows customers to delete evaluation jobs under terminated evaluation job statuses - Stopped, Failed, or Completed. Customers can submit a batch of 25 evaluation jobs to be deleted at once. +* api-change:``emr-containers``: Correct endpoint for FIPS is configured for US Gov Regions. +* api-change:``inspector2``: Add enums for Agentless scan statuses and EC2 enablement error states +* api-change:``quicksight``: Explicit query for authors and dashboard viewing sharing for embedded users +* api-change:``route53``: Amazon Route 53 now supports the Asia Pacific (Malaysia) Region (ap-southeast-5) for latency records, geoproximity records, and private DNS for Amazon VPCs in that region. + + 1.35.3 ====== diff --git a/botocore/__init__.py b/botocore/__init__.py index c5ecff85cd..2a57a66240 100644 --- a/botocore/__init__.py +++ b/botocore/__init__.py @@ -16,7 +16,7 @@ import os import re -__version__ = '1.35.3' +__version__ = '1.35.4' class NullHandler(logging.Handler): diff --git a/botocore/data/autoscaling/2011-01-01/service-2.json b/botocore/data/autoscaling/2011-01-01/service-2.json index 423d48a1ef..d9b4c75eec 100644 --- a/botocore/data/autoscaling/2011-01-01/service-2.json +++ b/botocore/data/autoscaling/2011-01-01/service-2.json @@ -945,7 +945,7 @@ "errors":[ {"shape":"ResourceContentionFault"} ], - "documentation":"

Sets the health status of the specified instance.

For more information, see Health checks for instances in an Auto Scaling group in the Amazon EC2 Auto Scaling User Guide.

" + "documentation":"

Sets the health status of the specified instance.

For more information, see Set up a custom health check for your Auto Scaling group in the Amazon EC2 Auto Scaling User Guide.

" }, "SetInstanceProtection":{ "name":"SetInstanceProtection", @@ -1945,7 +1945,7 @@ }, "HealthCheckType":{ "shape":"XmlStringMaxLen32", - "documentation":"

A comma-separated value string of one or more health check types.

The valid values are EC2, ELB, and VPC_LATTICE. EC2 is the default health check and cannot be disabled. For more information, see Health checks for instances in an Auto Scaling group in the Amazon EC2 Auto Scaling User Guide.

Only specify EC2 if you must clear a value that was previously set.

" + "documentation":"

A comma-separated value string of one or more health check types.

The valid values are EC2, EBS, ELB, and VPC_LATTICE. EC2 is the default health check and cannot be disabled. For more information, see Health checks for instances in an Auto Scaling group in the Amazon EC2 Auto Scaling User Guide.

Only specify EC2 if you must clear a value that was previously set.

" }, "HealthCheckGracePeriod":{ "shape":"HealthCheckGracePeriod", @@ -5598,7 +5598,7 @@ }, "HealthCheckType":{ "shape":"XmlStringMaxLen32", - "documentation":"

A comma-separated value string of one or more health check types.

The valid values are EC2, ELB, and VPC_LATTICE. EC2 is the default health check and cannot be disabled. For more information, see Health checks for instances in an Auto Scaling group in the Amazon EC2 Auto Scaling User Guide.

Only specify EC2 if you must clear a value that was previously set.

" + "documentation":"

A comma-separated value string of one or more health check types.

The valid values are EC2, EBS, ELB, and VPC_LATTICE. EC2 is the default health check and cannot be disabled. For more information, see Health checks for instances in an Auto Scaling group in the Amazon EC2 Auto Scaling User Guide.

Only specify EC2 if you must clear a value that was previously set.

" }, "HealthCheckGracePeriod":{ "shape":"HealthCheckGracePeriod", diff --git a/botocore/data/bedrock/2023-04-20/paginators-1.json b/botocore/data/bedrock/2023-04-20/paginators-1.json index edf5de8958..d6c0493ba0 100644 --- a/botocore/data/bedrock/2023-04-20/paginators-1.json +++ b/botocore/data/bedrock/2023-04-20/paginators-1.json @@ -41,6 +41,18 @@ "output_token": "nextToken", "limit_key": "maxResults", "result_key": "invocationJobSummaries" + }, + "ListImportedModels": { + "input_token": "nextToken", + "output_token": "nextToken", + "limit_key": "maxResults", + "result_key": "modelSummaries" + }, + "ListModelImportJobs": { + "input_token": "nextToken", + "output_token": "nextToken", + "limit_key": "maxResults", + "result_key": "modelImportJobSummaries" } } } diff --git a/botocore/data/bedrock/2023-04-20/service-2.json b/botocore/data/bedrock/2023-04-20/service-2.json index 4509dc6068..867091cd39 100644 --- a/botocore/data/bedrock/2023-04-20/service-2.json +++ b/botocore/data/bedrock/2023-04-20/service-2.json @@ -13,6 +13,25 @@ "uid":"bedrock-2023-04-20" }, "operations":{ + "BatchDeleteEvaluationJob":{ + "name":"BatchDeleteEvaluationJob", + "http":{ + "method":"POST", + "requestUri":"/evaluation-jobs/batch-delete", + "responseCode":202 + }, + "input":{"shape":"BatchDeleteEvaluationJobRequest"}, + "output":{"shape":"BatchDeleteEvaluationJobResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"ConflictException"}, + {"shape":"InternalServerException"}, + {"shape":"ThrottlingException"} + ], + "documentation":"

Creates a batch deletion job. A model evaluation job can only be deleted if it has following status FAILED, COMPLETED, and STOPPED. You can request up to 25 model evaluation jobs be deleted in a single request.

" + }, "CreateEvaluationJob":{ "name":"CreateEvaluationJob", "http":{ @@ -115,6 +134,28 @@ "documentation":"

Creates a fine-tuning job to customize a base model.

You specify the base foundation model and the location of the training data. After the model-customization job completes successfully, your custom model resource will be ready to use. Amazon Bedrock returns validation loss metrics and output generations after the job completes.

For information on the format of training and validation data, see Prepare the datasets.

Model-customization jobs are asynchronous and the completion time depends on the base model and the training/validation data size. To monitor a job, use the GetModelCustomizationJob operation to retrieve the job status.

For more information, see Custom models in the Amazon Bedrock User Guide.

", "idempotent":true }, + "CreateModelImportJob":{ + "name":"CreateModelImportJob", + "http":{ + "method":"POST", + "requestUri":"/model-import-jobs", + "responseCode":201 + }, + "input":{"shape":"CreateModelImportJobRequest"}, + "output":{"shape":"CreateModelImportJobResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"ConflictException"}, + {"shape":"InternalServerException"}, + {"shape":"TooManyTagsException"}, + {"shape":"ServiceQuotaExceededException"}, + {"shape":"ThrottlingException"} + ], + "documentation":"

Creates a model import job to import model that you have customized in other environments, such as Amazon SageMaker. For more information, see Import a customized model

", + "idempotent":true + }, "CreateModelInvocationJob":{ "name":"CreateModelInvocationJob", "http":{ @@ -197,6 +238,26 @@ "documentation":"

Deletes a guardrail.

", "idempotent":true }, + "DeleteImportedModel":{ + "name":"DeleteImportedModel", + "http":{ + "method":"DELETE", + "requestUri":"/imported-models/{modelIdentifier}", + "responseCode":200 + }, + "input":{"shape":"DeleteImportedModelRequest"}, + "output":{"shape":"DeleteImportedModelResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"ConflictException"}, + {"shape":"InternalServerException"}, + {"shape":"ThrottlingException"} + ], + "documentation":"

Deletes a custom model that you imported earlier. For more information, see Import a customized model in the Amazon Bedrock User Guide.

", + "idempotent":true + }, "DeleteModelInvocationLoggingConfiguration":{ "name":"DeleteModelInvocationLoggingConfiguration", "http":{ @@ -306,6 +367,24 @@ ], "documentation":"

Gets details about a guardrail. If you don't specify a version, the response returns details for the DRAFT version.

" }, + "GetImportedModel":{ + "name":"GetImportedModel", + "http":{ + "method":"GET", + "requestUri":"/imported-models/{modelIdentifier}", + "responseCode":200 + }, + "input":{"shape":"GetImportedModelRequest"}, + "output":{"shape":"GetImportedModelResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"InternalServerException"}, + {"shape":"ThrottlingException"} + ], + "documentation":"

Gets properties associated with a customized model you imported.

" + }, "GetModelCopyJob":{ "name":"GetModelCopyJob", "http":{ @@ -342,6 +421,24 @@ ], "documentation":"

Retrieves the properties associated with a model-customization job, including the status of the job. For more information, see Custom models in the Amazon Bedrock User Guide.

" }, + "GetModelImportJob":{ + "name":"GetModelImportJob", + "http":{ + "method":"GET", + "requestUri":"/model-import-jobs/{jobIdentifier}", + "responseCode":200 + }, + "input":{"shape":"GetModelImportJobRequest"}, + "output":{"shape":"GetModelImportJobResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"InternalServerException"}, + {"shape":"ThrottlingException"} + ], + "documentation":"

Retrieves the properties associated with import model job, including the status of the job. For more information, see Import a customized model in the Amazon Bedrock User Guide.

" + }, "GetModelInvocationJob":{ "name":"GetModelInvocationJob", "http":{ @@ -463,6 +560,23 @@ ], "documentation":"

Lists details about all the guardrails in an account. To list the DRAFT version of all your guardrails, don't specify the guardrailIdentifier field. To list all versions of a guardrail, specify the ARN of the guardrail in the guardrailIdentifier field.

You can set the maximum number of results to return in a response in the maxResults field. If there are more results than the number you set, the response returns a nextToken that you can send in another ListGuardrails request to see the next batch of results.

" }, + "ListImportedModels":{ + "name":"ListImportedModels", + "http":{ + "method":"GET", + "requestUri":"/imported-models", + "responseCode":200 + }, + "input":{"shape":"ListImportedModelsRequest"}, + "output":{"shape":"ListImportedModelsResponse"}, + "errors":[ + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"InternalServerException"}, + {"shape":"ThrottlingException"} + ], + "documentation":"

Returns a list of models you've imported. You can filter the results to return based on one or more criteria. For more information, see Import a customized model in the Amazon Bedrock User Guide.

" + }, "ListModelCopyJobs":{ "name":"ListModelCopyJobs", "http":{ @@ -498,6 +612,23 @@ ], "documentation":"

Returns a list of model customization jobs that you have submitted. You can filter the jobs to return based on one or more criteria.

For more information, see Custom models in the Amazon Bedrock User Guide.

" }, + "ListModelImportJobs":{ + "name":"ListModelImportJobs", + "http":{ + "method":"GET", + "requestUri":"/model-import-jobs", + "responseCode":200 + }, + "input":{"shape":"ListModelImportJobsRequest"}, + "output":{"shape":"ListModelImportJobsResponse"}, + "errors":[ + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"InternalServerException"}, + {"shape":"ThrottlingException"} + ], + "documentation":"

Returns a list of import jobs you've submitted. You can filter the results to return based on one or more criteria. For more information, see Import a customized model in the Amazon Bedrock User Guide.

" + }, "ListModelInvocationJobs":{ "name":"ListModelInvocationJobs", "http":{ @@ -738,6 +869,83 @@ "min":1, "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})|(([0-9a-zA-Z][_-]?)+)" }, + "BatchDeleteEvaluationJobError":{ + "type":"structure", + "required":[ + "jobIdentifier", + "code" + ], + "members":{ + "jobIdentifier":{ + "shape":"EvaluationJobIdentifier", + "documentation":"

The ARN of the model evaluation job being deleted.

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

A HTTP status code of the model evaluation job being deleted.

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

A status message about the model evaluation job deletion.

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

A JSON array that provides the status of the model evaluation jobs being deleted.

" + }, + "BatchDeleteEvaluationJobErrors":{ + "type":"list", + "member":{"shape":"BatchDeleteEvaluationJobError"}, + "max":25, + "min":0 + }, + "BatchDeleteEvaluationJobItem":{ + "type":"structure", + "required":[ + "jobIdentifier", + "jobStatus" + ], + "members":{ + "jobIdentifier":{ + "shape":"EvaluationJobIdentifier", + "documentation":"

The ARN of model evaluation job to be deleted.

" + }, + "jobStatus":{ + "shape":"EvaluationJobStatus", + "documentation":"

The status of the job's deletion.

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

An array of model evaluation jobs to be deleted, and their associated statuses.

" + }, + "BatchDeleteEvaluationJobItems":{ + "type":"list", + "member":{"shape":"BatchDeleteEvaluationJobItem"} + }, + "BatchDeleteEvaluationJobRequest":{ + "type":"structure", + "required":["jobIdentifiers"], + "members":{ + "jobIdentifiers":{ + "shape":"EvaluationJobIdentifiers", + "documentation":"

An array of model evaluation job ARNs to be deleted.

" + } + } + }, + "BatchDeleteEvaluationJobResponse":{ + "type":"structure", + "required":[ + "errors", + "evaluationJobs" + ], + "members":{ + "errors":{ + "shape":"BatchDeleteEvaluationJobErrors", + "documentation":"

A JSON object containing the HTTP status codes and the ARNs of model evaluation jobs that failed to be deleted.

" + }, + "evaluationJobs":{ + "shape":"BatchDeleteEvaluationJobItems", + "documentation":"

The list of model evaluation jobs to be deleted.

" + } + } + }, "BedrockModelId":{ "type":"string", "max":140, @@ -1104,6 +1312,63 @@ } } }, + "CreateModelImportJobRequest":{ + "type":"structure", + "required":[ + "jobName", + "importedModelName", + "roleArn", + "modelDataSource" + ], + "members":{ + "jobName":{ + "shape":"JobName", + "documentation":"

The name of the import job.

" + }, + "importedModelName":{ + "shape":"ImportedModelName", + "documentation":"

The name of the imported model.

" + }, + "roleArn":{ + "shape":"RoleArn", + "documentation":"

The Amazon Resource Name (ARN) of the model import job.

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

The data source for the imported model.

" + }, + "jobTags":{ + "shape":"TagList", + "documentation":"

Tags to attach to this import job.

" + }, + "importedModelTags":{ + "shape":"TagList", + "documentation":"

Tags to attach to the imported model.

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

A unique, case-sensitive identifier to ensure that the API request completes no more than one time. If this token matches a previous request, Amazon Bedrock ignores the request, but does not return an error. For more information, see Ensuring idempotency.

" + }, + "vpcConfig":{ + "shape":"VpcConfig", + "documentation":"

VPC configuration parameters for the private Virtual Private Cloud (VPC) that contains the resources you are using for the import job.

" + }, + "importedModelKmsKeyId":{ + "shape":"KmsKeyId", + "documentation":"

The imported model is encrypted at rest using this key.

" + } + } + }, + "CreateModelImportJobResponse":{ + "type":"structure", + "required":["jobArn"], + "members":{ + "jobArn":{ + "shape":"ModelImportJobArn", + "documentation":"

The Amazon Resource Name (ARN) of the model import job.

" + } + } + }, "CreateModelInvocationJobRequest":{ "type":"structure", "required":[ @@ -1308,6 +1573,23 @@ "members":{ } }, + "DeleteImportedModelRequest":{ + "type":"structure", + "required":["modelIdentifier"], + "members":{ + "modelIdentifier":{ + "shape":"ImportedModelIdentifier", + "documentation":"

Name of the imported model to delete.

", + "location":"uri", + "locationName":"modelIdentifier" + } + } + }, + "DeleteImportedModelResponse":{ + "type":"structure", + "members":{ + } + }, "DeleteModelInvocationLoggingConfigurationRequest":{ "type":"structure", "members":{ @@ -1362,7 +1644,7 @@ "documentation":"

Each Amazon Bedrock support different inference parameters that change how the model behaves during inference.

" } }, - "documentation":"

Contains the ARN of the Amazon Bedrock models specified in your model evaluation job. Each Amazon Bedrock model supports different inferenceParams. To learn more about supported inference parameters for Amazon Bedrock models, see Inference parameters for foundation models.

The inferenceParams are specified using JSON. To successfully insert JSON as string make sure that all quotations are properly escaped. For example, \"temperature\":\"0.25\" key value pair would need to be formatted as \\\"temperature\\\":\\\"0.25\\\" to successfully accepted in the request.

" + "documentation":"

Contains the ARN of the Amazon Bedrock models specified in your model evaluation job. Each Amazon Bedrock model supports different inferenceParams. To learn more about supported inference parameters for Amazon Bedrock models, see Inference parameters for foundation models.

The inferenceParams are specified using JSON. To successfully insert JSON as string make sure that all quotations are properly escaped. For example, \"temperature\":\"0.25\" key value pair would need to be formatted as \\\"temperature\\\":\\\"0.25\\\" to successfully accepted in the request.

" }, "EvaluationConfig":{ "type":"structure", @@ -1385,7 +1667,7 @@ "members":{ "name":{ "shape":"EvaluationDatasetName", - "documentation":"

Used to specify supported built-in prompt datasets. Valid values are Builtin.Bold, Builtin.BoolQ, Builtin.NaturalQuestions, Builtin.Gigaword, Builtin.RealToxicityPrompts, Builtin.TriviaQa, Builtin.T-Rex, Builtin.WomensEcommerceClothingReviews and Builtin.Wikitext2.

" + "documentation":"

Used to specify supported built-in prompt datasets. Valid values are Builtin.Bold, Builtin.BoolQ, Builtin.NaturalQuestions, Builtin.Gigaword, Builtin.RealToxicityPrompts, Builtin.TriviaQA, Builtin.T-Rex, Builtin.WomensEcommerceClothingReviews and Builtin.Wikitext2.

" }, "datasetLocation":{ "shape":"EvaluationDatasetLocation", @@ -1472,6 +1754,12 @@ "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:evaluation-job/[a-z0-9]{12})", "sensitive":true }, + "EvaluationJobIdentifiers":{ + "type":"list", + "member":{"shape":"EvaluationJobIdentifier"}, + "max":25, + "min":1 + }, "EvaluationJobName":{ "type":"string", "max":63, @@ -1485,7 +1773,8 @@ "Completed", "Failed", "Stopping", - "Stopped" + "Stopped", + "Deleting" ] }, "EvaluationJobType":{ @@ -2060,6 +2349,55 @@ } } }, + "GetImportedModelRequest":{ + "type":"structure", + "required":["modelIdentifier"], + "members":{ + "modelIdentifier":{ + "shape":"ImportedModelIdentifier", + "documentation":"

Name or Amazon Resource Name (ARN) of the imported model.

", + "location":"uri", + "locationName":"modelIdentifier" + } + } + }, + "GetImportedModelResponse":{ + "type":"structure", + "members":{ + "modelArn":{ + "shape":"ImportedModelArn", + "documentation":"

The Amazon Resource Name (ARN) associated with this imported model.

" + }, + "modelName":{ + "shape":"ImportedModelName", + "documentation":"

The name of the imported model.

" + }, + "jobName":{ + "shape":"JobName", + "documentation":"

Job name associated with the imported model.

" + }, + "jobArn":{ + "shape":"ModelImportJobArn", + "documentation":"

Job Amazon Resource Name (ARN) associated with the imported model.

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

The data source for this imported model.

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

Creation time of the imported model.

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

The architecture of the imported model.

" + }, + "modelKmsKeyArn":{ + "shape":"KmsKeyArn", + "documentation":"

The imported model is encrypted at rest using this key.

" + } + } + }, "GetModelCopyJobRequest":{ "type":"structure", "required":["jobArn"], @@ -2242,6 +2580,75 @@ } } }, + "GetModelImportJobRequest":{ + "type":"structure", + "required":["jobIdentifier"], + "members":{ + "jobIdentifier":{ + "shape":"ModelImportJobIdentifier", + "documentation":"

The identifier of the import job.

", + "location":"uri", + "locationName":"jobIdentifier" + } + } + }, + "GetModelImportJobResponse":{ + "type":"structure", + "members":{ + "jobArn":{ + "shape":"ModelImportJobArn", + "documentation":"

The Amazon Resource Name (ARN) of the import job.

" + }, + "jobName":{ + "shape":"JobName", + "documentation":"

The name of the import job.

" + }, + "importedModelName":{ + "shape":"ImportedModelName", + "documentation":"

The name of the imported model.

" + }, + "importedModelArn":{ + "shape":"ImportedModelArn", + "documentation":"

The Amazon Resource Name (ARN) of the imported model.

" + }, + "roleArn":{ + "shape":"RoleArn", + "documentation":"

The Amazon Resource Name (ARN) of the IAM role associated with this job.

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

The data source for the imported model.

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

The status of the job. A successful job transitions from in-progress to completed when the imported model is ready to use. If the job failed, the failure message contains information about why the job failed.

" + }, + "failureMessage":{ + "shape":"ErrorMessage", + "documentation":"

Information about why the import job failed.

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

The time the resource was created.

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

Time the resource was last modified.

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

Time that the resource transitioned to terminal state.

" + }, + "vpcConfig":{ + "shape":"VpcConfig", + "documentation":"

The Virtual Private Cloud (VPC) configuration of the import model job.

" + }, + "importedModelKmsKeyArn":{ + "shape":"KmsKeyArn", + "documentation":"

The imported model is encrypted at rest using this key.

" + } + } + }, "GetModelInvocationJobRequest":{ "type":"structure", "required":["jobIdentifier"], @@ -3249,6 +3656,51 @@ "min":1, "pattern":"[a-zA-Z0-9](-*[a-zA-Z0-9])*" }, + "ImportedModelArn":{ + "type":"string", + "max":1011, + "min":20, + "pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:imported-model/[a-z0-9]{12}" + }, + "ImportedModelIdentifier":{ + "type":"string", + "max":1011, + "min":1, + "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:imported-model/[a-z0-9]{12})|(([0-9a-zA-Z][_-]?)+)" + }, + "ImportedModelName":{ + "type":"string", + "max":63, + "min":1, + "pattern":"([0-9a-zA-Z][_-]?)+" + }, + "ImportedModelSummary":{ + "type":"structure", + "required":[ + "modelArn", + "modelName", + "creationTime" + ], + "members":{ + "modelArn":{ + "shape":"ImportedModelArn", + "documentation":"

The Amazon Resource Name (ARN) of the imported model.

" + }, + "modelName":{ + "shape":"ImportedModelName", + "documentation":"

Name of the imported model.

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

Creation time of the imported model.

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

Information about tne imported model.

" + }, + "ImportedModelSummaryList":{ + "type":"list", + "member":{"shape":"ImportedModelSummary"} + }, "InferenceType":{ "type":"string", "enum":[ @@ -3291,7 +3743,7 @@ "type":"string", "max":2048, "min":1, - "pattern":"arn:aws(-[^:]+)?:kms:[a-zA-Z0-9-]*:[0-9]{12}:((key/[a-zA-Z0-9-]{36})|(alias/[a-zA-Z0-9-_/]+))" + "pattern":"(arn:aws(-[^:]+)?:kms:[a-zA-Z0-9-]*:[0-9]{12}:((key/[a-zA-Z0-9-]{36})|(alias/[a-zA-Z0-9-_/]+)))|([a-zA-Z0-9-]{36})|(alias/[a-zA-Z0-9-_/]+)" }, "ListCustomModelsRequest":{ "type":"structure", @@ -3512,6 +3964,66 @@ } } }, + "ListImportedModelsRequest":{ + "type":"structure", + "members":{ + "creationTimeBefore":{ + "shape":"Timestamp", + "documentation":"

Return imported models that created before the specified time.

", + "location":"querystring", + "locationName":"creationTimeBefore" + }, + "creationTimeAfter":{ + "shape":"Timestamp", + "documentation":"

Return imported models that were created after the specified time.

", + "location":"querystring", + "locationName":"creationTimeAfter" + }, + "nameContains":{ + "shape":"ImportedModelName", + "documentation":"

Return imported models only if the model name contains these characters.

", + "location":"querystring", + "locationName":"nameContains" + }, + "maxResults":{ + "shape":"MaxResults", + "documentation":"

The maximum number of results to return in the response. If the total number of results is greater than this value, use the token returned in the response in the nextToken field when making another request to return the next batch of results.

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

If the total number of results is greater than the maxResults value provided in the request, enter the token returned in the nextToken field in the response in this field to return the next batch of results.

", + "location":"querystring", + "locationName":"nextToken" + }, + "sortBy":{ + "shape":"SortModelsBy", + "documentation":"

The field to sort by in the returned list of imported models.

", + "location":"querystring", + "locationName":"sortBy" + }, + "sortOrder":{ + "shape":"SortOrder", + "documentation":"

Specifies whetehr to sort the results in ascending or descending order.

", + "location":"querystring", + "locationName":"sortOrder" + } + } + }, + "ListImportedModelsResponse":{ + "type":"structure", + "members":{ + "nextToken":{ + "shape":"PaginationToken", + "documentation":"

If the total number of results is greater than the maxResults value provided in the request, use this token when making another request in the nextToken field to return the next batch of results.

" + }, + "modelSummaries":{ + "shape":"ImportedModelSummaryList", + "documentation":"

Model summaries.

" + } + } + }, "ListModelCopyJobsRequest":{ "type":"structure", "members":{ @@ -3656,6 +4168,72 @@ } } }, + "ListModelImportJobsRequest":{ + "type":"structure", + "members":{ + "creationTimeAfter":{ + "shape":"Timestamp", + "documentation":"

Return import jobs that were created after the specified time.

", + "location":"querystring", + "locationName":"creationTimeAfter" + }, + "creationTimeBefore":{ + "shape":"Timestamp", + "documentation":"

Return import jobs that were created before the specified time.

", + "location":"querystring", + "locationName":"creationTimeBefore" + }, + "statusEquals":{ + "shape":"ModelImportJobStatus", + "documentation":"

Return imported jobs with the specified status.

", + "location":"querystring", + "locationName":"statusEquals" + }, + "nameContains":{ + "shape":"JobName", + "documentation":"

Return imported jobs only if the job name contains these characters.

", + "location":"querystring", + "locationName":"nameContains" + }, + "maxResults":{ + "shape":"MaxResults", + "documentation":"

The maximum number of results to return in the response. If the total number of results is greater than this value, use the token returned in the response in the nextToken field when making another request to return the next batch of results.

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

If the total number of results is greater than the maxResults value provided in the request, enter the token returned in the nextToken field in the response in this field to return the next batch of results.

", + "location":"querystring", + "locationName":"nextToken" + }, + "sortBy":{ + "shape":"SortJobsBy", + "documentation":"

The field to sort by in the returned list of imported jobs.

", + "location":"querystring", + "locationName":"sortBy" + }, + "sortOrder":{ + "shape":"SortOrder", + "documentation":"

Specifies whether to sort the results in ascending or descending order.

", + "location":"querystring", + "locationName":"sortOrder" + } + } + }, + "ListModelImportJobsResponse":{ + "type":"structure", + "members":{ + "nextToken":{ + "shape":"PaginationToken", + "documentation":"

If the total number of results is greater than the maxResults value provided in the request, enter the token returned in the nextToken field in the response in this field to return the next batch of results.

" + }, + "modelImportJobSummaries":{ + "shape":"ModelImportJobSummaries", + "documentation":"

Import job summaries.

" + } + } + }, "ListModelInvocationJobsRequest":{ "type":"structure", "members":{ @@ -4037,6 +4615,17 @@ "type":"list", "member":{"shape":"ModelCustomization"} }, + "ModelDataSource":{ + "type":"structure", + "members":{ + "s3DataSource":{ + "shape":"S3DataSource", + "documentation":"

The Amazon S3 data source of the imported model.

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

Data source for the imported model.

", + "union":true + }, "ModelId":{ "type":"string", "max":2048, @@ -4049,6 +4638,74 @@ "min":1, "pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}(([:][a-z0-9-]{1,63}){0,2})?/[a-z0-9]{12})|(:foundation-model/([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})))|(([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2}))|(([0-9a-zA-Z][_-]?)+)" }, + "ModelImportJobArn":{ + "type":"string", + "max":1011, + "min":0, + "pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:model-import-job/[a-z0-9]{12}" + }, + "ModelImportJobIdentifier":{ + "type":"string", + "max":1011, + "min":0, + "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:model-import-job/[a-z0-9]{12})|([a-zA-Z0-9](-*[a-zA-Z0-9\\+\\-\\.])*)" + }, + "ModelImportJobStatus":{ + "type":"string", + "enum":[ + "InProgress", + "Completed", + "Failed" + ] + }, + "ModelImportJobSummaries":{ + "type":"list", + "member":{"shape":"ModelImportJobSummary"} + }, + "ModelImportJobSummary":{ + "type":"structure", + "required":[ + "jobArn", + "jobName", + "status", + "creationTime" + ], + "members":{ + "jobArn":{ + "shape":"ModelImportJobArn", + "documentation":"

The Amazon Resource Name (ARN) of the import job.

" + }, + "jobName":{ + "shape":"JobName", + "documentation":"

The name of the import job.

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

The status of the imported job.

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

The time when the import job was last modified.

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

The time import job was created.

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

The time when import job ended.

" + }, + "importedModelArn":{ + "shape":"ImportedModelArn", + "documentation":"

The Amazon resource Name (ARN) of the imported model.

" + }, + "importedModelName":{ + "shape":"ImportedModelName", + "documentation":"

The name of the imported model.

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

Information about the import job.

" + }, "ModelInvocationIdempotencyToken":{ "type":"string", "max":256, @@ -4411,6 +5068,17 @@ }, "documentation":"

S3 configuration for storing log data.

" }, + "S3DataSource":{ + "type":"structure", + "required":["s3Uri"], + "members":{ + "s3Uri":{ + "shape":"S3Uri", + "documentation":"

The URI of the Amazon S3 data source.

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

The Amazon S3 data source of the imported job.

" + }, "S3InputFormat":{ "type":"string", "enum":["JSONL"] @@ -4419,7 +5087,7 @@ "type":"string", "max":1024, "min":1, - "pattern":"s3://[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9](/.*)?" + "pattern":"s3://[a-z0-9][-.a-z0-9]{1,61}(?:/[-!_*'().a-z0-9A-Z]+(?:/[-!_*'().a-z0-9A-Z]+)*)?/?" }, "SageMakerFlowDefinitionArn":{ "type":"string", diff --git a/botocore/data/emr-containers/2020-10-01/endpoint-rule-set-1.json b/botocore/data/emr-containers/2020-10-01/endpoint-rule-set-1.json index 8bbec487ba..89a0b7aa03 100644 --- a/botocore/data/emr-containers/2020-10-01/endpoint-rule-set-1.json +++ b/botocore/data/emr-containers/2020-10-01/endpoint-rule-set-1.json @@ -218,6 +218,44 @@ } ], "rules": [ + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + { + "ref": "Region" + }, + "us-gov-east-1" + ] + } + ], + "endpoint": { + "url": "https://emr-containers.us-gov-east-1.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + { + "ref": "Region" + }, + "us-gov-west-1" + ] + } + ], + "endpoint": { + "url": "https://emr-containers.us-gov-west-1.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + }, { "conditions": [], "endpoint": { diff --git a/botocore/data/emr-containers/2020-10-01/service-2.json b/botocore/data/emr-containers/2020-10-01/service-2.json index 7a05bd0b1d..1b43d1018d 100644 --- a/botocore/data/emr-containers/2020-10-01/service-2.json +++ b/botocore/data/emr-containers/2020-10-01/service-2.json @@ -5,11 +5,13 @@ "endpointPrefix":"emr-containers", "jsonVersion":"1.1", "protocol":"rest-json", + "protocols":["rest-json"], "serviceFullName":"Amazon EMR Containers", "serviceId":"EMR containers", "signatureVersion":"v4", "signingName":"emr-containers", - "uid":"emr-containers-2020-10-01" + "uid":"emr-containers-2020-10-01", + "auth":["aws.auth#sigv4"] }, "operations":{ "CancelJobRun":{ diff --git a/botocore/data/endpoints.json b/botocore/data/endpoints.json index 81c0f2e556..40440aed29 100644 --- a/botocore/data/endpoints.json +++ b/botocore/data/endpoints.json @@ -56,6 +56,9 @@ "ap-southeast-4" : { "description" : "Asia Pacific (Melbourne)" }, + "ap-southeast-5" : { + "description" : "Asia Pacific (Malaysia)" + }, "ca-central-1" : { "description" : "Canada (Central)" }, @@ -125,6 +128,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "access-analyzer-fips.ca-central-1.amazonaws.com", @@ -242,6 +246,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "acm-fips.ca-central-1.amazonaws.com", @@ -350,6 +355,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "acm-pca-fips.ca-central-1.amazonaws.com", @@ -729,6 +735,12 @@ }, "hostname" : "api.ecr.ap-southeast-4.amazonaws.com" }, + "ap-southeast-5" : { + "credentialScope" : { + "region" : "ap-southeast-5" + }, + "hostname" : "api.ecr.ap-southeast-5.amazonaws.com" + }, "ca-central-1" : { "credentialScope" : { "region" : "ca-central-1" @@ -1352,6 +1364,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "apigateway-fips.ca-central-1.amazonaws.com", @@ -1471,6 +1484,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -1504,6 +1518,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -1608,6 +1623,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -2038,6 +2054,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -2394,6 +2411,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "autoscaling-fips.ca-central-1.amazonaws.com", @@ -2592,6 +2610,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -3257,6 +3276,12 @@ "tags" : [ "dualstack" ] } ] }, + "ap-southeast-5" : { + "variants" : [ { + "hostname" : "cloudcontrolapi.ap-southeast-5.api.aws", + "tags" : [ "dualstack" ] + } ] + }, "ca-central-1" : { "variants" : [ { "hostname" : "cloudcontrolapi-fips.ca-central-1.amazonaws.com", @@ -3471,6 +3496,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -3619,6 +3645,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -3929,6 +3956,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -4622,6 +4650,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -5276,6 +5305,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "datasync-fips.ca-central-1.amazonaws.com", @@ -5402,6 +5432,9 @@ "ap-southeast-4" : { "hostname" : "datazone.ap-southeast-4.api.aws" }, + "ap-southeast-5" : { + "hostname" : "datazone.ap-southeast-5.api.aws" + }, "ca-central-1" : { "hostname" : "datazone.ca-central-1.api.aws", "variants" : [ { @@ -5588,6 +5621,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "directconnect-fips.ca-central-1.amazonaws.com", @@ -5704,6 +5738,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -5737,6 +5772,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "dms" : { @@ -6111,6 +6147,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "dynamodb-fips.ca-central-1.amazonaws.com", @@ -6223,6 +6260,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "ebs-fips.ca-central-1.amazonaws.com", @@ -6460,6 +6498,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -6558,6 +6597,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -6669,6 +6709,9 @@ "ap-southeast-4" : { "hostname" : "eks-auth.ap-southeast-4.api.aws" }, + "ap-southeast-5" : { + "hostname" : "eks-auth.ap-southeast-5.api.aws" + }, "ca-central-1" : { "hostname" : "eks-auth.ca-central-1.api.aws" }, @@ -6738,6 +6781,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -7285,6 +7329,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -7370,6 +7415,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "elasticmapreduce-fips.ca-central-1.amazonaws.com", @@ -7821,6 +7867,12 @@ "tags" : [ "dualstack" ] } ] }, + "ap-southeast-5" : { + "variants" : [ { + "hostname" : "aos.ap-southeast-5.api.aws", + "tags" : [ "dualstack" ] + } ] + }, "ca-central-1" : { "variants" : [ { "hostname" : "aos.ca-central-1.api.aws", @@ -7991,6 +8043,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -8126,6 +8179,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -9671,6 +9725,9 @@ "ap-southeast-4" : { "hostname" : "internetmonitor.ap-southeast-4.api.aws" }, + "ap-southeast-5" : { + "hostname" : "internetmonitor.ap-southeast-5.api.aws" + }, "ca-central-1" : { "hostname" : "internetmonitor.ca-central-1.api.aws", "variants" : [ { @@ -10649,6 +10706,9 @@ "ap-southeast-4" : { "hostname" : "kendra-ranking.ap-southeast-4.api.aws" }, + "ap-southeast-5" : { + "hostname" : "kendra-ranking.ap-southeast-5.api.aws" + }, "ca-central-1" : { "hostname" : "kendra-ranking.ca-central-1.api.aws", "variants" : [ { @@ -10728,6 +10788,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -11073,6 +11134,19 @@ "deprecated" : true, "hostname" : "kms-fips.ap-southeast-4.amazonaws.com" }, + "ap-southeast-5" : { + "variants" : [ { + "hostname" : "kms-fips.ap-southeast-5.amazonaws.com", + "tags" : [ "fips" ] + } ] + }, + "ap-southeast-5-fips" : { + "credentialScope" : { + "region" : "ap-southeast-5" + }, + "deprecated" : true, + "hostname" : "kms-fips.ap-southeast-5.amazonaws.com" + }, "ca-central-1" : { "variants" : [ { "hostname" : "kms-fips.ca-central-1.amazonaws.com", @@ -11458,6 +11532,12 @@ "tags" : [ "dualstack" ] } ] }, + "ap-southeast-5" : { + "variants" : [ { + "hostname" : "lambda.ap-southeast-5.api.aws", + "tags" : [ "dualstack" ] + } ] + }, "ca-central-1" : { "variants" : [ { "hostname" : "lambda.ca-central-1.api.aws", @@ -11937,6 +12017,12 @@ "tags" : [ "dualstack" ] } ] }, + "ap-southeast-5" : { + "variants" : [ { + "hostname" : "logs.ap-southeast-5.api.aws", + "tags" : [ "dualstack" ] + } ] + }, "ca-central-1" : { "variants" : [ { "hostname" : "logs-fips.ca-central-1.amazonaws.com", @@ -12946,6 +13032,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -13360,6 +13447,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -13920,6 +14008,13 @@ "tags" : [ "dualstack" ] } ] }, + "ap-southeast-5" : { + "protocols" : [ "https" ], + "variants" : [ { + "hostname" : "pi.ap-southeast-5.api.aws", + "tags" : [ "dualstack" ] + } ] + }, "ca-central-1" : { "protocols" : [ "https" ], "variants" : [ { @@ -14617,6 +14712,9 @@ "ap-southeast-4" : { "hostname" : "qbusiness.ap-southeast-4.api.aws" }, + "ap-southeast-5" : { + "hostname" : "qbusiness.ap-southeast-5.api.aws" + }, "ca-central-1" : { "hostname" : "qbusiness.ca-central-1.api.aws" }, @@ -14773,6 +14871,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "ram-fips.ca-central-1.amazonaws.com", @@ -14878,6 +14977,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "rbin-fips.ca-central-1.amazonaws.com", @@ -14983,6 +15083,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "rds-fips.ca-central-1.amazonaws.com", @@ -15257,6 +15358,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "redshift-fips.ca-central-1.amazonaws.com", @@ -15665,6 +15767,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -15879,6 +15982,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -16163,6 +16267,12 @@ "tags" : [ "dualstack" ] } ] }, + "ap-southeast-5" : { + "variants" : [ { + "hostname" : "s3.dualstack.ap-southeast-5.amazonaws.com", + "tags" : [ "dualstack" ] + } ] + }, "aws-global" : { "credentialScope" : { "region" : "us-east-1" @@ -17103,6 +17213,11 @@ "tags" : [ "dualstack" ] } ] }, + "ap-southeast-5" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, "ca-central-1" : { "variants" : [ { "tags" : [ "dualstack" ] @@ -17733,6 +17848,12 @@ "tags" : [ "dualstack" ] } ] }, + "ap-southeast-5" : { + "variants" : [ { + "hostname" : "servicediscovery.ap-southeast-5.api.aws", + "tags" : [ "dualstack" ] + } ] + }, "ca-central-1" : { "variants" : [ { "hostname" : "servicediscovery-fips.ca-central-1.amazonaws.com", @@ -17937,6 +18058,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -18607,6 +18729,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { "variants" : [ { @@ -18704,6 +18827,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -18786,6 +18910,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "ssm-fips.ca-central-1.amazonaws.com", @@ -19158,6 +19283,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -19350,6 +19476,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -19390,6 +19517,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "aws-global" : { "credentialScope" : { "region" : "us-east-1" @@ -19496,6 +19624,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -19577,6 +19706,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -19658,6 +19788,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -21627,6 +21758,7 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, + "ap-southeast-5" : { }, "ca-central-1" : { }, "ca-west-1" : { }, "eu-central-1" : { }, @@ -23367,6 +23499,11 @@ } } }, + "aoss" : { + "endpoints" : { + "us-gov-west-1" : { } + } + }, "api.detective" : { "defaults" : { "protocols" : [ "https" ] diff --git a/botocore/data/inspector2/2020-06-08/service-2.json b/botocore/data/inspector2/2020-06-08/service-2.json index 6e1551274f..fe597885bc 100644 --- a/botocore/data/inspector2/2020-06-08/service-2.json +++ b/botocore/data/inspector2/2020-06-08/service-2.json @@ -11,7 +11,8 @@ "serviceId":"Inspector2", "signatureVersion":"v4", "signingName":"inspector2", - "uid":"inspector2-2020-06-08" + "uid":"inspector2-2020-06-08", + "auth":["aws.auth#sigv4"] }, "operations":{ "AssociateMember":{ @@ -1060,7 +1061,7 @@ "members":{ "message":{"shape":"String"} }, - "documentation":"

You do not have sufficient access to perform this action.

", + "documentation":"

You do not have sufficient access to perform this action.

For Enable, you receive this error if you attempt to use a feature in an unsupported Amazon Web Services Region.

", "error":{ "httpStatusCode":403, "senderFault":true @@ -1119,6 +1120,14 @@ "shape":"AccountId", "documentation":"

The Amazon Web Services account ID.

" }, + "exploitAvailableCount":{ + "shape":"Long", + "documentation":"

The number of findings that have an exploit available.

" + }, + "fixAvailableCount":{ + "shape":"Long", + "documentation":"

Details about the number of fixes.

" + }, "severityCounts":{ "shape":"SeverityCounts", "documentation":"

The number of findings by severity.

" @@ -4125,7 +4134,9 @@ "EVENTBRIDGE_THROTTLED", "RESOURCE_SCAN_NOT_DISABLED", "DISASSOCIATE_ALL_MEMBERS", - "ACCOUNT_IS_ISOLATED" + "ACCOUNT_IS_ISOLATED", + "EC2_SSM_RESOURCE_DATA_SYNC_LIMIT_EXCEEDED", + "EC2_SSM_ASSOCIATION_VERSION_LIMIT_EXCEEDED" ] }, "ErrorMessage":{"type":"string"}, @@ -4794,6 +4805,14 @@ "shape":"AccountId", "documentation":"

The ID of the Amazon Web Services account associated with the findings.

" }, + "exploitAvailableCount":{ + "shape":"Long", + "documentation":"

The number of findings that have an exploit available.

" + }, + "fixAvailableCount":{ + "shape":"Long", + "documentation":"

Details about the number of fixes.

" + }, "severityCounts":{ "shape":"SeverityCounts", "documentation":"

The value to sort results by.

" @@ -7230,7 +7249,9 @@ "DEEP_INSPECTION_PACKAGE_COLLECTION_LIMIT_EXCEEDED", "DEEP_INSPECTION_DAILY_SSM_INVENTORY_LIMIT_EXCEEDED", "DEEP_INSPECTION_COLLECTION_TIME_LIMIT_EXCEEDED", - "DEEP_INSPECTION_NO_INVENTORY" + "DEEP_INSPECTION_NO_INVENTORY", + "AGENTLESS_INSTANCE_STORAGE_LIMIT_EXCEEDED", + "AGENTLESS_INSTANCE_COLLECTION_TIME_LIMIT_EXCEEDED" ] }, "ScanType":{ diff --git a/botocore/data/partitions.json b/botocore/data/partitions.json index 7a28569c3d..712d31e3fe 100644 --- a/botocore/data/partitions.json +++ b/botocore/data/partitions.json @@ -44,6 +44,9 @@ "ap-southeast-4" : { "description" : "Asia Pacific (Melbourne)" }, + "ap-southeast-5" : { + "description" : "Asia Pacific (Malaysia)" + }, "aws-global" : { "description" : "AWS Standard global region" }, diff --git a/botocore/data/quicksight/2018-04-01/service-2.json b/botocore/data/quicksight/2018-04-01/service-2.json index 4e7264dca5..23bd0af6f8 100644 --- a/botocore/data/quicksight/2018-04-01/service-2.json +++ b/botocore/data/quicksight/2018-04-01/service-2.json @@ -3715,7 +3715,8 @@ "Options":{ "shape":"AssetOptions", "documentation":"

An array of option definitions for an analysis.

" - } + }, + "QueryExecutionOptions":{"shape":"QueryExecutionOptions"} }, "documentation":"

The definition of an analysis.

" }, @@ -3908,10 +3909,48 @@ "InitialDashboardId":{ "shape":"ShortRestrictiveResourceId", "documentation":"

The dashboard ID for the dashboard that you want the user to see first. This ID is included in the output URL. When the URL in response is accessed, Amazon QuickSight renders this dashboard.

The Amazon Resource Name (ARN) of this dashboard must be included in the AuthorizedResourceArns parameter. Otherwise, the request will fail with InvalidParameterValueException.

" + }, + "EnabledFeatures":{ + "shape":"AnonymousUserDashboardEmbeddingConfigurationEnabledFeatures", + "documentation":"

A list of all enabled features of a specified anonymous dashboard.

" + }, + "DisabledFeatures":{ + "shape":"AnonymousUserDashboardEmbeddingConfigurationDisabledFeatures", + "documentation":"

A list of all disabled features of a specified anonymous dashboard.

" + }, + "FeatureConfigurations":{ + "shape":"AnonymousUserDashboardFeatureConfigurations", + "documentation":"

The feature configuration for an embedded dashboard.

" } }, "documentation":"

Information about the dashboard that you want to embed.

" }, + "AnonymousUserDashboardEmbeddingConfigurationDisabledFeature":{ + "type":"string", + "enum":["SHARED_VIEW"] + }, + "AnonymousUserDashboardEmbeddingConfigurationDisabledFeatures":{ + "type":"list", + "member":{"shape":"AnonymousUserDashboardEmbeddingConfigurationDisabledFeature"} + }, + "AnonymousUserDashboardEmbeddingConfigurationEnabledFeature":{ + "type":"string", + "enum":["SHARED_VIEW"] + }, + "AnonymousUserDashboardEmbeddingConfigurationEnabledFeatures":{ + "type":"list", + "member":{"shape":"AnonymousUserDashboardEmbeddingConfigurationEnabledFeature"} + }, + "AnonymousUserDashboardFeatureConfigurations":{ + "type":"structure", + "members":{ + "SharedView":{ + "shape":"SharedViewConfigurations", + "documentation":"

The shared view settings of an embedded dashboard.

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

The feature configuration for an embedded dashboard.

" + }, "AnonymousUserDashboardVisualEmbeddingConfiguration":{ "type":"structure", "required":["InitialDashboardVisualId"], @@ -24152,6 +24191,23 @@ "max":256, "min":1 }, + "QueryExecutionMode":{ + "type":"string", + "enum":[ + "AUTO", + "MANUAL" + ] + }, + "QueryExecutionOptions":{ + "type":"structure", + "members":{ + "QueryExecutionMode":{ + "shape":"QueryExecutionMode", + "documentation":"

A structure that describes the query execution mode.

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

A structure that describes the query execution options.

" + }, "QueueInfo":{ "type":"structure", "required":[ @@ -24872,6 +24928,10 @@ "StatePersistence":{ "shape":"StatePersistenceConfigurations", "documentation":"

The state persistence configurations of an embedded Amazon QuickSight console.

" + }, + "SharedView":{ + "shape":"SharedViewConfigurations", + "documentation":"

The shared view settings of an embedded dashboard.

" } }, "documentation":"

The feature configurations of an embedded Amazon QuickSight console.

" @@ -24898,6 +24958,10 @@ "shape":"StatePersistenceConfigurations", "documentation":"

The state persistence settings of an embedded dashboard.

" }, + "SharedView":{ + "shape":"SharedViewConfigurations", + "documentation":"

The shared view settings of an embedded dashboard.

" + }, "Bookmarks":{ "shape":"BookmarksConfigurations", "documentation":"

The bookmarks configuration for an embedded dashboard in Amazon QuickSight.

" @@ -26573,6 +26637,17 @@ }, "documentation":"

The shape conditional formatting of a filled map visual.

" }, + "SharedViewConfigurations":{ + "type":"structure", + "required":["Enabled"], + "members":{ + "Enabled":{ + "shape":"Boolean", + "documentation":"

The shared view settings of an embedded dashboard.

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

The shared view settings of an embedded dashboard.

" + }, "SharingModel":{ "type":"string", "enum":[ @@ -28853,7 +28928,8 @@ "Options":{ "shape":"AssetOptions", "documentation":"

An array of option definitions for a template.

" - } + }, + "QueryExecutionOptions":{"shape":"QueryExecutionOptions"} }, "documentation":"

The detailed definition of a template.

" }, diff --git a/botocore/data/route53/2013-04-01/service-2.json b/botocore/data/route53/2013-04-01/service-2.json index fcb3fac736..590e550071 100644 --- a/botocore/data/route53/2013-04-01/service-2.json +++ b/botocore/data/route53/2013-04-01/service-2.json @@ -1795,7 +1795,8 @@ "us-isob-east-1", "ap-southeast-4", "il-central-1", - "ca-west-1" + "ca-west-1", + "ap-southeast-5" ], "max":64, "min":1 @@ -5556,7 +5557,8 @@ "eu-south-2", "ap-southeast-4", "il-central-1", - "ca-west-1" + "ca-west-1", + "ap-southeast-5" ], "max":64, "min":1 @@ -6433,7 +6435,8 @@ "eu-south-2", "ap-southeast-4", "il-central-1", - "ca-west-1" + "ca-west-1", + "ap-southeast-5" ], "max":64, "min":1 diff --git a/docs/source/conf.py b/docs/source/conf.py index 23266881c9..1bfad2aec6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -59,7 +59,7 @@ # The short X.Y version. version = '1.35' # The full version, including alpha/beta/rc tags. -release = '1.35.3' +release = '1.35.4' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/tests/functional/endpoint-rules/emr-containers/endpoint-tests-1.json b/tests/functional/endpoint-rules/emr-containers/endpoint-tests-1.json index a2542059e0..d648a7291e 100644 --- a/tests/functional/endpoint-rules/emr-containers/endpoint-tests-1.json +++ b/tests/functional/endpoint-rules/emr-containers/endpoint-tests-1.json @@ -365,23 +365,23 @@ } }, { - "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://emr-containers-fips.us-gov-east-1.api.aws" + "url": "https://emr-containers.us-gov-east-1.amazonaws.com" } }, "params": { "Region": "us-gov-east-1", - "UseFIPS": true, - "UseDualStack": true + "UseFIPS": false, + "UseDualStack": false } }, { "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://emr-containers-fips.us-gov-east-1.amazonaws.com" + "url": "https://emr-containers.us-gov-east-1.amazonaws.com" } }, "params": { @@ -391,29 +391,55 @@ } }, { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://emr-containers.us-gov-east-1.api.aws" + "url": "https://emr-containers.us-gov-west-1.amazonaws.com" } }, "params": { - "Region": "us-gov-east-1", + "Region": "us-gov-west-1", "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://emr-containers.us-gov-west-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-west-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://emr-containers-fips.us-gov-east-1.api.aws" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": true, "UseDualStack": true } }, { - "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://emr-containers.us-gov-east-1.amazonaws.com" + "url": "https://emr-containers.us-gov-east-1.api.aws" } }, "params": { "Region": "us-gov-east-1", "UseFIPS": false, - "UseDualStack": false + "UseDualStack": true } }, {