macos15-arm: impl Image::rebuild()

Author: delan

Cargo.lock

@@ -9,6 +9,7 @@ bytesize = "2.0.1"
 chrono = { version = "0.4.39", features = ["serde"] }
 cli = { path = "monitor/cli" }
 cmd_lib = "1.9.5"
+crossbeam-channel = "0.5.13"
 dotenv = "0.15.0"
 hypervisor = { path = "monitor/hypervisor" }
 jane-eyre = "0.3.0"

Cargo.toml

@@ -12,7 +12,7 @@ cfg-if = "1.0.1"
 chrono = { workspace = true }
 cli = { workspace = true }
 cmd_lib = { workspace = true }
-crossbeam-channel = "0.5.13"
+crossbeam-channel = { workspace = true }
 dotenv = { workspace = true }
 http = "0.2"
 hypervisor = { workspace = true }

monitor/Cargo.toml

@@ -5,6 +5,7 @@ edition = "2024"
 
 [dependencies]
 cmd_lib.workspace = true
+crossbeam-channel.workspace = true
 jane-eyre.workspace = true
 settings.workspace = true
 shell.workspace = true

monitor/hypervisor/Cargo.toml

@@ -111,22 +111,3 @@ pub fn get_ipv4_address(guest_name: &str) -> Option<Ipv4Addr> {
     // TODO
     None
 }
-
-pub fn delete_guest(guest_name: &str) -> eyre::Result<()> {
-    let (tx, rx) = crossbeam_channel::bounded(0);
-    UTM_REQUEST.sender.send(UtmRequest::DeleteGuest {
-        result: tx,
-        guest_name: guest_name.to_owned(),
-    })?;
-    Ok(rx.recv()??)
-}
-
-pub fn clone_guest(original_guest_name: &str, new_guest_name: &str) -> eyre::Result<()> {
-    let (tx, rx) = crossbeam_channel::bounded(0);
-    UTM_REQUEST.sender.send(UtmRequest::CloneGuest {
-        result: tx,
-        original_guest_name: original_guest_name.to_owned(),
-        new_guest_name: new_guest_name.to_owned(),
-    })?;
-    Ok(rx.recv()??)
-}

monitor/hypervisor/src/impl_utm.rs

@@ -1,4 +1,5 @@
 pub mod libvirt;
+pub mod utm;
 
 #[cfg_attr(target_os = "linux", path = "impl_libvirt.rs")]
 #[cfg_attr(target_os = "macos", path = "impl_utm.rs")]

monitor/hypervisor/src/lib.rs

@@ -0,0 +1,34 @@
+use jane_eyre::eyre;
+
+#[cfg(not(target_os = "macos"))]
+#[expect(unused)]
+pub fn destroy_guest(guest_name: &str) -> eyre::Result<()> {
+    unimplemented!()
+}
+
+#[cfg(target_os = "macos")]
+pub fn destroy_guest(guest_name: &str) -> eyre::Result<()> {
+    let (tx, rx) = crossbeam_channel::bounded(0);
+    UTM_REQUEST.sender.send(UtmRequest::DeleteGuest {
+        result: tx,
+        guest_name: guest_name.to_owned(),
+    })?;
+    Ok(rx.recv()??)
+}
+
+#[cfg(not(target_os = "macos"))]
+#[expect(unused)]
+pub fn clone_guest(original_guest_name: &str, new_guest_name: &str) -> eyre::Result<()> {
+    unimplemented!()
+}
+
+#[cfg(target_os = "macos")]
+pub fn clone_guest(original_guest_name: &str, new_guest_name: &str) -> eyre::Result<()> {
+    let (tx, rx) = crossbeam_channel::bounded(0);
+    UTM_REQUEST.sender.send(UtmRequest::CloneGuest {
+        result: tx,
+        original_guest_name: original_guest_name.to_owned(),
+        new_guest_name: new_guest_name.to_owned(),
+    })?;
+    Ok(rx.recv()??)
+}

monitor/hypervisor/src/utm.rs

@@ -80,7 +80,10 @@ pub struct MacosUtm;
 #[expect(unused_variables)]
 impl Image for MacosUtm {
     fn rebuild(&self, profile: &Profile, snapshot_name: &str) -> eyre::Result<()> {
-        todo!()
+        let profile_name = &profile.profile_name;
+        let rebuild_guest_name = &profile.rebuild_guest_name(snapshot_name);
+        hypervisor::utm::clone_guest(&format!("{profile_name}-clean"), rebuild_guest_name)?;
+        Ok(())
     }
     fn delete_template(&self, profile: &Profile, snapshot_name: &str) -> eyre::Result<()> {
         todo!()