Merge pull request #490 from splitio/flagset-clean-redis-factory

Flagset clean redis factory

Author: chillaq

splitio/client/factory.py

@@ -441,7 +441,7 @@ def _build_redis_factory(api_key, cfg):
     cache_enabled = cfg.get('redisLocalCacheEnabled', False)
     cache_ttl = cfg.get('redisLocalCacheTTL', 5)
     storages = {
-        'splits': RedisSplitStorage(redis_adapter, cache_enabled, cache_ttl, cfg['flagSetsFilter'] if cfg['flagSetsFilter'] is not None else []),
+        'splits': RedisSplitStorage(redis_adapter, cache_enabled, cache_ttl, []),
         'segments': RedisSegmentStorage(redis_adapter),
         'impressions': RedisImpressionsStorage(redis_adapter, sdk_metadata),
         'events': RedisEventsStorage(redis_adapter, sdk_metadata),
@@ -524,7 +524,7 @@ def _build_pluggable_factory(api_key, cfg):
     pluggable_adapter = cfg.get('storageWrapper')
     storage_prefix = cfg.get('storagePrefix')
     storages = {
-        'splits': PluggableSplitStorage(pluggable_adapter, storage_prefix, cfg['flagSetsFilter'] if cfg['flagSetsFilter'] is not None else []),
+        'splits': PluggableSplitStorage(pluggable_adapter, storage_prefix, []),
         'segments': PluggableSegmentStorage(pluggable_adapter, storage_prefix),
         'impressions': PluggableImpressionsStorage(pluggable_adapter, sdk_metadata, storage_prefix),
         'events': PluggableEventsStorage(pluggable_adapter, sdk_metadata, storage_prefix),

tests/client/test_factory.py

@@ -115,13 +115,16 @@ def test_redis_client_creation(self, mocker):
             'redisSslCertReqs': 'some_cert_req',
             'redisSslCaCerts': 'some_ca_cert',
             'redisMaxConnections': 999,
+            'flagSetsFilter': ['set_1']
         }
         factory = get_factory('some_api_key', config=config)
         assert isinstance(factory._get_storage('splits'), redis.RedisSplitStorage)
         assert isinstance(factory._get_storage('segments'), redis.RedisSegmentStorage)
         assert isinstance(factory._get_storage('impressions'), redis.RedisImpressionsStorage)
         assert isinstance(factory._get_storage('events'), redis.RedisEventsStorage)
 
+        assert factory._get_storage('splits').flag_set_filter.flag_sets == set([])
+
         adapter = factory._get_storage('splits')._redis
         assert adapter == factory._get_storage('segments')._redis
         assert adapter == factory._get_storage('impressions')._redis
@@ -569,13 +572,15 @@ def test_pluggable_client_creation(self, mocker):
             'labelsEnabled': False,
             'impressionListener': 123,
             'storageType': 'pluggable',
-            'storageWrapper': StorageMockAdapter()
+            'storageWrapper': StorageMockAdapter(),
+            'flagSetsFilter': ['set_1']
         }
         factory = get_factory('some_api_key', config=config)
         assert isinstance(factory._get_storage('splits'), pluggable.PluggableSplitStorage)
         assert isinstance(factory._get_storage('segments'), pluggable.PluggableSegmentStorage)
         assert isinstance(factory._get_storage('impressions'), pluggable.PluggableImpressionsStorage)
         assert isinstance(factory._get_storage('events'), pluggable.PluggableEventsStorage)
+        assert factory._get_storage('splits').flag_set_filter.flag_sets == set([])
 
         adapter = factory._get_storage('splits')._pluggable_adapter
         assert adapter == factory._get_storage('segments')._pluggable_adapter