Enabling the ability to disable SSL certificate requirements for mgmt API endpoints (#103)

* using 1.3.1 of the python API client; this now works properly to skip SSL cert requirements

* added a functioning test, removed print statements

* fixed path issue and adjusted version range for api client to the specific working version

* fixed requirements.txt and small bug in client logic

Author: zeryx

.gitignore

@@ -1,6 +1,9 @@
 #Eclipse
 .project
 
+TestFiles
+test.txt
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

Algorithmia/client.py

@@ -26,6 +26,7 @@ class Client(object):
 
     def __init__(self, apiKey = None, apiAddress = None, caCert = None):
         # Override apiKey with environment variable
+        config = None
         self.requestSession = requests.Session()
         if apiKey is None and 'ALGORITHMIA_API_KEY' in os.environ:
             apiKey = os.environ['ALGORITHMIA_API_KEY']
@@ -36,6 +37,7 @@ def __init__(self, apiKey = None, apiAddress = None, caCert = None):
             self.apiAddress = Algorithmia.getApiAddress()
         if caCert == False:
             self.requestSession.verify = False
+            config = Configuration(use_ssl=False)
         elif caCert is None and 'REQUESTS_CA_BUNDLE' in os.environ:
             caCert = os.environ.get('REQUESTS_CA_BUNDLE')
             self.catCerts(caCert)
@@ -48,8 +50,8 @@ def __init__(self, apiKey = None, apiAddress = None, caCert = None):
             self.catCerts(caCert)
             self.requestSession.verify = self.ca_cert
 
-
-        config = Configuration()
+        if not config:
+            config = Configuration()
         config.api_key['Authorization'] = self.apiKey
         config.host = "{}/v1".format(self.apiAddress)
         self.manageApi = DefaultApi(ApiClient(config))

Test/client_test.py

@@ -35,6 +35,7 @@ def test_create_org(self):
         response = self.c.create_org({"org_name": self.orgname, "org_label": "some label", "org_contact_name": "Some owner", "org_email": self.orgname+"@algo.com","type_id":"basic"})
         self.assertEqual(self.orgname,response['org_name'])
 
+
     def test_get_org(self):
         response = self.c.get_org("a_myOrg84")
         self.assertEqual("a_myOrg84",response['org_name'])
@@ -56,6 +57,15 @@ def test_get_build_logs(self):
             print(result)
         self.assertTrue("error" not in result)
 
+    def test_get_build_logs_no_ssl(self):
+        client = Algorithmia.client(api_key=os.environ.get('ALGORITHMIA_API_KEY'), ca_cert=False)
+        user = os.environ.get('ALGO_USER_NAME')
+        algo = "Echo"
+        result = client.algo(user + '/' + algo).build_logs()
+        if "error" in result:
+            print(result)
+        self.assertTrue("error" not in result)
+
 
     def test_edit_org(self):
         orgname="a_myOrg84"
@@ -95,6 +105,7 @@ def test_get_supported_languages(self):
         self.assertTrue(response is not None and language_found)
 
 
+
     def test_invite_to_org(self):
         response = self.c.invite_to_org("a_myOrg38","a_Mrtest4")
         self.assertEqual(200,response.status_code)

requirements.txt

@@ -3,7 +3,7 @@ six
 enum-compat
 toml
 argparse
-algorithmia-api-client>=1.3,<1.4
+algorithmia-api-client==1.5.1
 algorithmia-adk>=1.0.2,<1.1
 numpy<2
 uvicorn==0.14.0

requirements27.txt

@@ -3,6 +3,6 @@ six
 enum-compat
 toml
 argparse
-algorithmia-api-client>=1.3,<1.4
+algorithmia-api-client==1.5.1
 algorithmia-adk>=1.0.2,<1.1
 numpy<2

setup.py

@@ -21,7 +21,7 @@
         'enum-compat',
         'toml',
         'argparse',
-        'algorithmia-api-client>=1.3,<1.4',
+        'algorithmia-api-client==1.5.1',
         'algorithmia-adk>=1.0.2,<1.1'
     ],
     include_package_data=True,