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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robusta-cli
-Version: 0.12.0
+Version: 0.13.0a0
 Summary: 
 Author: Natan Yellin
 Author-email: aantn@users.noreply.github.com
@@ -31,7 +31,8 @@ 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: humanize (>=3.13.1,<4.0.0)
-Requires-Dist: jinja2 (==3.1.3)
+Requires-Dist: idna (>=3.7)
+Requires-Dist: jinja2 (>=3.1.4)
 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)
@@ -48,7 +49,7 @@ Requires-Dist: rocketchat-api (>=1.30.0,<2.0.0)
 Requires-Dist: sentry-sdk (>=1.5.2,<2.0.0) ; extra == "all"
 Requires-Dist: setuptools (>=68.2.2,<69.0.0)
 Requires-Dist: slack-sdk (>=3.23.0,<4.0.0)
-Requires-Dist: supabase (>=1.0.3,<2.0.0) ; extra == "all"
+Requires-Dist: supabase (>=2.4,<3.0) ; extra == "all"
 Requires-Dist: tabulate (>=0.8.10,<0.9.0) ; extra == "all"
 Requires-Dist: toml (>=0.10.2,<0.11.0)
 Requires-Dist: typer (>=0.4.1,<0.5.0)
@@ -56,3 +57,4 @@ Requires-Dist: watchdog (>=2.1.0,<3.0.0) ; extra == "all"
 Requires-Dist: watchgod (>=0.7,<0.8)
 Requires-Dist: webexteamssdk (>=1.6.1,<2.0.0)
 Requires-Dist: websocket-client (==1.3.3)
