refactor: make configuration automatically compute if directory serving is enabled in the HTTP server

Author: jpraynaud

mithril-aggregator/src/configuration.rs

@@ -186,9 +186,6 @@ pub struct Configuration {
 
     /// Time interval at which usage metrics are persisted in event database (in seconds).
     pub persist_usage_report_interval_in_seconds: u64,
-
-    /// If set to true, the HTTP server can serve static directories.
-    pub allow_http_serve_directory: bool,
 }
 
 /// Uploader needed to copy the snapshot once computed.
@@ -273,7 +270,6 @@ impl Configuration {
             metrics_server_ip: "0.0.0.0".to_string(),
             metrics_server_port: 9090,
             persist_usage_report_interval_in_seconds: 10,
-            allow_http_serve_directory: false,
         }
     }
 
@@ -336,6 +332,15 @@ impl Configuration {
 
         Ok(allowed_discriminants)
     }
+
+    /// Check if the HTTP server can serve static directories.
+    // TODO: This function should be completed when the configuration of the uploaders for the Cardano database is done.
+    pub fn allow_http_serve_directory(&self) -> bool {
+        match self.snapshot_uploader_type {
+            SnapshotUploaderType::Local => true,
+            SnapshotUploaderType::Gcp => false,
+        }
+    }
 }
 
 /// Default configuration with all the default values for configurations.
@@ -415,9 +420,6 @@ pub struct DefaultConfiguration {
 
     /// Time interval at which metrics are persisted in event database (in seconds).
     pub persist_usage_report_interval_in_seconds: u64,
-
-    /// If set to true, the HTTP server can serve static directories.
-    pub allow_http_serve_directory: bool,
 }
 
 impl Default for DefaultConfiguration {
@@ -450,7 +452,6 @@ impl Default for DefaultConfiguration {
             metrics_server_ip: "0.0.0.0".to_string(),
             metrics_server_port: 9090,
             persist_usage_report_interval_in_seconds: 10,
-            allow_http_serve_directory: false,
         }
     }
 }
@@ -538,7 +539,6 @@ impl Source for DefaultConfiguration {
                 ),
             ])),
         );
-        insert_default_configuration!(result, myself.allow_http_serve_directory);
         Ok(result)
     }
 }
@@ -608,4 +608,21 @@ mod test {
             BTreeSet::from(SignedEntityConfig::DEFAULT_ALLOWED_DISCRIMINANTS)
         );
     }
+
+    #[test]
+    fn allow_http_serve_directory() {
+        let config = Configuration {
+            snapshot_uploader_type: SnapshotUploaderType::Local,
+            ..Configuration::new_sample()
+        };
+
+        assert!(config.allow_http_serve_directory());
+
+        let config = Configuration {
+            snapshot_uploader_type: SnapshotUploaderType::Gcp,
+            ..Configuration::new_sample()
+        };
+
+        assert!(!config.allow_http_serve_directory());
+    }
 }

mithril-aggregator/src/dependency_injection/builder.rs

@@ -1556,7 +1556,7 @@ impl DependenciesBuilder {
                     .clone(),
                 snapshot_directory: self.configuration.get_snapshot_dir()?,
                 cardano_node_version: self.configuration.cardano_node_version.clone(),
-                allow_http_serve_directory: self.configuration.allow_http_serve_directory,
+                allow_http_serve_directory: self.configuration.allow_http_serve_directory(),
             },
         );
 

mithril-aggregator/src/http_server/routes/artifact_routes/cardano_database.rs

@@ -103,6 +103,7 @@ mod handlers {
     }
 
     /// Download a file if it's a Cardano_database artifact file
+    // TODO: this function should probable be unit tested once the file naming convention is defined
     pub async fn ensure_downloaded_file_is_a_cardano_database_artifact(
         reply: warp::fs::File,
         logger: Logger,

mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs

@@ -99,7 +99,6 @@ impl Aggregator {
             ),
             ("CARDANO_TRANSACTIONS_SIGNING_CONFIG__STEP", "15"),
             ("PERSIST_USAGE_REPORT_INTERVAL_IN_SECONDS", "3"),
-            ("ALLOW_HTTP_SERVE_DIRECTORY", "true"),
         ]);
         let args = vec![
             "--db-directory",