Merge branch 'release-1.35.25' into develop

* release-1.35.25:
  Bumping version to 1.35.25
  Update to latest models
  Merge customizations for Resource Explorer 2

.changes/1.35.25.json

@@ -0,0 +1,42 @@
+[
+  {
+    "category": "``apigateway``",
+    "description": "Documentation updates for Amazon API Gateway",
+    "type": "api-change"
+  },
+  {
+    "category": "``athena``",
+    "description": "List/Get/Update/Delete/CreateDataCatalog now integrate with AWS Glue connections. Users can create a Glue connection through Athena or use a Glue connection to define their Athena federated parameters.",
+    "type": "api-change"
+  },
+  {
+    "category": "``bedrock-agent``",
+    "description": "Amazon Bedrock Prompt Flows and Prompt Management now supports using inference profiles to increase throughput and improve resilience.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "description": "Amazon EC2 G6e instances powered by NVIDIA L40S Tensor Core GPUs are the most cost-efficient GPU instances for deploying generative AI models and the highest performance GPU instances for spatial computing workloads.",
+    "type": "api-change"
+  },
+  {
+    "category": "``emr-serverless``",
+    "description": "This release adds support for job concurrency and queuing configuration at Application level.",
+    "type": "api-change"
+  },
+  {
+    "category": "``glue``",
+    "description": "Added AthenaProperties parameter to Glue Connections, allowing Athena to store service specific properties on Glue Connections.",
+    "type": "api-change"
+  },
+  {
+    "category": "``rds``",
+    "description": "Support ComputeRedundancy parameter in ModifyDBShardGroup API. Add DBShardGroupArn in DBShardGroup API response. Remove InvalidMaxAcuFault from CreateDBShardGroup and ModifyDBShardGroup API. Both API will throw InvalidParameterValueException for invalid ACU configuration.",
+    "type": "api-change"
+  },
+  {
+    "category": "``resource-explorer-2``",
+    "description": "AWS Resource Explorer released ListResources feature which allows customers to list all indexed AWS resources within a view.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,19 @@
 CHANGELOG
 =========
 
+1.35.25
+=======
+
+* api-change:``apigateway``: Documentation updates for Amazon API Gateway
+* api-change:``athena``: List/Get/Update/Delete/CreateDataCatalog now integrate with AWS Glue connections. Users can create a Glue connection through Athena or use a Glue connection to define their Athena federated parameters.
+* api-change:``bedrock-agent``: Amazon Bedrock Prompt Flows and Prompt Management now supports using inference profiles to increase throughput and improve resilience.
+* api-change:``ec2``: Amazon EC2 G6e instances powered by NVIDIA L40S Tensor Core GPUs are the most cost-efficient GPU instances for deploying generative AI models and the highest performance GPU instances for spatial computing workloads.
+* api-change:``emr-serverless``: This release adds support for job concurrency and queuing configuration at Application level.
+* api-change:``glue``: Added AthenaProperties parameter to Glue Connections, allowing Athena to store service specific properties on Glue Connections.
+* api-change:``rds``: Support ComputeRedundancy parameter in ModifyDBShardGroup API. Add DBShardGroupArn in DBShardGroup API response. Remove InvalidMaxAcuFault from CreateDBShardGroup and ModifyDBShardGroup API. Both API will throw InvalidParameterValueException for invalid ACU configuration.
+* api-change:``resource-explorer-2``: AWS Resource Explorer released ListResources feature which allows customers to list all indexed AWS resources within a view.
+
+
 1.35.24
 =======
 

botocore/__init__.py

@@ -16,7 +16,7 @@
 import os
 import re
 
-__version__ = '1.35.24'
+__version__ = '1.35.25'
 
 
 class NullHandler(logging.Handler):

botocore/data/apigateway/2015-07-09/service-2.json

@@ -3637,7 +3637,7 @@
         },
         "certificateUploadDate":{
           "shape":"Timestamp",
-          "documentation":"<p>The timestamp when the certificate that was used by edge-optimized endpoint for this domain name was uploaded.</p>"
+          "documentation":"<p>The timestamp when the certificate that was used by edge-optimized endpoint for this domain name was uploaded. API Gateway doesn't change this value if you update the certificate.</p>"
         },
         "regionalDomainName":{
           "shape":"String",

botocore/data/bedrock-agent/2023-06-05/service-2.json

@@ -2313,7 +2313,7 @@
         },
         "foundationModel":{
           "shape":"ModelIdentifier",
-          "documentation":"<p>The foundation model to be used for orchestration by the agent you create.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the foundation model to be used for orchestration by the agent you create.</p>"
         },
         "guardrailConfiguration":{
           "shape":"GuardrailConfiguration",
@@ -5190,8 +5190,8 @@
           "documentation":"<p>The unique identifier of the knowledge base to query.</p>"
         },
         "modelId":{
-          "shape":"ModelIdentifier",
-          "documentation":"<p>The unique identifier of the model to use to generate a response from the query results. Omit this field if you want to return the retrieved results as an array.</p>"
+          "shape":"KnowledgeBaseModelIdentifier",
+          "documentation":"<p>The unique identifier of the model or <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html\">inference profile</a> to use to generate a response from the query results. Omit this field if you want to return the retrieved results as an array.</p>"
         }
       },
       "documentation":"<p>Contains configurations for a knowledge base node in a flow. This node takes a query as the input and returns, as the output, the retrieved responses directly (as an array) or a response generated based on the retrieved responses. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/flows-nodes.html\">Node types in Amazon Bedrock works</a> in the Amazon Bedrock User Guide.</p>"
