Merge pull request #760 from cgwalters/utils-crate

Split off an internal "bootc-utils" crate

Author: jeckersb

Cargo.lock

@@ -17,6 +17,7 @@ include = ["/src", "LICENSE-APACHE", "LICENSE-MIT"]
 anstream = "0.6.13"
 anstyle = "1.0.6"
 anyhow = { workspace = true }
+bootc-utils = { path = "../utils" }
 camino = { workspace = true, features = ["serde1"] }
 ostree-ext = { version = "0.14.0" }
 chrono = { workspace = true, features = ["serde"] }

lib/Cargo.toml

@@ -10,9 +10,9 @@ use fn_error_context::context;
 use regex::Regex;
 use serde::Deserialize;
 
-use crate::cmdutils::CommandRunExt;
 use crate::install::run_in_host_mountns;
 use crate::task::Task;
+use bootc_utils::CommandRunExt;
 
 #[derive(Debug, Deserialize)]
 struct DevicesOutput {

lib/src/blockdev.rs

@@ -3,10 +3,11 @@
 //! APIs for operating on container images in the bootc storage.
 
 use anyhow::{Context, Result};
+use bootc_utils::CommandRunExt;
 use fn_error_context::context;
 use ostree_ext::container::{ImageReference, Transport};
 
-use crate::{cmdutils::CommandRunExt, imgstorage::Storage};
+use crate::imgstorage::Storage;
 
 /// The name of the image we push to containers-storage if nothing is specified.
 const IMAGE_DEFAULT: &str = "localhost/bootc";

lib/src/image.rs

@@ -12,6 +12,7 @@ use std::process::{Command, Stdio};
 use std::sync::Arc;
 
 use anyhow::{Context, Result};
+use bootc_utils::{AsyncCommandRunExt, CommandRunExt, ExitStatusExt};
 use camino::Utf8Path;
 use cap_std_ext::cap_std;
 use cap_std_ext::cap_std::fs::Dir;
@@ -22,8 +23,6 @@ use fn_error_context::context;
 use std::os::fd::OwnedFd;
 use tokio::process::Command as AsyncCommand;
 
-use crate::cmdutils::{AsyncCommandRunExt, CommandRunExt, ExitStatusExt};
-
 // Pass only 100 args at a time just to avoid potentially overflowing argument
 // vectors; not that this should happen in reality, but just in case.
 const SUBCMD_ARGV_CHUNKING: usize = 100;

lib/src/imgstorage.rs

@@ -22,6 +22,7 @@ use std::time::Duration;
 
 use anyhow::Ok;
 use anyhow::{anyhow, Context, Result};
+use bootc_utils::CommandRunExt;
 use camino::Utf8Path;
 use camino::Utf8PathBuf;
 use cap_std::fs::{Dir, MetadataExt};
@@ -43,7 +44,6 @@ use rustix::fs::{FileTypeExt, MetadataExt as _};
 use serde::{Deserialize, Serialize};
 
 use self::baseline::InstallBlockDeviceOpts;
-use crate::cmdutils::CommandRunExt;
 use crate::containerenv::ContainerExecutionInfo;
 use crate::mount::Filesystem;
 use crate::spec::ImageReference;

lib/src/install.rs

@@ -10,7 +10,6 @@
 
 mod boundimage;
 pub mod cli;
-mod cmdutils;
 pub(crate) mod deploy;
 pub(crate) mod generator;
 mod image;

lib/src/lib.rs

@@ -3,11 +3,12 @@
 use std::process::Command;
 
 use anyhow::{anyhow, Result};
+use bootc_utils::CommandRunExt;
 use camino::Utf8Path;
 use fn_error_context::context;
 use serde::Deserialize;
 
-use crate::{cmdutils::CommandRunExt, task::Task};
+use crate::task::Task;
 
 #[derive(Deserialize, Debug)]
 #[serde(rename_all = "kebab-case")]

lib/src/mount.rs

@@ -24,7 +24,7 @@ pub(crate) struct ImageListEntry {
 /// Given an image ID, return its manifest digest
 #[cfg(feature = "install")]
 pub(crate) fn imageid_to_digest(imgid: &str) -> Result<String> {
-    use crate::cmdutils::CommandRunExt;
+    use bootc_utils::CommandRunExt;
     let o: Vec<Inspect> = crate::install::run_in_host_mountns("podman")
         .args(["inspect", imgid])
         .run_and_parse_json()?;

lib/src/podman.rs

@@ -0,0 +1,22 @@
+[package]
+name = "bootc-utils"
+publish = false
+version = "0.0.0"
+edition = "2021"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/containers/bootc"
+
+[dependencies]
+anyhow = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+serde_json = { workspace = true }
+tempfile = { workspace = true }
+tracing = { workspace = true }
+tokio = { workspace = true, features = ["process"] }
+
+[dev-dependencies]
+similar-asserts = { version = "1.5.0" }
+static_assertions = "1.1.0"
+
+[lints]
+workspace = true