Implement snapshot bucket configuration

Author: jpraynaud

mithril-aggregator/src/command_args.rs

@@ -297,7 +297,7 @@ impl ServeCommand {
         debug!("SERVE command"; "config" => format!("{:?}", config));
         // Init dependencies
         let snapshot_store = config.build_snapshot_store()?;
-        let snapshot_uploader = config.build_snapshot_uploader();
+        let snapshot_uploader = config.build_snapshot_uploader()?;
 
         let sqlite_db_path = Some(config.get_sqlite_file());
 

mithril-aggregator/src/configuration.rs

@@ -49,6 +49,9 @@ pub struct Configuration {
     /// Type of snapshot uploader to use
     pub snapshot_uploader_type: SnapshotUploaderType,
 
+    /// Bucket name where the snapshots are stored if snapshot_uploader_type is Gcp
+    pub snapshot_bucket_name: Option<String>,
+
     /// Server listening IP
     pub server_ip: String,
 
@@ -109,7 +112,11 @@ impl Configuration {
     pub fn build_snapshot_store(&self) -> Result<Arc<dyn SnapshotStore>, Box<dyn Error>> {
         match self.snapshot_store_type {
             SnapshotStoreType::Gcp => Ok(Arc::new(RemoteSnapshotStore::new(
-                Box::new(GcpFileUploader::default()),
+                Box::new(GcpFileUploader::new(
+                    self.snapshot_bucket_name.to_owned().ok_or_else(|| {
+                        ConfigError::Message("missing snapshot bucket name".to_string())
+                    })?,
+                )),
                 self.url_snapshot_manifest.clone(),
             ))),
             SnapshotStoreType::Local => Ok(Arc::new(LocalSnapshotStore::new(
@@ -123,15 +130,17 @@ impl Configuration {
     }
 
     /// Create a snapshot uploader from configuration settings.
-    pub fn build_snapshot_uploader(&self) -> Arc<dyn SnapshotUploader> {
+    pub fn build_snapshot_uploader(&self) -> Result<Arc<dyn SnapshotUploader>, Box<dyn Error>> {
         match self.snapshot_uploader_type {
-            SnapshotUploaderType::Gcp => Arc::new(RemoteSnapshotUploader::new(Box::new(
-                GcpFileUploader::default(),
-            ))),
-            SnapshotUploaderType::Local => Arc::new(LocalSnapshotUploader::new(
+            SnapshotUploaderType::Gcp => Ok(Arc::new(RemoteSnapshotUploader::new(Box::new(
+                GcpFileUploader::new(self.snapshot_bucket_name.to_owned().ok_or_else(|| {
+                    ConfigError::Message("missing snapshot bucket name".to_string())
+                })?),
+            )))),
+            SnapshotUploaderType::Local => Ok(Arc::new(LocalSnapshotUploader::new(
                 self.get_server_url(),
                 &self.snapshot_directory,
-            )),
+            ))),
         }
     }
 

mithril-aggregator/src/dependency.rs

@@ -193,6 +193,7 @@ pub mod tests {
                 .to_string(),
             snapshot_store_type: SnapshotStoreType::Local,
             snapshot_uploader_type: SnapshotUploaderType::Local,
+            snapshot_bucket_name: None,
             server_ip: "0.0.0.0".to_string(),
             server_port: 8000,
             run_interval: 5000,

mithril-aggregator/tests/test_extensions/dependency.rs

@@ -37,6 +37,7 @@ pub async fn initialize_dependencies(
             .to_string(),
         snapshot_store_type: SnapshotStoreType::Local,
         snapshot_uploader_type: SnapshotUploaderType::Local,
+        snapshot_bucket_name: None,
         server_ip: "0.0.0.0".to_string(),
         server_port: 8000,
         run_interval: 5000,