Skip to content

Flagset clean redis factory #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chillaq merged 2 commits into from
Dec 4, 2023
Merged

Flagset clean redis factory #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f96bd15
Merge pull request #488 from splitio/development
chillaq Nov 3, 2023
7672970
clean up redis factory creation
chillaq Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions splitio/client/factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
7 changes: 6 additions & 1 deletion tests/client/test_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down