Merge pull request #364 from splitio/dw-update-apikey-splitio.api

updated apikey in splitio.api classes

Author: chillaq

splitio/api/auth.py

@@ -16,19 +16,19 @@
 class AuthAPI(object):  # pylint: disable=too-few-public-methods
     """Class that uses an httpClient to communicate with the SDK Auth Service API."""
 
-    def __init__(self, client, apikey, sdk_metadata, telemetry_runtime_producer):
+    def __init__(self, client, sdk_key, sdk_metadata, telemetry_runtime_producer):
         """
         Class constructor.
 
         :param client: HTTP Client responsble for issuing calls to the backend.
         :type client: HttpClient
-        :param apikey: User apikey token.
-        :type apikey: string
+        :param sdk_key: User sdk key.
+        :type sdk_key: string
         :param sdk_metadata: SDK version & machine name & IP.
         :type sdk_metadata: splitio.client.util.SdkMetadata
         """
         self._client = client
-        self._apikey = apikey
+        self._sdk_key = sdk_key
         self._metadata = headers_from_metadata(sdk_metadata)
         self._telemetry_runtime_producer = telemetry_runtime_producer
 
@@ -44,7 +44,7 @@ def authenticate(self):
             response = self._client.get(
                 'auth',
                 '/v2/auth',
-                self._apikey,
+                self._sdk_key,
                 extra_headers=self._metadata,
             )
             record_telemetry(response.status_code, get_current_epoch_time_ms() - start, HTTPExceptionsAndLatencies.TOKEN, self._telemetry_runtime_producer)

splitio/api/client.py

@@ -66,28 +66,28 @@ def _build_url(self, server, path):
         return self._urls[server] + path
 
     @staticmethod
-    def _build_basic_headers(apikey):
+    def _build_basic_headers(sdk_key):
         """
         Build basic headers with auth.
 
-        :param apikey: API token used to identify backend calls.
-        :type apikey: str
+        :param sdk_key: API token used to identify backend calls.
+        :type sdk_key: str
         """
         return {
             'Content-Type': 'application/json',
-            'Authorization': "Bearer %s" % apikey
+            'Authorization': "Bearer %s" % sdk_key
         }
 
-    def get(self, server, path, apikey, query=None, extra_headers=None):  # pylint: disable=too-many-arguments
+    def get(self, server, path, sdk_key, query=None, extra_headers=None):  # pylint: disable=too-many-arguments
         """
         Issue a get request.
 
         :param server: Whether the request is for SDK server, Events server or Auth server.
         :typee server: str
         :param path: path to append to the host url.
         :type path: str
-        :param apikey: api token.
-        :type apikey: str
+        :param sdk_key: sdk key.
+        :type sdk_key: str
         :param query: Query string passed as dictionary.
         :type query: dict
         :param extra_headers: key/value pairs of possible extra headers.
@@ -96,7 +96,7 @@ def get(self, server, path, apikey, query=None, extra_headers=None):  # pylint:
         :return: Tuple of status_code & response text
         :rtype: HttpResponse
         """
-        headers = self._build_basic_headers(apikey)
+        headers = self._build_basic_headers(sdk_key)
         if extra_headers is not None:
             headers.update(extra_headers)
 
@@ -111,16 +111,16 @@ def get(self, server, path, apikey, query=None, extra_headers=None):  # pylint:
         except Exception as exc:  # pylint: disable=broad-except
             raise HttpClientException('requests library is throwing exceptions') from exc
 
-    def post(self, server, path, apikey, body, query=None, extra_headers=None):  # pylint: disable=too-many-arguments
+    def post(self, server, path, sdk_key, body, query=None, extra_headers=None):  # pylint: disable=too-many-arguments
         """
         Issue a POST request.
 
         :param server: Whether the request is for SDK server or Events server.
         :typee server: str
         :param path: path to append to the host url.
         :type path: str
-        :param apikey: api token.
-        :type apikey: str
+        :param sdk_key: sdk key.
+        :type sdk_key: str
         :param body: body sent in the request.
         :type body: str
         :param query: Query string passed as dictionary.
@@ -131,7 +131,7 @@ def post(self, server, path, apikey, body, query=None, extra_headers=None):  # p
         :return: Tuple of status_code & response text
         :rtype: HttpResponse
         """
