refactor: use __repr__ for Kubernetes class in debug messages

nuvla · Jul 12, 2024 · 25c6e89 · 25c6e89
1 parent b247cd8
commit 25c6e89
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/nuvla/job_engine/connector/helm_driver.py b/nuvla/job_engine/connector/helm_driver.py
@@ -11,9 +11,8 @@
 
 class Helm:
     def __init__(self, path_to_k8s_creds: str, **kwargs):
-        self.k8s = Kubernetes.from_path_to_k8s_creds(path_to_k8s_creds,
-                                                     **kwargs)
-        self.k8s.state_debug()
+        self.k8s = Kubernetes.from_path_to_k8s_creds(path_to_k8s_creds, **kwargs)
+        log.debug(self.k8s)
 
     @property
     def connector_type(self):

diff --git a/nuvla/job_engine/connector/k8s_driver.py b/nuvla/job_engine/connector/k8s_driver.py
@@ -91,6 +91,12 @@ def __init__(self, **kwargs):
                                        f'{self.ne_image_org}/{self.ne_image_repo}')
         self.base_image = f'{self.ne_image_registry}{self.ne_image_name}:{self.ne_image_tag}'
 
+    def __repr__(self):
+        return (f'{self.__class__.__name__}(endpoint={self._endpoint}, '
+                f'ca_md5={md5sum(from_base64(self._ca_base64))}, '
+                f'user_cert_md5={md5sum(from_base64(self._cert_base64))}, '
+                f'user_key_md5={md5sum(from_base64(self._key_base64))})')
+
     @staticmethod
     def from_path_to_k8s_creds(path_to_k8s_creds: str, **kwargs):
         params = {
@@ -101,13 +107,6 @@ def from_path_to_k8s_creds(path_to_k8s_creds: str, **kwargs):
         params.update(kwargs)
         return Kubernetes(**params)
 
-    def state_debug(self):
-        log.debug('Kubernetes object state:')
-        log.debug('CA %s', from_base64(self._ca_base64))
-        log.debug('User certificate %s', from_base64(self._cert_base64))
-        log.debug('User key md5sum: %s', md5sum(from_base64(self._key_base64)))
-        log.debug('Kubernetes endpoint %s', self._endpoint)
-
     @property
     def connector_type(self):
         return 'Kubernetes-cli'

diff --git a/nuvla/job_engine/connector/kubernetes.py b/nuvla/job_engine/connector/kubernetes.py
@@ -616,9 +616,8 @@ def __init__(self, job: Job, **kwargs):
 
         self.nuvlabox_resource = self.api.get(kwargs.get("nuvlabox_id"))
 
-        self.k8s = Kubernetes.from_path_to_k8s_creds(_NUVLAEDGE_SHARED_PATH)
-
-        self.k8s.state_debug()
+        self.k8s = Kubernetes.from_path_to_k8s_creds(job.nuvlaedge_shared_path)
+        log.debug(self.k8s)
 
     def connect(self):
         self.k8s.connect()
@@ -808,9 +807,9 @@ def manage_ssh_key(self, action: str, pubkey: str, credential_id: str,
 
 class K8sLogging:
 
-    def __init__(self):
-        self.k8s = Kubernetes.from_path_to_k8s_creds(_NUVLAEDGE_SHARED_PATH)
-        self.k8s.state_debug()
+    def __init__(self, job: Job):
+        self.k8s = Kubernetes.from_path_to_k8s_creds(job.nuvlaedge_shared_path)
+        log.debug(self.k8s)
 
     def log(self, component: str, since: str, lines: int, namespace='') -> str:
         """