Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions alibabacloud_credentials/provider/ecs_ram_role.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ def shutdown_handler(signum, frame):
)

def get_credentials(self) -> Credentials:
return self._credentials_cache()
return self._credentials_cache._sync_call()

async def get_credentials_async(self) -> Credentials:
return await self._credentials_cache()
return await self._credentials_cache._async_call()

def _get_role_name(self, url: str = None) -> str:
tea_request = ph.get_new_request()
Expand Down
4 changes: 2 additions & 2 deletions alibabacloud_credentials/provider/oidc.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ def __init__(self, *,
)

def get_credentials(self) -> Credentials:
return self._credentials_cache()
return self._credentials_cache._sync_call()

async def get_credentials_async(self) -> Credentials:
return await self._credentials_cache()
return await self._credentials_cache._async_call()

def _refresh_credentials(self) -> RefreshResult[Credentials]:
token = _get_token(self._oidc_token_file_path)
Expand Down
4 changes: 2 additions & 2 deletions alibabacloud_credentials/provider/ram_role_arn.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ def __init__(self, *,
)

def get_credentials(self) -> Credentials:
return self._credentials_cache()
return self._credentials_cache._sync_call()

async def get_credentials_async(self) -> Credentials:
return await self._credentials_cache()
return await self._credentials_cache._async_call()

def _refresh_credentials(self) -> RefreshResult[Credentials]:
tea_request = ph.get_new_request()
Expand Down
7 changes: 0 additions & 7 deletions alibabacloud_credentials/provider/refreshable.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,6 @@ def __init__(self, refresh_callable: Callable[[], RefreshResult[T]],
self._consecutive_refresh_failures = 0
self._cached_value = None
self._refresh_lock = threading.Lock()
self._loop = asyncio.get_event_loop()

def __call__(self):
if self._loop.is_running():
return self._async_call()
else:
return self._sync_call()

def _sync_call(self) -> T:
if self._cache_is_stale():
Expand Down
4 changes: 2 additions & 2 deletions alibabacloud_credentials/provider/rsa_key_pair.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ def __init__(self, *,
)

def get_credentials(self) -> Credentials:
return self._credentials_cache()
return self._credentials_cache._sync_call()

async def get_credentials_async(self) -> Credentials:
return await self._credentials_cache()
return await self._credentials_cache._async_call()

def _refresh_credentials(self) -> RefreshResult[Credentials]:
tea_request = ph.get_new_request()
Expand Down
4 changes: 2 additions & 2 deletions alibabacloud_credentials/provider/uri.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ def __init__(self, *,
)

def get_credentials(self) -> Credentials:
return self._credentials_cache()
return self._credentials_cache._sync_call()

async def get_credentials_async(self) -> Credentials:
return await self._credentials_cache()
return await self._credentials_cache._async_call()

def _refresh_credentials(self) -> RefreshResult[Credentials]:
r = urlparse(self._uri)
Expand Down
2 changes: 0 additions & 2 deletions tests/provider/test_refreshable.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import unittest
from unittest.mock import patch, MagicMock, AsyncMock
import asyncio
import threading
import time
from datetime import datetime
from alibabacloud_credentials.provider.refreshable import (
Credentials,
RefreshResult,
Expand Down