Merge pull request #35 from cgwalters/update-ostree-ext

Use version API from ostree-ext

Author: jmarrero

lib/Cargo.toml

@@ -11,7 +11,7 @@ rust-version = "1.63.0"
 [dependencies]
 anyhow = "1.0"
 camino = "1.0.4"
-ostree-ext = "0.10.1"
+ostree-ext = "0.10.5"
 clap = { version= "3.2", features = ["derive"] }
 clap_mangen = { version = "0.1", optional = true }
 cap-std-ext = "1.0.1"

lib/src/status.rs

@@ -131,13 +131,12 @@ pub(crate) async fn status(opts: super::cli::StatusOpts) -> Result<()> {
             } else {
                 let state = ostree_container::store::query_image_commit(repo, &commit)?;
                 println!("    Digest: {}", state.manifest_digest.as_str());
-                let config = state.configuration.as_ref();
-                let cconfig = config.and_then(|c| c.config().as_ref());
-                let labels = cconfig.and_then(|c| c.labels().as_ref());
-                if let Some(labels) = labels {
-                    if let Some(version) = labels.get("version") {
-                        println!("    Version: {version}");
-                    }
+                let version = state
+                    .configuration
+                    .as_ref()
+                    .and_then(ostree_container::version_for_config);
+                if let Some(version) = version {
+                    println!("    Version: {version}");
                 }
             }
         } else {

tests/kolainst/basic

@@ -12,6 +12,8 @@ cd $(mktemp -d)
 
 case "${AUTOPKGTEST_REBOOT_MARK:-}" in
   "")
+    bootc status > status.txt
+    grep 'Version:' status.txt
     bootc status --json > status.json
     image=$(jq -r '.[0].image.image' < status.json)
     echo "booted into $image"