Merge branch 'release-1.35.46' into develop

* release-1.35.46:
  Bumping version to 1.35.46
  Update endpoints model
  Update to latest models

.changes/1.35.46.json

@@ -0,0 +1,37 @@
+[
+  {
+    "category": "``bedrock-runtime``",
+    "description": "Updating invoke regex to support imported models for converse API",
+    "type": "api-change"
+  },
+  {
+    "category": "``imagebuilder``",
+    "description": "Add macOS platform and instance placement options",
+    "type": "api-change"
+  },
+  {
+    "category": "``m2``",
+    "description": "Add AuthSecretsManagerArn optional parameter to batch job APIs, expand batch parameter limits, and introduce clientToken constraints.",
+    "type": "api-change"
+  },
+  {
+    "category": "``rds``",
+    "description": "Global clusters now expose the Endpoint attribute as one of its fields. It is a Read/Write endpoint for the global cluster which resolves to the Global Cluster writer instance.",
+    "type": "api-change"
+  },
+  {
+    "category": "``repostspace``",
+    "description": "Adds the BatchAddRole and BatchRemoveRole APIs.",
+    "type": "api-change"
+  },
+  {
+    "category": "``timestream-query``",
+    "description": "This release adds support for Query Insights, a feature that provides details of query execution, enabling users to identify areas for improvement to optimize their queries, resulting in improved query performance and lower query costs.",
+    "type": "api-change"
+  },
+  {
+    "category": "``s3``",
+    "description": "Fixed SelectObjectContent regression from `#3284 <https://github.com/boto/botocore/issues/3284>`__.",
+    "type": "bugfix"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,18 @@
 CHANGELOG
 =========
 
+1.35.46
+=======
+
+* api-change:``bedrock-runtime``: Updating invoke regex to support imported models for converse API
+* api-change:``imagebuilder``: Add macOS platform and instance placement options
+* api-change:``m2``: Add AuthSecretsManagerArn optional parameter to batch job APIs, expand batch parameter limits, and introduce clientToken constraints.
+* api-change:``rds``: Global clusters now expose the Endpoint attribute as one of its fields. It is a Read/Write endpoint for the global cluster which resolves to the Global Cluster writer instance.
+* api-change:``repostspace``: Adds the BatchAddRole and BatchRemoveRole APIs.
+* api-change:``timestream-query``: This release adds support for Query Insights, a feature that provides details of query execution, enabling users to identify areas for improvement to optimize their queries, resulting in improved query performance and lower query costs.
+* bugfix:``s3``: Fixed SelectObjectContent regression from `#3284 <https://github.com/boto/botocore/issues/3284>`__.
+
+
 1.35.45
 =======
 

botocore/__init__.py

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

botocore/data/bedrock-runtime/2023-09-30/service-2.json

@@ -339,7 +339,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}:imported-model/[a-z0-9]{12})|([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-:.]+)"
+      "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}:imported-model/[a-z0-9]{12})|([0-9]{12}:provisioned-model/[a-z0-9]{12})|([0-9]{12}:inference-profile/[a-zA-Z0-9-:.]+)))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|([a-zA-Z0-9-:.]+)"
     },
     "ConverseMetrics":{
       "type":"structure",
@@ -1515,7 +1515,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}:imported-model/[a-z0-9]{12})|([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-:.]+)"
+      "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}:imported-model/[a-z0-9]{12})|([0-9]{12}:provisioned-model/[a-z0-9]{12})|([0-9]{12}:inference-profile/[a-zA-Z0-9-:.]+)))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.:]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)|([a-zA-Z0-9-:.]+)"
     },
     "InvokeModelRequest":{
       "type":"structure",

botocore/data/endpoints.json

@@ -4979,6 +4979,7 @@
           "ap-southeast-2" : { },
           "ap-southeast-3" : { },
           "ap-southeast-4" : { },
+          "ap-southeast-5" : { },
           "ca-central-1" : {
             "variants" : [ {
               "hostname" : "controltower-fips.ca-central-1.amazonaws.com",

botocore/data/imagebuilder/2019-12-02/service-2.json

@@ -11,7 +11,8 @@
     "serviceId":"imagebuilder",
     "signatureVersion":"v4",
     "signingName":"imagebuilder",
-    "uid":"imagebuilder-2019-12-02"
+    "uid":"imagebuilder-2019-12-02",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "CancelImageCreation":{
@@ -769,7 +770,7 @@
         {"shape":"ForbiddenException"},
         {"shape":"CallRateLimitExceededException"}
       ],
-      "documentation":"<p>Returns the list of component build versions for the specified semantic version.</p> <note> <p>The semantic version has four nodes: &lt;major&gt;.&lt;minor&gt;.&lt;patch&gt;/&lt;build&gt;. You can assign values for the first three, and can filter on all of them.</p> <p> <b>Filtering:</b> With semantic versioning, you have the flexibility to use wildcards (x) to specify the most recent versions or nodes when selecting the base image or components for your recipe. When you use a wildcard in any node, all nodes to the right of the first wildcard must also be wildcards.</p> </note>"
+      "documentation":"<p>Returns the list of component build versions for the specified component version Amazon Resource Name (ARN).</p>"
     },
     "ListComponents":{
       "name":"ListComponents",
@@ -2266,7 +2267,7 @@
         },
         "kmsKeyId":{
           "shape":"NonEmptyString",
-          "documentation":"<p>Identifies which KMS key is used to encrypt the container image.</p>"
+          "documentation":"<p>Identifies which KMS key is used to encrypt the Dockerfile template.</p>"
         },
         "clientToken":{
           "shape":"ClientToken",
@@ -2619,15 +2620,19 @@
         },
         "resourceTags":{
           "shape":"ResourceTagMap",
-          "documentation":"<p>The tags attached to the resource created by Image Builder.</p>"
+          "documentation":"<p>The metadata tags to assign to the Amazon EC2 instance that Image Builder launches during the build process. Tags are formatted as key value pairs.</p>"
         },
         "instanceMetadataOptions":{
           "shape":"InstanceMetadataOptions",
           "documentation":"<p>The instance metadata options that you can set for the HTTP requests that pipeline builds use to launch EC2 build and test instances.</p>"
         },
         "tags":{
           "shape":"TagMap",
-          "documentation":"<p>The tags of the infrastructure configuration.</p>"
+          "documentation":"<p>The metadata tags to assign to the infrastructure configuration resource that Image Builder creates as output. Tags are formatted as key value pairs.</p>"
+        },
+        "placement":{
+          "shape":"Placement",
+          "documentation":"<p>The instance placement settings that define where the instances that are launched from your image will run.</p>"
         },
         "clientToken":{
           "shape":"ClientToken",
@@ -3282,7 +3287,7 @@
         },
         "containerTags":{
           "shape":"StringList",
-          "documentation":"<p>Tags for Image Builder to apply to the output container image that &amp;INS; scans. Tags can help you identify and manage your scanned images.</p>"
+          "documentation":"<p>Tags for Image Builder to apply to the output container image that Amazon Inspector scans. Tags can help you identify and manage your scanned images.</p>"
         }
       },
       "documentation":"<p>Settings that Image Builder uses to configure the ECR repository and the output container images that Amazon Inspector scans.</p>"
@@ -4840,6 +4845,10 @@
         "tags":{
           "shape":"TagMap",
           "documentation":"<p>The tags of the infrastructure configuration.</p>"
+        },
+        "placement":{
+          "shape":"Placement",
+          "documentation":"<p>The instance placement settings that define where the instances that are launched from your image will run.</p>"
         }
       },
       "documentation":"<p>Details of the infrastructure configuration.</p>"
@@ -4886,6 +4895,10 @@
         "instanceProfileName":{
           "shape":"InstanceProfileNameType",
           "documentation":"<p>The instance profile of the infrastructure configuration.</p>"
+        },
+        "placement":{
+          "shape":"Placement",
+          "documentation":"<p>The instance placement settings that define where the instances that are launched from your image will run.</p>"
         }
       },
       "documentation":"<p>The infrastructure used when building Amazon EC2 AMIs.</p>"
