diff --git a/CHANGES.rst b/CHANGES.rst index 787b12ed..2dd19298 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,10 @@ Changes ------- +2.14.0 (2024-08-23) +^^^^^^^^^^^^^^^^^^^ +* bump botocore dependency specification + 2.13.3 (2024-08-22) ^^^^^^^^^^^^^^^^^^^ * fix ``create_waiter_with_client()`` diff --git a/aiobotocore/__init__.py b/aiobotocore/__init__.py index 2cf494cb..6684d2b8 100644 --- a/aiobotocore/__init__.py +++ b/aiobotocore/__init__.py @@ -1 +1 @@ -__version__ = '2.13.3' +__version__ = '2.14.0' diff --git a/aiobotocore/client.py b/aiobotocore/client.py index 5f3ece32..fa140326 100644 --- a/aiobotocore/client.py +++ b/aiobotocore/client.py @@ -1,3 +1,4 @@ +from botocore.auth import resolve_auth_type from botocore.awsrequest import prepare_request_dict from botocore.client import ( BaseClient, @@ -64,15 +65,19 @@ async def create_client( region_name, client_config = self._normalize_fips_region( region_name, client_config ) + if auth := service_model.metadata.get('auth'): + service_signature_version = resolve_auth_type(auth) + else: + service_signature_version = service_model.metadata.get( + 'signatureVersion' + ) endpoint_bridge = ClientEndpointBridge( self._endpoint_resolver, scoped_config, client_config, service_signing_name=service_model.metadata.get('signingName'), config_store=self._config_store, - service_signature_version=service_model.metadata.get( - 'signatureVersion' - ), + service_signature_version=service_signature_version, ) client_args = self._get_client_args( service_model, @@ -341,8 +346,10 @@ async def _make_api_call(self, operation_name, api_params): 'client_region': self.meta.region_name, 'client_config': self.meta.config, 'has_streaming_input': operation_model.has_streaming_input, - 'auth_type': operation_model.auth_type, + 'auth_type': operation_model.resolved_auth_type, + 'unsigned_payload': operation_model.unsigned_payload, } + api_params = await self._emit_api_params( api_params=api_params, operation_model=operation_model, diff --git a/pyproject.toml b/pyproject.toml index 9d20b214..eb7559b6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,7 @@ classifiers = [ dynamic = ["version", "readme"] dependencies = [ - "botocore >=1.34.70, <1.34.163", # NOTE: When updating, always keep `project.optional-dependencies` aligned + "botocore >=1.35.0, <1.35.5", # NOTE: When updating, always keep `project.optional-dependencies` aligned "aiohttp >=3.9.2, <4.0.0", "wrapt >=1.10.10, <2.0.0", "aioitertools >=0.5.1, <1.0.0", @@ -37,10 +37,10 @@ dependencies = [ [project.optional-dependencies] awscli = [ - "awscli >=1.32.70, <1.33.45", + "awscli >=1.34.0, <1.34.5", ] boto3 = [ - "boto3 >=1.34.70, <1.34.163", + "boto3 >=1.35.0, <1.35.5", ] [project.urls] diff --git a/tests/test_patches.py b/tests/test_patches.py index 280b81a1..a68f26d4 100644 --- a/tests/test_patches.py +++ b/tests/test_patches.py @@ -146,7 +146,7 @@ }, # client.py ClientCreator.create_client: { - 'eeb7c4730ac86aec37de53b2be0779490b05f50b', + 'e5bfb3213dc625a3c96e13ca7514f1ca7fc18899', }, ClientCreator._create_client_class: { 'fcecaf8d4f2c1ac3c5d0eb50c573233ef86d641d', @@ -178,8 +178,7 @@ '06864c8ecac153fa36d9d57f0057cb95909ee7cd', }, BaseClient._make_api_call: { - '2cb11088d36a89cf9f5c41508bce908acbde24c4', - '490a95d7f829ce1fc2e3fbb6169ee63f04d6aeeb', + 'fccb87670b86bd0bd834d5c38b74e1d77211590a', }, BaseClient._make_request: { 'cfd8bbf19ea132134717cdf9c460694ddacdbf58', @@ -203,7 +202,7 @@ # config.py Config.merge: {'c3dd8c3ffe0da86953ceba4a35267dfb79c6a2c8'}, Config: { - '9154efda503c21ab9aa048214ddca7aa637e2ff9', + '823f8d031fc7218a600a56268a369aaa878f46c8', }, # credentials.py create_mfa_serial_refresher: {'9b5e98782fcacdcea5899a6d0d29d1b9de348bb0'},