Fixup configs to have defaults & digest function uses lower case (#438)

Minor changes to allow HttpServerConfig to use default values if not set in config. Also a minor change for format_execute_response_message to format the digest_function value to lower case to make it compatible with bb_browser.
TraceMachina · Dec 1, 2023 · d56f008 · d56f008
1 parent 4aa2bc4
commit d56f008
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/native-link-config/src/cas_server.rs b/native-link-config/src/cas_server.rs
@@ -210,27 +210,29 @@ pub struct TlsConfig {
 /// specified.
 #[derive(Deserialize, Debug, Default)]
 pub struct HttpServerConfig {
-    #[serde(deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
+    #[serde(default, deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
     pub http2_max_pending_accept_reset_streams: Option<u32>,
-    #[serde(deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
+    #[serde(default, deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
     pub http2_initial_stream_window_size: Option<u32>,
-    #[serde(deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
+    #[serde(default, deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
     pub http2_initial_connection_window_size: Option<u32>,
+    #[serde(default)]
     pub http2_adaptive_window: Option<bool>,
-    #[serde(deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
+    #[serde(default, deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
     pub http2_max_frame_size: Option<u32>,
-    #[serde(deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
+    #[serde(default, deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
     pub http2_max_concurrent_streams: Option<u32>,
     /// Note: This is in seconds.
-    #[serde(deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
+    #[serde(default, deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
     pub http2_keep_alive_interval: Option<u32>,
     /// Note: This is in seconds.
-    #[serde(deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
+    #[serde(default, deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
     pub http2_keep_alive_timeout: Option<u32>,
-    #[serde(deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
+    #[serde(default, deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
     pub http2_max_send_buf_size: Option<u32>,
+    #[serde(default)]
     pub http2_enable_connect_protocol: Option<bool>,
-    #[serde(deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
+    #[serde(default, deserialize_with = "convert_optinoal_numeric_with_shellexpand")]
     pub http2_max_header_list_size: Option<u32>,
 }
 
@@ -390,7 +392,7 @@ pub struct UploadActionResultConfig {
     /// Same as `success_message_template` but for failure case.
     ///
     /// An example that is fully compatible with `bb_browser` is:
-    /// <https://example.com/{instance_name}/blobs/{digest_function}/historical_execute_response/{historical_results_hash}-{historical_results_size}/>
+    /// <https://example.com/my-instance-name-here/blobs/{digest_function}/historical_execute_response/{historical_results_hash}-{historical_results_size}/>
     ///
     /// Default: "" (no message)
     #[serde(default, deserialize_with = "convert_string_with_shellexpand")]

diff --git a/native-link-worker/src/running_actions_manager.rs b/native-link-worker/src/running_actions_manager.rs
@@ -1293,7 +1293,10 @@ impl UploadActionResults {
         maybe_historical_digest_info: Option<DigestInfo>,
         hasher: DigestHasherFunc,
     ) -> Result<String, Error> {
-        template_str.replace("digest_function", hasher.proto_digest_func().as_str_name());
+        template_str.replace(
+            "digest_function",
+            hasher.proto_digest_func().as_str_name().to_lowercase(),
+        );
         template_str.replace("action_digest_hash", action_digest_info.hash_str());
         template_str.replace("action_digest_size", action_digest_info.size_bytes);
         if let Some(historical_digest_info) = maybe_historical_digest_info {