Redo output

Author: bleggett

Cargo.lock

@@ -19,3 +19,5 @@ tokio-stream = { version = "0.1", features = ["io-util", "net"] }
 nix = { version= "0.31", features = ["sched"] }
 futures = "0.3"
 async-trait = "0.1"
+clap = { version = "4.5", features = ["derive"] }
+console = "0.16"

Cargo.toml

@@ -8,7 +8,7 @@ use futures::{FutureExt, future::join_all};
 use log::debug;
 use std::path::Path;
 
-const GROUP_IDENTIFIER: &str = "IOMMUChecks";
+const GROUP_IDENTIFIER: &str = "iommu";
 const NAME: &str = "IOMMU Checks";
 
 pub struct IOMMUChecks {
@@ -26,7 +26,7 @@ impl IOMMUChecks {
     pub async fn run_all(&self) -> CheckGroupResult {
         let results = join_all([self.check_iommu().boxed()]).await;
 
-        let mut group_result = Skipped;
+        let mut group_result = Passed;
         for res in results.iter() {
             // Set group result to Failed if we failed and aren't already in an Errored state
             if !matches!(group_result, Errored(_)) && matches!(res.result, Failed(_)) {

src/checkers/iommu.rs

@@ -11,7 +11,7 @@ use log::debug;
 use procfs::{Current, sys::kernel};
 use std::{fs, path::PathBuf, process::Command};
 
-const GROUP_IDENTIFIER: &str = "KernelChecks";
+const GROUP_IDENTIFIER: &str = "kernel";
 const NAME: &str = "Kernel Checks";
 // TODO (bml) assemble actual list
 const REQUIRED_MODULES: &[&str] = &["nf_tables", "msr"];

src/checkers/kernel.rs

@@ -15,7 +15,7 @@ use std::{
     process::Command,
 };
 
-const GROUP_IDENTIFIER: &str = "PVHChecks";
+const GROUP_IDENTIFIER: &str = "pvh";
 const NAME: &str = "PVH Checks";
 
 #[derive(Debug, PartialEq)]
@@ -40,7 +40,7 @@ impl PVHChecks {
     pub async fn run_all(&self) -> CheckGroupResult {
         let results = join_all([self.check_virtualization().boxed()]).await;
 
-        let mut group_result = Skipped;
+        let mut group_result = Passed;
         for res in results.iter() {
             // Set group result to Failed if we failed and aren't already in an Errored state
             if !matches!(group_result, Errored(_)) && matches!(res.result, Failed(_)) {

src/checkers/pvh.rs

@@ -9,7 +9,7 @@ use futures::{FutureExt, future::join_all};
 use log::debug;
 use sysinfo::{Disks, System};
 
-const GROUP_IDENTIFIER: &str = "SystemChecks";
+const GROUP_IDENTIFIER: &str = "system";
 const NAME: &str = "System Checks";
 const MINIMUM_MEMORY: u64 = 4 * 1024 * 1024 * 1024; // 4GB
 const MINIMUM_DISK: u64 = 20 * 1024 * 1024 * 1024; // 20GB

src/checkers/system.rs

@@ -1,9 +1,14 @@
 pub mod host_executor;
 
+use console::{style, Emoji};
 use async_trait::async_trait;
 use log::{debug, error, info, warn};
 use std::fmt;
 
+static CHECK: Emoji = Emoji("✅", "[+]");
+static WARN: Emoji = Emoji("⚠", "[!]");
+static ERROR: Emoji = Emoji("❌", "[X]");
+
 /// CheckResultValue is the final value for the result of an individual check.
 ///
 /// Failed means a check ran successfully but did not pass. Errored means a check hit an
@@ -89,26 +94,25 @@ impl CheckGroupResult {
     pub fn log_group(&self) {
         let name = &self.name;
         let result = &self.result;
-        let s = format!("[{}] {}", name, result);
+        let s = format!("{}: {}", name, result);
         match result {
-            CheckResultValue::Passed => info!("{}", s),
-            CheckResultValue::Failed(_) => warn!("{}", s),
-            CheckResultValue::Errored(_) => error!("{}", s),
-            CheckResultValue::Skipped => debug!("{}", s),
+            CheckResultValue::Passed => println!("{} {}", CHECK, style(s).green().bold()),
+            CheckResultValue::Failed(_) => println!("{} {}",ERROR, style(s).bright().yellow().bold()),
+            CheckResultValue::Errored(_) => println!("{} {}",ERROR, style(s).red().bright().bold()),
+            CheckResultValue::Skipped => println!("{} {}",WARN, style(s).yellow().dim()),
         }
     }
 
     /// log_individual_checks is a pretty-print helper to log the results of each individual check
     /// within a group.
     pub fn log_individual_checks(&self) {
-        let group_name = &self.name;
         for check_result in self.results.iter() {
             let name = &check_result.name;
             let result = &check_result.result;
-            let s = format!("[{}] {}: {}", group_name, name, result);
+            let s = format!("    • {}: {}", name, result);
             match result {
-                CheckResultValue::Passed => info!("{}", s),
-                CheckResultValue::Failed(_) => warn!("{}", s),
+                CheckResultValue::Passed => println!("{}", style(s).magenta().dim()),
+                CheckResultValue::Failed(_) => println!("{}", s),
                 CheckResultValue::Errored(_) => error!("{}", s),
                 CheckResultValue::Skipped => debug!("{}", s),
             }