Add more tests to improve the coverage (#571)

Co-authored-by: Alex <[email protected]>

Author: hsong-rh

src/aap_eda/services/activation/engine/common.py

@@ -121,7 +121,7 @@ def get_status(self, container_id: str) -> ContainerStatus:
             raise exceptions.ContainerNotFoundError(e) from e
 
     @abstractmethod
-    def start(self, request: ContainerRequest, logger: LogHandler) -> str:
+    def start(self, request: ContainerRequest, log_handler: LogHandler) -> str:
         # It returns the container id
         try:
             # Implementation
@@ -132,7 +132,7 @@ def start(self, request: ContainerRequest, logger: LogHandler) -> str:
             raise exceptions.ContainerStartError(e) from e
 
     @abstractmethod
-    def cleanup(self, container_id: str, logger: LogHandler) -> None:
+    def cleanup(self, container_id: str, log_handler: LogHandler) -> None:
         try:
             # Implementation
             ...

src/aap_eda/services/activation/engine/kubernetes.py

@@ -77,7 +77,7 @@ def get_k8s_client() -> Client:
             network_api=k8sclient.NetworkingV1Api(),
         )
     except ConfigException as e:
-        raise ContainerEngineInitError(str(e))
+        raise ContainerEngineInitError(str(e)) from e
 
 
 class Engine(ContainerEngine):
