Agent Config Parsing Casing Fixes

rust/Cargo.toml

@@ -60,7 +60,7 @@ bs58 = "0.5.0"
 bytes = "1"
 clap = "4"
 color-eyre = "0.6"
-config = "~0.13.3"
+config = "0.13.3"
 convert_case = "0.6"
 crunchy = "0.2"
 ctrlc = "3.2"

rust/hyperlane-base/Cargo.toml

@@ -10,11 +10,11 @@ publish.workspace = true
 version.workspace = true
 
 [dependencies]
-# Main block
 async-trait.workspace = true
 bs58.workspace = true
 color-eyre = { workspace = true, optional = true }
 config.workspace = true
+convert_case.workspace = true
 derive-new.workspace = true
 ed25519-dalek.workspace = true
 ethers.workspace = true

rust/hyperlane-base/src/settings/loader/arguments.rs

@@ -1,10 +1,10 @@
 use std::ffi::{OsStr, OsString};
 
 use config::{ConfigError, Map, Source, Value, ValueKind};
+use convert_case::{Case, Casing};
+use itertools::Itertools;
 
 /// A source for loading configuration from command line arguments.
-/// Command line argument keys are case-insensitive, and the following forms are
-/// supported:
 ///
 /// * `--key=value`
 /// * `--key="value"`
@@ -23,6 +23,10 @@ pub struct CommandLineArguments {
     /// Ignore empty env values (treat as unset).
     ignore_empty: bool,
 
+    /// What casing to use for the keys in the environment. By default it will not mutate the key
+    /// value.
+    casing: Option<Case>,
+
     /// Alternate source for the environment. This can be used when you want to
     /// test your own code using this source, without the need to change the
     /// actual system environment variables.
@@ -41,6 +45,11 @@ impl CommandLineArguments {
         self
     }
 
+    pub fn casing(mut self, casing: Case) -> Self {
+        self.casing = Some(casing);
+        self
+    }
+
     pub fn source<I, S>(mut self, source: I) -> Self
     where
         I: IntoIterator<Item = S>,
@@ -77,12 +86,15 @@ impl Source for CommandLineArguments {
                 continue;
             }
 
-            let mut key = key.to_lowercase();
-
-            // If separator is given replace with `.`
-            if !separator.is_empty() && separator != "." {
-                key = key.replace(separator, ".");
-            }
+            let key = if let Some(case) = self.casing {
+                // if case is given, replace case of each key component
+                key.split(separator).map(|s| s.to_case(case)).join(".")
+            } else if !separator.is_empty() && separator != "." {
+                // If separator is given replace with `.`
+                key.replace(separator, ".")
+            } else {
+                key
+            };
 
             m.insert(key, Value::new(Some(&uri), ValueKind::String(value)));
         }
@@ -283,19 +295,21 @@ mod test {
                 Some(Value::new(
                     Some(&origin),
                     ValueKind::String($value.to_owned())
-                ))
+                )),
+                $key
             );
         };
     }
 
     const ARGUMENTS: &[&str] = &[
         "--key-a",
         "value-a",
-        "--keY-b=value-b",
-        "--key-c=\"value c\"",
-        "--KEY-d='valUE d'",
+        "--key-b=value-b",
+        "--key-c-partA=\"value c a\"",
+        "--key-c-PartB=\"value c b\"",
+        "--key-d='valUE d'",
         "--key-e=''",
-        "--key-F",
+        "--key-f",
         "--key-g=value-g",
         "--key-h",
     ];
@@ -309,7 +323,8 @@ mod test {
 
         assert_arg!(config, "key.a", "value-a");
         assert_arg!(config, "key.b", "value-b");
-        assert_arg!(config, "key.c", "value c");
+        assert_arg!(config, "key.c.partA", "value c a");
+        assert_arg!(config, "key.c.PartB", "value c b");
         assert_arg!(config, "key.d", "valUE d");
         assert_arg!(config, "key.e", "");
         assert_arg!(config, "key.f", "");
@@ -329,7 +344,8 @@ mod test {
 
         assert_arg!(config, "key.a", "value-a");
         assert_arg!(config, "key.b", "value-b");
-        assert_arg!(config, "key.c", "value c");
+        assert_arg!(config, "key.c.partA", "value c a");
+        assert_arg!(config, "key.c.PartB", "value c b");
         assert_arg!(config, "key.d", "valUE d");
         assert_arg!(config, "key.g", "value-g");