Merge branch 'fix-dotenv-quote' of github.com:tellerops/teller into f…

…ix-dotenv-quote

teller-cli/src/cli.rs

@@ -183,7 +183,7 @@ pub struct NewArgs {
 }
 
 async fn load_teller(config: Option<String>) -> eyre::Result<Teller> {
-    let config_arg = config.unwrap_or_else(|| "teller.yml".to_string());
+    let config_arg = config.unwrap_or_else(|| DEFAULT_FILE_PATH.to_string());
     let config_path = Path::new(&config_arg);
     let teller = Teller::from_yaml(config_path).await?;
     Ok(teller)

teller-cli/tests/cmd/export.trycmd

@@ -1,37 +1,37 @@
 ```console
-$ teller -c teller.yml export yaml
+$ teller export yaml
 FOO_BAR: foo
 FOO_BAZ: baz
 PRINT_MOOD: happy
 PRINT_NAME: linus
 
 
-$ teller -c teller.yml export csv
+$ teller export csv
 FOO_BAR,foo
 PRINT_NAME,linus
 FOO_BAZ,baz
 PRINT_MOOD,happy
 
 
-$ teller -c teller.yml export json
+$ teller export json
 {"FOO_BAR":"foo","FOO_BAZ":"baz","PRINT_MOOD":"happy","PRINT_NAME":"linus"}
 
-$ teller -c teller.yml export env
+$ teller export env
 FOO_BAR=foo
 PRINT_NAME=linus
 FOO_BAZ=baz
 PRINT_MOOD=happy
 
 
-$ teller -c teller.yml sh
+$ teller sh
 #!/bin/sh
 export FOO_BAR='foo'
 export PRINT_NAME='linus'
 export FOO_BAZ='baz'
 export PRINT_MOOD='happy'
 
 
-$ teller -c teller.yml env
+$ teller env
 FOO_BAR=foo
 PRINT_NAME=linus
 FOO_BAZ=baz

teller-cli/tests/cmd/redact.in/one.env

@@ -0,0 +1,3 @@
+PRINT_NAME=linus
+FOO_BAR=foo
+EMPTY=""

teller-cli/tests/cmd/redact.in/text.txt

@@ -0,0 +1,2 @@
+hello linus,
+I just read that you made linux.

teller-cli/tests/cmd/redact.in/two.env

@@ -0,0 +1,2 @@
+PRINT_MOOD=happy
+FOO_BAZ=baz

teller-cli/tests/cmd/redact.trycmd

@@ -0,0 +1,6 @@
+```console
+$ teller redact --in text.txt
+hello [REDACTED],
+I just read that you made linux.
+
+```

teller-cli/tests/cmd/run.trycmd

@@ -1,5 +1,5 @@
 ```console
-$ teller -c teller.yml run --reset --shell -- node index.js
+$ teller run --reset --shell -- node index.js
 hello from nodejs
 linus
 happy

teller-cli/tests/cmd/scan.trycmd

@@ -1,13 +1,13 @@
 ```console
-$ teller -c teller.yml scan
+$ teller scan
 scanning for 4 item(s) in .
  2:9   ./one.env  fo***  dotenv  one.env 
  2:9   ./two.env  ba***  dotenv  two.env 
  1:12  ./two.env  ha***  dotenv  two.env 
  1:12  ./one.env  li***  dotenv  one.env 
 found 4 result(s)
 
-$ teller -c teller.yml scan -a
+$ teller scan -a
 scanning for 4 item(s) in .
  2:9   ./one.env          fo***  dotenv  one.env 
  2:9   ./two.env          ba***  dotenv  two.env 
@@ -16,7 +16,7 @@ scanning for 4 item(s) in .
  1:12  ./one.env          li***  dotenv  one.env 
 found 5 result(s)
 
-$ teller -c teller.yml scan -b
+$ teller scan -b
 scanning for 4 item(s) in .
  2:9   ./one.env      fo***  dotenv  one.env 
  2:9   ./two.env      ba***  dotenv  two.env 

teller-cli/tests/cmd/template.in/.teller.yml

@@ -0,0 +1,11 @@
+providers:
+  dot1:
+    kind: dotenv
+    maps:
+      - id: one
+        path: one.env
+  dot2:
+    kind: dotenv
+    maps:
+      - id: two
+        path: two.env

teller-cli/tests/cmd/template.trycmd

@@ -1,5 +1,5 @@
 ```console
-$ teller -c teller.yml template --in config-templ.t
+$ teller template --in config-templ.t
 production_var: linus
 production_mood: happy
 

teller-core/src/redact.rs

@@ -39,13 +39,16 @@ impl Redactor {
         if self.has_match(message, kvs) {
             let mut redacted = message.to_string();
             for kv in kvs {
-                redacted = redacted.replace(
-                    &kv.value,
-                    kv.meta
-                        .as_ref()
-                        .and_then(|m| m.redact_with.as_ref())
-                        .map_or("[REDACTED]", |s| s.as_str()),
-                );
+                // only replace values with at least 2 chars
+                if kv.value.len() >= 2 {
+                    redacted = redacted.replace(
+                        &kv.value,
+                        kv.meta
+                            .as_ref()
+                            .and_then(|m| m.redact_with.as_ref())
+                            .map_or("[REDACTED]", |s| s.as_str()),
+                    );
+                }
             }
             Cow::Owned(redacted)
         } else {