Ini file comment processing

.travis.yml

@@ -0,0 +1,19 @@
+language: python
+python:
+  - "3.4"
+  - "3.5"
+  - "3.6"
+  - "3.7"
+  - "3.8"
+env:
+  - PYTHONPATH=$PYTHONPATH:$TRAVIS_BUILD_DIR
+# command to install dependencies
+install:
+  - pip install coverage
+  - pip install requests==2.21.0
+  - pip install alibabacloud-tea
+# command to run tests
+script:
+  - coverage run --source=alibabacloud_credentials -m pytest tests/test_*
+  - wget --no-check-certificate https://codecov.io/bash -O codecov.sh
+  - bash codecov.sh -cF "python"

alibabacloud_credentials/client.py

@@ -1,4 +1,5 @@
 from alibabacloud_credentials import providers, credentials
+from alibabacloud_credentials.models import Config
 from alibabacloud_credentials.utils import auth_constant as ac
 from functools import wraps
 
@@ -19,6 +20,7 @@ class Client:
 
     def __init__(self, config=None):
         if config is None:
+            config = Config()
             provider = providers.DefaultCredentialsProvider()
             self.cloud_credential = provider.get_credentials()
         self.cloud_credential = self.get_credential(config)

alibabacloud_credentials/providers.py

@@ -248,10 +248,16 @@ def get_credentials(self):
         conf.read(file_path, encoding='utf-8')
         ini_map = dict(conf._sections)
         for k in dict(conf._sections):
-            ini_map[k] = dict(ini_map[k])
+            option = dict(ini_map[k])
+            for key, value in dict(ini_map[k]).items():
+                if '#' in value:
+                    option[key] = value.split('#')[0].strip()
+                else:
+                    option[key] = value.strip()
+            ini_map[k] = option
         client_config = ini_map.get(au.client_type)
         if client_config is None:
-            raise CredentialException("Client is not open in the specified credentials file")
+            return
         return self._create_credential(client_config)
 
     def _create_credential(self, config):

tests/test_client.py

@@ -17,3 +17,8 @@ def test_client(self):
         self.assertEqual('654321', cred.get_access_key_secret())
         self.assertEqual(auth_constant.ACCESS_KEY, cred.get_type())
         self.assertIsNone(cred.get_security_token())
+        try:
+            cred = Client()
+            cred.get_access_key_id()
+        except Exception as e:
+            self.assertEqual(str(e), 'not found credentials')

tests/test_providers.py

@@ -135,7 +135,7 @@ def test_ProfileCredentialsProvider(self):
         auth_util.client_type = 'client7'
         self.assertIsNone(prov.get_credentials())
         prov = providers.ProfileCredentialsProvider()
-        self.assertRaises(exceptions.CredentialException, prov.get_credentials)
+        self.assertIsNone(prov.get_credentials())
 
     def test_EnvironmentVariableCredentialsProvider(self):
         prov = providers.EnvironmentVariableCredentialsProvider()
@@ -144,7 +144,7 @@ def test_EnvironmentVariableCredentialsProvider(self):
 
         auth_util.client_type = 'default'
         auth_util.environment_access_key_id = 'accessKeyIdTest'
-        self.assertIsInstance(prov.get_credentials(), AccessKeyCredential)
+        self.assertIsNone(prov.get_credentials())
 
         auth_util.environment_access_key_secret = 'accessKeySecretTest'
         cred = prov.get_credentials()

tests/tests.ini

@@ -1,5 +1,5 @@
 [default]
-enable=true
+enable=true          # enable
 type=access_key
 access_key_id=foo
 access_key_secret=bar