From d129c4b0b143e82e5ef2eaae28f3337defa206fa Mon Sep 17 00:00:00 2001 From: "Genevieve (Genna) Helsel" Date: Tue, 28 Jan 2025 17:22:12 -0800 Subject: [PATCH] teach eden reloadconfig to handle --manifold-key Summary: # Context To test edenfs_config changes, one can upload the raw config to manifold and ask the edenfs_config_manager to use that raw config rather than canarying the change to a machine or having a local configerator checkout. # This Diff I added this flag mid last year (D61072490) but didn't add it to the helper cli `reloadconfig`. This diff adds it to `reloadconfig` for ease of use. `reloadconfig` just passes the args to the `edenfs_config_manager` so you don't have to remember the path for invoking the manager. Reviewed By: ViniGupta08 Differential Revision: D68801571 fbshipit-source-id: 8ae36a96886d6a50a108f158a254a7ecfbe381f8 --- eden/fs/cli_rs/edenfs-commands/src/config.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/eden/fs/cli_rs/edenfs-commands/src/config.rs b/eden/fs/cli_rs/edenfs-commands/src/config.rs index 2b2c9ed36374c..59fec64a9ec4d 100644 --- a/eden/fs/cli_rs/edenfs-commands/src/config.rs +++ b/eden/fs/cli_rs/edenfs-commands/src/config.rs @@ -98,6 +98,12 @@ pub struct ReloadConfigCmd { )] canary_host: Option, + #[clap( + long, + help = "Load configs from the edenfs_test_configs Manifold bucket instead of reading from remote. This is useful for testing changes locally without having to push them to production" + )] + manifold_key: Option, + #[clap( long, help = "If the script is ran as root, used to specify user when making requests to Configerator. Defaults to SUDO_USER, $LOGUSER, os.getlogin, or \"unknown\" in that order." @@ -165,6 +171,10 @@ impl crate::Subcommand for ReloadConfigCmd { cmd.arg("--canary-host").arg(canary_host); } + if let Some(manifold_key) = &self.manifold_key { + cmd.arg("--manifold-key").arg(manifold_key); + } + if let Some(user) = &self.user { cmd.arg("--user").arg(user); }