Merge branch 'release-1.35.42' into develop

* release-1.35.42: Bumping version to 1.35.42 Update to latest models Merge customizations for S3
boto · Oct 16, 2024 · 5478d76 · 5478d76
2 parents b127e9b + f08e038
commit 5478d76
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 35 deletions.
diff --git a/.changes/1.35.42.json b/.changes/1.35.42.json
@@ -0,0 +1,12 @@
+[
+  {
+    "category": "``s3``",
+    "description": "Add support for the new optional bucket-region and prefix query parameters in the ListBuckets API. For ListBuckets requests that express pagination, Amazon S3 will now return both the bucket names and associated AWS regions in the response.",
+    "type": "api-change"
+  },
+  {
+    "category": "Config",
+    "description": "Fixed sigv4a_signing_region_set resolution when set in environment or config file.",
+    "type": "bugfix"
+  }
+]
diff --git a/.changes/next-release/bugfix-Config-98372.json b/.changes/next-release/bugfix-Config-98372.json
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+1.35.42
+=======
+
+* api-change:``s3``: Add support for the new optional bucket-region and prefix query parameters in the ListBuckets API. For ListBuckets requests that express pagination, Amazon S3 will now return both the bucket names and associated AWS regions in the response.
+* bugfix:Config: Fixed sigv4a_signing_region_set resolution when set in environment or config file.
+
+
 1.35.41
 =======
 

diff --git a/botocore/__init__.py b/botocore/__init__.py
@@ -16,7 +16,7 @@
 import os
 import re
 
-__version__ = '1.35.41'
+__version__ = '1.35.42'
 
 
 class NullHandler(logging.Handler):

diff --git a/botocore/data/s3/2006-03-01/paginators-1.sdk-extras.json b/botocore/data/s3/2006-03-01/paginators-1.sdk-extras.json
@@ -4,27 +4,32 @@
     "pagination": {
       "ListBuckets": {
         "non_aggregate_keys": [
-          "Owner"
+          "Owner",
+          "Prefix"
         ]
       },
       "ListMultipartUploads": {
         "non_aggregate_keys": [
-          "RequestCharged"
+          "RequestCharged",
+          "Prefix"
         ]
       },
       "ListObjectVersions": {
         "non_aggregate_keys": [
-          "RequestCharged"
+          "RequestCharged",
+          "Prefix"
         ]
       },
       "ListObjects": {
           "non_aggregate_keys": [
-            "RequestCharged"
+            "RequestCharged",
+            "Prefix"
           ]
       },
       "ListObjectsV2": {
         "non_aggregate_keys": [
-          "RequestCharged"
+          "RequestCharged",
+          "Prefix"
         ]
       },
       "ListParts": {

diff --git a/botocore/data/s3/2006-03-01/service-2.json b/botocore/data/s3/2006-03-01/service-2.json
diff --git 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.41'
+release = '1.35.42'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/tests/functional/test_paginator_config.py b/tests/functional/test_paginator_config.py
@@ -81,7 +81,6 @@
     'route53.ListResourceRecordSets.MaxItems',
     's3.ListMultipartUploads.Delimiter',
     's3.ListMultipartUploads.KeyMarker',
-    's3.ListMultipartUploads.Prefix',
     's3.ListMultipartUploads.Bucket',
     's3.ListMultipartUploads.MaxUploads',
     's3.ListMultipartUploads.UploadIdMarker',
@@ -90,13 +89,11 @@
     's3.ListObjectVersions.Delimiter',
     's3.ListObjectVersions.VersionIdMarker',
     's3.ListObjectVersions.KeyMarker',
-    's3.ListObjectVersions.Prefix',
     's3.ListObjectVersions.Name',
     's3.ListObjectVersions.EncodingType',
     's3.ListObjects.MaxKeys',
     's3.ListObjects.Delimiter',
     's3.ListObjects.NextMarker',
-    's3.ListObjects.Prefix',
     's3.ListObjects.Marker',
     's3.ListObjects.Name',
     's3.ListObjects.EncodingType',
@@ -105,7 +102,6 @@
     's3.ListObjectsV2.Delimiter',
     's3.ListObjectsV2.ContinuationToken',
     's3.ListObjectsV2.KeyCount',
-    's3.ListObjectsV2.Prefix',
     's3.ListObjectsV2.Name',
     's3.ListObjectsV2.EncodingType',
     's3.ListParts.PartNumberMarker',