robusta-cli 0.10.32a0__tar.gz → 0.11.0__tar.gz

{robusta_cli-0.10.32a0 → robusta_cli-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robusta-cli
-Version: 0.10.32a0
+Version: 0.11.0
 Summary: 
 Author: Natan Yellin
 Author-email: aantn@users.noreply.github.com
@@ -28,6 +28,7 @@ Requires-Dist: dulwich (==0.20.28) ; extra == "all"
 Requires-Dist: fpdf2 (>=2.7.1,<3.0.0)
 Requires-Dist: grafana-api (>=1.0.3,<2.0.0) ; extra == "all"
 Requires-Dist: hikaru-model-26 (>=1.1.1,<2.0.0)
+Requires-Dist: jinja2 (==3.1.3)
 Requires-Dist: kafka-python (>=2.0.2,<3.0.0) ; extra == "all"
 Requires-Dist: kubernetes (>=26.1.0,<27.0.0)
 Requires-Dist: markdown2 (>=2.4.2,<3.0.0)

{robusta_cli-0.10.32a0 → robusta_cli-0.11.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "robusta-cli"
-version = "0.10.32-alpha"
+version = "0.11.0"
 description = ""
 authors = ["Natan Yellin <aantn@users.noreply.github.com>"]
 packages = [
@@ -36,6 +36,7 @@ supabase = { version = "^1.0.3", optional = true }
 tabulate = { version = "^0.8.10" }
 slack-sdk = { version = "^3.23.0" }
 Flask = { version = "^3.0.0", optional = true }
+jinja2 = { version ="3.1.3", optional = true }  # indirect dependency
 grafana-api = { version = "^1.0.3", optional = true }
 watchdog =  { version = "^2.1.0", optional = true }
 better-exceptions = { version =  "^0.3.3", optional = true }

{robusta_cli-0.10.32a0 → robusta_cli-0.11.0}/src/robusta/_version.py

@@ -1,2 +1,2 @@
 # this is updated by .github/workflows/release.yaml
-__version__ = "0.10.32-alpha"
+__version__ = "0.11.0"

{robusta_cli-0.10.32a0 → robusta_cli-0.11.0}/src/robusta/core/triggers/multi_resources_trigger.py

@@ -1,8 +1,12 @@
 from typing import Any, Dict, List
 
 from robusta.core.playbooks.base_trigger import TriggerEvent
-from robusta.integrations.kubernetes.autogenerated.triggers import KubernetesAnyAllChangesTrigger
+from robusta.integrations.kubernetes.autogenerated.triggers import (
+    DEFAULT_CHANGE_FILTERS,
+    KubernetesAnyAllChangesTrigger,
+)
 from robusta.integrations.kubernetes.base_triggers import K8sTriggerEvent
+from robusta.utils.scope import ScopeParams
 
 
 class MultiResourceTrigger(KubernetesAnyAllChangesTrigger):
@@ -28,11 +32,15 @@ class MultiResourceTrigger(KubernetesAnyAllChangesTrigger):
         labels_selector: str = None,
         resources: List[str] = None,
         operations: List[str] = None,
+        change_filters: Dict[str, List[str]] = DEFAULT_CHANGE_FILTERS,
+        scope: ScopeParams = None
     ):
         super().__init__(
             name_prefix=name_prefix,
             namespace_prefix=namespace_prefix,
             labels_selector=labels_selector,
+            change_filters=change_filters,
+            scope=scope
         )
         self.resources = [resource.lower() for resource in resources] if resources else []
         self.operations = [op.lower() for op in operations] if operations else []

{robusta_cli-0.10.32a0 → robusta_cli-0.11.0}/src/robusta/integrations/kubernetes/autogenerated/triggers.py

@@ -1,10 +1,12 @@
 # This file was autogenerated. Do not edit.
 
-from typing import Optional, Dict
+from typing import Dict, Optional
+
 from pydantic import BaseModel
-from robusta.integrations.kubernetes.base_triggers import K8sBaseTrigger
+
 from robusta.core.model.k8s_operation_type import K8sOperationType
 from robusta.integrations.kubernetes.autogenerated.events import *
+from robusta.integrations.kubernetes.base_triggers import DEFAULT_CHANGE_FILTERS, K8sBaseTrigger
 from robusta.utils.scope import ScopeParams
 
 
@@ -15,7 +17,7 @@ class PodAllChangesTrigger(K8sBaseTrigger):
         name_prefix: str = None,
         namespace_prefix: str = None,
         labels_selector: str = None,
-        change_filters: Dict[str, List[str]] = None,
+        change_filters: Dict[str, List[str]] = DEFAULT_CHANGE_FILTERS,
         scope: ScopeParams = None
     ):
         super().__init__(
@@ -209,7 +211,7 @@ class DaemonSetAllChangesTrigger(K8sBaseTrigger):
         name_prefix: str = None,
         namespace_prefix: str = None,
         labels_selector: str = None,
-        change_filters: Dict[str, List[str]] = None,
+        change_filters: Dict[str, List[str]] = DEFAULT_CHANGE_FILTERS,
         scope: ScopeParams = None
     ):
         super().__init__(
@@ -306,7 +308,7 @@ class DeploymentAllChangesTrigger(K8sBaseTrigger):
         name_prefix: str = None,
         namespace_prefix: str = None,
         labels_selector: str = None,
-        change_filters: Dict[str, List[str]] = None,
+        change_filters: Dict[str, List[str]] = DEFAULT_CHANGE_FILTERS,
         scope: ScopeParams = None
     ):
         super().__init__(
@@ -403,7 +405,7 @@ class StatefulSetAllChangesTrigger(K8sBaseTrigger):
         name_prefix: str = None,
         namespace_prefix: str = None,
         labels_selector: str = None,
-        change_filters: Dict[str, List[str]] = None,
+        change_filters: Dict[str, List[str]] = DEFAULT_CHANGE_FILTERS,
         scope: ScopeParams = None
     ):
         super().__init__(
@@ -1761,7 +1763,7 @@ class IngressAllChangesTrigger(K8sBaseTrigger):
         name_prefix: str = None,
         namespace_prefix: str = None,
         labels_selector: str = None,
-        change_filters: Dict[str, List[str]] = None,
+        change_filters: Dict[str, List[str]] = DEFAULT_CHANGE_FILTERS,
         scope: ScopeParams = None
     ):
         super().__init__(
@@ -1854,7 +1856,7 @@ class IngressUpdateTrigger(K8sBaseTrigger):
 # Kubernetes Any Triggers
 class KubernetesAnyAllChangesTrigger(K8sBaseTrigger):
     def __init__(
-        self, name_prefix: str = None, namespace_prefix: str = None, labels_selector: str = None, scope: ScopeParams = None
+        self, name_prefix: str = None, namespace_prefix: str = None, labels_selector: str = None, change_filters: Dict[str, List[str]] = DEFAULT_CHANGE_FILTERS, scope: ScopeParams = None
     ):
         super().__init__(
             kind="Any",
@@ -1862,6 +1864,7 @@ class KubernetesAnyAllChangesTrigger(K8sBaseTrigger):
             name_prefix=name_prefix,
             namespace_prefix=namespace_prefix,
             labels_selector=labels_selector,
+            change_filters=change_filters,
             scope=scope,
         )
 

{robusta_cli-0.10.32a0 → robusta_cli-0.11.0}/src/robusta/integrations/kubernetes/base_triggers.py

@@ -3,10 +3,9 @@ from typing import Any, Dict, List, Optional, Union
 
 import hikaru
 import pydash
-from pydash.helpers import UNSET
-
 from hikaru import HikaruBase
 from pydantic import BaseModel, PrivateAttr
+from pydash.helpers import UNSET
 
 from robusta.core.model.events import ExecutionBaseEvent
 from robusta.core.model.k8s_operation_type import K8sOperationType
@@ -17,7 +16,7 @@ from robusta.integrations.kubernetes.autogenerated.events import KIND_TO_EVENT_C
 from robusta.integrations.kubernetes.autogenerated.models import get_api_version
 from robusta.integrations.kubernetes.model_not_found_exception import ModelNotFoundException
 from robusta.utils.common import duplicate_without_fields, is_matching_diff
-from robusta.utils.scope import ScopeParams, BaseScopeMatcher
+from robusta.utils.scope import BaseScopeMatcher, ScopeParams
 
 OBJ = "obj"
 OLD_OBJ = "old_obj"
@@ -118,21 +117,24 @@ DEFAULT_CHANGE_IGNORE = [
 
 
 class K8sTriggerChangeFilters(BaseModel):
-    include: List[str] = DEFAULT_CHANGE_INCLUDE
-    ignore: List[str] = DEFAULT_CHANGE_IGNORE
+    include: Optional[List[str]] = None
+    ignore: Optional[List[str]] = None
 
 
 class InvalidMatcher(Exception):
     pass
 
 
+DEFAULT_CHANGE_FILTERS = K8sTriggerChangeFilters(include=DEFAULT_CHANGE_INCLUDE, ignore=DEFAULT_CHANGE_IGNORE)
+
+
 class K8sBaseTrigger(BaseTrigger):
     kind: str
     operation: K8sOperationType = None
     name_prefix: str = None
     namespace_prefix: str = None
     labels_selector: str = None
-    change_filters: K8sTriggerChangeFilters = None
+    change_filters: Optional[K8sTriggerChangeFilters] = None
     scope: Optional[ScopeParams] = None
 
     _labels_map: Dict = PrivateAttr()
@@ -261,7 +263,7 @@ class K8sBaseTrigger(BaseTrigger):
 
         if not self.change_filters:
             execution_event.obj_filtered = execution_event.obj
-            execution_event.old_obj_filtered = execution_event.old_obj_filtered
+            execution_event.old_obj_filtered = execution_event.old_obj
             execution_event.filtered_diffs = []
             return True
 
@@ -272,7 +274,10 @@ class K8sBaseTrigger(BaseTrigger):
 
         if execution_event.operation == K8sOperationType.UPDATE:
             all_diffs = obj_filtered.diff(old_obj_filtered)
-            filtered_diffs = list(filter(lambda x: is_matching_diff(x, self.change_filters.include), all_diffs))
+            if self.change_filters.include:
+                filtered_diffs = list(filter(lambda x: is_matching_diff(x, self.change_filters.include), all_diffs))
+            else:
+                filtered_diffs = all_diffs
             if len(filtered_diffs) == 0:
                 result = False
         execution_event.obj_filtered = obj_filtered

{robusta_cli-0.10.32a0 → robusta_cli-0.11.0}/src/robusta/integrations/mattermost/sender.py

@@ -11,8 +11,10 @@ from robusta.core.reporting.blocks import (
     KubernetesDiffBlock,
     ListBlock,
     MarkdownBlock,
+    ScanReportBlock,
     TableBlock,
 )
+from robusta.core.reporting.consts import EnrichmentAnnotation
 from robusta.core.reporting.utils import add_pngs_for_all_svgs
 from robusta.core.sinks.mattermost.mattermost_sink_params import MattermostSinkParams
 from robusta.core.sinks.transformer import Transformer
@@ -70,6 +72,8 @@ class MattermostSender:
             return self.__to_mattermost(block.to_markdown(), sink_name)
         elif isinstance(block, KubernetesDiffBlock):
             return self.__to_mattermost_diff(block, sink_name)
+        elif isinstance(block, ScanReportBlock):
+            raise AssertionError("to_mattermost() should never be called on a ScanReportBlock")
         else:
             logging.warning(f"cannot convert block of type {type(block)} to mattermost format block: {block}")
             return ""  # no reason to crash the entire report
@@ -144,6 +148,8 @@ class MattermostSender:
             blocks.append(MarkdownBlock(finding.description))
 
         for enrichment in finding.enrichments:
+            if enrichment.annotations.get(EnrichmentAnnotation.SCAN, False):
+                enrichment.blocks = [Transformer.scanReportBlock_to_fileblock(b) for b in enrichment.blocks]
             blocks.extend(enrichment.blocks)
 
         status: FindingStatus = (

{robusta_cli-0.10.32a0 → robusta_cli-0.11.0}/src/robusta/utils/common.py

@@ -23,6 +23,9 @@ def duplicate_without_fields(obj: HikaruBase, omitted_fields: List[str]):
     if obj is None:
         return None
 
+    if not omitted_fields:
+        return obj
+
     duplication = obj.dup()
 
     for field_name in omitted_fields: