add waiter return and fix SSO token refresh bug

CHANGES.rst

@@ -1,9 +1,11 @@
 Changes
 -------
-2.5.3 (TBD)
+2.5.3
 ^^^^^^^^^^^^^^^^^^
 * add more support for Python 3.11
 * bump botocore to 1.31.17
+* add waiter.wait return
+* fix SSO token refresh bug #1025
 
 2.5.2 (2023-07-06)
 ^^^^^^^^^^^^^^^^^^

aiobotocore/tokens.py

@@ -83,12 +83,13 @@ async def _protected_refresh(self):
 
 class AioSSOTokenProvider(SSOTokenProvider):
     async def _attempt_create_token(self, token):
-        response = await self._client.create_token(
-            grantType=self._GRANT_TYPE,
-            clientId=token["clientId"],
-            clientSecret=token["clientSecret"],
-            refreshToken=token["refreshToken"],
-        )
+        async with self._client as client:
+            response = await client.create_token(
+                grantType=self._GRANT_TYPE,
+                clientId=token["clientId"],
+                clientSecret=token["clientSecret"],
+                refreshToken=token["refreshToken"],
+            )
         expires_in = timedelta(seconds=response["expiresIn"])
         new_token = {
             "startUrl": self._sso_config["sso_start_url"],

aiobotocore/utils.py

@@ -480,7 +480,8 @@ async def get_bucket_region(self, bucket, response):
 
         # Finally, HEAD the bucket. No other choice sadly.
         try:
-            response = await self._client.head_bucket(Bucket=bucket)
+            async with self._client as client:
+                response = await client.head_bucket(Bucket=bucket)
             headers = response['ResponseMetadata']['HTTPHeaders']
         except ClientError as e:
             headers = e.response['ResponseMetadata']['HTTPHeaders']
@@ -595,7 +596,8 @@ async def get_bucket_region(self, bucket, response):
 
         # Finally, HEAD the bucket. No other choice sadly.
         try:
-            response = await self._client.head_bucket(Bucket=bucket)
+            async with self._client as client:
+                response = await client.head_bucket(Bucket=bucket)
             headers = response['ResponseMetadata']['HTTPHeaders']
         except ClientError as e:
             headers = e.response['ResponseMetadata']['HTTPHeaders']

aiobotocore/waiter.py

@@ -46,7 +46,7 @@ def create_waiter_with_client(waiter_name, waiter_model, client):
     # Waiter.wait method. This is needed to attach a docstring to the
     # method.
     async def wait(self, **kwargs):
-        await AIOWaiter.wait(self, **kwargs)
+        return await AIOWaiter.wait(self, **kwargs)
 
     wait.__doc__ = WaiterDocstring(
         waiter_name=waiter_name,
@@ -118,7 +118,7 @@ async def wait(self, **kwargs):
                 logger.debug(
                     "Waiting complete, waiter matched the " "success state."
                 )
-                return
+                return response
             if current_state == 'failure':
                 reason = 'Waiter encountered a terminal failure state: %s' % (
                     acceptor.explanation