add function to get cluster name

Author: ggtrd

src/storage/azure.py

@@ -2,54 +2,36 @@
 from datetime import datetime
 from azure.storage.blob import BlobServiceClient
 from azure.core.exceptions import ResourceExistsError
-from src.storage.base import BaseStorage
+from src.storage.base import Storage
+from src.kubernetes import Storage
 
-class AzureStorage(BaseStorage):
-    """
-    Azure Blob Storage provider implementation in pure Python.
-    Container format: <cluster_name-namespace>
-    """
 
-    def __init__(self, storage_address: str, storage_username: str, storage_password: str):
-        if ".net/" in storage_address:
-            self.account_url = storage_address.split(".net/")[0] + ".net"
-        else:
-            self.account_url = storage_address
-
-        self.account_key = storage_password
-        
-        namespace = "unknown-namespace"
-        ns_path = "/var/run/secrets/kubernetes.io/serviceaccount/namespace"
-        if os.path.exists(ns_path):
-            with open(ns_path, "r") as f:
-                namespace = f.read().strip()
-
-        cluster_name = os.getenv("CLUSTER_NAME")
-        if not cluster_name:
-            account_name = self.account_url.replace("https://", "").replace("http://", "").split(".")[0]
-            cluster_name = account_name.replace("-backup", "").replace("backup", "")
+class AzureStorage(Storage):
 
+    def __init__(self, kube, storage_address: str, storage_username: str, storage_password: str):
+        cluster_name = kube.get_cluster_name()
+        namespace = kube.get_namespace()
         self.blob_container = f"{cluster_name}-{namespace}".lower().replace("_", "-")
-
+        self.storage_address = storage_address
+        self.storage_password = storage_password
         self.blob_service_client = BlobServiceClient(
-            account_url=self.account_url,
-            credential=self.account_key
-        )
-        
-        self._ensure_container_exists()
+            account_url=self.storage_address,
+            credential=self.storage_password
+        )        
+        self._ensure_blob_container_exists()
+
 
-    def _ensure_container_exists(self):
-        """
-        Creates the Azure container if it does not exist.
-        """
+    def _ensure_blob_container_exists(self):
+        """Creates the Azure container if it does not exist."""
         try:
-            print(f"info: checking or creating Azure container '{self.blob_container}'...", flush=True)
+            print(f"info: checking or creating Azure container '{self.blob_container}'...")
             self.blob_service_client.create_container(name=self.blob_container)
-            print(f"info: container '{self.blob_container}' successfully created.", flush=True)
+            print(f"info: container '{self.blob_container}' successfully created.")
         except ResourceExistsError:
-            print(f"info: container '{self.blob_container}' already exists. Reusing it.", flush=True)
+            print(f"info: container '{self.blob_container}' already exists. Reusing it.")
         except Exception as e:
-            print(f"error: failed to verify/create Azure container: {e}", flush=True)
+            raise RuntimeError(f"Critical: Failed to verify/create Azure container: {e}")
+
 
     def upload_stream(self, pvc_name: str, path: str, data_generator) -> bool:
         date_str = datetime.utcnow().strftime("%Y%m%d-%H%M%S")
@@ -63,11 +45,11 @@ def upload_stream(self, pvc_name: str, path: str, data_generator) -> bool:
                 blob=blob_name
             )
 
-            print(f"info: uploading directly to '{blob_name}'...", flush=True)
+            print(f"info: uploading directly to '{blob_name}'...")
 
             # The Azure SDK natively supports data generators for chunked upload
             blob_client.upload_blob(data_generator, overwrite=True, max_concurrency=2)
             return True
         except Exception as e:
-            print(f"error: azure upload failed: {e}", flush=True)
+            print(f"error: azure upload failed: {e}")
             return False

src/storage/base.py

@@ -1,17 +1,13 @@
 from abc import ABC, abstractmethod
 
-class BaseStorage(ABC):
-    """
-    Abstract class defining the contract for all storage providers.
-    """
+class Storage(ABC):
+    """Abstract class defining the contract for all storage providers."""
 
     @abstractmethod
     def __init__(self, storage_address: str, storage_username: str, storage_password: str):
         pass
 
     @abstractmethod
     def upload_stream(self, pvc_name: str, path: str, stream) -> bool:
-        """
-        Upload a continuous data stream to the target storage.
-        """
+        """Upload a continuous data stream to the target storage."""
         pass