-        headers = self._build_basic_headers(apikey)
+        headers = self._build_basic_headers(sdk_key)
 
         if extra_headers is not None:
             headers.update(extra_headers)

splitio/api/events.py

@@ -15,19 +15,19 @@
 class EventsAPI(object):  # pylint: disable=too-few-public-methods
     """Class that uses an httpClient to communicate with the events API."""
 
-    def __init__(self, http_client, apikey, sdk_metadata, telemetry_runtime_producer):
+    def __init__(self, http_client, sdk_key, sdk_metadata, telemetry_runtime_producer):
         """
         Class constructor.
 
         :param http_client: HTTP Client responsble for issuing calls to the backend.
         :type http_client: HttpClient
-        :param apikey: User apikey token.
-        :type apikey: string
+        :param sdk_key: sdk key.
+        :type sdk_key: string
         :param sdk_metadata: SDK version & machine name & IP.
         :type sdk_metadata: splitio.client.util.SdkMetadata
         """
         self._client = http_client
-        self._apikey = apikey
+        self._sdk_key = sdk_key
         self._metadata = headers_from_metadata(sdk_metadata)
         self._telemetry_runtime_producer = telemetry_runtime_producer
 
@@ -70,7 +70,7 @@ def flush_events(self, events):
             response = self._client.post(
                 'events',
                 '/events/bulk',
-                self._apikey,
+                self._sdk_key,
                 body=bulk,
                 extra_headers=self._metadata,
             )

splitio/api/impressions.py

@@ -17,17 +17,17 @@
 class ImpressionsAPI(object):  # pylint: disable=too-few-public-methods
     """Class that uses an httpClient to communicate with the impressions API."""
 
-    def __init__(self, client, apikey, sdk_metadata, telemetry_runtime_producer, mode=ImpressionsMode.OPTIMIZED):
+    def __init__(self, client, sdk_key, sdk_metadata, telemetry_runtime_producer, mode=ImpressionsMode.OPTIMIZED):
         """
         Class constructor.
 
         :param client: HTTP Client responsble for issuing calls to the backend.
         :type client: HttpClient
-        :param apikey: User apikey token.
-        :type apikey: string
+        :param sdk_key: sdk key.
+        :type sdk_key: string
         """
         self._client = client
-        self._apikey = apikey
+        self._sdk_key = sdk_key
         self._metadata = headers_from_metadata(sdk_metadata)
         self._metadata['SplitSDKImpressionsMode'] = mode.name
         self._telemetry_runtime_producer = telemetry_runtime_producer
@@ -99,7 +99,7 @@ def flush_impressions(self, impressions):
             response = self._client.post(
                 'events',
                 '/testImpressions/bulk',
-                self._apikey,
+                self._sdk_key,
                 body=bulk,
                 extra_headers=self._metadata,
             )
@@ -126,7 +126,7 @@ def flush_counters(self, counters):
             response = self._client.post(
                 'events',
                 '/testImpressions/count',
-                self._apikey,
+                self._sdk_key,
                 body=bulk,
                 extra_headers=self._metadata,
             )

splitio/api/segments.py

@@ -17,20 +17,20 @@
 class SegmentsAPI(object):  # pylint: disable=too-few-public-methods
     """Class that uses an httpClient to communicate with the segments API."""
 
