Allow parsing execution_completion_behaviour from environment variable.

Author: dkostyrev

nativelink-config/src/cas_server.rs

@@ -24,7 +24,7 @@ use crate::serde_utils::{
     convert_data_size_with_shellexpand, convert_duration_with_shellexpand,
     convert_numeric_with_shellexpand, convert_optional_numeric_with_shellexpand,
     convert_optional_string_with_shellexpand, convert_string_with_shellexpand,
-    convert_vec_string_with_shellexpand,
+    convert_vec_string_with_shellexpand, convert_enum_with_shellexpand,
 };
 use crate::stores::{ClientTlsConfig, ConfigDigestHashFunction, StoreRefName, StoreSpec};
 
@@ -854,7 +854,7 @@ pub struct LocalWorkerConfig {
     /// Default: None (directory cache disabled)
     pub directory_cache: Option<DirectoryCacheConfig>,
 
-    #[serde(default)]
+    #[serde(deserialize_with = "convert_enum_with_shellexpand")]
     pub execution_completion_behaviour: ExecutionCompletionBehaviour,
 }
 

nativelink-config/src/serde_utils.rs

@@ -18,7 +18,7 @@ use std::fmt;
 
 use byte_unit::Byte;
 use humantime::parse_duration;
-use serde::de::Visitor;
+use serde::de::{DeserializeOwned, Visitor};
 use serde::{Deserialize, Deserializer, de};
 
 /// Helper for serde macro so you can use shellexpand variables in the json configuration
@@ -479,3 +479,17 @@ where
 
     deserializer.deserialize_any(DurationVisitor::<T>(PhantomData))
 }
+
+pub fn convert_enum_with_shellexpand<'de, D, T>(deserializer: D) -> Result<T, D::Error>
+where
+    D: Deserializer<'de>,
+    T: DeserializeOwned,
+{
+    let s = String::deserialize(deserializer)?;
+    let expanded = shellexpand::env(&s)
+        .map_err(de::Error::custom)?;
+
+    let quoted = format!("\"{}\"", expanded);
+    serde_json5::from_str(&quoted)
+        .map_err(de::Error::custom)
+}