Add bundle-schema option to CLI

DiamondLightSource · Jan 5, 2024 · 92d3c70 · 92d3c70
1 parent fea447b
commit 92d3c70
Show file tree

Hide file tree

Showing 8 changed files with 250 additions and 34 deletions.
diff --git a/bundler/Cargo.lock b/bundler/Cargo.lock
diff --git a/bundler/Cargo.toml b/bundler/Cargo.toml
@@ -4,14 +4,16 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.79"
+anyhow = { version = "1.0.79" }
 axum = { version = "0.7.3" }
 axum-extra = { version = "0.9.1", features = ["typed-header"] }
 clap = { version = "4.4.12", features = ["derive", "env"] }
+clio = { version = "0.3.5", features = ["clap-parse"] }
 dotenvy = { version = "0.15.7" }
 flate2 = { version = "1.0.28" }
 headers = { version = "0.4.0" }
 humantime = { version = "2.1.0" }
+schemars = { version = "0.8.16" }
 serde = { version = "1.0.194", features = ["derive"] }
 serde_json = { version = "1.0.110" }
 sqlx = { version = "0.7.3", features = [

diff --git a/bundler/src/bundle.rs b/bundler/src/bundle.rs
@@ -1,9 +1,10 @@
 use crate::permissionables::{permissions::Permissions, proposals::Proposals, sessions::Sessions};
 use flate2::{write::GzEncoder, Compression};
+use schemars::{schema::RootSchema, schema_for};
 use serde::Serialize;
 use sqlx::MySqlPool;
 use std::{
-    collections::hash_map::DefaultHasher,
+    collections::{hash_map::DefaultHasher, BTreeMap},
     hash::{Hash, Hasher},
 };
 use tar::Header;
@@ -148,4 +149,13 @@ where
 
         Ok(bundle_builder.into_inner()?.finish()?)
     }
+
+    /// Produces a set of schemas associated with the data in the bundle
+    pub fn schemas() -> BTreeMap<&'static str, RootSchema> {
+        BTreeMap::from([
+            ("proposals", schema_for!(Proposals)),
+            ("sessions", schema_for!(Sessions)),
+            ("permissions", schema_for!(Permissions)),
+        ])
+    }
 }