Fixup host exec for collect

bleggett · bleggett · commit 0f0423d5dbd2 · 2026-02-11T17:40:04.000-05:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "edera-preflight"
+name = "preflight"
 version = "0.1.0"
 edition = "2024"
 description = "CLI to run pre-deployment checks before running workloads."
@@ -17,3 +17,5 @@ tokio = { version = "1", features = ["full"] }
 tokio-util = { version = "0.7" }
 tokio-stream = { version = "0.1", features = ["io-util", "net"] }
 nix = { version= "0.31", features = ["sched"] }
+futures = "0.3"
+async-trait = "0.1"
diff --git a/README.md b/README.md
@@ -17,7 +17,6 @@ docker run \
   --env EDERA_PREFLIGHT_TARGET_DIR='/host' \
   --env EDERA_PREFLIGHT_SKIP_GROUPS='ScriptedChecks;SystemChecks' \
   --env EDERA_PREFLIGHT_SCRIPTS_DIR=/scripts \
-  --volume /:/host \
   --pid host \
   --net host \
   --privileged \
diff --git a/hack/code/autofix.sh b/hack/code/autofix.sh
@@ -4,5 +4,5 @@ set -e
 REAL_SCRIPT="$(realpath "${0}")"
 cd "$(dirname "${REAL_SCRIPT}")/../.."
 
-cargo clippy --all --fix --allow-dirty --allow-staged
-cargo fmt --all
+./hack/build/cargo.sh clippy --all --fix --allow-dirty --allow-staged
+./hack/build/cargo.sh fmt --all
diff --git a/hack/debug/local.sh b/hack/debug/local.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+set -e
+
+VER=$(date +%s)
+USERIMG=$(whoami)
+REGISTRY="localhost"
+
+docker build . -f ./images/Dockerfile.preflight -t "${REGISTRY}/${USERIMG}-preflight-debug:${VER}"
+
+docker run --privileged --pid="host" \
+  -e RUST_LOG="debug" \
+  -e EDERA_PREFLIGHT_VERBOSE=true \
+  -e EDERA_PREFLIGHT_TARGET_DIR='/host' \
+  -e EDERA_PREFLIGHT_SKIP_GROUPS='KernelChecks;ScriptedChecks;SystemChecks' \
+  -e EDERA_PREFLIGHT_SCRIPTS_DIR=/scripts \
+  "${REGISTRY}/${USERIMG}-preflight-debug:${VER}"
diff --git a/images/Dockerfile.preflight b/images/Dockerfile.preflight
@@ -1,4 +1,4 @@
-FROM ghcr.io/edera-dev/cross-base-linux-musl:latest@sha256:87ba899ea380bd85c22f194ab2f4f2cf791fc832d27ee20bb00d07ce23771975 AS build
+FROM ghcr.io/edera-dev/cross-base-linux-musl:latest@sha256:a591bb18a5ede06c6e814a4d263dddb172e0b9f998873841163585c286484983 AS build
 
 ENV TARGET_LIBC=musl TARGET_VENDOR=unknown DISABLE_CROSS_RS=1
 
diff --git a/src/checkers/kernel.rs b/src/checkers/kernel.rs
@@ -4,6 +4,7 @@ use crate::helpers::{
 };
 
 use anyhow::{Result, bail};
+use async_trait::async_trait;
 use log::debug;
 use procfs::{Current, sys::kernel};
 use std::fs;
@@ -136,6 +137,7 @@ impl KernelChecks {
     }
 }
 
