fix: disable SSL verification type issues and improve tests

Author: pyrooka

ibm_cloud_sdk_core/get_authenticator.py

@@ -65,22 +65,22 @@ def __construct_authenticator(config: dict) -> Authenticator:
             url=config.get('AUTH_URL'),
             client_id=config.get('CLIENT_ID'),
             client_secret=config.get('CLIENT_SECRET'),
-            disable_ssl_verification=config.get('AUTH_DISABLE_SSL'),
+            disable_ssl_verification=config.get('AUTH_DISABLE_SSL', 'false').lower() == 'true',
             scope=config.get('SCOPE'))
     elif auth_type == 'cp4d':
         authenticator = CloudPakForDataAuthenticator(
             username=config.get('USERNAME'),
             password=config.get('PASSWORD'),
             url=config.get('AUTH_URL'),
             apikey=config.get('APIKEY'),
-            disable_ssl_verification=config.get('AUTH_DISABLE_SSL'))
+            disable_ssl_verification=config.get('AUTH_DISABLE_SSL', 'false').lower() == 'true')
     elif auth_type == 'iam' and config.get('APIKEY'):
         authenticator = IAMAuthenticator(
             apikey=config.get('APIKEY'),
             url=config.get('AUTH_URL'),
             client_id=config.get('CLIENT_ID'),
             client_secret=config.get('CLIENT_SECRET'),
-            disable_ssl_verification=config.get('AUTH_DISABLE_SSL'),
+            disable_ssl_verification=config.get('AUTH_DISABLE_SSL', 'false').lower() == 'true',
             scope=config.get('SCOPE'))
     elif auth_type == 'noauth':
         authenticator = NoAuthAuthenticator()

resources/ibm-credentials-container.env

@@ -1,9 +1,13 @@
 SERVICE_1_AUTH_TYPE=container
 SERVICE_1_CR_TOKEN_FILENAME=crtoken.txt
-SERVICE_1_IAM_PROFILE_NAME=iam-user1
-SERVICE_1_IAM_PROFILE_ID=iam-id1
+SERVICE_1_IAM_PROFILE_NAME=iam-user-123
+SERVICE_1_IAM_PROFILE_ID=iam-id-123
 SERVICE_1_AUTH_URL=https://iamhost/iam/api
 SERVICE_1_SCOPE=scope1
-SERVICE_1_CLIENT_ID=iam-client1
-SERVICE_1_CLIENT_SECRET=iam-secret1
-SERVICE_1_AUTH_DISABLE_SSL=true
+SERVICE_1_CLIENT_ID=iam-client-123
+SERVICE_1_CLIENT_SECRET=iam-secret-123
+SERVICE_1_AUTH_DISABLE_SSL=true
+
+SERVICE_2_AUTH_TYPE=container
+SERVICE_2_IAM_PROFILE_NAME=iam-user-123
+SERVICE_2_AUTH_DISABLE_SSL=false

test/test_utils.py

@@ -274,13 +274,19 @@ def test_convert_list():
     assert mock4_str == mock4
 
 
+# pylint: disable=too-many-statements
 def test_get_authenticator_from_credential_file():
     file_path = os.path.join(os.path.dirname(__file__),
                              '../resources/ibm-credentials-iam.env')
     os.environ['IBM_CREDENTIALS_FILE'] = file_path
     authenticator = get_authenticator_from_environment('ibm watson')
     assert authenticator is not None
     assert authenticator.token_manager.apikey == '5678efgh'
+    assert authenticator.token_manager.url == 'https://iam.cloud.ibm.com'
+    assert authenticator.token_manager.client_id is None
+    assert authenticator.token_manager.client_secret is None
+    assert authenticator.token_manager.disable_ssl_verification is False
+    assert authenticator.token_manager.scope is None
     del os.environ['IBM_CREDENTIALS_FILE']
 
     file_path = os.path.join(os.path.dirname(__file__),
@@ -297,7 +303,24 @@ def test_get_authenticator_from_credential_file():
     authenticator = get_authenticator_from_environment('service 1')
     assert authenticator is not None
     assert authenticator.token_manager.cr_token_filename == 'crtoken.txt'
-    assert authenticator.token_manager.iam_profile_name == 'iam-user1'
+    assert authenticator.token_manager.iam_profile_name == 'iam-user-123'
+    assert authenticator.token_manager.iam_profile_id == 'iam-id-123'
+    assert authenticator.token_manager.url == 'https://iamhost/iam/api'
+    assert authenticator.token_manager.scope == 'scope1'
+    assert authenticator.token_manager.client_id == 'iam-client-123'
+    assert authenticator.token_manager.client_secret == 'iam-secret-123'
+    assert authenticator.token_manager.disable_ssl_verification is True
+
+    authenticator = get_authenticator_from_environment('service 2')
+    assert authenticator is not None
+    assert authenticator.token_manager.cr_token_filename is None
+    assert authenticator.token_manager.iam_profile_name == 'iam-user-123'
+    assert authenticator.token_manager.iam_profile_id is None
+    assert authenticator.token_manager.url == 'https://iam.cloud.ibm.com'
+    assert authenticator.token_manager.scope is None
+    assert authenticator.token_manager.client_id is None
+    assert authenticator.token_manager.client_secret is None
+    assert authenticator.token_manager.disable_ssl_verification is False
     del os.environ['IBM_CREDENTIALS_FILE']
 
     file_path = os.path.join(os.path.dirname(__file__),
@@ -307,6 +330,9 @@ def test_get_authenticator_from_credential_file():
     assert authenticator is not None
     assert authenticator.token_manager.username == 'my_username'
     assert authenticator.token_manager.password == 'my_password'
+    assert authenticator.token_manager.url == 'https://my_url/v1/authorize'
+    assert authenticator.token_manager.apikey is None
+    assert authenticator.token_manager.disable_ssl_verification is False
     del os.environ['IBM_CREDENTIALS_FILE']
 
     file_path = os.path.join(os.path.dirname(__file__),