fix(config): Handle multi word service name

Author: ehdsouza

ibm_cloud_sdk_core/utils.py

@@ -94,18 +94,16 @@ def read_from_env_variables(service_name):
     """
     :return dict config: parsed env variables
     """
-    service_name = service_name.replace(' ', '_').replace('-', '_').lower()
     config = {}
     for key, value in environ.items():
-        _parse_key_and_update_config(config, service_name.lower(), key.lower(), value)
+        _parse_key_and_update_config(config, service_name, key, value)
     return config
 
 def read_from_credential_file(service_name, separator='='):
     """
     :param str service_name: The service name
     :return dict config: parsed key values pairs
     """
-    service_name = service_name.replace(' ', '_').replace('-', '_').lower()
     DEFAULT_CREDENTIALS_FILE_NAME = 'ibm-credentials.env'
 
     # File path specified by an env variable
@@ -136,10 +134,12 @@ def read_from_credential_file(service_name, separator='='):
     return config
 
 def _parse_key_and_update_config(config, service_name, key, value):
+    service_name = service_name.replace(' ', '_').replace('-', '_').lower()
+    key = key.replace(' ', '_').replace('-', '_').lower()
     if key.startswith(service_name):
-        index = key.find('_')
+        index = key.find(service_name)
         if index != -1:
-            config[key[index + 1:]] = value
+            config[key[index + len(service_name) + 1:]] = value
 
 def read_from_vcap_services(service_name):
     service_name = service_name.replace(' ', '_').replace('-', '_').lower()

test/test_base_service.py

@@ -422,3 +422,8 @@ def test_service_url_not_set():
     with pytest.raises(ValueError) as err:
         service.prepare_request('POST', url='')
     assert str(err.value) == 'The service_url is required'
+
+def test_multi_word_service_name():
+    os.environ['personality-insights_url'] = 'xyz'
+    service = BaseService(service_url='', authenticator=NoAuthAuthenticator(), display_name='personality-insights')
+    assert service.service_url == 'xyz'

test/test_utils.py

@@ -86,3 +86,10 @@ def test_vcap_credentials():
     authenticator = get_authenticator_from_environment('test')
     assert authenticator is None
     del os.environ['VCAP_SERVICES']
+
+def test_multi_word_service_name():
+    os.environ['PERSONALITY-INSIGHTS_APIKEY'] = '5678efgh'
+    authenticator = get_authenticator_from_environment('personality-insights')
+    assert authenticator is not None
+    assert authenticator.token_manager.apikey == '5678efgh'
+    del os.environ['PERSONALITY-INSIGHTS_APIKEY']