Include bundle hash in revision

Author: garryod

bundler/src/bundle.rs

@@ -2,6 +2,10 @@ use crate::permissionables::{proposals::Proposals, sessions::Sessions};
 use flate2::{write::GzEncoder, Compression};
 use serde::Serialize;
 use sqlx::MySqlPool;
+use std::{
+    collections::hash_map::DefaultHasher,
+    hash::{Hash, Hasher},
+};
 use tar::Header;
 
 #[derive(Debug, Serialize)]
@@ -10,7 +14,7 @@ struct WasmModule {
     pub module: String,
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Debug, Hash, Serialize)]
 pub struct NoMetadata;
 
 #[derive(Debug, Serialize)]
@@ -48,12 +52,18 @@ where
 
 impl<Metadata> Bundle<Metadata>
 where
-    Metadata: Serialize,
+    Metadata: Hash + Serialize,
 {
     pub fn new(metadata: Metadata, proposals: Proposals, sessions: Sessions) -> Self {
+        let mut hasher = DefaultHasher::new();
+        metadata.hash(&mut hasher);
+        proposals.hash(&mut hasher);
+        sessions.hash(&mut hasher);
+        let hash = hasher.finish();
+
         Self {
             manifest: Manifest {
-                revision: crate::built_info::PKG_VERSION.to_string(),
+                revision: format!("{}:{}", crate::built_info::PKG_VERSION, hash),
                 roots: vec!["diamond".to_string()],
                 wasm: vec![],
                 metadata,

bundler/src/main.rs

@@ -8,6 +8,7 @@ use clap::Parser;
 use serde::Serialize;
 use sqlx::{mysql::MySqlPoolOptions, MySqlPool};
 use std::{
+    hash::Hash,
     marker::PhantomData,
     net::{Ipv4Addr, SocketAddr, SocketAddrV4},
     ops::Add,
@@ -33,7 +34,7 @@ where
 
 impl<Metadata> TryFrom<Bundle<Metadata>> for BundleFile<Metadata>
 where
-    Metadata: Serialize,
+    Metadata: Hash + Serialize,
 {
     type Error = anyhow::Error;
 

bundler/src/permissionables/proposals.rs

@@ -1,9 +1,9 @@
 use serde::Serialize;
 use sqlx::{query_as, MySqlPool};
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 
-#[derive(Debug, Default, PartialEq, Eq, Serialize)]
-pub struct Proposals(HashMap<String, Vec<u32>>);
+#[derive(Debug, Default, PartialEq, Eq, Hash, Serialize)]
+pub struct Proposals(BTreeMap<String, Vec<u32>>);
 
 impl Proposals {
     pub async fn fetch(ispyb_pool: &MySqlPool) -> Result<Self, sqlx::Error> {
@@ -55,12 +55,12 @@ impl FromIterator<ProposalRow> for Proposals {
 mod tests {
     use super::Proposals;
     use sqlx::MySqlPool;
-    use std::collections::{HashMap, HashSet};
+    use std::collections::{BTreeMap, BTreeSet};
 
     #[sqlx::test(migrations = "tests/migrations")]
     async fn fetch_empty(ispyb_pool: MySqlPool) {
         let proposals = Proposals::fetch(&ispyb_pool).await.unwrap();
-        let expected = Proposals(HashMap::new());
+        let expected = Proposals(BTreeMap::new());
         assert_eq!(expected, proposals);
     }
 
@@ -73,9 +73,9 @@ mod tests {
     )]
     async fn fetch_some(ispyb_pool: MySqlPool) {
         let proposals = Proposals::fetch(&ispyb_pool).await.unwrap();
-        let mut expected = HashMap::new();
-        expected.insert("foo".to_string(), HashSet::from([100, 101, 102]));
-        expected.insert("bar".to_string(), HashSet::from([100]));
+        let mut expected = BTreeMap::new();
+        expected.insert("foo".to_string(), BTreeSet::from([100, 101, 102]));
+        expected.insert("bar".to_string(), BTreeSet::from([100]));
         assert_eq!(
             expected,
             proposals

bundler/src/permissionables/sessions.rs

@@ -1,9 +1,9 @@
 use serde::Serialize;
 use sqlx::{query_as, MySqlPool};
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 
-#[derive(Debug, Default, PartialEq, Eq, Serialize)]
-pub struct Sessions(HashMap<String, Vec<(u32, u32)>>);
+#[derive(Debug, Default, PartialEq, Eq, Hash, Serialize)]
+pub struct Sessions(BTreeMap<String, Vec<(u32, u32)>>);
 
 impl Sessions {
     pub async fn fetch(ispyb_pool: &MySqlPool) -> Result<Self, sqlx::Error> {
@@ -65,12 +65,12 @@ impl FromIterator<SessionRow> for Sessions {
 mod tests {
     use super::Sessions;
     use sqlx::MySqlPool;
-    use std::collections::{HashMap, HashSet};
+    use std::collections::{BTreeMap, BTreeSet};
 
     #[sqlx::test(migrations = "tests/migrations")]
     async fn fetch_empty(ispyb_pool: MySqlPool) {
         let sessions = Sessions::fetch(&ispyb_pool).await.unwrap();
-        let expected = Sessions(HashMap::new());
+        let expected = Sessions(BTreeMap::new());
         assert_eq!(expected, sessions);
     }
 
@@ -83,7 +83,7 @@ mod tests {
     )]
     async fn fetch_direct(ispyb_pool: MySqlPool) {
         let sessions = Sessions::fetch(&ispyb_pool).await.unwrap();
-        let mut expected = HashMap::new();
+        let mut expected = BTreeMap::new();
         expected.insert("foo".to_string(), vec![(100, 1), (100, 2)]);
         expected.insert("bar".to_string(), vec![(101, 1)]);
         assert_eq!(
@@ -105,14 +105,14 @@ mod tests {
     )]
     async fn fetch_indirect(ispyb_pool: MySqlPool) {
         let sessions = Sessions::fetch(&ispyb_pool).await.unwrap();
-        let mut expected = HashMap::new();
+        let mut expected = BTreeMap::new();
         expected.insert(
             "foo".to_string(),
-            HashSet::from([(100, 1), (100, 2), (100, 3), (101, 1), (101, 2)]),
+            BTreeSet::from([(100, 1), (100, 2), (100, 3), (101, 1), (101, 2)]),
         );
         expected.insert(
             "bar".to_string(),
-            HashSet::from([(100, 1), (100, 2), (100, 3)]),
+            BTreeSet::from([(100, 1), (100, 2), (100, 3)]),
         );
         assert_eq!(
             expected,
@@ -138,14 +138,14 @@ mod tests {
     )]
     async fn fetch_both(ispyb_pool: MySqlPool) {
         let sessions = Sessions::fetch(&ispyb_pool).await.unwrap();
-        let mut expected = HashMap::new();
+        let mut expected = BTreeMap::new();
         expected.insert(
             "foo".to_string(),
-            HashSet::from([(100, 1), (100, 2), (100, 3), (101, 1), (101, 2)]),
+            BTreeSet::from([(100, 1), (100, 2), (100, 3), (101, 1), (101, 2)]),
         );
         expected.insert(
             "bar".to_string(),
-            HashSet::from([(100, 1), (100, 2), (100, 3), (101, 1)]),
+            BTreeSet::from([(100, 1), (100, 2), (100, 3), (101, 1)]),
         );
         assert_eq!(
             expected,