Merge pull request #1324 from cgwalters/lint-truncate

lints: Add --no-truncate flag to bootc container lint

Author: cgwalters

lib/src/cli.rs

@@ -279,6 +279,11 @@ pub(crate) enum ContainerOpts {
         /// Example: --skip nonempty-boot --skip baseimage-root
         #[clap(long)]
         skip: Vec<String>,
+
+        /// Don't truncate the output. By default, only a limited number of entries are
+        /// shown for each lint, followed by a count of remaining entries.
+        #[clap(long)]
+        no_truncate: bool,
     },
 }
 
@@ -1097,6 +1102,7 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
                 fatal_warnings,
                 list,
                 skip,
+                no_truncate,
             } => {
                 if list {
                     return lints::lint_list(std::io::stdout().lock());
@@ -1114,7 +1120,14 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
 
                 let root = &Dir::open_ambient_dir(rootfs, cap_std::ambient_authority())?;
                 let skip = skip.iter().map(|s| s.as_str());
-                lints::lint(root, warnings, root_type, skip, std::io::stdout().lock())?;
+                lints::lint(
+                    root,
+                    warnings,
+                    root_type,
+                    skip,
+                    std::io::stdout().lock(),
+                    no_truncate,
+                )?;
                 Ok(())
             }
         },

lib/src/fsck.rs

@@ -8,9 +8,10 @@
 
 use std::fmt::Write as _;
 use std::future::Future;
+use std::num::NonZeroUsize;
 use std::pin::Pin;
 
-use bootc_utils::iterator_split_nonempty_rest_count;
+use bootc_utils::collect_until;
 use camino::Utf8PathBuf;
 use cap_std::fs::{Dir, MetadataExt as _};
 use cap_std_ext::cap_std;
@@ -250,9 +251,10 @@ async fn check_fsverity_inner(storage: &Storage) -> FsckResult {
     let verity_found_state =
         verity_state_of_all_objects(&storage.repo(), verity_state.desired == Tristate::Enabled)
             .await?;
-    let Some((missing, rest)) =
-        iterator_split_nonempty_rest_count(verity_found_state.missing.iter(), 5)
-    else {
+    let Some((missing, rest)) = collect_until(
+        verity_found_state.missing.iter(),
+        const { NonZeroUsize::new(5).unwrap() },
+    ) else {
         return fsck_ok();
     };
     let mut err = String::from("fsverity enabled, but objects without fsverity:\n");