Merge pull request #383 from splitio/iff-archived-splits

added handling archived split

Author: chillaq

splitio/push/splitworker.py

@@ -7,7 +7,7 @@
 import json
 from enum import Enum
 
-from splitio.models.splits import from_raw
+from splitio.models.splits import from_raw, Status
 from splitio.push.parser import UpdateType
 
 _LOGGER = logging.getLogger(__name__)
@@ -72,7 +72,11 @@ def _run(self):
             try:
                 if self._check_instant_ff_update(event):
                     try:
-                        self._feature_flag_storage.put(from_raw(json.loads(self._get_feature_flag_definition(event))))
+                        new_split = from_raw(json.loads(self._get_feature_flag_definition(event)))
+                        if new_split.status == Status.ACTIVE:
+                            self._feature_flag_storage.put(new_split)
+                        else:
+                            self._feature_flag_storage.remove(new_split.name)
                         self._feature_flag_storage.set_change_number(event.change_number)
                         continue
                     except Exception as e:

tests/push/test_split_worker.py

@@ -99,8 +99,12 @@ def get_change_number():
         def put(feature_flag):
             self._feature_flag = feature_flag
 
+        def remove(feature_flag):
+            self._feature_flag_delete = feature_flag
+
         split_worker._feature_flag_storage.get_change_number = get_change_number
         split_worker._feature_flag_storage.put = put
+        split_worker._feature_flag_storage.remove = remove
 
         # compression 0
         self._feature_flag = None
@@ -120,6 +124,14 @@ def put(feature_flag):
         time.sleep(0.1)
         assert self._feature_flag.name == 'bilal_split'
 
+        # should call delete split
+        self._feature_flag = None
+        self._feature_flag_delete = None
+        q.put(SplitChangeUpdate('some', 'SPLIT_UPDATE', 123456790, 2345,  'eyJ0cmFmZmljVHlwZU5hbWUiOiAidXNlciIsICJpZCI6ICIzM2VhZmE1MC0xYTY1LTExZWQtOTBkZi1mYTMwZDk2OTA0NDUiLCAibmFtZSI6ICJiaWxhbF9zcGxpdCIsICJ0cmFmZmljQWxsb2NhdGlvbiI6IDEwMCwgInRyYWZmaWNBbGxvY2F0aW9uU2VlZCI6IC0xMzY0MTE5MjgyLCAic2VlZCI6IC02MDU5Mzg4NDMsICJzdGF0dXMiOiAiQVJDSElWRUQiLCAia2lsbGVkIjogZmFsc2UsICJkZWZhdWx0VHJlYXRtZW50IjogIm9mZiIsICJjaGFuZ2VOdW1iZXIiOiAxNjg0Mjc1ODM5OTUyLCAiYWxnbyI6IDIsICJjb25maWd1cmF0aW9ucyI6IHt9LCAiY29uZGl0aW9ucyI6IFt7ImNvbmRpdGlvblR5cGUiOiAiUk9MTE9VVCIsICJtYXRjaGVyR3JvdXAiOiB7ImNvbWJpbmVyIjogIkFORCIsICJtYXRjaGVycyI6IFt7ImtleVNlbGVjdG9yIjogeyJ0cmFmZmljVHlwZSI6ICJ1c2VyIn0sICJtYXRjaGVyVHlwZSI6ICJJTl9TRUdNRU5UIiwgIm5lZ2F0ZSI6IGZhbHNlLCAidXNlckRlZmluZWRTZWdtZW50TWF0Y2hlckRhdGEiOiB7InNlZ21lbnROYW1lIjogImJpbGFsX3NlZ21lbnQifX1dfSwgInBhcnRpdGlvbnMiOiBbeyJ0cmVhdG1lbnQiOiAib24iLCAic2l6ZSI6IDB9LCB7InRyZWF0bWVudCI6ICJvZmYiLCAic2l6ZSI6IDEwMH1dLCAibGFiZWwiOiAiaW4gc2VnbWVudCBiaWxhbF9zZWdtZW50In0sIHsiY29uZGl0aW9uVHlwZSI6ICJST0xMT1VUIiwgIm1hdGNoZXJHcm91cCI6IHsiY29tYmluZXIiOiAiQU5EIiwgIm1hdGNoZXJzIjogW3sia2V5U2VsZWN0b3IiOiB7InRyYWZmaWNUeXBlIjogInVzZXIifSwgIm1hdGNoZXJUeXBlIjogIkFMTF9LRVlTIiwgIm5lZ2F0ZSI6IGZhbHNlfV19LCAicGFydGl0aW9ucyI6IFt7InRyZWF0bWVudCI6ICJvbiIsICJzaXplIjogMH0sIHsidHJlYXRtZW50IjogIm9mZiIsICJzaXplIjogMTAwfV0sICJsYWJlbCI6ICJkZWZhdWx0IHJ1bGUifV19', 0))
+        time.sleep(0.1)
+        assert self._feature_flag_delete == 'bilal_split'
+        assert self._feature_flag == None
+
     def test_edge_cases(self, mocker):
         q = queue.Queue()
         split_worker = SplitWorker(handler_sync, q, mocker.Mock())