Bump botocore dependency specification (#1389)

Author: claytonparnell

CHANGES.rst

@@ -1,6 +1,10 @@
 Changes
 -------
 
+2.24.0 (2025-07-31)
+^^^^^^^^^^^^^^^^^^^
+* bump botocore dependency specification
+
 2.23.2 (2025-07-24)
 ^^^^^^^^^^^^^^^^^^^
 * bump botocore dependency specification

aiobotocore/__init__.py

@@ -1 +1 @@
-__version__ = '2.23.2'
+__version__ = '2.24.0'

aiobotocore/credentials.py

@@ -42,7 +42,6 @@
     SSOTokenLoader,
     UnauthorizedSSOTokenError,
     UnknownCredentialError,
-    _get_client_creator,
     _local_now,
     _parse_if_needed,
     _serialize_if_needed,
@@ -56,6 +55,7 @@
 from aiobotocore.utils import (
     AioContainerMetadataFetcher,
     AioInstanceMetadataFetcher,
+    create_nested_client,
 )
 
 logger = logging.getLogger(__name__)
@@ -1101,3 +1101,20 @@ async def load(self):
             method=self.METHOD,
             refresh_using=sso_fetcher.fetch_credentials,
         )
+
+
+def _get_client_creator(session, region_name):
+    """Create a client creator function for use in credential providers.
+
+    This is the async version of botocore.credentials._get_client_creator that
+    uses aiobotocore's create_nested_client.
+    """
+
+    def client_creator(service_name, **kwargs):
+        create_client_kwargs = {'region_name': region_name}
+        create_client_kwargs.update(**kwargs)
+        return create_nested_client(
+            session, service_name, **create_client_kwargs
+        )
+
+    return client_creator

aiobotocore/session.py

@@ -251,6 +251,7 @@ async def _create_client(
         monitor = self._get_internal_component('monitor')
         if monitor is not None:
             monitor.register(client.meta.events)
+        self._register_client_plugins(client)
         return client
 
     async def get_available_regions(

aiobotocore/tokens.py

@@ -3,6 +3,7 @@
 from datetime import timedelta
 
 import dateutil.parser
+from botocore import UNSIGNED
 from botocore.compat import total_seconds
 from botocore.exceptions import ClientError, TokenRetrievalError
 from botocore.tokens import (
@@ -14,6 +15,9 @@
     _utc_now,
 )
 
+from aiobotocore.config import AioConfig
+from aiobotocore.utils import create_nested_client
+
 logger = logging.getLogger(__name__)
 
 
@@ -152,6 +156,14 @@ async def _refresher(self):
             token_dict["accessToken"], expiration=expiration
         )
 
+    @property
+    def _client(self):
+        config = AioConfig(
+            region_name=self._sso_config["sso_region"],
+            signature_version=UNSIGNED,
+        )
+        return create_nested_client(self._session, "sso-oidc", config=config)
+
     def load_token(self, **kwargs):
         if self._sso_config is None:
             return None

aiobotocore/utils.py

@@ -24,14 +24,17 @@
     IMDSRegionProvider,
     InstanceMetadataFetcher,
     InstanceMetadataRegionFetcher,
+    PluginContext,
     ReadTimeoutError,
     S3ExpressIdentityCache,
     S3ExpressIdentityResolver,
     S3RegionRedirector,
     S3RegionRedirectorv2,
     get_environ_proxies,
     os,
+    reset_plugin_context,
     resolve_imds_endpoint_mode,
+    set_plugin_context,
 )
 
 import aiobotocore.httpsession
@@ -747,3 +750,35 @@ async def _get_response(self, full_url, headers, timeout):
                 f"container metadata: {e}"
             )
             raise MetadataRetrievalError(error_msg=error_msg)
+
+
+@contextlib.asynccontextmanager
+async def create_nested_client(session, service_name, **kwargs):
+    """Create a nested client with plugin context disabled.
+
+    If a client is created from within a plugin based on the environment variable,
+    an infinite loop could arise. Any clients created from within another client
+    must use this method to prevent infinite loops.
+
+    This is the async version of botocore.utils.create_nested_client that works
+    with aiobotocore's async session.
+
+    Usage:
+        async with create_nested_client(session, 'sts', region_name='us-east-1') as client:
+            response = await client.assume_role(...)
+    """
+    # Set plugin context to disabled
+    ctx = PluginContext(plugins="DISABLED")
+    token = set_plugin_context(ctx)
+
+    try:
+        # Create client context
+        async with session.create_client(service_name, **kwargs) as client:
+            # Reset plugin context immediately after client creation, matching botocore behavior
+            reset_plugin_context(token)
+            token = None
+
+            yield client
+    finally:
+        if token:
+            reset_plugin_context(token)

pyproject.toml

@@ -22,6 +22,7 @@ classifiers = [
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
     'Programming Language :: Python :: 3.13',
+    'Programming Language :: Python :: 3.14',
     'Environment :: Web Environment',
     'Framework :: AsyncIO',
 ]
@@ -31,7 +32,7 @@ dynamic = ["version", "readme"]
 dependencies = [
     "aiohttp >= 3.9.2, < 4.0.0",
     "aioitertools >= 0.5.1, < 1.0.0",
-    "botocore >= 1.39.7, < 1.39.9", # NOTE: When updating, always keep `project.optional-dependencies` aligned
+    "botocore >= 1.39.9, < 1.39.12", # NOTE: When updating, always keep `project.optional-dependencies` aligned
     "python-dateutil >= 2.1, < 3.0.0",
     "jmespath >= 0.7.1, < 2.0.0",
     "multidict >= 6.0.0, < 7.0.0",
@@ -40,10 +41,10 @@ dependencies = [
 
 [project.optional-dependencies]
 awscli = [
-    "awscli >= 1.41.7, < 1.41.9",
+    "awscli >= 1.41.9, < 1.41.12",
 ]
 boto3 = [
-    "boto3 >= 1.39.7, < 1.39.9",
+    "boto3 >= 1.39.9, < 1.39.12",
 ]
 httpx = [
     "httpx >= 0.25.1, < 0.29"

tests/test_patches.py

@@ -29,6 +29,7 @@
     SharedCredentialProvider,
     SSOCredentialFetcher,
     SSOProvider,
+    _get_client_creator,
     create_credential_resolver,
     create_mfa_serial_refresher,
     get_credentials,
@@ -109,6 +110,7 @@
     S3ExpressIdentityResolver,
     S3RegionRedirector,
     S3RegionRedirectorv2,
+    create_nested_client,
 )
 from botocore.waiter import (
     NormalizedOperationMethod,
@@ -651,6 +653,12 @@ def test_protocol_parsers():
                 'ff0c735a388ac8dd7fe300a32c1e36cdf33c0f56',
             },
         ),
+        (
+            _get_client_creator,
+            {
+                '6274e5675ecf13180b5a18daa0242bb71d6437b6',
+            },
+        ),
         # configprovider.py
         (
             SmartDefaultsConfigStoreFactory.merge_smart_defaults,
@@ -1353,6 +1361,12 @@ def test_protocol_parsers():
                 '148a10274d3268dd42df05d3bcfb98c668f01086',
             },
         ),
+        (
+            create_nested_client,
+            {
+                '619a190d84c4871c0e3c4828b0d6ea607d8b89da',
+            },
+        ),
         # waiter.py
         (
             NormalizedOperationMethod.__call__,