diff --git a/ChangeLog.md b/ChangeLog.md index e8cd2d2..601b329 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,6 @@ +### 2020-02-03 Version 0.1.4 +* Optimize the way to obtain the credentials.ini file. + ### 2020-01-28 Version 0.1.3 * Support async refresh credentials. diff --git a/alibabacloud_credentials/__init__.py b/alibabacloud_credentials/__init__.py index 12d06bf..e1a267b 100644 --- a/alibabacloud_credentials/__init__.py +++ b/alibabacloud_credentials/__init__.py @@ -1 +1 @@ -__version__ = "0.1.3" +__version__ = "0.1.4" diff --git a/alibabacloud_credentials/providers.py b/alibabacloud_credentials/providers.py index 47ccf38..27d58be 100644 --- a/alibabacloud_credentials/providers.py +++ b/alibabacloud_credentials/providers.py @@ -3,6 +3,7 @@ import time import configparser import calendar +import os from Tea.core import TeaCore from Tea.request import TeaRequest @@ -354,7 +355,9 @@ def __init__(self, path=None): def parse_ini(self): file_path = self.file_path if self.file_path else au.environment_credentials_file if file_path is None: - file_path = ac.DEFAULT_CREDENTIALS_FILE_PATH + if not ac.HOME: + return + file_path = os.path.join(ac.HOME, "/.alibabacloud/credentials.ini") if len(file_path) == 0: raise CredentialException("The specified credentials file is empty") diff --git a/alibabacloud_credentials/utils/auth_constant.py b/alibabacloud_credentials/utils/auth_constant.py index b91636e..4dec9c1 100644 --- a/alibabacloud_credentials/utils/auth_constant.py +++ b/alibabacloud_credentials/utils/auth_constant.py @@ -1,10 +1,6 @@ import os -try: - DEFAULT_CREDENTIALS_FILE_PATH = os.environ['HOME'] + "/.alibabacloud/credentials.ini" -except KeyError: - DEFAULT_CREDENTIALS_FILE_PATH = os.environ['HOMEPATH'] + "/.alibabacloud/credentials.ini" - +HOME = os.getenv('HOME') if os.getenv('HOME') else os.getenv('HOMEPATH') INI_ACCESS_KEY_ID = "access_key_id" INI_ACCESS_KEY_IDSECRET = "access_key_secret" INI_TYPE = "type"