Enable passing path to config file via env args

p2panda · Jun 3, 2024 · 6039788 · 6039788
1 parent 5516f82
commit 6039788
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/aquadoggo_cli/Cargo.toml b/aquadoggo_cli/Cargo.toml
@@ -21,7 +21,7 @@ doc = false
 
 [dependencies]
 anyhow = "1.0.62"
-clap = { version = "4.1.8", features = ["derive", "cargo"] }
+clap = { version = "4.1.8", features = ["derive", "cargo", "env"] }
 colored = "2.0.4"
 directories = "5.0.1"
 env_logger = "0.9.0"

diff --git a/aquadoggo_cli/XXX b/aquadoggo_cli/XXX
@@ -0,0 +1 @@
+73bd83d5d1c678944ae009aa1eaff143dc09dc965419167570f8c942b7c18912
diff --git a/aquadoggo_cli/src/config.rs b/aquadoggo_cli/src/config.rs
@@ -31,6 +31,8 @@ pub fn load_config() -> Result<(ConfigFilePath, ConfigFile)> {
     // Parse command line arguments first to get optional config file path
     let cli = Cli::parse();
 
+    println!("{:#?}", cli);
+
     // Determine if a config file path was provided or if we should look for it in common locations
     let config_file_path: ConfigFilePath = match &cli.config {
         Some(path) => {
@@ -48,6 +50,8 @@ pub fn load_config() -> Result<(ConfigFilePath, ConfigFile)> {
         figment = figment.merge(Toml::file(path));
     }
 
+    println!("{:#?}", Env::raw().filter(|k| k == "CONFIG"));
+
     let config = figment
         .merge(Env::raw())
         .merge(Serialized::defaults(cli))
@@ -74,7 +78,7 @@ struct Cli {
     /// When not set the program will try to find a `config.toml` file in the same folder the
     /// program is executed in and otherwise in the regarding operation systems XDG config
     /// directory ("$HOME/.config/aquadoggo/config.toml" on Linux).
-    #[arg(short = 'c', long, value_name = "PATH")]
+    #[arg(short = 'c', long, value_name = "PATH", env)]
     #[serde(skip_serializing_if = "Option::is_none")]
     config: Option<PathBuf>,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		73bd83d5d1c678944ae009aa1eaff143dc09dc965419167570f8c942b7c18912