+#[async_trait]
 impl CheckGroup for KernelChecks {
     fn id(&self) -> &str {
         GROUP_IDENTIFIER
@@ -149,7 +151,7 @@ impl CheckGroup for KernelChecks {
         "Kernel requirement checks"
     }
 
-    fn run(&self) -> CheckGroupResult {
+    async fn run(&self) -> CheckGroupResult {
         self.run_all()
     }
 }
diff --git a/src/checkers/script.rs b/src/checkers/script.rs
@@ -4,6 +4,7 @@ use crate::helpers::{
 };
 
 use anyhow::Result;
+use async_trait::async_trait;
 use log::{debug, warn};
 use std::env;
 use std::fs;
@@ -249,6 +250,7 @@ impl ScriptChecks {
     }
 }
 
+#[async_trait]
 impl CheckGroup for ScriptChecks {
     fn id(&self) -> &str {
         GROUP_IDENTIFIER
@@ -262,7 +264,7 @@ impl CheckGroup for ScriptChecks {
         "Checks composed through small shell scripts"
     }
 
-    fn run(&self) -> CheckGroupResult {
+    async fn run(&self) -> CheckGroupResult {
         self.run_all()
     }
 }
diff --git a/src/checkers/system.rs b/src/checkers/system.rs
@@ -3,6 +3,7 @@ use crate::helpers::{
     CheckResultValue::{Errored, Failed, Passed},
 };
 
+use async_trait::async_trait;
 use log::debug;
 use sysinfo::{Disks, System};
 
@@ -76,6 +77,7 @@ impl SystemChecks {
     }
 }
 
+#[async_trait]
 impl CheckGroup for SystemChecks {
     fn id(&self) -> &str {
         GROUP_IDENTIFIER
@@ -89,7 +91,7 @@ impl CheckGroup for SystemChecks {
         "System requirement checks"
     }
 
-    fn run(&self) -> CheckGroupResult {
+    async fn run(&self) -> CheckGroupResult {
         self.run_all()
     }
 }
diff --git a/src/helpers/mod.rs b/src/helpers/mod.rs
@@ -1,5 +1,6 @@
 pub mod host_executor;
 
+use async_trait::async_trait;
 use log::{error, info, warn};
 use std::fmt;
 
@@ -115,6 +116,7 @@ impl CheckGroupResult {
 }
 
 /// CheckGroup is a trait representing a group of checks.
+#[async_trait]
 pub trait CheckGroup {
     /// name is the name of the check group
     fn name(&self) -> &str;
@@ -127,5 +129,5 @@ pub trait CheckGroup {
     fn description(&self) -> &str;
 
     /// run is the main entry point that runs the checks within the check group.
-    fn run(&self) -> CheckGroupResult;
+    async fn run(&self) -> CheckGroupResult;
 }
diff --git a/src/main.rs b/src/main.rs
@@ -2,31 +2,34 @@ mod checkers;
 mod helpers;
 mod recorders;
 
+use checkers::{kernel::KernelChecks, script::ScriptChecks, system::SystemChecks};
 use helpers::{
     CheckGroup, CheckGroupResult,
     CheckResultValue::{Errored, Failed, Passed},
+    host_executor::HostNamespaceExecutor,
 };
-
-use checkers::{kernel::KernelChecks, script::ScriptChecks, system::SystemChecks};
-
 use recorders::system::SystemRecorder;
 
 use anyhow::{Context, Result, anyhow, bail};
 use chrono::Utc;
 use flate2::{Compression, write::GzEncoder};
 use log::info;
-use std::env;
-use std::os::unix;
-use std::path::{Path, PathBuf};
-use std::{fs, fs::File};
+use std::{
+    env, fs,
+    fs::File,
+    path::{Path, PathBuf},
+};
+use tokio::task::JoinHandle;
 
 // Skip certain groups. List is separated by ;
 fn skip_groups() -> Vec<String> {
     let skips = env::var("EDERA_PREFLIGHT_SKIP_GROUPS").unwrap_or_default();
     skips.split(";").map(|s| s.to_string()).collect()
 }
 
-fn create_gzip_from(base_path: PathBuf) -> Result<()> {
+/// This writes the gzip to the container namespace /tmp, and then copies it out to
+/// the same path on the host at the end.
+async fn create_gzip_from(base_path: PathBuf, host_executor: HostNamespaceExecutor) -> Result<()> {
     let mut archive_path = base_path.clone();
     archive_path.set_extension("tar.gz");
     let tar_gz = File::create(&archive_path)
@@ -35,8 +38,23 @@ fn create_gzip_from(base_path: PathBuf) -> Result<()> {
     let mut tar = tar::Builder::new(enc);
     tar.append_dir_all(".", base_path)
         .context("failed to append to tar {}")?;
-    info!("Wrote to: {}", archive_path.to_string_lossy());
-    Ok(())
+    tar.into_inner().context("failed to finish tar")?;
+    let container_tarfile = archive_path.to_string_lossy().to_string();
+
+    let targz_content = std::fs::read(&container_tarfile).expect("could not read tar");
+
+    info!("Read {} bytes of tar", targz_content.len());
+
+    let copy_to_host: JoinHandle<()> = host_executor.spawn_in_host_ns(async move {
+        // Write tar.gz to host
+        tokio::fs::write(&container_tarfile, targz_content)
+            .await
+            .expect("could not write tar to host");
+
+        info!("Wrote to: {}", container_tarfile);
+    });
+
+    Ok(copy_to_host.await?)
 }
 
 fn create_base_path() -> Result<PathBuf> {
@@ -83,24 +101,22 @@ fn write_group_report(
     Ok(())
 }
 
-fn main() -> Result<()> {
+#[tokio::main(flavor = "multi_thread", worker_threads = 10)]
+async fn main() -> Result<()> {
     env_logger::init();
 
+    let host_executor = HostNamespaceExecutor::new();
+
     let groups: Vec<Box<dyn CheckGroup>> = vec![
         Box::new(SystemChecks),
         Box::new(ScriptChecks),
         Box::new(KernelChecks),
-        Box::new(SystemRecorder),
+        Box::new(SystemRecorder::new(host_executor.clone())),
     ];
 
     let mut final_result = Passed;
     let skip_groups = skip_groups();
 
-    if let Ok(target_dir) = env::var("EDERA_PREFLIGHT_TARGET_DIR") {
-        unix::fs::chroot(&target_dir)
-            .map_err(|e| anyhow!("failed to chroot to {target_dir}: {e}"))?;
-    }
-
     let base_path =
         create_base_path().map_err(|e| anyhow!("failed to create bundle base path: {e}"))?;
 
@@ -113,7 +129,7 @@ fn main() -> Result<()> {
 
         info!("Running Group [{}] - {}", group.name(), group.description());
 
-        let check_group_result = group.run();
+        let check_group_result = group.run().await;
 
         check_group_result.log_group();
 
@@ -133,7 +149,7 @@ fn main() -> Result<()> {
         write_group_report(group, &check_group_result, &base_path)?;
     }
 
-    create_gzip_from(base_path)?;
+    create_gzip_from(base_path, host_executor.clone()).await?;
 
     match final_result {
         Errored(_) | Failed(_) => bail!("Preflight checks did not pass"),
diff --git a/src/recorders/system.rs b/src/recorders/system.rs
diff --git a/test.sh b/test.sh

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ghcr.io/edera-dev/cross-base-linux-musl:latest@sha256:87ba899ea380bd85c22f194ab2f4f2cf791fc832d27ee20bb00d07ce23771975 AS build`
	`1`	`+FROM ghcr.io/edera-dev/cross-base-linux-musl:latest@sha256:a591bb18a5ede06c6e814a4d263dddb172e0b9f998873841163585c286484983 AS build`
`2`	`2`
`3`	`3`	`ENV TARGET_LIBC=musl TARGET_VENDOR=unknown DISABLE_CROSS_RS=1`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ use crate::helpers::{`
`4`	`4`	`};`
`5`	`5`
`6`	`6`	`use anyhow::{Result, bail};`
	`7`	`+use async_trait::async_trait;`
`7`	`8`	`use log::debug;`
`8`	`9`	`use procfs::{Current, sys::kernel};`
`9`	`10`	`use std::fs;`
`@@ -136,6 +137,7 @@ impl KernelChecks {`
`136`	`137`	`}`
`137`	`138`	`}`
`138`	`139`
	`140`	`+#[async_trait]`
`139`	`141`	`impl CheckGroup for KernelChecks {`
`140`	`142`	`fn id(&self) -> &str {`
`141`	`143`	`GROUP_IDENTIFIER`
`@@ -149,7 +151,7 @@ impl CheckGroup for KernelChecks {`
`149`	`151`	`"Kernel requirement checks"`
`150`	`152`	`}`
`151`	`153`
`152`		`- fn run(&self) -> CheckGroupResult {`
	`154`	`+ async fn run(&self) -> CheckGroupResult {`
`153`	`155`	`self.run_all()`
`154`	`156`	`}`
`155`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ use crate::helpers::{`
`4`	`4`	`};`
`5`	`5`
`6`	`6`	`use anyhow::Result;`
	`7`	`+use async_trait::async_trait;`
`7`	`8`	`use log::{debug, warn};`
`8`	`9`	`use std::env;`
`9`	`10`	`use std::fs;`
`@@ -249,6 +250,7 @@ impl ScriptChecks {`
`249`	`250`	`}`
`250`	`251`	`}`
`251`	`252`
	`253`	`+#[async_trait]`
`252`	`254`	`impl CheckGroup for ScriptChecks {`
`253`	`255`	`fn id(&self) -> &str {`
`254`	`256`	`GROUP_IDENTIFIER`
`@@ -262,7 +264,7 @@ impl CheckGroup for ScriptChecks {`
`262`	`264`	`"Checks composed through small shell scripts"`
`263`	`265`	`}`
`264`	`266`
`265`		`- fn run(&self) -> CheckGroupResult {`
	`267`	`+ async fn run(&self) -> CheckGroupResult {`
`266`	`268`	`self.run_all()`
`267`	`269`	`}`
`268`	`270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ use crate::helpers::{`
`3`	`3`	`CheckResultValue::{Errored, Failed, Passed},`
`4`	`4`	`};`
`5`	`5`
	`6`	`+use async_trait::async_trait;`
`6`	`7`	`use log::debug;`
`7`	`8`	`use sysinfo::{Disks, System};`
`8`	`9`
`@@ -76,6 +77,7 @@ impl SystemChecks {`
`76`	`77`	`}`
`77`	`78`	`}`
`78`	`79`
	`80`	`+#[async_trait]`
`79`	`81`	`impl CheckGroup for SystemChecks {`
`80`	`82`	`fn id(&self) -> &str {`
`81`	`83`	`GROUP_IDENTIFIER`
`@@ -89,7 +91,7 @@ impl CheckGroup for SystemChecks {`
`89`	`91`	`"System requirement checks"`
`90`	`92`	`}`
`91`	`93`
`92`		`- fn run(&self) -> CheckGroupResult {`
	`94`	`+ async fn run(&self) -> CheckGroupResult {`
`93`	`95`	`self.run_all()`
`94`	`96`	`}`
`95`	`97`	`}`