fix Events API logic for recent upstream changes

whummer · whummer · commit b45eb7fad258 · 2021-04-17T22:25:19.000+02:00
diff --git a/localstack/services/events/events_starter.py b/localstack/services/events/events_starter.py
@@ -56,19 +56,19 @@ def filter_event(event_pattern, event):
                 if not filter_event_with_content_base_parameter(value, event_value):
                     return False
 
-            elif isinstance(value, (str, int)):
+            elif isinstance(value, (str, dict)):
                 try:
-                    if isinstance(json.loads(value), dict) and \
-                       not filter_event(json.loads(value), event_value):
+                    value = json.loads(value) if isinstance(value, str) else value
+                    if isinstance(value, dict) and not filter_event(value, event_value):
                         return False
                 except json.decoder.JSONDecodeError:
                     return False
         return True
 
     rule_information = self.events_backend.describe_rule(rule)
     if rule_information.event_pattern:
-        event_pattern = json.loads(rule_information.event_pattern)
-        if not filter_event(event_pattern, event):
+        event_pattern = rule_information.event_pattern._filter
+        if event_pattern and not filter_event(event_pattern, event):
             return False
     return True
 
diff --git a/tests/integration/test_events.py b/tests/integration/test_events.py
@@ -718,7 +718,7 @@ def test_put_event_with_content_base_rule_in_pattern(self):
         pattern = {
             'Source': [{'exists': True}],
             'detail-type': [{'prefix': 'core.app'}],
-            'Detail': json.dumps({
+            'Detail': {
                 'decription': ['this-is-event-details'],
                 'amount': [200],
                 'salary': [2000, 4000],
@@ -737,7 +737,7 @@ def test_put_event_with_content_base_rule_in_pattern(self):
                 'num-test5': [{'numeric': ['>=', 200, '<=', 500]}],
                 'num-test6': [{'numeric': ['>', 200, '<', 500]}],
                 'num-test7': [{'numeric': ['>=', 200, '<', 500]}]
-            })
+            }
         }
 
         event = {
