wip tests

Author: jmarrero

crates/lib/src/cli.rs

@@ -944,10 +944,15 @@ async fn upgrade(
     } else {
         // Check if image exists in bootc storage (/usr/lib/bootc/storage)
         let imgstore = sysroot.get_ensure_imgstore()?;
-        let use_unified = match imgstore.exists(&format!("{imgref:#}")).await {
+
+        let image_ref_str = crate::utils::imageref_to_container_ref(imgref);
+
+        let use_unified = match imgstore.exists(&image_ref_str).await {
             Ok(v) => v,
             Err(e) => {
-                tracing::warn!("Failed to check bootc storage for image: {e}; falling back to standard pull");
+                tracing::warn!(
+                    "Failed to check bootc storage for image: {e}; falling back to standard pull"
+                );
                 false
             }
         };
@@ -1073,10 +1078,15 @@ async fn switch_ostree(
 
     // Check if image exists in bootc storage (/usr/lib/bootc/storage)
     let imgstore = sysroot.get_ensure_imgstore()?;
-    let use_unified = match imgstore.exists(&format!("{target:#}")).await {
+
+    let target_ref_str = crate::utils::imageref_to_container_ref(&target);
+
+    let use_unified = match imgstore.exists(&target_ref_str).await {
         Ok(v) => v,
         Err(e) => {
-            tracing::warn!("Failed to check bootc storage for image: {e}; falling back to standard pull");
+            tracing::warn!(
+                "Failed to check bootc storage for image: {e}; falling back to standard pull"
+            );
             false
         }
     };
@@ -1473,9 +1483,7 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
             ImageOpts::CopyToStorage { source, target } => {
                 crate::image::push_entrypoint(source.as_deref(), target.as_deref()).await
             }
-            ImageOpts::SetUnified => {
-                crate::image::set_unified_entrypoint().await
-            }
+            ImageOpts::SetUnified => crate::image::set_unified_entrypoint().await,
             ImageOpts::PullFromDefaultStorage { image } => {
                 let storage = get_storage().await?;
                 storage

crates/lib/src/deploy.rs

@@ -392,7 +392,7 @@ pub(crate) async fn prepare_for_pull_unified(
     // Get or initialize the bootc container storage (same as used for LBIs)
     let imgstore = store.get_ensure_imgstore()?;
 
-    let image_ref_str = format!("{imgref:#}");
+    let image_ref_str = crate::utils::imageref_to_container_ref(imgref);
 
     // Log the original transport being used for the pull
     tracing::info!(

crates/lib/src/image.rs

@@ -206,7 +206,9 @@ pub(crate) async fn set_unified_entrypoint() -> Result<()> {
 
     // Pull the image from its original source into bootc storage using LBI machinery
     let imgstore = sysroot.get_ensure_imgstore()?;
-    let img_string = format!("{:#}", imgref);
+
+    let img_string = crate::utils::imageref_to_container_ref(imgref);
+
     const SET_UNIFIED_JOURNAL_ID: &str = "1a0b9c8d7e6f5a4b3c2d1e0f9a8b7c6d";
     tracing::info!(
         message_id = SET_UNIFIED_JOURNAL_ID,
@@ -226,9 +228,11 @@ pub(crate) async fn set_unified_entrypoint() -> Result<()> {
         image: imgref.image.clone(),
         signature: imgref.signature.clone(),
     };
-    let ostree_imgref = ostree_ext::container::OstreeImageReference::from(containers_storage_imgref);
-    let _ = ostree_ext::container::store::ImageImporter::new(repo, &ostree_imgref, Default::default())
-        .await?;
+    let ostree_imgref =
+        ostree_ext::container::OstreeImageReference::from(containers_storage_imgref);
+    let _ =
+        ostree_ext::container::store::ImageImporter::new(repo, &ostree_imgref, Default::default())
+            .await?;
 
     tracing::info!(
         message_id = SET_UNIFIED_JOURNAL_ID,