add and fix tests

Author: b-yogesh

src/gaiaflow/cli/commands/minikube.py

@@ -124,14 +124,14 @@ def dockerize(
         typer.echo("Please create a project with Gaiaflow before running this command.")
         return
     if dockerfile_path:
-        docker_build_mode = "minikube-user"
+        docker_handler_mode = "minikube-user"
     else:
-        docker_build_mode = "minikube"
+        docker_handler_mode = "minikube"
     imports.MinikubeManager.run(
         gaiaflow_path=gaiaflow_path,
         user_project_path=user_project_path,
         action=imports.ExtendedAction.DOCKERIZE,
-        docker_build_mode=docker_build_mode,
+        docker_handler_mode=docker_handler_mode,
         image_name=image_name,
         dockerfile_path=dockerfile_path,
     )

src/gaiaflow/managers/helpers.py

@@ -476,18 +476,17 @@ def __init__(self, gaiaflow_path: Path, os_type: str):
         self.os_type = os_type
 
     def create_inline(self):
-        if self.os_type == "linux" or is_wsl():
-            kube_config = Path.home() / ".kube" / "config"
-            backup_config = kube_config.with_suffix(".backup")
-
-            self._backup_kube_config(kube_config, backup_config)
-            self._patch_kube_config(kube_config)
-            self._write_inline(kube_config)
-
-            if backup_config.exists():
-                shutil.copy(backup_config, kube_config)
-                backup_config.unlink()
-                log_info("Reverted kube config to original state.")
+        kube_config = Path.home() / ".kube" / "config"
+        backup_config = kube_config.with_suffix(".backup")
+
+        self._backup_kube_config(kube_config, backup_config)
+        self._patch_kube_config(kube_config)
+        self._write_inline(kube_config)
+
+        if backup_config.exists():
+            shutil.copy(backup_config, kube_config)
+            backup_config.unlink()
+            log_info("Reverted kube config to original state.")
 
     def _backup_kube_config(self, kube_config: Path, backup_config: Path):
         if kube_config.exists():

src/gaiaflow/managers/minikube_manager.py

@@ -139,8 +139,8 @@ def stop(self):
     def create_kube_config_inline(self):
         self.kube_helper.create_inline()
 
-    def build_docker_image(self, dockerfile_path: str):
-        if not dockerfile_path:
+    def build_docker_image(self, dockerfile_path: str = ""):
+        if dockerfile_path != "":
             dockerfile_path = (
                 self.gaiaflow_path / "_docker" / "user-package" / "Dockerfile"
             )
@@ -201,7 +201,4 @@ def list_images(self):
         self.docker_helper.list_images()
 
     def remove_image(self, image_name: str):
-        self.docker_helper.remove_image(image_name)
-
-    def prune_images(self):
-        self.docker_helper.prune_images()
+        self.docker_helper.remove_image(image_name)

tests/cli/commands/test_minikube.py

@@ -8,6 +8,8 @@
     ExtendedAction
 from gaiaflow.cli.commands.minikube import app as prod_app
 from gaiaflow.cli.commands.minikube import load_imports
+from gaiaflow.managers.helpers import DockerHandlerMode
+
 
 class TestGaiaflowProdCLI(unittest.TestCase):
     def setUp(self):
@@ -32,15 +34,11 @@ def test_start_command(self, mock_load_imports):
 
         result = self.runner.invoke(prod_app, [
             "start",
-            "--path", str(self.test_project_path),
             "--force-new"
         ])
 
         self.assertEqual(result.exit_code, 0)
 
-        self.mock_imports.create_gaiaflow_context_path.assert_called_once_with(
-            self.test_project_path
-        )
         self.mock_imports.gaiaflow_path_exists_in_state.assert_called_once_with(
             self.test_gaiaflow_path, True
         )
@@ -59,7 +57,6 @@ def test_start_command_exits_when_project_not_exists(self, mock_load_imports):
 
         result = self.runner.invoke(prod_app, [
             "start",
-            "--path", str(self.test_project_path)
         ])
 
         self.assertEqual(result.exit_code, 0)
@@ -73,7 +70,6 @@ def test_stop_command(self, mock_load_imports):
 
         result = self.runner.invoke(prod_app, [
             "stop",
-            "--path", str(self.test_project_path)
         ])
 
         self.assertEqual(result.exit_code, 0)
@@ -90,7 +86,6 @@ def test_restart_command(self, mock_load_imports):
 
         result = self.runner.invoke(prod_app, [
             "restart",
-            "--path", str(self.test_project_path),
             "--force-new"
         ])
 
@@ -100,6 +95,7 @@ def test_restart_command(self, mock_load_imports):
             gaiaflow_path=self.test_gaiaflow_path,
             user_project_path=self.test_project_path,
             action=BaseAction.RESTART,
+            force_new=True
         )
 
     @patch('gaiaflow.cli.commands.minikube.load_imports')
