Remove debug code

scripts/generate_kubernetes_code.py

@@ -383,8 +383,6 @@ def __init__(
                         labels_selector=labels_selector,
                         scope=scope,
                     )
-                    if scope:
-                        logging.warning("SCOPE (" + str(type(self)) + "): " + str(scope))
 
                 @staticmethod
                 def get_execution_event_type() -> type:
@@ -418,8 +416,6 @@ def __init__(
                     labels_selector=labels_selector,
                     scope=scope,
                 )
-                if scope:
-                    logging.warning("SCOPE (" + str(type(self)) + "): " + str(scope))
 
             @staticmethod
             def get_execution_event_type() -> type:

src/robusta/integrations/kubernetes/base_triggers.py

@@ -61,8 +61,6 @@ class K8sBaseTrigger(BaseTrigger, BaseScopeMatching):
 
     def __init__(self, *args, **data):
         super().__init__(*args, **data)
-        if self.scope:
-            logging.warning(f"2 SCOPE: {self.scope}")
         if self.labels_selector:
             labels = self.labels_selector.split(",")
             self._labels_map = {}
@@ -128,14 +126,12 @@ def scope_match_attributes(self, attr_matcher, attr_value):
         # attr_value is the full payload (nested dicts/lists)
         # attr_matcher is a comma-separated list of jsonpath_ng-compatible search path expressions
         # (for example "spec.containers[*].name=bad, status.phase=Pending")
-        logging.error(f"XXX {attr_matcher}")
-        logging.error(f"XXX {attr_value}")
         try:
-            return all(self.match_by_yaml_path(expr, attr_value) for expr in attr_matcher.split(","))
+            return all(self.match_attr_by_path(expr, attr_value) for expr in attr_matcher.split(","))
         except InvalidMatcher:
             logging.error(f'invalid attribute-matching expression "{attr_matcher}')
 
-    def match_by_yaml_path(self, expr, data):
+    def match_attr_by_path(self, expr, data):
         try:
             path, value = expr.rsplit("=", 1)
         except ValueError:  # no "=" in the expression
@@ -153,7 +149,6 @@ def match_by_yaml_path(self, expr, data):
             logging.error(f'invalid path expression "{path}"')
             return not expected_result
         found = expr.find(data)
-        logging.warning(f"--> {path} {found}")
         # The match expression must be constructed in a way that it matches a single leaf
         # value in the data structure, which in case of K8s data would always be either a
         # string, an integer or null (None).
@@ -169,13 +164,12 @@ def match_by_yaml_path(self, expr, data):
         elif isinstance(found, int):
             try:
                 value = int(value)
-                return (found == value) is expected_result
             except (TypeError, ValueError):
-                logging.error(f'right-hand side value of match expression "{expr}" cannot be parsed as int')
                 return not expected_result
+            return (found == value) is expected_result
         elif found is None:
-            # TODO
-            return not expected_result
+            # TODO is this the expected behavior?
+            return (found == "null") is expected_result
         else:
             logging.error(
                 f'path expression "{path}" matched a value of type "{type(found)}, '