Move try_deserialize_timestamp to bootc_utils

Signed-off-by: Etienne Champetier <[email protected]>

Author: champtar

Cargo.lock

@@ -535,7 +535,7 @@ impl InstallAleph {
                 l.get(oci_spec::image::ANNOTATION_CREATED)
                     .map(|s| s.as_str())
             })
-            .and_then(crate::status::try_deserialize_timestamp);
+            .and_then(bootc_utils::try_deserialize_timestamp);
         let r = InstallAleph {
             image: src_imageref.imgref.name.clone(),
             version: imgstate.version().as_ref().map(|s| s.to_string()),

lib/src/install.rs

@@ -102,16 +102,6 @@ pub(crate) struct Deployments {
     pub(crate) other: VecDeque<ostree::Deployment>,
 }
 
-pub(crate) fn try_deserialize_timestamp(t: &str) -> Option<chrono::DateTime<chrono::Utc>> {
-    match chrono::DateTime::parse_from_rfc3339(t).context("Parsing timestamp") {
-        Ok(t) => Some(t.into()),
-        Err(e) => {
-            tracing::warn!("Invalid timestamp in image: {:#}", e);
-            None
-        }
-    }
-}
-
 pub(crate) fn labels_of_config(
     config: &oci_spec::image::ImageConfiguration,
 ) -> Option<&std::collections::HashMap<String, String>> {

lib/src/status.rs

@@ -1,4 +1,4 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
 
 use ostree_ext::container as ostree_container;
 use ostree_ext::oci_spec;
@@ -52,7 +52,7 @@ fn create_imagestatus(
                 .map(|s| s.as_str())
         })
         .or_else(|| config.created().as_deref())
-        .and_then(try_deserialize_timestamp);
+        .and_then(bootc_utils::try_deserialize_timestamp);
 
     let version = ostree_container::version_for_config(config).map(ToOwned::to_owned);
     let architecture = config.architecture().to_string();
@@ -70,13 +70,3 @@ fn labels_of_config(
 ) -> Option<&std::collections::HashMap<String, String>> {
     config.config().as_ref().and_then(|c| c.labels().as_ref())
 }
-
-fn try_deserialize_timestamp(t: &str) -> Option<chrono::DateTime<chrono::Utc>> {
-    match chrono::DateTime::parse_from_rfc3339(t).context("Parsing timestamp") {
-        Ok(t) => Some(t.into()),
-        Err(e) => {
-            tracing::warn!("Invalid timestamp in image: {:#}", e);
-            None
-        }
-    }
-}

lib/src/store/ostree_container.rs

@@ -8,6 +8,7 @@ repository = "https://github.com/bootc-dev/bootc"
 
 [dependencies]
 anyhow = { workspace = true }
+chrono = { workspace = true }
 rustix = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }

utils/Cargo.toml

@@ -8,5 +8,7 @@ mod path;
 pub use path::*;
 mod iterators;
 pub use iterators::*;
+mod timestamp;
+pub use timestamp::*;
 mod tracing_util;
 pub use tracing_util::*;

utils/src/lib.rs

@@ -0,0 +1,13 @@
+use anyhow::Context;
+use chrono;
+
+/// Try to parse an RFC 3339, warn on error.
+pub fn try_deserialize_timestamp(t: &str) -> Option<chrono::DateTime<chrono::Utc>> {
+    match chrono::DateTime::parse_from_rfc3339(t).context("Parsing timestamp") {
+        Ok(t) => Some(t.into()),
+        Err(e) => {
+            tracing::warn!("Invalid timestamp in image: {:#}", e);
+            None
+        }
+    }
+}