Merge pull request #17 from mire3212/update-tests

Refreshing Tests and Minor Tweaks

Author: SeaBlooms

jupiterone/client.py

@@ -3,6 +3,7 @@
 # see https://github.com/PyCQA/pylint/issues/409
 
 import json
+from warnings import warn
 from typing import Dict, List
 
 import requests
@@ -50,11 +51,11 @@ def __init__(self, account: str = None, token: str = None, url: str = DEFAULT_UR
         self.account = account
         self.token = token
         self.url = url
-        self.query_endpoint = self.url + "/graphql"
+        self.query_endpoint = self.url
         self.rules_endpoint = self.url + "/rules/graphql"
         self.headers = {
             "Authorization": "Bearer {}".format(self.token),
-            "Jupiterone-Account": self.account,
+            "JupiterOne-Account": self.account,
         }
 
     @property
@@ -90,7 +91,7 @@ def _execute_query(self, query: str, variables: Dict = None) -> Dict:
         if variables:
             data.update(variables=variables)
 
-        # Always ask for variableresultsize
+        # Always ask for variableResultSize
         data.update(flags={"variableResultSize": True})
 
         response = requests.post(
@@ -124,7 +125,7 @@ def _execute_query(self, query: str, variables: Dict = None) -> Dict:
             raise JupiterOneApiRetryError("JupiterOne API rate limit exceeded.")
 
         elif response.status_code in [504]:
-            raise JupiterOneApiRetryError("Bad Gateway error. Check network route and try again.")
+            raise JupiterOneApiRetryError("Gateway Timeout.")
 
         elif response.status_code in [500]:
             raise JupiterOneApiError("JupiterOne API internal server error.")

setup.py

@@ -3,8 +3,7 @@
 
 install_reqs = [
     'requests',
-    'retrying',
-    'warnings'
+    'retrying'
 ]
 
 setup(name='jupiterone',

tests/pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+pythonpath = ..

tests/test_create_entity.py

@@ -32,7 +32,7 @@ def request_callback(request):
         return (200, headers, json.dumps(response))
 
     responses.add_callback(
-        responses.POST, 'https://api.us.jupiterone.io/graphql',
+        responses.POST, 'https://graphql.us.jupiterone.io',
         callback=request_callback,
         content_type='application/json',
     )

tests/test_create_relationship.py

@@ -36,7 +36,7 @@ def request_callback(request):
         return (200, headers, json.dumps(response))
 
     responses.add_callback(
-        responses.POST, 'https://api.us.jupiterone.io/graphql',
+        responses.POST, 'https://graphql.us.jupiterone.io',
         callback=request_callback,
         content_type='application/json',
     )

tests/test_delete_entity.py

@@ -33,7 +33,7 @@ def request_callback(request):
         return (200, headers, json.dumps(response))
 
     responses.add_callback(
-        responses.POST, 'https://api.us.jupiterone.io/graphql',
+        responses.POST, 'https://graphql.us.jupiterone.io',
         callback=request_callback,
         content_type='application/json',
     )

tests/test_delete_relationship.py

@@ -36,7 +36,7 @@ def request_callback(request):
         return (200, headers, json.dumps(response))
 
     responses.add_callback(
-        responses.POST, 'https://api.us.jupiterone.io/graphql',
+        responses.POST, 'https://graphql.us.jupiterone.io',
         callback=request_callback,
         content_type='application/json',
     )