added property to flagset filter to provide sorted flagsets

Author: chillaq

splitio/client/client.py

@@ -404,9 +404,9 @@ def _get_treatments_by_flag_sets(self, key, flag_sets, method, attributes=None):
         :return: Dictionary with the result of all the feature flags provided
         :rtype: dict
         """
-        feature_flags_names = self._get_feature_flag_names_by_flag_sets(flag_sets, method)
+        feature_flags_names = self._get_feature_flag_names_by_flag_sets(flag_sets, method.value)
         if feature_flags_names == []:
-            _LOGGER.warning("%s: No valid Flag set or no feature flags found for evaluating treatments" % (method))
+            _LOGGER.warning("%s: No valid Flag set or no feature flags found for evaluating treatments" % (method.value))
             return {}
 
         if 'config' in method.value:

splitio/client/input_validator.py

@@ -597,4 +597,4 @@ def validate_flag_sets(flag_sets, method_name):
 
         sanitized_flag_sets.add(flag_set)
 
-    return sorted(list(sanitized_flag_sets))
+    return list(sanitized_flag_sets)

splitio/storage/__init__.py

@@ -2,7 +2,6 @@
 import abc
 import threading
 
-
 class SplitStorage(object, metaclass=abc.ABCMeta):
     """Split storage interface implemented as an abstract class."""
 
@@ -324,6 +323,7 @@ def __init__(self, flag_sets=[]):
         """Constructor."""
         self.flag_sets = set(flag_sets)
         self.should_filter = any(flag_sets)
+        self.sorted_flag_sets = sorted(flag_sets)
 
     def set_exist(self, flag_set):
         """

splitio/sync/split.py

@@ -123,7 +123,7 @@ def _get_config_sets(self):
         """
         if self._feature_flag_storage.flag_set_filter.flag_sets == set({}):
             return None
-        return ','.join(self._feature_flag_storage.flag_set_filter.flag_sets)
+        return ','.join(self._feature_flag_storage.flag_set_filter.sorted_flag_sets)
 
     def synchronize_splits(self, till=None):
         """

splitio/util/storage_helper.py

@@ -70,27 +70,6 @@ def combine_valid_flag_sets(result_sets):
             to_return.update(result_set)
     return to_return
 
