composefs/state: Require container details when writing state

Make `container_details` argument mandatory while writing composefs
deployment state.

It's better to fetch the container details from the source imgref,
rather than the target imgref, as the target might not even exist at the
time of deployment.

Fixes CI failures as we were fetching from local registry (according to
the target imgref), which doesn't exist

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

Author: Johan-Liebert1

crates/lib/src/bootc_composefs/boot.rs

@@ -96,11 +96,13 @@ use rustix::{mount::MountFlags, path::Arg};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
-use crate::bootc_kargs::compute_new_kargs;
-use crate::composefs_consts::{TYPE1_ENT_PATH, TYPE1_ENT_PATH_STAGED};
 use crate::parsers::bls_config::{BLSConfig, BLSConfigType};
 use crate::parsers::grub_menuconfig::MenuEntry;
 use crate::task::Task;
+use crate::{
+    bootc_composefs::repo::get_imgref,
+    composefs_consts::{TYPE1_ENT_PATH, TYPE1_ENT_PATH_STAGED},
+};
 use crate::{
     bootc_composefs::repo::open_composefs_repo,
     store::{ComposefsFilesystem, Storage},
@@ -109,6 +111,9 @@ use crate::{
     bootc_composefs::state::{get_booted_bls, write_composefs_state},
     bootloader::esp_in,
 };
+use crate::{
+    bootc_composefs::status::get_container_manifest_and_config, bootc_kargs::compute_new_kargs,
+};
 use crate::{bootc_composefs::status::get_sorted_grub_uki_boot_entries, install::PostFetchState};
 use crate::{
     composefs_consts::{
@@ -1217,7 +1222,11 @@ pub(crate) async fn setup_composefs_boot(
         false,
         boot_type,
         boot_digest,
-        None,
+        &get_container_manifest_and_config(&get_imgref(
+            &state.source.imageref.transport.to_string(),
+            &state.source.imageref.name,
+        ))
+        .await?,
     )
     .await?;
 

crates/lib/src/bootc_composefs/state.rs

@@ -24,9 +24,7 @@ use rustix::{
 
 use crate::bootc_composefs::boot::BootType;
 use crate::bootc_composefs::repo::get_imgref;
-use crate::bootc_composefs::status::{
-    get_container_manifest_and_config, get_sorted_type1_boot_entries, ImgConfigManifest,
-};
+use crate::bootc_composefs::status::{get_sorted_type1_boot_entries, ImgConfigManifest};
 use crate::parsers::bls_config::BLSConfigType;
 use crate::store::{BootedComposefs, Storage};
 use crate::{
@@ -168,7 +166,7 @@ pub(crate) fn update_target_imgref_in_origin(
 /// * `staged`            - Whether this is a staged deployment (writes to transient state dir)
 /// * `boot_type`         - Boot loader type (`Bls` or `Uki`)
 /// * `boot_digest`       - Optional boot digest for verification
-/// * `container_details` - Optional container manifest and config. Fetched if not provided
+/// * `container_details` - Container manifest and config used to create this deployment
 ///
 /// # State Directory Structure
 ///
@@ -183,11 +181,11 @@ pub(crate) fn update_target_imgref_in_origin(
 pub(crate) async fn write_composefs_state(
     root_path: &Utf8PathBuf,
     deployment_id: Sha512HashValue,
-    imgref: &ImageReference,
+    target_imgref: &ImageReference,
     staged: bool,
     boot_type: BootType,
     boot_digest: Option<String>,
-    container_details: Option<&ImgConfigManifest>,
+    container_details: &ImgConfigManifest,
 ) -> Result<()> {
     let state_path = root_path
         .join(STATE_DIR_RELATIVE)
@@ -211,14 +209,11 @@ pub(crate) async fn write_composefs_state(
         image: image_name,
         transport,
         ..
-    } = &imgref;
+    } = &target_imgref;
 
-    let imgref = get_imgref(&transport, &image_name);
+    println!("imgref: {target_imgref:#?}");
 
-    let img_config = match container_details {
-        Some(val) => val,
-        None => &get_container_manifest_and_config(&imgref).await?,
-    };
+    let imgref = get_imgref(&transport, &image_name);
 
     let mut config = tini::Ini::new().section("origin").item(
         ORIGIN_CONTAINER,
@@ -244,7 +239,7 @@ pub(crate) async fn write_composefs_state(
     state_dir
         .atomic_write(
             format!("{}.imginfo", deployment_id.to_hex()),
-            serde_json::to_vec(&img_config)?,
+            serde_json::to_vec(&container_details)?,
         )
         .context("Failed to write to .imginfo file")?;
 

crates/lib/src/bootc_composefs/update.rs

@@ -259,7 +259,7 @@ pub(crate) async fn do_upgrade(
         true,
         boot_type,
         boot_digest,
-        Some(img_manifest_config),
+        img_manifest_config,
     )
     .await?;