Update credential file path check to current working directory (#50)

* fix: Update credential file path check to current working directory instead of core root

Author: rmkeezer

ibm_cloud_sdk_core/utils.py

@@ -16,8 +16,8 @@
 # from ibm_cloud_sdk_core.authenticators import Authenticator
 import datetime
 import json as json_import
-from os import getenv, environ
-from os.path import dirname, isfile, join, expanduser, abspath
+from os import getenv, environ, getcwd
+from os.path import isfile, join, expanduser
 from typing import List, Union
 
 import dateutil.parser as date_parser
@@ -182,7 +182,7 @@ def __read_from_credential_file(service_name: str, separator: str = '=') -> dict
     # Current working directory
     if credential_file_path is None:
         file_path = join(
-            dirname(dirname(abspath(__file__))), default_credentials_file_name)
+            getcwd(), default_credentials_file_name)
         if isfile(file_path):
             credential_file_path = file_path
 

resources/ibm-credentials.env

@@ -0,0 +1,4 @@
+IBM_WATSON_APIKEY=5678efgh
+IBM_WATSON_AUTH_TYPE=iam
+IBM_WATSON_URL=https://cwdserviceurl
+IBM_WATSON_DISABLE_SSL=False

test/test_base_service.py

@@ -3,6 +3,7 @@
 import json
 import time
 import os
+from shutil import copyfile
 import pytest
 import responses
 import jwt
@@ -154,6 +155,29 @@ def test_fail_http_config():
     with pytest.raises(TypeError):
         service.with_http_config(None)
 
+@responses.activate
+def test_cwd():
+    file_path = os.path.join(
+        os.path.dirname(__file__), '../resources/ibm-credentials.env')
+    # Try changing working directories to test getting creds from cwd
+    cwd = os.getcwd()
+    os.chdir(os.path.dirname(file_path))
+    iam_authenticator = get_authenticator_from_environment('ibm_watson')
+    service = AnyServiceV1('2017-07-07', authenticator=iam_authenticator)
+    service.configure_service('ibm_watson')
+    os.chdir(cwd)
+    assert service.service_url == 'https://cwdserviceurl'
+    assert service.authenticator is not None
+
+    # Copy credentials file to cwd to test loading from current working directory
+    temp_env_path = os.getcwd() + '/ibm-credentials.env'
+    copyfile(file_path, temp_env_path)
+    iam_authenticator = get_authenticator_from_environment('ibm_watson')
+    service = AnyServiceV1('2017-07-07', authenticator=iam_authenticator)
+    service.configure_service('ibm_watson')
+    os.remove(temp_env_path)
+    assert service.service_url == 'https://cwdserviceurl'
+    assert service.authenticator is not None
 
 @responses.activate
 def test_iam():