fix refreshable credentials injection (#1314)

Author: thehesiod

CHANGES.rst

@@ -1,5 +1,8 @@
 Changes
 -------
+2.21.1 (2025-03-04)
+^^^^^^^^^^^^^^^^^^^
+* fix for refreshable credential account-id lookup
 
 2.21.0 (2025-02-28)
 ^^^^^^^^^^^^^^^^^^^

aiobotocore/__init__.py

@@ -1 +1 @@
-__version__ = '2.21.0'
+__version__ = '2.21.1'

aiobotocore/args.py

@@ -2,7 +2,7 @@
 
 import botocore.parsers
 import botocore.serialize
-from botocore.args import ClientArgsCreator
+from botocore.args import ClientArgsCreator, EPRBuiltins
 
 from .config import AioConfig
 from .endpoint import DEFAULT_HTTP_SESSION_CLS, AioEndpointCreator
@@ -176,6 +176,12 @@ def _build_endpoint_resolver(
             credentials=credentials,
             account_id_endpoint_mode=account_id_endpoint_mode,
         )
+
+        # replace with async version
+        resolver_builtins[EPRBuiltins.ACCOUNT_ID] = (
+            credentials.get_account_id if credentials else None
+        )
+
         # Client context params for s3 conflict with the available settings
         # in the `s3` parameter on the `Config` object. If the same parameter
         # is set in both places, the value in the `s3` parameter takes priority.

aiobotocore/credentials.py

@@ -247,6 +247,19 @@ async def call(self):
 
 
 class AioCredentials(Credentials):
+    # Overrides for property accessors
+    def get_account_id(self):
+        return self.account_id
+
+    def get_access_key(self):
+        return self.access_key
+
+    def get_secret_key(self):
+        return self.secret_key
+
+    def get_token(self):
+        return self.token
+
     async def get_frozen_credentials(self):
         return ReadOnlyCredentials(
             self.access_key, self.secret_key, self.token, self.account_id
@@ -258,14 +271,30 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self._refresh_lock = asyncio.Lock()
 
+    async def get_account_id(self):
+        await self._refresh()
+        return self._account_id
+
+    async def get_access_key(self):
+        await self._refresh()
+        return self._access_key
+
+    async def get_secret_key(self):
+        await self._refresh()
+        return self._secret_key
+
+    async def get_token(self):
+        await self._refresh()
+        return self._token
+
     # Redeclaring the properties so it doesn't call refresh
     # Have to redeclare setter as we're overriding the getter
     @property
     def access_key(self):
         # TODO: this needs to be resolved
         raise NotImplementedError(
             "missing call to self._refresh. "
-            "Use get_frozen_credentials instead"
+            "Use get_frozen_credentials or get_access_key"
         )
         return self._access_key
 
@@ -278,7 +307,7 @@ def secret_key(self):
         # TODO: this needs to be resolved
         raise NotImplementedError(
             "missing call to self._refresh. "
-            "Use get_frozen_credentials instead"
+            "Use get_frozen_credentials or get_secret_key instead"
         )
         return self._secret_key
 
@@ -291,7 +320,7 @@ def token(self):
         # TODO: this needs to be resolved
         raise NotImplementedError(
             "missing call to self._refresh. "
-            "Use get_frozen_credentials instead"
+            "Use get_frozen_credentials or get_token instead"
         )
         return self._token
 
@@ -304,7 +333,7 @@ def account_id(self):
         # TODO: this needs to be resolved
         raise NotImplementedError(
             "missing call to self._refresh. "
-            "Use get_frozen_credentials instead"
+            "Use get_frozen_credentials or get_account_id instead"
         )
         return self._account_id
 

aiobotocore/regions.py

@@ -4,6 +4,8 @@
 from botocore.exceptions import EndpointProviderError
 from botocore.regions import EndpointRulesetResolver
 
+from aiobotocore._helpers import resolve_awaitable
+
 LOG = logging.getLogger(__name__)
 
 
@@ -82,9 +84,11 @@ async def _get_provider_params(
                 call_args=call_args,
             )
             if param_val is None and param_def.builtin is not None:
-                param_val = self._resolve_param_as_builtin(
-                    builtin_name=param_def.builtin,
-                    builtins=customized_builtins,
+                param_val = await resolve_awaitable(
+                    self._resolve_param_as_builtin(
+                        builtin_name=param_def.builtin,
+                        builtins=customized_builtins,
+                    )
                 )
             if param_val is not None:
                 provider_params[param_name] = param_val