Merge pull request #8 from Dunedan/skip-provisioning

Add an option to skip provisioning

Author: lnussbaum

incant/cli.py

@@ -46,11 +46,12 @@ def help(ctx):
 
 @cli.command()
 @click.argument("name", required=False)
+@click.option("--no-provision", is_flag=True, help="Skip provisioning after starting the instances.")
 @click.pass_context
-def up(ctx, name: Optional[str]):
+def up(ctx, name: Optional[str], no_provision: Optional[bool]):
     """Start and provision an instance or all instances if no name is provided."""
     try:
-        Incant(reporter=ctx.obj["REPORTER"], **ctx.obj["OPTIONS"]).up(name)
+        Incant(reporter=ctx.obj["REPORTER"], **ctx.obj["OPTIONS"]).up(name, provision=not no_provision)
     except IncantError as e:
         _handle_error(e, ctx.obj["REPORTER"])
 

incant/incant.py

@@ -40,7 +40,7 @@ def _get_instance_configs(self, name: Optional[str] = None) -> InstanceDict:
     def dump_config(self):
         self.config_manager.dump_config()
 
-    def up(self, name=None):
+    def up(self, name=None, provision: bool = True):
         instance_configs = self._get_instance_configs(name)
 
         # Step 1 -- Create instances (we do this for all instances so that they can
@@ -82,7 +82,7 @@ def up(self, name=None):
             if instance_config.shared_folder:
                 self.incus.create_shared_folder(instance_config.name)
 
-            if instance_config.provision:
+            if instance_config.provision and provision:
                 # Automatically run provisioning after instance creation
                 self.provision(instance_config.name)
 

tests/test_incant.py

@@ -258,6 +258,32 @@ def test_up_single_instance_with_provision(
         mock_incus_cli.is_instance_ready.assert_called_once_with("test-instance", True)
         incant_app.provisioner.provision.assert_called_once_with("test-instance", ["script.sh"])
 
+    @patch("incant.incant.time.sleep", return_value=None)
+    def test_up_single_instance_with_provision_but_disabled(
+        self,
+        mock_sleep,
+        incant_app,
+        mock_config_manager,
+        mock_incus_cli,
+        mock_provision_manager,
+        mock_reporter,
+    ):
+        instance_config = InstanceConfig(
+            name="test-instance", image="img", provision=["script.sh"], shared_folder=False
+        )
+        mock_config_manager.instance_configs = {"test-instance": instance_config}
+        mock_incus_cli.is_agent_running.return_value = True
+        mock_incus_cli.is_agent_usable.return_value = True
+        mock_incus_cli.is_instance_ready.return_value = True  # Provision implies wait
+
+        incant_app.up("test-instance", provision=False)
+
+        mock_incus_cli.create_instance.assert_called_once_with(instance_config)
+        mock_incus_cli.is_agent_running.assert_called_once_with("test-instance")
+        mock_incus_cli.is_agent_usable.assert_called_once_with("test-instance")
+        mock_incus_cli.is_instance_ready.assert_called_once_with("test-instance", True)
+        incant_app.provisioner.provision.assert_not_called()
+
     @patch("incant.incant.time.sleep", return_value=None)
     def test_up_single_instance_with_shared_folder(
         self, mock_sleep, incant_app, mock_config_manager, mock_incus_cli, mock_reporter