+Requires-Dist: werkzeug (>=3.0.3)

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "robusta-cli"
-version = "0.12.0"
+version = "0.13.0-alpha"
 description = ""
 authors = ["Natan Yellin <aantn@users.noreply.github.com>"]
 packages = [
@@ -32,11 +32,13 @@ pydantic = "^1.8.1"
 kubernetes = "^26.1.0"
 click-spinner = "^0.1.10"
 pymsteams = "^0.1.16"
-supabase = { version = "^1.0.3", optional = true }
+idna= { version = ">=3.7", optional = true }
+supabase = "^2.4"
 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
+werkzeug = { version = ">=3.0.3", optional = true }
+jinja2 = { version = ">=3.1.4", optional = true }
 grafana-api = { version = "^1.0.3", optional = true }
 watchdog =  { version = "^2.1.0", optional = true }
 better-exceptions = { version =  "^0.3.3", optional = true }
@@ -59,11 +61,6 @@ webexteamssdk = "^1.6.1"
 bitmath = "^1.3.3.1"
 croniter = "^1.3.15"
 humanize = "^3.13.1"
-
-# The following are added to speed up poetry dependency resolution
-botocore = "1.31.72"
-boto3 = "1.28.72"
-
 # we're freezing a specific version here because the latest version doesn't have prebuilt wheels on pypi
 # and therefore requires gcc to install which we'd like to avoid
 # this is similar to the issue at https://github.com/dulwich/dulwich/issues/839
@@ -77,6 +74,9 @@ hikaru-model-26 = "^1.1.1"
 apprise = "^1.5.0"
 rocketchat-api = "^1.30.0"
 pydash = "8.0.0"
+# The following are added to speed up poetry dependency resolution
+botocore = "1.31.72"
+boto3 = "1.28.72"
 
 [tool.poetry.dev-dependencies]
 pre-commit = "^2.13.0"

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

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

{robusta_cli-0.12.0 → robusta_cli-0.13.0a0}/src/robusta/api/__init__.py

@@ -70,12 +70,12 @@ from robusta.core.model.env_vars import (
     ROBUSTA_LOGO_URL,
     ROBUSTA_TELEMETRY_ENDPOINT,
     ROBUSTA_UI_DOMAIN,
+    RUNNER_SERVICE_ACCOUNT,
     RUNNER_VERSION,
     SEND_ADDITIONAL_TELEMETRY,
     SERVICE_CACHE_MAX_SIZE,
     SERVICE_CACHE_TTL_SEC,
     SLACK_TABLE_COLUMNS_LIMIT,
-    SUPABASE_LOGIN_RATE_LIMIT_SEC,
     TEAMS_IMAGE_WIDTH,
     TELEMETRY_PERIODIC_SEC,
     TRACE_INCOMING_REQUESTS,

{robusta_cli-0.12.0 → robusta_cli-0.13.0a0}/src/robusta/cli/self_host.py

@@ -74,6 +74,10 @@ class RobustaRelay(BaseModel):
     apiEndpointPrefix: str
     apiNodePort: int = 30313  # api.domain
     wsNodePort: int = 30314  # relay.domain
+    relayPrefix: str = "relay"
+    platformPrefix: str = "platform"
+    apiPrefix: str = "api"
+    isOnPrem: bool = True
 
     def __init__(
         self,
@@ -184,6 +188,13 @@ def gen_config(
     )
     values.KONG_HTTP_NODE_PORT = db_nport
 
+    backendProfile = BackendProfile.fromDomainProvider(
+        domain=domain,
+        api_endpoint_prefix=api_endpoint_prefix,
+        platform_endpoint_prefix=platform_endpoint_prefix,
+        relay_endpoint_prefix=relay_ws_endpoint_prefix,
+    )
+
     relayValues = RobustaRelay(
         domain=domain,
         anon_key=values.ANON_KEY,
@@ -193,8 +204,13 @@ def gen_config(
         platform_endpoint_prefix=platform_endpoint_prefix,
         api_endpoint_prefix=api_endpoint_prefix,
     )
+
     relayValues.apiNodePort = api_nport
     relayValues.wsNodePort = ws_nport
+    relayValues.relayPrefix = relay_ws_endpoint_prefix
+    relayValues.platformPrefix = platform_endpoint_prefix
+    relayValues.apiPrefix = api_endpoint_prefix
+
 
     uiValues = RobustaUI(
         domain=domain,
@@ -215,12 +231,8 @@ def gen_config(
         "RELAY": relay_ws_endpoint_prefix,
     }
 
-    backendProfile = BackendProfile.fromDomainProvider(
-        domain=domain,
-        api_endpoint_prefix=api_endpoint_prefix,
-        platform_endpoint_prefix=platform_endpoint_prefix,
-        relay_endpoint_prefix=relay_ws_endpoint_prefix,
-    )
+
+
     self_host_approval_url = "https://api.robusta.dev/terms-of-service.html"
     typer.echo(f"By using this software you agree to the terms of service ({self_host_approval_url})\n")
     write_values_files("self_host_values.yaml", "robusta_cli_config.json", values_dict, backendProfile)

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

@@ -27,7 +27,6 @@ CLUSTER_STATUS_PERIOD_SEC = int(os.environ.get("CLUSTER_STATUS_PERIOD_SEC", 60 *
 DISCOVERY_CHECK_THRESHOLD_SEC = int(os.environ.get("DISCOVERY_CHECK_THRESHOLD_SEC", 60 * 50))  # 50 min
 DISCOVERY_PROCESS_TIMEOUT_SEC = int(os.environ.get("DISCOVERY_PROCESS_TIMEOUT_SEC", 60 * 120))  # 120 min
 DISCOVERY_WATCHDOG_CHECK_SEC = int(os.environ.get("DISCOVERY_WATCHDOG_CHECK_SEC", 15 * 120))  # 15 min
-SUPABASE_LOGIN_RATE_LIMIT_SEC = int(os.environ.get("SUPABASE_LOGIN_RATE_LIMIT_SEC", 900))
 SUPABASE_TIMEOUT_SECONDS = int(os.environ.get("SUPABASE_TIMEOUT_SECONDS", 60))
 GRAFANA_RENDERER_URL = os.environ.get("GRAFANA_RENDERER_URL", "http://127.0.0.1:8281/render")
 RESOURCE_UPDATES_CACHE_TTL_SEC = os.environ.get("RESOURCE_UPDATES_CACHE_TTL_SEC", 120)
@@ -66,6 +65,8 @@ ENABLE_TELEMETRY = os.environ.get("ENABLE_TELEMETRY", "true").lower() == "true"
 SEND_ADDITIONAL_TELEMETRY = os.environ.get("SEND_ADDITIONAL_TELEMETRY", "false").lower() == "true"
 RELEASE_NAME = os.environ.get("RELEASE_NAME", "robusta")
 
+RUNNER_SERVICE_ACCOUNT = os.environ.get("RUNNER_SERVICE_ACCOUNT", f"{RELEASE_NAME}-runner-service-account")
+
 TELEMETRY_PERIODIC_SEC = int(os.environ.get("TELEMETRY_PERIODIC_SEC", 60 * 60 * 24))  # 24H
 
 SLACK_TABLE_COLUMNS_LIMIT = int(os.environ.get("SLACK_TABLE_COLUMNS_LIMIT", 3))

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

@@ -1,6 +1,5 @@
 import json
 import logging
-import time
 from collections import defaultdict
 from datetime import datetime
 from typing import Any, Dict, List, Optional
@@ -13,7 +12,7 @@ from supabase import create_client
 from supabase.lib.client_options import ClientOptions
 
 from robusta.core.model.cluster_status import ClusterStatus
-from robusta.core.model.env_vars import SUPABASE_LOGIN_RATE_LIMIT_SEC, SUPABASE_TIMEOUT_SECONDS
+from robusta.core.model.env_vars import SUPABASE_TIMEOUT_SECONDS
 from robusta.core.model.helm_release import HelmRelease
 from robusta.core.model.jobs import JobInfo
 from robusta.core.model.namespaces import NamespaceInfo
@@ -69,11 +68,10 @@ class SupabaseDal(AccountResourceFetcher):
         self.key = key
         self.account_id = account_id
         self.cluster = cluster_name
-        options = ClientOptions(postgrest_client_timeout=SUPABASE_TIMEOUT_SECONDS)
+        options = ClientOptions(postgrest_client_timeout=SUPABASE_TIMEOUT_SECONDS, auto_refresh_token=True)
         self.client = create_client(url, key, options)
         self.email = email
         self.password = password
-        self.sign_in_time = 0
         self.sign_in()
         self.client.auth.on_auth_state_change(self.__update_token_patch)
         self.sink_name = sink_name
@@ -96,12 +94,11 @@ class SupabaseDal(AccountResourceFetcher):
             ).eq("scan_id", scan_id).execute()
         except Exception as e:
             logging.error(f"Failed to set scan state {scan_id} error: {e}")
-            self.handle_supabase_error()
             raise
 
     def insert_scan_meta(self, scan_id: str, start_time: datetime, scan_type: ScanType) -> None:
         try:
-            self.__rpc_patch(
+            self.client.rpc(
                 "insert_scan_meta_v2",
                 {
                     "_account_id": self.account_id,
@@ -116,7 +113,6 @@ class SupabaseDal(AccountResourceFetcher):
             raise
         except Exception as e:
             logging.exception(f"Failed to persist scan meta {scan_id} error: {e}")
-            self.handle_supabase_error()
             raise
 
     def persist_scan(self, block: ScanReportBlock):
@@ -125,7 +121,6 @@ class SupabaseDal(AccountResourceFetcher):
             self.client.table(SCANS_RESULT_TABLE).insert(db_scanResults, returning=ReturnMethod.minimal).execute()
         except Exception as e:
             logging.exception(f"Failed to persist scan {block.scan_id} error: {e}")
-            self.handle_supabase_error()
             raise
 
         try:
@@ -139,7 +134,6 @@ class SupabaseDal(AccountResourceFetcher):
             ).eq("scan_id", block.scan_id).execute()
         except Exception as e:
             logging.exception(f"Failed to set scan state {block.scan_id} error: {e}")
-            self.handle_supabase_error()
             raise
 
     def persist_finding(self, finding: Finding):
@@ -148,13 +142,12 @@ class SupabaseDal(AccountResourceFetcher):
 
         scans, enrichments = [], []
         for enrich in finding.enrichments:
-            (
+            if enrich.annotations.get(EnrichmentAnnotation.SCAN, False):
                 scans.append(enrich)
-                if enrich.annotations.get(EnrichmentAnnotation.SCAN, False)
-                else enrichments.append(enrich)
-            )
+            else:
+                enrichments.append(enrich)
 
-        if (len(scans) > 0) and (len(enrichments)) == 0:
+        if scans and not enrichments:
             return
 
         for enrichment in enrichments:
@@ -172,20 +165,16 @@ class SupabaseDal(AccountResourceFetcher):
 
             try:
                 self.client.table(EVIDENCE_TABLE).insert(evidence, returning=ReturnMethod.minimal).execute()
-            except Exception as e:
-                logging.error(f"Failed to persist finding {finding.id} enrichment {enrichment} error: {e}")
+            except Exception:
+                logging.exception(f"Failed to persist finding {finding.id} enrichment {enrichment}")
+
         try:
-            (
-                self.client.table(ISSUES_TABLE)
-                .insert(
-                    ModelConversion.to_finding_json(self.account_id, self.cluster, finding),
-                    returning=ReturnMethod.minimal,
-                )
-                .execute()
-            )
-        except Exception as e:
-            logging.error(f"Failed to persist finding {finding.id} error: {e}")
-            self.handle_supabase_error()
+            self.client.table(ISSUES_TABLE).insert(
+                ModelConversion.to_finding_json(self.account_id, self.cluster, finding),
+                returning=ReturnMethod.minimal,
+            ).execute()
+        except Exception:
+            logging.exception(f"Failed to persist finding {finding.id}")
 
     def to_service(self, service: ServiceInfo) -> Dict[Any, Any]:
         return {
@@ -213,8 +202,7 @@ class SupabaseDal(AccountResourceFetcher):
         try:
             self.client.table(SERVICES_TABLE).upsert(db_services, returning=ReturnMethod.minimal).execute()
         except Exception as e:
-            logging.error(f"Failed to persist services {services} error: {e}")
-            self.handle_supabase_error()
+            logging.exception(f"Failed to persist services {services} error: {e}")
             raise
 
     def get_active_services(self) -> List[ServiceInfo]:
@@ -238,7 +226,6 @@ class SupabaseDal(AccountResourceFetcher):
             )
         except Exception as e:
             logging.error(f"Failed to get existing services (supabase) error: {e}")
-            self.handle_supabase_error()
             raise
 
         return [
@@ -267,7 +254,6 @@ class SupabaseDal(AccountResourceFetcher):
             )
         except Exception as e:
             logging.error(f"Failed to check cluster issues: {e}")
-            self.handle_supabase_error()
             raise
 
         return len(res.data) > 0
@@ -284,7 +270,6 @@ class SupabaseDal(AccountResourceFetcher):
             )
         except Exception as e:
             logging.error(f"Failed to get existing nodes (supabase) error: {e}")
-            self.handle_supabase_error()
             raise
 
         return [
@@ -327,7 +312,6 @@ class SupabaseDal(AccountResourceFetcher):
             self.client.table(NODES_TABLE).upsert(db_nodes, returning=ReturnMethod.minimal).execute()
         except Exception as e:
             logging.error(f"Failed to persist node {nodes} error: {e}")
-            self.handle_supabase_error()
             raise
 
     @staticmethod
@@ -351,7 +335,6 @@ class SupabaseDal(AccountResourceFetcher):
             )
         except Exception as e:
             logging.error(f"Failed to get existing jobs (supabase) error: {e}")
-            self.handle_supabase_error()
             raise
 
         return [JobInfo.from_db_row(job) for job in res.data]
@@ -368,7 +351,9 @@ class SupabaseDal(AccountResourceFetcher):
     def is_job_healthy(self, job: JobInfo) -> bool:
         is_running = job.status.active > 0
         is_completed = [condition for condition in job.status.conditions if condition.type == "Complete"]
-        return is_running or len(is_completed) > 0
+        is_starting = not any([job.status.active, job.status.failed, job.status.succeeded, job.status.conditions])
+
+        return is_running or len(is_completed) > 0 or is_starting
 
     def publish_jobs(self, jobs: List[JobInfo]):
         if not jobs:
@@ -379,7 +364,40 @@ class SupabaseDal(AccountResourceFetcher):
             self.client.table(JOBS_TABLE).upsert(db_jobs, returning=ReturnMethod.minimal).execute()
         except Exception as e:
             logging.error(f"Failed to persist jobs {jobs} error: {e}")
-            self.handle_supabase_error()
+            raise
+
+    def remove_deleted_node(self, node_name: str):
+        if not node_name:
+            return
+
+        try:
+            (
+                self.client.table(NODES_TABLE)
+                .delete(returning=ReturnMethod.minimal)
+                .eq("account_id", self.account_id)
+                .eq("cluster_id", self.cluster)
+                .eq("name", node_name)
+                .execute()
+            )
+        except Exception as e:
+            logging.exception(f"Failed to delete node {node_name} error: {e}")
+            raise
+
+    def remove_deleted_service(self, service_key: str):
+        if not service_key:
+            return
+
+        try:
+            (
+                self.client.table(SERVICES_TABLE)
+                .delete(returning=ReturnMethod.minimal)
+                .eq("account_id", self.account_id)
+                .eq("cluster", self.cluster)
+                .eq("service_key", service_key)
+                .execute()
+            )
+        except Exception as e:
+            logging.exception(f"Failed to delete service {service_key} error: {e}")
             raise
 
     def remove_deleted_job(self, job: JobInfo):
@@ -396,8 +414,24 @@ class SupabaseDal(AccountResourceFetcher):
                 .execute()
             )
         except Exception as e:
-            logging.error(f"Failed to delete job {job} error: {e}")
-            self.handle_supabase_error()
+            logging.exception(f"Failed to delete job {job} error: {e}")
+            raise
+
+    def remove_deleted_namespace(self, namespace_name: str):
+        if not namespace_name:
+            return
+
+        try:
+            (
+                self.client.table(NAMESPACES_TABLE)
+                .delete(returning=ReturnMethod.minimal)
+                .filter("account_id", "eq", self.account_id)
+                .filter("cluster_id", "eq", self.cluster)
+                .eq("name", namespace_name)
+                .execute()
+            )
+        except Exception as e:
+            logging.exception(f"Failed to delete namespace {namespace_name} error: {e}")
             raise
 
     # helm release
@@ -413,7 +447,6 @@ class SupabaseDal(AccountResourceFetcher):
             )
         except Exception as e:
             logging.error(f"Failed to get existing helm releases (supabase) error: {e}")
-            self.handle_supabase_error()
             raise
 
         return [HelmRelease.from_db_row(helm_release) for helm_release in res.data]
@@ -437,27 +470,13 @@ class SupabaseDal(AccountResourceFetcher):
             self.client.table(HELM_RELEASES_TABLE).upsert(db_helm_releases, returning=ReturnMethod.minimal).execute()
         except Exception as e:
             logging.error(f"Failed to persist helm_releases {helm_releases} error: {e}")
-            self.handle_supabase_error()
             raise
 
     def sign_in(self):
-        if time.time() > self.sign_in_time + SUPABASE_LOGIN_RATE_LIMIT_SEC:
-            logging.info("Supabase dal login")
-            self.sign_in_time = time.time()
-            res = self.client.auth.sign_in_with_password({"email": self.email, "password": self.password})
-            self.client.auth.set_session(res.session.access_token, res.session.refresh_token)
-            self.client.postgrest.auth(res.session.access_token)
-
-    def handle_supabase_error(self):
-        """Workaround for Gotrue bug in refresh token."""
-        # If there's an error during refresh token, no new refresh timer task is created, and the client remains not authenticated for good
-        # When there's an error connecting to supabase server, we will re-login, to re-authenticate the session.
-        # Adding rate-limiting mechanism, not to login too much because of other errors
-        # https://github.com/supabase/gotrue-py/issues/9
-        try:
-            self.sign_in()
-        except Exception:
-            logging.error("Failed to sign in on error", exc_info=True)
+        logging.info("Supabase dal login")
+        res = self.client.auth.sign_in_with_password({"email": self.email, "password": self.password})
+        self.client.auth.set_session(res.session.access_token, res.session.refresh_token)
+        self.client.postgrest.auth(res.session.access_token)
 
     def to_db_cluster_status(self, data: ClusterStatus) -> Dict[str, Any]:
         db_cluster_status = data.dict()
@@ -481,7 +500,6 @@ class SupabaseDal(AccountResourceFetcher):
             )
         except Exception as e:
             logging.error(f"Failed to upsert {self.to_db_cluster_status(cluster_status)} error: {e}")
-            self.handle_supabase_error()
 
     def get_active_namespaces(self) -> List[NamespaceInfo]:
         try:
@@ -495,7 +513,6 @@ class SupabaseDal(AccountResourceFetcher):
             )
         except Exception as e:
             logging.error(f"Failed to get existing namespaces (supabase) error: {e}")
-            self.handle_supabase_error()
             raise
 
         return [NamespaceInfo.from_db_row(namespace) for namespace in res.data]
@@ -516,7 +533,6 @@ class SupabaseDal(AccountResourceFetcher):
             self.client.table(NAMESPACES_TABLE).upsert(db_namespaces, returning=ReturnMethod.minimal).execute()
         except Exception as e:
             logging.error(f"Failed to persist namespaces {namespaces} error: {e}")
-            self.handle_supabase_error()
             raise
 
     def publish_cluster_nodes(self, node_count: int, pod_count: int):
@@ -527,10 +543,9 @@ class SupabaseDal(AccountResourceFetcher):
             "_pod_count": pod_count,
         }
         try:
-            self.__rpc_patch(UPDATE_CLUSTER_NODE_COUNT, data)
+            self.client.rpc(UPDATE_CLUSTER_NODE_COUNT, data)
         except Exception as e:
             logging.error(f"Failed to publish node count {data} error: {e}")
-            self.handle_supabase_error()
 
         logging.debug(f"cluster nodes: {UPDATE_CLUSTER_NODE_COUNT} => {data}")
 
@@ -548,7 +563,6 @@ class SupabaseDal(AccountResourceFetcher):
             ).execute()
         except Exception as e:
             logging.error(f"Failed to persist resource events error: {e}")
-            self.handle_supabase_error()
             raise
 
     def persist_platform_blocks(self, enrichment: Enrichment, finding_id):
@@ -601,9 +615,8 @@ class SupabaseDal(AccountResourceFetcher):
 
             res = query_builder.execute()
         except Exception as e:
-            msg = f"Failed to get existing account resources (supabase) error"
+            msg = "Failed to get existing account resources (supabase) error"
             logging.error(msg, exc_info=True)
-            self.handle_supabase_error()
             raise e
 
         account_resources_map: Dict[ResourceKind, List[AccountResource]] = defaultdict(list)
@@ -656,32 +669,10 @@ class SupabaseDal(AccountResourceFetcher):
             )
 
             self.client.table(ACCOUNT_RESOURCE_STATUS_TABLE).upsert(data).execute()
-        except Exception as e:
-            logging.error(f"Failed to set account resource status to {status_type}", exc_info=True)
-            self.handle_supabase_error()
+        except Exception:
+            logging.exception(f"Failed to set account resource status to {status_type}")
             raise
 
-    def __rpc_patch(self, func_name: str, params: dict) -> Dict[str, Any]:
-        """
-        Supabase client is async. Sync impl of rpc call
-        """
-        headers = self.client.table("").session.headers
-        url: str = f"{self.client.rest_url}/rpc/{func_name}"
-
-        response = requests.post(url, headers=headers, json=params)
-        response.raise_for_status()
-        response_data = {}
-        try:
-            if response.content:
-                response_data = response.json()
-        except Exception:  # this can be okay if no data is expected
-            logging.debug("Failed to parse rpc response data")
-
-        return {
-            "data": response_data,
-            "status_code": response.status_code,
-        }
-
     def __update_token_patch(self, event, session):
         logging.debug(f"Event {event}, Session {session}")
         if session and event == "TOKEN_REFRESHED":
@@ -698,4 +689,3 @@ class SupabaseDal(AccountResourceFetcher):
             )
         except Exception as e:
             logging.error(f"Failed to set cluster status active=False error: {e}")
-            self.handle_supabase_error()