Merge pull request #365 from splitio/dw-update-apikey-splitio.client

updated apikey in splitio.client classes

Author: chillaq

splitio/client/client.py

@@ -377,7 +377,7 @@ def track(self, key, traffic_type, event_type, value=None, properties=None):
         start = get_current_epoch_time_ms()
         key = input_validator.validate_track_key(key)
         event_type = input_validator.validate_event_type(event_type)
-        should_validate_existance = self.ready and self._factory._apikey != 'localhost'  # pylint: disable=protected-access
+        should_validate_existance = self.ready and self._factory._sdk_key != 'localhost'  # pylint: disable=protected-access
         traffic_type = input_validator.validate_traffic_type(
             traffic_type,
             should_validate_existance,

splitio/client/config.py

@@ -62,7 +62,7 @@
 }
 
 
-def _parse_operation_mode(apikey, config):
+def _parse_operation_mode(sdk_key, config):
     """
     Process incoming config to determine operation mode and storage type
 
@@ -72,7 +72,7 @@ def _parse_operation_mode(apikey, config):
     :returns: operation mode and storage type
     :rtype: Tuple (str, str)
     """
-    if apikey == 'localhost':
+    if sdk_key == 'localhost':
         _LOGGER.debug('Using Localhost operation mode')
         return 'localhost', 'localhost'
 
@@ -119,20 +119,20 @@ def _sanitize_impressions_mode(storage_type, mode, refresh_rate=None):
     return mode, refresh_rate
 
 
-def sanitize(apikey, config):
+def sanitize(sdk_key, config):
     """
     Look for inconsistencies or ill-formed configs and tune it accordingly.
 
-    :param apikey: customer's apikey
-    :type apikey: str
+    :param sdk_key: sdk key
+    :type sdk_key: str
 
     :param config: DEFAULT + user supplied config
     :type config: dict
 
     :returns: sanitized config
     :rtype: dict
     """
-    config['operationMode'], config['storageType'] = _parse_operation_mode(apikey, config)
+    config['operationMode'], config['storageType'] = _parse_operation_mode(sdk_key, config)
     processed = DEFAULT_CONFIG.copy()
     processed.update(config)
     imp_mode, imp_rate = _sanitize_impressions_mode(config['storageType'], config.get('impressionsMode'),

splitio/client/factory.py

@@ -91,7 +91,7 @@ class SplitFactory(object):  # pylint: disable=too-many-instance-attributes
 
     def __init__(  # pylint: disable=too-many-arguments
             self,
-            apikey,
+            sdk_key,
             storages,
             labels_enabled,
             recorder,
@@ -120,7 +120,7 @@ def __init__(  # pylint: disable=too-many-arguments
         :param preforked_initialization: Whether should be instantiated as preforked or not.
         :type preforked_initialization: bool
         """
-        self._apikey = apikey
+        self._sdk_key = sdk_key
         self._storages = storages
         self._labels_enabled = labels_enabled
         self._sync_manager = sync_manager
@@ -253,7 +253,7 @@ def _wait_for_tasks_to_stop():
         finally:
             self._status = Status.DESTROYED
             with _INSTANTIATED_FACTORIES_LOCK:
-                _INSTANTIATED_FACTORIES.subtract([self._apikey])
+                _INSTANTIATED_FACTORIES.subtract([self._sdk_key])
 
     @property
     def destroyed(self):

splitio/client/input_validator.py

@@ -449,20 +449,20 @@ def filter(self, record):
         return record.name not in ('SegmentsAPI', 'HttpClient')
 
 
-def validate_factory_instantiation(sdkkey):
+def validate_factory_instantiation(sdk_key):
     """
     Check if the factory if being instantiated with the appropriate arguments.
 
-    :param apikey: str
-    :type apikey: str
+    :param sdk_key: str
+    :type sdk_key: str
     :return: bool
     :rtype: True|False
     """
-    if sdkkey == 'localhost':
+    if sdk_key == 'localhost':
         return True
-    if (not _check_not_null(sdkkey, 'sdkkey', 'factory_instantiation')) or \
-       (not _check_is_string(sdkkey, 'sdkkey', 'factory_instantiation')) or \
-       (not _check_string_not_empty(sdkkey, 'sdkkey', 'factory_instantiation')):
+    if (not _check_not_null(sdk_key, 'sdk_key', 'factory_instantiation')) or \
+       (not _check_is_string(sdk_key, 'sdk_key', 'factory_instantiation')) or \
+       (not _check_string_not_empty(sdk_key, 'sdk_key', 'factory_instantiation')):
         return False
     return True
 

tests/client/test_input_validator.py

@@ -553,7 +553,7 @@ def test_track(self, mocker):
             telemetry_producer.get_telemetry_init_producer(),
             mocker.Mock()
         )
-        factory._apikey = 'some-test'
+        factory._sdk_key = 'some-test'
 
         client = Client(factory, recorder)
         client._event_storage = event_storage
@@ -728,14 +728,14 @@ def test_track(self, mocker):
         )]
 
         # Test that it does not warn when in localhost mode.
-        factory._apikey = 'localhost'
+        factory._sdk_key = 'localhost'
         _logger.reset_mock()
         assert client.track("some_key", "traffic_type", "event_type", None) is True
         assert _logger.error.mock_calls == []
         assert _logger.warning.mock_calls == []
 
         # Test that it does not warn when not in localhost mode and not ready
-        factory._apikey = 'not-localhost'
+        factory._sdk_key = 'not-localhost'
         ready_property.return_value = False
         type(factory).ready = ready_property
         _logger.reset_mock()
@@ -1156,19 +1156,19 @@ def test_input_validation_factory(self, mocker):
 
         assert get_factory(None) is None
         assert logger.error.mock_calls == [
-            mocker.call("%s: you passed a null %s, %s must be a non-empty string.", 'factory_instantiation', 'sdkkey', 'sdkkey')
+            mocker.call("%s: you passed a null %s, %s must be a non-empty string.", 'factory_instantiation', 'sdk_key', 'sdk_key')
         ]
 
         logger.reset_mock()
         assert get_factory('') is None
         assert logger.error.mock_calls == [
-            mocker.call("%s: you passed an empty %s, %s must be a non-empty string.", 'factory_instantiation', 'sdkkey', 'sdkkey')
+            mocker.call("%s: you passed an empty %s, %s must be a non-empty string.", 'factory_instantiation', 'sdk_key', 'sdk_key')
         ]
 
         logger.reset_mock()
         assert get_factory(True) is None
         assert logger.error.mock_calls == [
-            mocker.call("%s: you passed an invalid %s, %s must be a non-empty string.", 'factory_instantiation', 'sdkkey', 'sdkkey')
+            mocker.call("%s: you passed an invalid %s, %s must be a non-empty string.", 'factory_instantiation', 'sdk_key', 'sdk_key')
         ]
 
         logger.reset_mock()