Skip to content

Commit a2aba79

Browse files
committed
fix: resolve loop in synchronously function
1 parent e7007de commit a2aba79

File tree

7 files changed

+10
-19
lines changed

7 files changed

+10
-19
lines changed

alibabacloud_credentials/provider/ecs_ram_role.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ def shutdown_handler(signum, frame):
8181
)
8282

8383
def get_credentials(self) -> Credentials:
84-
return self._credentials_cache()
84+
return self._credentials_cache._sync_call()
8585

8686
async def get_credentials_async(self) -> Credentials:
87-
return await self._credentials_cache()
87+
return await self._credentials_cache._async_call()
8888

8989
def _get_role_name(self, url: str = None) -> str:
9090
tea_request = ph.get_new_request()

alibabacloud_credentials/provider/oidc.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ def __init__(self, *,
9595
)
9696

9797
def get_credentials(self) -> Credentials:
98-
return self._credentials_cache()
98+
return self._credentials_cache._sync_call()
9999

100100
async def get_credentials_async(self) -> Credentials:
101-
return await self._credentials_cache()
101+
return await self._credentials_cache._async_call()
102102

103103
def _refresh_credentials(self) -> RefreshResult[Credentials]:
104104
token = _get_token(self._oidc_token_file_path)

alibabacloud_credentials/provider/ram_role_arn.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ def __init__(self, *,
9393
)
9494

9595
def get_credentials(self) -> Credentials:
96-
return self._credentials_cache()
96+
return self._credentials_cache._sync_call()
9797

9898
async def get_credentials_async(self) -> Credentials:
99-
return await self._credentials_cache()
99+
return await self._credentials_cache._async_call()
100100

101101
def _refresh_credentials(self) -> RefreshResult[Credentials]:
102102
tea_request = ph.get_new_request()

alibabacloud_credentials/provider/refreshable.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,6 @@ def __init__(self, refresh_callable: Callable[[], RefreshResult[T]],
161161
self._consecutive_refresh_failures = 0
162162
self._cached_value = None
163163
self._refresh_lock = threading.Lock()
164-
self._loop = asyncio.get_event_loop()
165-
166-
def __call__(self):
167-
if self._loop.is_running():
168-
return self._async_call()
169-
else:
170-
return self._sync_call()
171164

172165
def _sync_call(self) -> T:
173166
if self._cache_is_stale():

alibabacloud_credentials/provider/rsa_key_pair.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ def __init__(self, *,
7979
)
8080

8181
def get_credentials(self) -> Credentials:
82-
return self._credentials_cache()
82+
return self._credentials_cache._sync_call()
8383

8484
async def get_credentials_async(self) -> Credentials:
85-
return await self._credentials_cache()
85+
return await self._credentials_cache._async_call()
8686

8787
def _refresh_credentials(self) -> RefreshResult[Credentials]:
8888
tea_request = ph.get_new_request()

alibabacloud_credentials/provider/uri.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ def __init__(self, *,
4444
)
4545

4646
def get_credentials(self) -> Credentials:
47-
return self._credentials_cache()
47+
return self._credentials_cache._sync_call()
4848

4949
async def get_credentials_async(self) -> Credentials:
50-
return await self._credentials_cache()
50+
return await self._credentials_cache._async_call()
5151

5252
def _refresh_credentials(self) -> RefreshResult[Credentials]:
5353
r = urlparse(self._uri)

tests/provider/test_refreshable.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import unittest
22
from unittest.mock import patch, MagicMock, AsyncMock
33
import asyncio
4-
import threading
54
import time
6-
from datetime import datetime
75
from alibabacloud_credentials.provider.refreshable import (
86
Credentials,
97
RefreshResult,

0 commit comments

Comments
 (0)