@@ -5202,6 +5202,12 @@
       "min":0,
       "pattern":"^[0-9a-zA-Z]+$"
     },
+    "KnowledgeBaseModelIdentifier":{
+      "type":"string",
+      "max":2048,
+      "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]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):(model-gateway|inference-profile)/[a-zA-Z0-9-:.]+)|([a-zA-Z0-9-:.]+)$"
+    },
     "KnowledgeBaseRoleArn":{
       "type":"string",
       "max":2048,
@@ -6301,7 +6307,7 @@
         },
         "modelId":{
           "shape":"PromptModelIdentifier",
-          "documentation":"<p>The unique identifier of the model to run inference with.</p>"
+          "documentation":"<p>The unique identifier of the model or <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html\">inference profile</a> to run inference with.</p>"
         },
         "templateConfiguration":{
           "shape":"PromptTemplateConfiguration",
@@ -6424,7 +6430,7 @@
       "type":"string",
       "max":2048,
       "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]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)$"
+      "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]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|(arn:aws(|-us-gov|-cn|-iso|-iso-b):bedrock:(|[0-9a-z-]{1,20}):(|[0-9]{12}):(model-gateway|inference-profile)/[a-zA-Z0-9-:.]+)|([a-zA-Z0-9-:.]+)$"
     },
     "PromptModelInferenceConfiguration":{
       "type":"structure",
@@ -6462,7 +6468,7 @@
       "members":{
         "overrideLambda":{
           "shape":"LambdaArn",
-          "documentation":"<p>The ARN of the Lambda function to use when parsing the raw foundation model output in parts of the agent sequence. If you specify this field, at least one of the <code>promptConfigurations</code> must contain a <code>parserMode</code> value that is set to <code>OVERRIDDEN</code>. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/lambda-parser.html\">Parser Lambda function in Agents for Amazon Bedrock</a>.</p>"
+          "documentation":"<p>The ARN of the Lambda function to use when parsing the raw foundation model output in parts of the agent sequence. If you specify this field, at least one of the <code>promptConfigurations</code> must contain a <code>parserMode</code> value that is set to <code>OVERRIDDEN</code>. For more information, see <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/lambda-parser.html\">Parser Lambda function in Amazon Bedrock Agents</a>.</p>"
         },
         "promptConfigurations":{
           "shape":"PromptConfigurations",
@@ -6568,7 +6574,7 @@
         },
         "modelId":{
           "shape":"PromptModelIdentifier",
-          "documentation":"<p>The unique identifier of the model with which to run inference on the prompt.</p>"
+          "documentation":"<p>The unique identifier of the model or <a href=\"https://docs.aws.amazon.com/bedrock/latest/userguide/cross-region-inference.html\">inference profile</a> with which to run inference on the prompt.</p>"
         },
         "name":{
           "shape":"PromptVariantName",

botocore/data/ec2/2016-11-15/service-2.json

@@ -459,7 +459,7 @@
         "requestUri":"/"
       },
       "input":{"shape":"CancelConversionRequest"},
-      "documentation":"<p>Cancels an active conversion task. The task can be the import of an instance or volume. The action removes all artifacts of the conversion, including a partially uploaded volume or instance. If the conversion is complete or is in the process of transferring the final disk image, the command fails and returns an exception.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/CommandLineReference/ec2-cli-vmimport-export.html\">Importing a Virtual Machine Using the Amazon EC2 CLI</a>.</p>"
+      "documentation":"<p>Cancels an active conversion task. The task can be the import of an instance or volume. The action removes all artifacts of the conversion, including a partially uploaded volume or instance. If the conversion is complete or is in the process of transferring the final disk image, the command fails and returns an exception.</p>"
     },
     "CancelExportTask":{
       "name":"CancelExportTask",
@@ -4827,7 +4827,7 @@
       },
       "input":{"shape":"ImportInstanceRequest"},
       "output":{"shape":"ImportInstanceResult"},
-      "documentation":"<note> <p>We recommend that you use the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportImage.html\"> <code>ImportImage</code> </a> API. For more information, see <a href=\"https://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html\">Importing a VM as an image using VM Import/Export</a> in the <i>VM Import/Export User Guide</i>.</p> </note> <p>Creates an import instance task using metadata from the specified disk image.</p> <p>This API action is not supported by the Command Line Interface (CLI). For information about using the Amazon EC2 CLI, which is deprecated, see <a href=\"https://awsdocs.s3.amazonaws.com/EC2/ec2-clt.pdf#UsingVirtualMachinesinAmazonEC2\">Importing a VM to Amazon EC2</a> in the <i>Amazon EC2 CLI Reference</i> PDF file.</p> <p>This API action supports only single-volume VMs. To import multi-volume VMs, use <a>ImportImage</a> instead.</p> <p>For information about the import manifest referenced by this API action, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html\">VM Import Manifest</a>.</p>"
+      "documentation":"<note> <p>We recommend that you use the <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ImportImage.html\"> <code>ImportImage</code> </a> API instead. For more information, see <a href=\"https://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html\">Importing a VM as an image using VM Import/Export</a> in the <i>VM Import/Export User Guide</i>.</p> </note> <p>Creates an import instance task using metadata from the specified disk image.</p> <p>This API action supports only single-volume VMs. To import multi-volume VMs, use <a>ImportImage</a> instead.</p> <p>For information about the import manifest referenced by this API action, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html\">VM Import Manifest</a>.</p> <p>This API action is not supported by the Command Line Interface (CLI).</p>"
     },
     "ImportKeyPair":{
       "name":"ImportKeyPair",
@@ -4857,7 +4857,7 @@
       },
       "input":{"shape":"ImportVolumeRequest"},
       "output":{"shape":"ImportVolumeResult"},
