Version 1.0.26: Allow custom requests parameters

* for ex. disabling SSL verification as in test_status_connection.py

Author: dariosky

ravenpackapi/core.py

@@ -14,13 +14,14 @@
 from ravenpackapi.utils.constants import JSON_AVAILABLE_FIELDS, ENTITY_TYPES
 
 _VALID_METHODS = ('get', 'post', 'put', 'delete')
-VERSION = '1.0.25'
+VERSION = '1.0.26'
 
 logger = logging.getLogger("ravenpack.core")
 
 
 class RPApi(object):
     _CHUNK_SIZE = 32 * 1024
+    common_request_params = {}
 
     def __init__(self, api_key=None):
         self._BASE_URL = os.environ.get(
@@ -59,6 +60,7 @@ def request(self, endpoint, data=None, params=None, method='get', stream=False):
             data=json.dumps(data) if data else None,
             params=params,
             stream=stream,
+            **self.common_request_params
         )
         if self.log_curl_commands:
             logger.info("API query to %s" % to_curl(response.request))
@@ -159,3 +161,7 @@ def get_entity_mapping(self, identifiers):
         )
         data = response.json()
         return RPMappingResults(data)
+
+    def get_status(self):
+        response = self.request('/status')
+        return response.json()

ravenpackapi/models/job.py

@@ -115,6 +115,7 @@ def save_to_file(self, filename):
             response = requests.get(job.url,
                                     headers=api.headers,
                                     stream=True,
+                                    **api.common_request_params
                                     )
             if response.status_code != 200:
                 logger.error("Error calling the API, we tried: %s" % to_curl(response.request))
@@ -136,6 +137,7 @@ def iterate_results(self):
             r = s.get(job.url,
                       headers=api.headers,
                       stream=True,
+                      **api.common_request_params
                       )
             iterator = r.iter_lines(chunk_size=self._CHUNK_SIZE)
             headers = next(iterator)  # discard the headers

…venpackapi/tests/query_entity_mapping.py ravenpackapi/tests/test_entity_mapping.pyravenpackapi/tests/query_entity_mapping.py renamed to ravenpackapi/tests/test_entity_mapping.py ravenpackapi/tests/query_entity_mapping.py renamed to ravenpackapi/tests/test_entity_mapping.py

@@ -0,0 +1,18 @@
+import pytest
+from urllib3.exceptions import InsecureRequestWarning
+
+from ravenpackapi import RPApi
+
+
+class TestEntityMapping(object):
+    def test_status(self):
+        api = RPApi()
+        status = api.get_status()
+        assert status.get('status') == 'OK'
+
+    def test_status_no_https_verify(self):
+        api = RPApi()
+        api.common_request_params['verify'] = False
+        with pytest.warns(InsecureRequestWarning):
+            status = api.get_status()
+            assert status.get('status') == 'OK'

ravenpackapi/tests/test_status_connection.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-VERSION = '1.0.25'
+VERSION = '1.0.26'
 
 with open('README.rst') as readme_file:
     readme = readme_file.read()