Merge pull request #283 from cgwalters/bump-ostree-ext

Port to ostree-ext 0.13, cap-std 3

lib/Cargo.toml

@@ -15,11 +15,11 @@ anstream = "0.6.4"
 anstyle = "1.0.4"
 anyhow = "1.0"
 camino = { version = "1.0.4", features = ["serde1"] }
-ostree-ext = { version = "0.12.8" }
+ostree-ext = { version = "0.13" }
 chrono = { version = "0.4.23", features = ["serde"] }
 clap = { version= "4.2", features = ["derive"] }
 clap_mangen = { version = "0.2", optional = true }
-cap-std-ext = "3"
+cap-std-ext = "4"
 hex = "^0.4"
 fn-error-context = "0.2.0"
 gvariant = "0.4.0"

lib/src/deploy.rs

@@ -5,7 +5,7 @@
 use anyhow::Ok;
 use anyhow::{Context, Result};
 
-use cap_std::fs::Dir;
+use cap_std::fs::{Dir, MetadataExt};
 use cap_std_ext::cap_std;
 use cap_std_ext::dirext::CapStdExtDirExt;
 use fn_error_context::context;
@@ -16,7 +16,6 @@ use ostree_ext::container::store::PrepareResult;
 use ostree_ext::ostree;
 use ostree_ext::ostree::Deployment;
 use ostree_ext::sysroot::SysrootLock;
-use rustix::fs::MetadataExt;
 
 use crate::spec::HostSpec;
 use crate::spec::ImageReference;
@@ -315,7 +314,7 @@ pub(crate) fn switch_origin_inplace(root: &Dir, imgref: &ImageReference) -> Resu
 
 #[test]
 fn test_switch_inplace() -> Result<()> {
-    use std::os::unix::fs::DirBuilderExt;
+    use cap_std::fs::DirBuilderExt;
 
     let td = cap_std_ext::cap_tempfile::TempDir::new(cap_std::ambient_authority())?;
     let mut builder = cap_std::fs::DirBuilder::new();

lib/src/install.rs

@@ -20,14 +20,13 @@ use anyhow::Ok;
 use anyhow::{anyhow, Context, Result};
 use camino::Utf8Path;
 use camino::Utf8PathBuf;
-use cap_std::fs::Dir;
+use cap_std::fs::{Dir, MetadataExt};
 use cap_std_ext::cap_std;
 use cap_std_ext::prelude::CapStdExtDirExt;
 use chrono::prelude::*;
 use clap::ValueEnum;
 use ostree_ext::oci_spec;
 use rustix::fs::FileTypeExt;
-use rustix::fs::MetadataExt;
 
 use fn_error_context::context;
 use ostree::gio;
@@ -691,8 +690,7 @@ async fn initialize_ostree_root_from_self(
 
     let uname = rustix::system::uname();
 
-    let config = state.configuration.as_ref();
-    let labels = config.and_then(crate::status::labels_of_config);
+    let labels = crate::status::labels_of_config(&state.configuration);
     let timestamp = labels
         .and_then(|l| {
             l.get(oci_spec::image::ANNOTATION_CREATED)

lib/src/status.rs

@@ -117,19 +117,17 @@ pub(crate) fn labels_of_config(
 pub(crate) fn create_imagestatus(
     image: ImageReference,
     manifest_digest: &str,
-    config: Option<&ImageConfiguration>,
+    config: &ImageConfiguration,
 ) -> ImageStatus {
-    let labels = config.and_then(labels_of_config);
+    let labels = labels_of_config(config);
     let timestamp = labels
         .and_then(|l| {
             l.get(oci_spec::image::ANNOTATION_CREATED)
                 .map(|s| s.as_str())
         })
         .and_then(try_deserialize_timestamp);
 
-    let version = config
-        .and_then(ostree_container::version_for_config)
-        .map(ToOwned::to_owned);
+    let version = ostree_container::version_for_config(config).map(ToOwned::to_owned);
     ImageStatus {
         image,
         version,
@@ -155,13 +153,10 @@ fn boot_entry_from_deployment(
             let csum = deployment.csum();
             let imgstate = ostree_container::store::query_image_commit(repo, &csum)?;
             let cached = imgstate.cached_update.map(|cached| {
-                create_imagestatus(image.clone(), &cached.manifest_digest, Some(&cached.config))
+                create_imagestatus(image.clone(), &cached.manifest_digest, &cached.config)
             });
-            let imagestatus = create_imagestatus(
-                image,
-                &imgstate.manifest_digest,
-                imgstate.configuration.as_ref(),
-            );
+            let imagestatus =
+                create_imagestatus(image, &imgstate.manifest_digest, &imgstate.configuration);
             // We found a container-image based deployment
             (Some(imagestatus), cached)
         } else {