@@ -108,7 +104,6 @@ def test_dockerize_command(self, mock_load_imports):
 
         result = self.runner.invoke(prod_app, [
             "dockerize",
-            "--path", str(self.test_project_path),
             "--image-name", "my-custom-image"
         ])
 
@@ -118,8 +113,42 @@ def test_dockerize_command(self, mock_load_imports):
             gaiaflow_path=self.test_gaiaflow_path,
             user_project_path=self.test_project_path,
             action=ExtendedAction.DOCKERIZE,
-            local=False,
-            image_name="my-custom-image"
+            docker_handler_mode=DockerHandlerMode.MINIKUBE,
+            image_name="my-custom-image", dockerfile_path=None
+        )
+
+    @patch("gaiaflow.cli.commands.minikube.load_imports")
+    def test_list_images_command(self, mock_load_imports):
+        mock_load_imports.return_value = self.mock_imports
+
+        result = self.runner.invoke(
+            prod_app, ["list-images"]
+        )
+
+        self.assertEqual(result.exit_code, 0)
+
+        self.mock_imports.MinikubeManager.run.assert_called_once_with(
+            gaiaflow_path=self.test_gaiaflow_path,
+            user_project_path=self.test_project_path,
+            action=ExtendedAction.LIST_IMAGES,
+            docker_handler_mode=DockerHandlerMode.MINIKUBE,
+        )
+
+    @patch("gaiaflow.cli.commands.minikube.load_imports")
+    def test_remove_image_command(self, mock_load_imports):
+        mock_load_imports.return_value = self.mock_imports
+
+        result = self.runner.invoke(prod_app, ["remove-image", "--image-name",
+                                               "my-custom-image"])
+
+        self.assertEqual(result.exit_code, 0)
+
+        self.mock_imports.MinikubeManager.run.assert_called_once_with(
+            gaiaflow_path=self.test_gaiaflow_path,
+            user_project_path=self.test_project_path,
+            action=ExtendedAction.REMOVE_IMAGE,
+            docker_handler_mode=DockerHandlerMode.MINIKUBE,
+            image_name="my-custom-image",
         )
 
     @patch('gaiaflow.cli.commands.minikube.load_imports')
@@ -128,7 +157,6 @@ def test_dockerize_command_with_default_image_name(self, mock_load_imports):
 
         result = self.runner.invoke(prod_app, [
             "dockerize",
-            "--path", str(self.test_project_path)
         ])
 
         self.assertEqual(result.exit_code, 0)
@@ -143,7 +171,6 @@ def test_create_config_command(self, mock_load_imports):
 
         result = self.runner.invoke(prod_app, [
             "create-config",
-            "--path", str(self.test_project_path)
         ])
 
         self.assertEqual(result.exit_code, 0)
@@ -160,7 +187,6 @@ def test_create_secret_command(self, mock_load_imports):
 
         result = self.runner.invoke(prod_app, [
             "create-secret",
-            "--path", str(self.test_project_path),
             "--name", "my-secret",
             "--data", "key1=value1",
             "--data", "key2=value2"
@@ -186,7 +212,6 @@ def test_cleanup_command(self, mock_load_imports):
 
         result = self.runner.invoke(prod_app, [
             "cleanup",
-            "--path", str(self.test_project_path)
         ])
 
         self.assertEqual(result.exit_code, 0)
@@ -203,14 +228,13 @@ def test_all_commands_handle_missing_project_gracefully(self, mock_load_imports)
         self.mock_imports.gaiaflow_path_exists_in_state.return_value = False
 
         commands_and_args = [
-            ["start", "--path", str(self.test_project_path)],
-            ["stop", "--path", str(self.test_project_path)],
-            ["restart", "--path", str(self.test_project_path)],
-            ["dockerize", "--path", str(self.test_project_path)],
-            ["create-config", "--path", str(self.test_project_path)],
-            ["create-secret", "--path", str(self.test_project_path),
-             "--name", "test", "--data", "key=value"],
-            ["cleanup", "--path", str(self.test_project_path)],
+            ["start"],
+            ["stop"],
+            ["restart"],
+            ["dockerize"],
+            ["create-config"],
+            ["create-secret", "--name", "test", "--data", "key=value"],
+            ["cleanup"],
         ]
 
         for command_args in commands_and_args:
@@ -244,7 +268,6 @@ def test_action_objects_comparison(self, mock_load_imports):
 
         result = self.runner.invoke(prod_app, [
             "start",
-            "--path", str(self.test_project_path)
         ])
 
         self.assertEqual(result.exit_code, 0)