#2: no env prefix by default

Kryptonite-RU · Feb 28, 2023 · 6c636ed · 6c636ed
1 parent ff31d1e
commit 6c636ed
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/config-manager-proc/src/utils/top_level.rs b/config-manager-proc/src/utils/top_level.rs
@@ -81,19 +81,26 @@ pub(crate) fn extract_clap_app(attrs: &[Attribute]) -> NormalClapAppInfo {
 }
 
 pub(crate) fn extract_env_prefix(attrs: &[Attribute]) -> Option<String> {
-    attrs
+    match attrs
         .iter()
         .find(|a| compare_attribute_name(a, ENV_PREFIX_KEY))
-        .map(|atr| match atr.parse_meta() {
+    {
+        None => Some(String::new()),
+        Some(attr) => match attr.parse_meta() {
             Err(err) => panic!("Can't parse attribute as meta: {err}"),
             Ok(meta) => match meta {
+                Meta::Path(_) => None,
                 Meta::NameValue(MetaNameValue {
                     lit: Lit::Str(input_name),
                     ..
-                }) => input_name.value(),
-                _ => panic!("{ENV_PREFIX_KEY} must match #[{ENV_PREFIX_KEY} = \"...\"]"),
+                }) => Some(input_name.value()),
+                _ => panic!(
+                    "{ENV_PREFIX_KEY} must match #[{ENV_PREFIX_KEY} = \"...\"] or \
+                     #[{ENV_PREFIX_KEY}]"
+                ),
             },
-        })
+        },
+    }
 }
 
 pub(crate) fn extract_debug_cmd_input(attrs: &[Attribute]) -> Option<TokenStream> {

diff --git a/tests/parse_method/env.rs b/tests/parse_method/env.rs
@@ -72,7 +72,7 @@ fn env() {
 
 #[test]
 fn env_prefix() {
-    test_env(vec![empty_prefix, no_prefix, some_prefix])
+    test_env(vec![empty_prefix, no_prefix, some_prefix, binary_prefix])
 }
 
 fn empty_prefix() {
@@ -111,7 +111,6 @@ fn some_prefix() {
     });
 }
 
-/// bin file is like config-manager/target/debug/deps/parse_method-b5e125d4f8a36dad
 fn no_prefix() {
     #[derive(Debug, PartialEq)]
     #[config(__debug_cmd_input__())]
@@ -124,5 +123,23 @@ fn no_prefix() {
 
     set_env("fir", 1);
     set_env("second", 2);
-    assert!(matches!(NoPrefix::parse(), Err(Error::MissingArgument(_))));
+    assert_ok_and_compare(&NoPrefix {
+        first: 1,
+        second: 2,
+    });
+}
+
+/// bin file is like config-manager/target/debug/deps/parse_method-b5e125d4f8a36dad
+fn binary_prefix() {
+    #[config(env_prefix, __debug_cmd_input__())]
+    struct BinPrefix {
+        #[allow(dead_code)]
+        #[source(env)]
+        first: String,
+    }
+
+    set_env("first", 1);
+
+    let parsed = BinPrefix::parse();
+    assert!(matches!(parsed, Err(Error::MissingArgument(_))));
 }