-      "documentation":"<p>Creates an import volume task using metadata from the specified disk image.</p> <p>This API action supports only single-volume VMs. To import multi-volume VMs, use <a>ImportImage</a> instead. To import a disk to a snapshot, use <a>ImportSnapshot</a> instead.</p> <p>This API action is not supported by the Command Line Interface (CLI). For information about using the Amazon EC2 CLI, which is deprecated, see <a href=\"https://awsdocs.s3.amazonaws.com/EC2/ec2-clt.pdf#importing-your-volumes-into-amazon-ebs\">Importing Disks to Amazon EBS</a> in the <i>Amazon EC2 CLI Reference</i> PDF file.</p> <p>For information about the import manifest referenced by this API action, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html\">VM Import Manifest</a>.</p>"
+      "documentation":"<note> <p>This API action supports only single-volume VMs. To import multi-volume VMs, use <a>ImportImage</a> instead. To import a disk to a snapshot, use <a>ImportSnapshot</a> instead.</p> </note> <p>Creates an import volume task using metadata from the specified disk image.</p> <p>For information about the import manifest referenced by this API action, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/manifest.html\">VM Import Manifest</a>.</p> <p>This API action is not supported by the Command Line Interface (CLI).</p>"
     },
     "ListImagesInRecycleBin":{
       "name":"ListImagesInRecycleBin",
@@ -17321,7 +17321,7 @@
       "type":"structure",
       "members":{
         "KeyName":{
-          "shape":"KeyPairName",
+          "shape":"KeyPairNameWithResolver",
           "documentation":"<p>The name of the key pair.</p>"
         },
         "KeyPairId":{
@@ -19306,11 +19306,7 @@
     },
     "DescribeCapacityBlockOfferingsRequest":{
       "type":"structure",
-      "required":[
-        "InstanceType",
-        "InstanceCount",
-        "CapacityDurationHours"
-      ],
+      "required":["CapacityDurationHours"],
       "members":{
         "DryRun":{
           "shape":"Boolean",
@@ -29887,7 +29883,11 @@
     },
     "FleetCapacityReservationUsageStrategy":{
       "type":"string",
-      "enum":["use-capacity-reservations-first"]
+      "enum":[
+        "use-capacity-reservations-first",
+        "use-capacity-reservations-only",
+        "none"
+      ]
     },
     "FleetData":{
       "type":"structure",
@@ -37483,7 +37483,15 @@
         "r8g.48xlarge",
         "r8g.metal-24xl",
         "r8g.metal-48xl",
-        "mac2-m1ultra.metal"
+        "mac2-m1ultra.metal",
+        "g6e.xlarge",
+        "g6e.2xlarge",
+        "g6e.4xlarge",
+        "g6e.8xlarge",
+        "g6e.12xlarge",
+        "g6e.16xlarge",
+        "g6e.24xlarge",
+        "g6e.48xlarge"
       ]
     },
     "InstanceTypeHypervisor":{
@@ -39755,6 +39763,7 @@
       }
     },
     "KeyPairName":{"type":"string"},
+    "KeyPairNameWithResolver":{"type":"string"},
     "KeyType":{
       "type":"string",
       "enum":[
@@ -54262,7 +54271,7 @@
       "members":{
         "Description":{
           "shape":"String",
-          "documentation":"<p>The description of the snapshot.</p>",
+          "documentation":"<p>The description of the disk image being imported.</p>",
           "locationName":"description"
         },
         "DiskImageSize":{