-def _check_flag_sets(feature_flag_storage, feature_flag):
-    """
-    Check each flag set in given array, return it if exist in a given config flag set array, if config array is empty return all
-
-    :param flag_sets: Flag sets array
-    :type flag_sets: list(str)
-    :param config_flag_sets: Config flag sets array
-    :type config_flag_sets: list(str)
-
-    :return: array of flag sets
-    :rtype: list(str)
-    """
-    sets_to_fetch = []
-    for flag_set in flag_sets:
-        if not flag_set_filter.set_exist(flag_set) and flag_set_filter.should_filter:
-            _LOGGER.warning("Flag set %s is not part of the configured flag set list, ignoring the request." % (flag_set))
-            continue
-        sets_to_fetch.append(flag_set)
-
-    return sets_to_fetch
-
 def combine_valid_flag_sets(result_sets):
     """
     Check each flag set in given array of sets, combine all flag sets in one unique set

tests/client/test_input_validator.py

@@ -1296,19 +1296,19 @@ def test_validate_pluggable_adapter(self):
     def test_sanitize_flag_sets(self):
         """Test sanitization for flag sets."""
         flag_sets = input_validator.validate_flag_sets([' set1', 'set2 ', 'set3'], 'm')
-        assert flag_sets == ['set1', 'set2', 'set3']
+        assert sorted(flag_sets) == ['set1', 'set2', 'set3']
 
         flag_sets = input_validator.validate_flag_sets(['1set', '_set2'], 'm')
         assert flag_sets == ['1set']
 
         flag_sets = input_validator.validate_flag_sets(['Set1', 'SET2'], 'm')
-        assert flag_sets == ['set1', 'set2']
+        assert sorted(flag_sets) == ['set1', 'set2']
 
         flag_sets = input_validator.validate_flag_sets(['se\t1', 's/et2', 's*et3', 's!et4', 'se@t5', 'se#t5', 'se$t5', 'se^t5', 'se%t5', 'se&t5'], 'm')
         assert flag_sets == []
 
         flag_sets = input_validator.validate_flag_sets(['set4', 'set1', 'set3', 'set1'], 'm')
-        assert flag_sets == ['set1', 'set3', 'set4']
+        assert sorted(flag_sets) == ['set1', 'set3', 'set4']
 
         flag_sets = input_validator.validate_flag_sets(['w' * 50, 's' * 51], 'm')
         assert flag_sets == ['w' * 50]

tests/storage/test_flag_sets.py

@@ -58,3 +58,6 @@ def test_flag_set_filter(self):
         assert not flag_set_filter.intersect(set({'set4'}))
         assert not flag_set_filter.set_exist('set4')
         assert flag_set_filter.set_exist('set1')
+
+        flag_set_filter = FlagSetsFilter(['set5', 'set2', 'set6', 'set1'])
+        assert flag_set_filter.sorted_flag_sets == ['set1', 'set2', 'set5', 'set6']

tests/sync/test_splits_synchronizer.py

@@ -74,6 +74,7 @@ def intersect(sets):
                 return True
         storage.flag_set_filter = flag_set_filter
         storage.flag_set_filter.flag_sets = {}
+        storage.flag_set_filter.sorted_flag_sets = []
 
         split_synchronizer = SplitSynchronizer(api, storage)
 
@@ -100,6 +101,7 @@ def intersect(sets):
                 return True
         storage.flag_set_filter = flag_set_filter
         storage.flag_set_filter.flag_sets = {}
+        storage.flag_set_filter.sorted_flag_sets = []
 
         api = mocker.Mock()
         def get_changes(*args, **kwargs):
@@ -143,6 +145,7 @@ def intersect(sets):
                 return True
         storage.flag_set_filter = flag_set_filter
         storage.flag_set_filter.flag_sets = {}
+        storage.flag_set_filter.sorted_flag_sets = []
 
         def change_number_mock():
             return 2
@@ -206,6 +209,7 @@ def intersect(sets):
 
         storage.flag_set_filter = flag_set_filter
         storage.flag_set_filter.flag_sets = {}
+        storage.flag_set_filter.sorted_flag_sets = []
 
         split_synchronizer = SplitSynchronizer(api, storage)
         split_synchronizer._backoff = Backoff(1, 1)

tests/sync/test_synchronizer.py

@@ -30,6 +30,7 @@ def intersect(sets):
                 return True
         storage.flag_set_filter = flag_set_filter
         storage.flag_set_filter.flag_sets = {}
+        storage.flag_set_filter.sorted_flag_sets = []
 
         def run(x, c):
             raise APIException("something broke")
@@ -55,6 +56,7 @@ def intersect(sets):
                 return True
         storage.flag_set_filter = flag_set_filter
         storage.flag_set_filter.flag_sets = {}
+        storage.flag_set_filter.sorted_flag_sets = []
 
         def run(x, c):
             raise APIException("something broke", 414)
@@ -182,6 +184,7 @@ def intersect(sets):
                 return True
         split_storage.flag_set_filter = flag_set_filter
         split_storage.flag_set_filter.flag_sets = {}
+        split_storage.flag_set_filter.sorted_flag_sets = []
 
         split_api = mocker.Mock()
         split_api.fetch_splits.return_value = {'splits': self.splits, 'since': 123,

tests/tasks/test_split_sync.py

@@ -33,6 +33,7 @@ def intersect(sets):
                 return True
         storage.flag_set_filter = flag_set_filter
         storage.flag_set_filter.flag_sets = {}
+        storage.flag_set_filter.sorted_flag_sets = []
 
         api = mocker.Mock()
         splits = [{
@@ -102,8 +103,6 @@ def get_changes(*args, **kwargs):
         assert api.fetch_splits.mock_calls[0][1][1].cache_control_headers == True
         assert api.fetch_splits.mock_calls[1][1][0] == 123
         assert api.fetch_splits.mock_calls[1][1][1].cache_control_headers == True
-#        assert mocker.call(-1, fetch_options) in api.fetch_splits.mock_calls
-#        assert mocker.call(123, fetch_options) in api.fetch_splits.mock_calls
 
         inserted_split = storage.update.mock_calls[0][1][0][0]
         assert isinstance(inserted_split, Split)