Merge pull request #2038 from input-output-hk/ensemble/fix-clap-argum…

…ents-always-override-config Fix: `clap` arguments are always overriding configuration
input-output-hk · Oct 22, 2024 · 17b4319 · 17b4319
2 parents ef8c283 + 8a6fb72
commit 17b4319
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 27 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mithril-aggregator/Cargo.toml b/mithril-aggregator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.5.85"
+version = "0.5.86"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

diff --git a/mithril-aggregator/src/commands/serve_command.rs b/mithril-aggregator/src/commands/serve_command.rs
@@ -87,31 +87,30 @@ impl Source for ServeCommand {
                 ),
             );
         }
-        result.insert(
-            "disable_digests_cache".to_string(),
-            Value::new(
-                Some(&namespace),
-                ValueKind::from(self.disable_digests_cache),
-            ),
-        );
-        result.insert(
-            "reset_digests_cache".to_string(),
-            Value::new(Some(&namespace), ValueKind::from(self.reset_digests_cache)),
-        );
-        result.insert(
-            "allow_unparsable_block".to_string(),
-            Value::new(
-                Some(&namespace),
-                ValueKind::from(self.allow_unparsable_block),
-            ),
-        );
-        result.insert(
-            "enable_metrics_server".to_string(),
-            Value::new(
-                Some(&namespace),
-                ValueKind::from(self.enable_metrics_server),
-            ),
-        );
+        if self.disable_digests_cache {
+            result.insert(
+                "disable_digests_cache".to_string(),
+                Value::new(Some(&namespace), ValueKind::from(true)),
+            );
+        };
+        if self.reset_digests_cache {
+            result.insert(
+                "reset_digests_cache".to_string(),
+                Value::new(Some(&namespace), ValueKind::from(true)),
+            );
+        }
+        if self.allow_unparsable_block {
+            result.insert(
+                "allow_unparsable_block".to_string(),
+                Value::new(Some(&namespace), ValueKind::from(true)),
+            );
+        };
+        if self.enable_metrics_server {
+            result.insert(
+                "enable_metrics_server".to_string(),
+                Value::new(Some(&namespace), ValueKind::from(true)),
+            );
+        };
         if let Some(metrics_server_ip) = self.metrics_server_ip.clone() {
             result.insert(
                 "metrics_server_ip".to_string(),