@@ -6606,11 +6619,34 @@
         "ENABLED"
       ]
     },
+    "Placement":{
+      "type":"structure",
+      "members":{
+        "availabilityZone":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Availability Zone where your build and test instances will launch.</p>"
+        },
+        "tenancy":{
+          "shape":"TenancyType",
+          "documentation":"<p>The tenancy of the instance. An instance with a tenancy of <code>dedicated</code> runs on single-tenant hardware. An instance with a tenancy of <code>host</code> runs on a Dedicated Host.</p> <p>If tenancy is set to <code>host</code>, then you can optionally specify one target for placement – either host ID or host resource group ARN. If automatic placement is enabled for your host, and you don't specify any placement target, Amazon EC2 will try to find an available host for your build and test instances.</p>"
+        },
+        "hostId":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The ID of the Dedicated Host on which build and test instances run. This only applies if <code>tenancy</code> is <code>host</code>. If you specify the host ID, you must not specify the resource group ARN. If you specify both, Image Builder returns an error.</p>"
+        },
+        "hostResourceGroupArn":{
+          "shape":"NonEmptyString",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the host resource group in which to launch build and test instances. This only applies if <code>tenancy</code> is <code>host</code>. If you specify the resource group ARN, you must not specify the host ID. If you specify both, Image Builder returns an error.</p>"
+        }
+      },
+      "documentation":"<p>By default, EC2 instances run on shared tenancy hardware. This means that multiple Amazon Web Services accounts might share the same physical hardware. When you use dedicated hardware, the physical server that hosts your instances is dedicated to your Amazon Web Services account. Instance placement settings contain the details for the physical hardware where instances that Image Builder launches during image creation will run.</p>"
+    },
     "Platform":{
       "type":"string",
       "enum":[
         "Windows",
-        "Linux"
+        "Linux",
+        "macOS"
       ]
     },
     "PutComponentPolicyRequest":{
@@ -7206,6 +7242,14 @@
       "max":10000,
       "min":1
     },
