Merge pull request #149 from splitio/development

Development

Author: mredolatti

CHANGES.txt

@@ -1,3 +1,6 @@
+8.1.2 (Jul 19, 2019)
+ - Validated TLS support for redis connections
+ - Fixed traffic type count issue
 8.1.1 (14 Jun, 2019)
  - Fixed python3 compatibility issue in uwsgi caching mode.
 8.1.0 (3 Jun, 2019)

splitio/storage/adapters/redis.py

@@ -48,6 +48,8 @@ def original_exception(self):
 
 
 class SentinelConfigurationException(Exception):
+    """Exception to be raised when sentinel config options are incorrect."""
+
     pass
 
 
@@ -367,6 +369,9 @@ def _build_sentinel_client(config):  #pylint: disable=too-many-locals
     """
     sentinels = config.get('redisSentinels')
 
+    if config.get('redisSsl', False):
+        raise SentinelConfigurationException('Redis Sentinel cannot be used with SSL/TLS.')
+
     if sentinels is None:
         raise SentinelConfigurationException('redisSentinels must be specified.')
     if not isinstance(sentinels, list):

splitio/storage/inmemmory.py

@@ -44,6 +44,8 @@ def put(self, split):
         :type split: splitio.models.split.Split
         """
         with self._lock:
+            if split.name in self._splits:
+                self._decrease_traffic_type_count(self._splits[split.name].traffic_type_name)
             self._splits[split.name] = split
             self._increase_traffic_type_count(split.traffic_type_name)
 

splitio/version.py

@@ -1 +1 @@
-__version__ = '8.1.1'
+__version__ = '8.1.2'

tests/storage/adapters/test_redis_adapter.py

@@ -1,6 +1,6 @@
 """Redis storage adapter test module."""
 
-
+import pytest
 from splitio.storage.adapters import redis
 from redis import StrictRedis
 from redis.sentinel import Sentinel
@@ -145,7 +145,7 @@ def test_adapter_building(self, mocker):
             'redisErrors': 'abc',
             'redisDecodeResponses': True,
             'redisRetryOnTimeout': True,
-            'redisSsl': True,
+            'redisSsl': False,
             'redisSslKeyfile': '/ssl.cert',
             'redisSslCertfile': '/ssl2.cert',
             'redisSslCertReqs': 'abc',
@@ -170,3 +170,11 @@ def test_adapter_building(self, mocker):
             retry_on_timeout=True,
             max_connections=5
         )
+
+    def test_sentinel_ssl_fails(self):
+        """Test that SSL/TLS & Sentinel don't return a valid client."""
+        with pytest.raises(redis.SentinelConfigurationException) as exc:
+            redis.build({
+                'redisSentinels': ['a', 'b'],
+                'redisSsl': True,
+            })

tests/storage/test_inmemory_storage.py

@@ -121,6 +121,37 @@ def test_is_valid_traffic_type(self, mocker):
         assert storage.is_valid_traffic_type('user') is False
         assert storage.is_valid_traffic_type('account') is False
 
+    def test_traffic_type_inc_dec_logic(self, mocker):
+        """Test that adding/removing split, handles traffic types correctly."""
+        storage = InMemorySplitStorage()
+
+        split1 = mocker.Mock()
+        name1_prop = mocker.PropertyMock()
+        name1_prop.return_value = 'split1'
+        type(split1).name = name1_prop
+
+        split2 = mocker.Mock()
+        name2_prop = mocker.PropertyMock()
+        name2_prop.return_value = 'split1'
+        type(split2).name = name2_prop
+
+        tt_user = mocker.PropertyMock()
+        tt_user.return_value = 'user'
+
+        tt_account = mocker.PropertyMock()
+        tt_account.return_value = 'account'
+
+        type(split1).traffic_type_name = tt_user
+        type(split2).traffic_type_name = tt_account
+
+        storage.put(split1)
+        assert storage.is_valid_traffic_type('user') is True
+        assert storage.is_valid_traffic_type('account') is False
+
+        storage.put(split2)
+        assert storage.is_valid_traffic_type('user') is False
+        assert storage.is_valid_traffic_type('account') is True
+
 
 class InMemorySegmentStorageTests(object):
     """In memory segment storage tests."""