robusta-cli 0.13.0a0__tar.gz → 0.13.1__tar.gz

{robusta_cli-0.13.0a0 → robusta_cli-0.13.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robusta-cli
-Version: 0.13.0a0
+Version: 0.13.1
 Summary: 
 Author: Natan Yellin
 Author-email: aantn@users.noreply.github.com

{robusta_cli-0.13.0a0 → robusta_cli-0.13.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "robusta-cli"
-version = "0.13.0-alpha"
+version = "0.13.1"
 description = ""
 authors = ["Natan Yellin <aantn@users.noreply.github.com>"]
 packages = [

{robusta_cli-0.13.0a0 → robusta_cli-0.13.1}/src/robusta/_version.py

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

{robusta_cli-0.13.0a0 → robusta_cli-0.13.1}/src/robusta/core/model/env_vars.py

@@ -115,7 +115,10 @@ ARGO_ROLLOUTS = load_bool("ARGO_ROLLOUTS", False)
 # lowered case k8s kinds in a json array string. "[\"configmap\", \"secret\"]"
 RESOURCE_YAML_BLOCK_LIST = json.loads(os.environ.get("RESOURCE_YAML_BLOCK_LIST", "[]"))
 
-NAMESPACE_DATA_TTL = int(os.environ.get("NAMESPACE_DATA_TTL", 30*60))  # in seconds
+NAMESPACE_DATA_TTL = int(os.environ.get("NAMESPACE_DATA_TTL", 30 * 60))  # in seconds
 
-PROCESSED_ALERTS_CACHE_TTL = int(os.environ.get("PROCESSED_ALERT_CACHE_TTL", 2*3600))
+PROCESSED_ALERTS_CACHE_TTL = int(os.environ.get("PROCESSED_ALERT_CACHE_TTL", 2 * 3600))
 PROCESSED_ALERTS_CACHE_MAX_SIZE = int(os.environ.get("PROCESSED_ALERTS_CACHE_MAX_SIZE", 100_000))
+
+POD_WAIT_RETRIES = int(os.environ.get("POD_WAIT_RETRIES", 10))
+POD_WAIT_RETRIES_SECONDS = int(os.environ.get("POD_WAIT_RETRIES_SECONDS", 5))

{robusta_cli-0.13.0a0 → robusta_cli-0.13.1}/src/robusta/core/sinks/robusta/dal/supabase_dal.py

@@ -5,7 +5,9 @@ from datetime import datetime
 from typing import Any, Dict, List, Optional
 
 import requests
+from postgrest._sync.request_builder import SyncQueryRequestBuilder
 from postgrest.base_request_builder import BaseFilterRequestBuilder
+from postgrest.exceptions import APIError as PostgrestAPIError
 from postgrest.types import ReturnMethod
 from postgrest.utils import sanitize_param
 from supabase import create_client
@@ -70,6 +72,7 @@ class SupabaseDal(AccountResourceFetcher):
         self.cluster = cluster_name
         options = ClientOptions(postgrest_client_timeout=SUPABASE_TIMEOUT_SECONDS, auto_refresh_token=True)
         self.client = create_client(url, key, options)
+        self.patch_postgrest_execute()
         self.email = email
         self.password = password
         self.sign_in()
@@ -78,6 +81,24 @@ class SupabaseDal(AccountResourceFetcher):
         self.persist_events = persist_events
         self.signing_key = signing_key
 
+    def patch_postgrest_execute(self):
+        # This is somewhat hacky.
+        def execute_with_retry(_self):
+            try:
+                return self._original_execute(_self)
+            except PostgrestAPIError as exc:
+                message = exc.message or ""
+                if exc.code == "PGRST301" or "expired" in message.lower():
+                    # JWT expired. Sign in again and retry the query
+                    logging.error("JWT token expired/invalid, signing in to Supabase again")
+                    self.sign_in()
+                    return self._original_execute(_self)
+                else:
+                    raise
+
+        self._original_execute = SyncQueryRequestBuilder.execute
+        SyncQueryRequestBuilder.execute = execute_with_retry
+
     def __to_db_scanResult(self, scanResult: ScanReportRow) -> Dict[Any, Any]:
         db_sr = scanResult.dict()
         db_sr["account_id"] = self.account_id
@@ -107,7 +128,7 @@ class SupabaseDal(AccountResourceFetcher):
                     "_scan_start": str(start_time),
                     "_type": scan_type,
                 },
-            )
+            ).execute()
         except requests.exceptions.HTTPError as e:
             logging.exception(f"Failed to insert scan meta {scan_id}, error: {e}, response: {e.response.text}")
             raise
@@ -543,9 +564,9 @@ class SupabaseDal(AccountResourceFetcher):
             "_pod_count": pod_count,
         }
         try:
-            self.client.rpc(UPDATE_CLUSTER_NODE_COUNT, data)
+            self.client.rpc(UPDATE_CLUSTER_NODE_COUNT, data).execute()
         except Exception as e:
-            logging.error(f"Failed to publish node count {data} error: {e}")
+            logging.exception(f"Failed to publish node count {data} error: {e}")
 
         logging.debug(f"cluster nodes: {UPDATE_CLUSTER_NODE_COUNT} => {data}")
 

{robusta_cli-0.13.0a0 → robusta_cli-0.13.1}/src/robusta/integrations/kubernetes/custom_models.py

@@ -13,7 +13,13 @@ from kubernetes import client
 from kubernetes.client import ApiException
 from pydantic import BaseModel
 
-from robusta.core.model.env_vars import IMAGE_REGISTRY, INSTALLATION_NAMESPACE, RUNNER_SERVICE_ACCOUNT
+from robusta.core.model.env_vars import (
+    IMAGE_REGISTRY,
+    INSTALLATION_NAMESPACE,
+    POD_WAIT_RETRIES,
+    POD_WAIT_RETRIES_SECONDS,
+    RUNNER_SERVICE_ACCOUNT,
+)
 from robusta.integrations.kubernetes.api_client_utils import (
     SUCCEEDED_STATE,
     exec_shell_command,
@@ -451,13 +457,19 @@ class RobustaJob(Job):
         # we serialize and then deserialize to work around https://github.com/haxsaw/hikaru/issues/15
         return [hikaru.from_dict(pod.to_dict(), cls=RobustaPod) for pod in pods.items]
 
-    def get_single_pod(self) -> RobustaPod:
+    def get_single_pod(self, retries: int = POD_WAIT_RETRIES, wait: int = POD_WAIT_RETRIES_SECONDS) -> RobustaPod:
         """
         like get_pods() but verifies that only one pod is associated with the job and returns that pod
+        if no pods, retry X times with Y seconds wait
         """
         pods = self.get_pods()
+        while retries > 0 and len(pods) == 0:
+            time.sleep(wait)
+            pods = self.get_pods()
+            retries -= 1
+
         if len(pods) != 1:
-            raise Exception(f"got more pods than expected for job {self.metadata.name}: {pods}")
+            raise Exception(f"got {len(pods)} pods. expected 1 for job {self.metadata.name}: {pods}")
         return pods[0]
 
     def create_job_owned_secret(self, job_secret: JobSecret):
@@ -478,7 +490,7 @@ class RobustaJob(Job):
             metadata=ObjectMeta(name=job_secret.name, ownerReferences=[robusta_owner_reference]), data=job_secret.data
         )
         try:
-            return secret.createNamespacedSecret(job_pod.metadata.namespace).obj
+            secret.createNamespacedSecret(job_pod.metadata.namespace).obj
         except Exception as e:
             logging.error(f"Failed to create secret {job_secret.name}", exc_info=True)
             raise e