@@ -93,6 +93,8 @@ def __init__(
 
         self._set_namespace()
         self.secret_name = f"activation-secret-{activation_id}"
+        self.job_name = None
+        self.pod_name = None
 
     def start(self, request: ContainerRequest, log_handler: LogHandler) -> str:
         # TODO : Should this be compatible with the previous version
@@ -237,10 +239,12 @@ def update_logs(self, container_id: str, log_handler: LogHandler) -> None:
                     log_handler.flush()
                     log_handler.set_log_read_at(dt)
             else:
-                LOGGER.warning(f"Pod with label {container_id} not found.")
-                log_handler.write(
-                    f"Pod with label {container_id} not found.", True
+                msg = (
+                    f"Pod with label {container_id} has unhandled state: "
+                    f"{container_status.state}."
                 )
+                LOGGER.warning(msg)
+                log_handler.write(msg, flush=True)
 
         # ContainerUpdateLogsError handled by the manager
         except ApiException as e:
@@ -259,7 +263,7 @@ def _get_job_pod(self, job_name: str) -> k8sclient.V1Pod:
             return result.items[0]
         except ApiException as e:
             LOGGER.error(f"API Exception {e}")
-            raise ContainerNotFoundError(str(e))
+            raise ContainerNotFoundError(str(e)) from e
 
     def _create_container_spec(
         self,
@@ -358,7 +362,7 @@ def _create_service(self, port: int) -> None:
                 LOGGER.info(f"Service already exists: {service_name}")
         except ApiException as e:
             LOGGER.error(f"API Exception {e}")
-            raise ContainerStartError(str(e))
+            raise ContainerStartError(str(e)) from e
 
     def _delete_services(self, log_handler: LogHandler) -> None:
         try:
@@ -378,7 +382,7 @@ def _delete_services(self, log_handler: LogHandler) -> None:
                 log_handler.write(f"Service {service_name} is deleted.", True)
         except ApiException as e:
             LOGGER.error(f"API Exception {e}")
-            raise ContainerCleanupError(str(e))
+            raise ContainerCleanupError(str(e)) from e
 
     def _create_job(
         self,
@@ -415,7 +419,7 @@ def _create_job(
             LOGGER.info(f"Submitted Job template: {self.job_name},")
         except ApiException as e:
             LOGGER.error(f"API Exception {e}")
-            raise ContainerStartError(str(e))
+            raise ContainerStartError(str(e)) from e
 
         return job_result
 
@@ -446,7 +450,7 @@ def _delete_job(self, log_handler: LogHandler) -> None:
         except ApiException as e:
             raise ContainerCleanupError(
                 f"Stop of {self.job_name} Failed: \n {e}"
-            )
+            ) from e
 
     def _wait_for_pod_to_start(self, log_handler: LogHandler) -> None:
         watcher = watch.Watch()
@@ -479,7 +483,8 @@ def _wait_for_pod_to_start(self, log_handler: LogHandler) -> None:
         except ApiException as e:
             raise ContainerStartError(
                 f"Pod {self.pod_name} failed with error {e}"
-            )
+            ) from e
+
         finally:
             watcher.stop()
 
@@ -488,14 +493,16 @@ def _set_namespace(self) -> None:
             "/var/run/secrets/kubernetes.io/serviceaccount/namespace"
         )
         try:
-            with open(namespace_file, "r") as namespace_ref:
+            with open(
+                namespace_file, mode="r", encoding="utf-8"
+            ) as namespace_ref:
                 self.namespace = namespace_ref.read()
 
             LOGGER.info(f"Namespace is {self.namespace}")
-        except FileNotFoundError:
+        except FileNotFoundError as e:
             message = f"Namespace file {namespace_file} does not exist."
             LOGGER.error(message)
-            raise ContainerEngineInitError(message)
+            raise ContainerEngineInitError(message) from e
 
     def _create_secret(
         self,
@@ -542,7 +549,7 @@ def _create_secret(
             LOGGER.info(f"Created secret: name: {self.secret_name}")
         except ApiException as e:
             LOGGER.error(f"API Exception {e}")
-            raise ContainerStartError(str(e))
+            raise ContainerStartError(str(e)) from e
 
     def _delete_secret(self, log_handler: LogHandler) -> None:
         try:
@@ -573,4 +580,4 @@ def _delete_secret(self, log_handler: LogHandler) -> None:
                 log_handler.write(message, True)
         except ApiException as e:
             LOGGER.error(f"API Exception {e}")
-            raise ContainerCleanupError(str(e))
+            raise ContainerCleanupError(str(e)) from e

src/aap_eda/services/activation/engine/podman.py

@@ -71,6 +71,8 @@ def __init__(
             else:
                 self.client = get_podman_client()
             LOGGER.debug(self.client.version())
+
+            self.auth_file = None
         except APIError as e:
             LOGGER.error(f"Failed to initialize podman engine: f{e}")
             raise exceptions.ContainerEngineInitError(str(e))
@@ -302,7 +304,7 @@ def _write_auth_json(self, request: ContainerRequest) -> None:
 
         auth_dict = {}
         if os.path.exists(self.auth_file):
-            with open(self.auth_file) as f:
+            with open(self.auth_file, encoding="utf-8") as f:
                 auth_dict = json.load(f)
 
         if "auths" not in auth_dict:
@@ -312,7 +314,7 @@ def _write_auth_json(self, request: ContainerRequest) -> None:
             request.credential
         )
 
-        with open(self.auth_file, "w") as f:
+        with open(self.auth_file, mode="w", encoding="utf-8") as f:
             json.dump(auth_dict, f, indent=6)
 
     def _create_auth_key(self, credential: Credential) -> dict:
@@ -358,11 +360,11 @@ def _pull_image(
                 raise exceptions.ContainerImagePullError(msg)
             LOGGER.info("Downloaded image")
             return image
-        except ImageNotFound:
+        except ImageNotFound as e:
             msg = f"Image {request.image_url} not found"
             LOGGER.exception(msg)
             log_handler.write(msg, True)
-            raise exceptions.ContainerImagePullError(msg)
+            raise exceptions.ContainerImagePullError(msg) from e
         except APIError as e:
             LOGGER.exception("Failed to pull image {request.image_url}: f{e}")
             raise exceptions.ContainerStartError(str(e))

tests/integration/services/activation/engine/data/auth.json

@@ -0,0 +1,10 @@
+{
+      "auths": {
+            "docker.io": {
+                  "auth": "erfi7sYi89234xJUqaqxgmzcnQ2rRFWM5aJX0EC="
+            },
+            "quay.io": {
+                  "auth": "bWU6c2VjcmV0"
+            }
+      }
+}