Merge pull request #886 from cgwalters/merge-ostree-rs-ext-followup

cli: Wrap ostree-ext via `bootc internals`

Author: cgwalters

lib/src/cli.rs

@@ -295,6 +295,16 @@ pub(crate) enum InternalsOpts {
     PrintJsonSchema,
     /// Perform cleanup actions
     Cleanup,
+    /// Proxy frontend for the `ostree-ext` CLI.
+    OstreeExt {
+        #[clap(allow_hyphen_values = true)]
+        args: Vec<OsString>,
+    },
+    /// Proxy frontend for the legacy `ostree container` CLI.
+    OstreeContainer {
+        #[clap(allow_hyphen_values = true)]
+        args: Vec<OsString>,
+    },
 }
 
 #[derive(Debug, clap::Subcommand, PartialEq, Eq)]
@@ -931,6 +941,17 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
                 let unit_dir = &Dir::open_ambient_dir(normal_dir, cap_std::ambient_authority())?;
                 crate::generator::generator(root, unit_dir)
             }
+            InternalsOpts::OstreeExt { args } => {
+                ostree_ext::cli::run_from_iter(["ostree-ext".into()].into_iter().chain(args)).await
+            }
+            InternalsOpts::OstreeContainer { args } => {
+                ostree_ext::cli::run_from_iter(
+                    ["ostree-ext".into(), "container".into()]
+                        .into_iter()
+                        .chain(args),
+                )
+                .await
+            }
             InternalsOpts::FixupEtcFstab => crate::deploy::fixup_etc_fstab(&root),
             InternalsOpts::PrintJsonSchema => {
                 let schema = schema_for!(crate::spec::Host);
@@ -1005,3 +1026,11 @@ fn test_parse_generator() {
         Opt::Internals(InternalsOpts::SystemdGenerator { .. })
     ));
 }
+
+#[test]
+fn test_parse_ostree_ext() {
+    assert!(matches!(
+        Opt::parse_including_static(["bootc", "internals", "ostree-container"]),
+        Opt::Internals(InternalsOpts::OstreeContainer { .. })
+    ));
+}

tests/booted/readonly/11-ostree-ext-cli.nu

@@ -0,0 +1,13 @@
+# Verify our wrapped "bootc internals ostree-container" calling into
+# the legacy ostree-ext CLI.
+use std assert
+use tap.nu
+
+tap begin "verify bootc wrapping ostree-ext"
+
+# Parse the status and get the booted image
+let st = bootc status --json | from json
+let booted = $st.status.booted.image
+# Then verify we can extract its metadata via the ostree-container code.
+let metadata = bootc internals ostree-container image metadata --repo=/ostree/repo $"($booted.image.transport):($booted.image.image)" | from json
+assert equal $metadata.mediaType "application/vnd.oci.image.manifest.v1+json"