-    def __init__(self, http_client, apikey, sdk_metadata, telemetry_runtime_producer):
+    def __init__(self, http_client, sdk_key, sdk_metadata, telemetry_runtime_producer):
         """
         Class constructor.
 
         :param client: HTTP Client responsble for issuing calls to the backend.
         :type client: client.HttpClient
-        :param apikey: User apikey token.
-        :type apikey: string
+        :param sdk_key: User sdk_key token.
+        :type sdk_key: string
         :param sdk_metadata: SDK version & machine name & IP.
         :type sdk_metadata: splitio.client.util.SdkMetadata
 
         """
         self._client = http_client
-        self._apikey = apikey
+        self._sdk_key = sdk_key
         self._metadata = headers_from_metadata(sdk_metadata)
         self._telemetry_runtime_producer = telemetry_runtime_producer
 
@@ -56,7 +56,7 @@ def fetch_segment(self, segment_name, change_number, fetch_options):
             response = self._client.get(
                 'sdk',
                 '/segmentChanges/{segment_name}'.format(segment_name=segment_name),
-                self._apikey,
+                self._sdk_key,
                 extra_headers=extra_headers,
                 query=query,
             )

splitio/api/splits.py

@@ -16,19 +16,19 @@
 class SplitsAPI(object):  # pylint: disable=too-few-public-methods
     """Class that uses an httpClient to communicate with the splits API."""
 
-    def __init__(self, client, apikey, sdk_metadata, telemetry_runtime_producer):
+    def __init__(self, client, sdk_key, sdk_metadata, telemetry_runtime_producer):
         """
         Class constructor.
 
         :param client: HTTP Client responsble for issuing calls to the backend.
         :type client: HttpClient
-        :param apikey: User apikey token.
-        :type apikey: string
+        :param sdk_key: User sdk_key token.
+        :type sdk_key: string
         :param sdk_metadata: SDK version & machine name & IP.
         :type sdk_metadata: splitio.client.util.SdkMetadata
         """
         self._client = client
-        self._apikey = apikey
+        self._sdk_key = sdk_key
         self._metadata = headers_from_metadata(sdk_metadata)
         self._telemetry_runtime_producer = telemetry_runtime_producer
 
@@ -51,7 +51,7 @@ def fetch_splits(self, change_number, fetch_options):
             response = self._client.get(
                 'sdk',
                 '/splitChanges',
-                self._apikey,
+                self._sdk_key,
                 extra_headers=extra_headers,
                 query=query,
             )

splitio/api/telemetry.py

@@ -12,17 +12,17 @@
 class TelemetryAPI(object):  # pylint: disable=too-few-public-methods
     """Class that uses an httpClient to communicate with the Telemetry API."""
 
-    def __init__(self, client, apikey, sdk_metadata, telemetry_runtime_producer):
+    def __init__(self, client, sdk_key, sdk_metadata, telemetry_runtime_producer):
         """
         Class constructor.
 
         :param client: HTTP Client responsble for issuing calls to the backend.
         :type client: HttpClient
-        :param apikey: User apikey token.
-        :type apikey: string
+        :param sdk_key: User sdk_key token.
+        :type sdk_key: string
         """
         self._client = client
-        self._apikey = apikey
+        self._sdk_key = sdk_key
         self._metadata = headers_from_metadata(sdk_metadata)
         self._telemetry_runtime_producer = telemetry_runtime_producer
 
@@ -38,7 +38,7 @@ def record_unique_keys(self, uniques):
             response = self._client.post(
                 'telemetry',
                 '/v1/keys/ss',
-                self._apikey,
+                self._sdk_key,
                 body=uniques,
                 extra_headers=self._metadata
             )
@@ -64,7 +64,7 @@ def record_init(self, configs):
             response = self._client.post(
                 'telemetry',
                 '/v1/metrics/config',
-                self._apikey,
+                self._sdk_key,
                 body=configs,
                 extra_headers=self._metadata,
             )
@@ -90,7 +90,7 @@ def record_stats(self, stats):
             response = self._client.post(
                 'telemetry',
                 '/v1/metrics/usage',
-                self._apikey,
+                self._sdk_key,
                 body=stats,
                 extra_headers=self._metadata,
             )