composefs: Use ManifestDiff for getting manifest diff

Now that we store the current deployment's manifest locally, we can
replace the ugly stuff with a simple call to `ManifestDiff::new`

Signed-off-by: Pragyan Poudyal <[email protected]>

Author: Johan-Liebert1

crates/lib/src/bootc_composefs/status.rs

@@ -181,6 +181,24 @@ pub(crate) fn get_bootloader() -> Result<Bootloader> {
     }
 }
 
+/// Reads the .imginfo file for the provided deployment
+#[context("Reading imginfo")]
+pub(crate) fn get_imginfo(storage: &Storage, deployment_id: &str) -> Result<ImgConfigManifest> {
+    let path = std::path::PathBuf::from(STATE_DIR_RELATIVE)
+        .join(deployment_id)
+        .join(format!("{deployment_id}.imginfo"));
+
+    let img_conf = storage
+        .physical_root
+        .read_to_string(&path)
+        .context("Failed to open file")?;
+
+    let img_conf = serde_json::from_str::<ImgConfigManifest>(&img_conf)
+        .context("Failed to parse file as JSON")?;
+
+    Ok(img_conf)
+}
+
 #[context("Getting composefs deployment metadata")]
 async fn boot_entry_from_composefs_deployment(
     storage: &Storage,
@@ -192,17 +210,7 @@ async fn boot_entry_from_composefs_deployment(
             let ostree_img_ref = OstreeImageReference::from_str(&img_name_from_config)?;
             let img_ref = ImageReference::from(ostree_img_ref);
 
-            let path = std::path::PathBuf::from(STATE_DIR_RELATIVE)
-                .join(&verity)
-                .join(format!("{verity}.imginfo"));
-
-            let img_conf = storage
-                .physical_root
-                .read_to_string(&path)
-                .context("Failed to open imginfo file")?;
-
-            let img_conf: ImgConfigManifest =
-                serde_json::from_str(&img_conf).context("Failed to parse imginfo file as JSON")?;
+            let img_conf = get_imginfo(storage, &verity)?;
 
             let image_digest = img_conf.manifest.config().digest().to_string();
             let architecture = img_conf.config.architecture().to_string();

crates/lib/src/bootc_composefs/update.rs

@@ -8,6 +8,7 @@ use composefs::{
 use composefs_boot::BootOps;
 use composefs_oci::image::create_filesystem;
 use fn_error_context::context;
+use ostree_ext::container::ManifestDiff;
 
 use crate::{
     bootc_composefs::{
@@ -16,7 +17,7 @@ use crate::{
         service::start_finalize_stated_svc,
         state::write_composefs_state,
         status::{
-            get_bootloader, get_composefs_status, get_container_manifest_and_config,
+            get_bootloader, get_composefs_status, get_container_manifest_and_config, get_imginfo,
             ImgConfigManifest,
         },
     },
@@ -366,30 +367,9 @@ pub(crate) async fn upgrade_composefs(
     }
 
     if opts.check {
-        // TODO(Johan-Liebert1): If we have the previous, i.e. the current manifest with us then we can replace the
-        // following with [`ostree_container::ManifestDiff::new`] which will be much cleaner
-        for (idx, diff_id) in img_config.config.rootfs().diff_ids().iter().enumerate() {
-            let diff_id = str_to_sha256digest(diff_id)?;
-
-            // we could use `check_stream` here but that will most probably take forever as it
-            // usually takes ~3s to verify one single layer
-            let have_layer = repo.has_stream(&diff_id)?;
-
-            if have_layer.is_none() {
-                if idx >= img_config.manifest.layers().len() {
-                    anyhow::bail!("Length mismatch between rootfs diff layers and manifest layers");
-                }
-
-                let layer = &img_config.manifest.layers()[idx];
-
-                println!(
-                    "Added layer: {}\tSize: {}",
-                    layer.digest(),
-                    layer.size().to_string()
-                );
-            }
-        }
-
+        let current_manifest = get_imginfo(storage, &*composefs.cmdline.digest)?;
+        let diff = ManifestDiff::new(&current_manifest.manifest, &img_config.manifest);
+        diff.print();
         return Ok(());
     }