fix(env): fix loading generic vs connection specific env settings

Author: radhermit

crates/cli/tests/bite/service/bugzilla.rs

@@ -120,3 +120,27 @@ async fn proxy() {
             .success();
     }
 }
+
+#[tokio::test]
+async fn env() {
+    let server = start_server().await;
+    server.respond(200, TEST_DATA.join("search/ids.json")).await;
+
+    // override base url
+    for var in ["BUGBITE_BASE", "BUGBITE_GENTOO_BASE"] {
+        cmd("bite bugzilla")
+            .env("BUGBITE_CONNECTION", "gentoo")
+            .env(var, server.uri())
+            .args(["search", "bugbite", "--fields", "id"])
+            .assert()
+            .stdout(predicate::str::diff(indoc::indoc! {"
+                924847
+                924852
+                924854
+                924855
+                924856
+            "}))
+            .stderr("")
+            .success();
+    }
+}

crates/lib/src/config.rs

@@ -138,13 +138,19 @@ impl Config {
         let mut builder = config::Config::builder().add_source(default_source);
 
         // load custom user service options from non-connection specific env vars
-        builder = builder.add_source(config::Environment::with_prefix("BUGBITE").try_parsing(true));
+        builder = builder.add_source(
+            config::Environment::with_prefix("BUGBITE")
+                .try_parsing(true)
+                .prefix_separator("_")
+                .separator("__"),
+        );
 
         // load custom user service options from connection specific env vars
         let env_prefix = format!("BUGBITE_{}", connection.to_uppercase());
         builder = builder.add_source(
             config::Environment::with_prefix(&env_prefix)
                 .try_parsing(true)
+                .prefix_separator("_")
                 .separator("__"),
         );