feat(hostd): varlink interfaced host controller to manage machine configuration and boot mgmt

Cargo.lock

@@ -993,12 +993,8 @@ name = "hostd"
 version = "0.2.0"
 dependencies = [
  "anyhow",
- "serde",
- "serde_derive",
- "serde_json",
- "tokio",
+ "internal",
  "varlink",
- "varlink_generator",
 ]
 
 [[package]]
@@ -1357,6 +1353,17 @@ dependencies = [
  "tracing-subscriber",
 ]
 
+[[package]]
+name = "internal"
+version = "0.2.0"
+dependencies = [
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "varlink",
+ "varlink_generator",
+]
+
 [[package]]
 name = "ipnet"
 version = "2.10.1"

Cargo.toml

@@ -7,6 +7,7 @@ members = [
   "hostd",
   "trace-request",
   "xtask",
+  "internal",
 ]
 default-members = [
   "agent",

hostd/Cargo.toml

@@ -5,11 +5,5 @@ edition.workspace = true
 
 [dependencies]
 anyhow.workspace = true
-serde.workspace = true
-serde_derive = "1.0.217"
-serde_json = "1.0.135"
-tokio.workspace = true
 varlink = "11.0.1"
-
-[build-dependencies]
-varlink_generator = "10.1.0"
+internal = { path = "../internal" }

hostd/build.rs

@@ -1,6 +0,0 @@
-extern crate varlink_generator;
-
-fn main() {
-    varlink_generator::cargo_build_tosource("src/io.systemd.hostname.varlink", true);
-    varlink_generator::cargo_build_tosource("src/io.patagia.hostd.varlink", true);
-}

hostd/src/main.rs

@@ -1,8 +1,6 @@
 use anyhow::Result;
 
-use crate::io_patagia_hostd::{Call_Apply, Call_Describe, Label, Machine, VarlinkInterface};
-
-mod io_patagia_hostd;
+use internal::io_patagia_hostd::{Call_Apply, Call_Describe, Label, Machine, VarlinkInterface};
 
 const LISTEN_ADDRESS: &str = "unix:/tmp/patagia/io.patagia.hostd";
 
@@ -37,7 +35,7 @@ impl VarlinkInterface for PatagiaHostd {
 
 fn main() -> Result<()> {
     let hostd = PatagiaHostd;
-    let hostd_iface = io_patagia_hostd::new(Box::new(hostd));
+    let hostd_iface = internal::io_patagia_hostd::new(Box::new(hostd));
 
     let svc = varlink::VarlinkService::new(
         "io.patagia.hostd",

internal/.gitignore

@@ -0,0 +1 @@
+/target

internal/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "internal"
+version.workspace = true
+edition.workspace = true
+
+[dependencies]
+serde.workspace = true
+serde_derive = "1.0.217"
+serde_json = "1.0.135"
+varlink = "11.0.1"
+
+[build-dependencies]
+varlink_generator = "10.1.0"

internal/build.rs

@@ -0,0 +1,11 @@
+extern crate varlink_generator;
+
+fn main() {
+    // iterate over all varlink files
+    std::fs::read_dir("src").unwrap().for_each(|f| {
+        let f = f.unwrap();
+        if f.file_name().to_str().unwrap().ends_with(".varlink") {
+            varlink_generator::cargo_build_tosource(&f.path().display().to_string(), true);
+        }
+    });
+}

internal/src/lib.rs

@@ -0,0 +1,2 @@
+pub mod io_patagia_hostd;
+pub mod io_systemd_hostname;