Merge pull request #265 from amazonlinux/metadata

updata: Update metadata generation tool

workspaces/Cargo.toml

@@ -27,6 +27,7 @@ members = [
     "updater/signpost",
     "updater/tough",
     "updater/tough_schema",
+    "updater/update_metadata",
     "updater/updog",
 
     "tuftool",

workspaces/api/data_store_version/Cargo.toml

@@ -8,6 +8,9 @@ edition = "2018"
 lazy_static = "1.2"
 log = "0.4"
 regex = "1.1"
+serde = { version = "1.0", features = ["derive"] }
+serde_plain = "0.3.0"
+
 snafu = "0.5"
 
 [build-dependencies]

workspaces/api/data_store_version/src/lib.rs

@@ -11,9 +11,12 @@ It is especially helpful during data store migrations, and is also used for data
 
 #[macro_use]
 extern crate log;
+#[macro_use]
+extern crate serde_plain;
 
 use lazy_static::lazy_static;
 use regex::Regex;
+use serde::{Serialize, Serializer};
 use snafu::{OptionExt, ResultExt};
 use std::path::Path;
 use std::path::PathBuf;
@@ -92,12 +95,23 @@ impl FromStr for Version {
     }
 }
 
+derive_deserialize_from_str!(Version, "Valid data-store version");
+
 impl fmt::Display for Version {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "v{}.{}", self.major, self.minor)
     }
 }
 
+impl Serialize for Version {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(&format!("{}.{}", self.major, self.minor))
+    }
+}
+
 impl Version {
     #[allow(dead_code)]
     pub fn new(major: VersionComponent, minor: VersionComponent) -> Self {

workspaces/deny.toml

@@ -52,6 +52,7 @@ skip = [
     { name = "tough", licenses = [] },
     { name = "tough_schema", licenses = [] },
     { name = "tuftool", licenses = [] },
+    { name = "update_metadata", licenses = [] },
     { name = "updog", licenses = [] },
     { name = "webpki-roots", licenses = [] },
 

workspaces/updater/update_metadata/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "update_metadata"
+version = "0.1.0"
+authors = ["Samuel Mendoza-Jonas <[email protected]>"]
+edition = "2018"
+publish = false
+
+[dependencies]
+chrono = { version = "0.4.9", features = ["serde"] }
+data_store_version = { path = "../../api/data_store_version" }
+rand = "0.7.0"
+regex = "1.1"
+semver = { version = "0.9.0", features = ["serde"] }
+serde = { version = "1.0.100", features = ["derive"] }
+serde_json = "1.0.40"
+serde_plain = "0.3.0"
+snafu = "0.5.0"
+
+[lib]
+name = "update_metadata"
+path = "src/lib.rs"