+    "TenancyType":{
+      "type":"string",
+      "enum":[
+        "default",
+        "dedicated",
+        "host"
+      ]
+    },
     "Timezone":{
       "type":"string",
       "max":100,
@@ -7414,18 +7458,22 @@
           "shape":"SnsTopicArn",
           "documentation":"<p>The Amazon Resource Name (ARN) for the SNS topic to which we send image build event notifications.</p> <note> <p>EC2 Image Builder is unable to send notifications to SNS topics that are encrypted using keys from other accounts. The key that is used to encrypt the SNS topic must reside in the account that the Image Builder service runs under.</p> </note>"
         },
-        "clientToken":{
-          "shape":"ClientToken",
-          "documentation":"<p>Unique, case-sensitive identifier you provide to ensure idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">Ensuring idempotency</a> in the <i>Amazon EC2 API Reference</i>.</p>",
-          "idempotencyToken":true
-        },
         "resourceTags":{
           "shape":"ResourceTagMap",
           "documentation":"<p>The tags attached to the resource created by Image Builder.</p>"
         },
         "instanceMetadataOptions":{
           "shape":"InstanceMetadataOptions",
           "documentation":"<p>The instance metadata options that you can set for the HTTP requests that pipeline builds use to launch EC2 build and test instances. For more information about instance metadata options, see one of the following links:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-options.html\">Configure the instance metadata options</a> in the <i> <i>Amazon EC2 User Guide</i> </i> for Linux instances.</p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/configuring-instance-metadata-options.html\">Configure the instance metadata options</a> in the <i> <i>Amazon EC2 Windows Guide</i> </i> for Windows instances.</p> </li> </ul>"
+        },
+        "placement":{
+          "shape":"Placement",
+          "documentation":"<p>The instance placement settings that define where the instances that are launched from your image will run.</p>"
+        },
+        "clientToken":{
+          "shape":"ClientToken",
+          "documentation":"<p>Unique, case-sensitive identifier you provide to ensure idempotency of the request. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html\">Ensuring idempotency</a> in the <i>Amazon EC2 API Reference</i>.</p>",
+          "idempotencyToken":true
         }
       }
     },