Refacto env vars configuration management.

jcamiel · jcamiel · commit f543f8d09576 · 2026-04-10T17:08:58.000+02:00
diff --git a/packages/hurl/src/cli/options/args.rs b/packages/hurl/src/cli/options/args.rs
@@ -190,13 +190,9 @@ fn parse_arg_matches(
     let digest = digest(arg_matches, default_options.digest);
     let error_format = error_format(arg_matches, default_options.error_format)?;
     let file_root = file_root(arg_matches, default_options.file_root);
-    let (follow_location, follow_location_trusted) = follow_location(
-        arg_matches,
-        (
-            default_options.follow_location,
-            default_options.follow_location_trusted,
-        ),
-    );
+    let follow_location = follow_location(arg_matches, default_options.follow_location);
+    let follow_location_trusted =
+        follow_location_trusted(arg_matches, default_options.follow_location_trusted);
     let from_entry = from_entry(arg_matches, default_options.from_entry);
     let headers = headers(arg_matches, default_options.headers);
     let html_dir = html_dir(arg_matches, default_options.html_dir)?;
@@ -241,23 +237,7 @@ fn parse_arg_matches(
     let user = user(arg_matches, default_options.user);
     let user_agent = user_agent(arg_matches, default_options.user_agent);
     let variables = variables(arg_matches, default_options.variables)?;
-
-    let verbose = verbose(
-        arg_matches,
-        default_options.verbosity == Some(Verbosity::Verbose),
-    );
-    let very_verbose = very_verbose(
-        arg_matches,
-        default_options.verbosity == Some(Verbosity::Debug),
-    );
-    // --verbose and --very-verbose flags are prioritized over --verbosity enum.
-    let verbosity = if verbose {
-        Some(Verbosity::Verbose)
-    } else if very_verbose {
-        Some(Verbosity::Debug)
-    } else {
-        verbosity(arg_matches, default_options.verbosity)
-    };
+    let verbosity = verbosity(arg_matches, default_options.verbosity);
 
     Ok(CliOptions {
         aws_sigv4,
@@ -387,12 +367,12 @@ fn client_key_file(
 
 /// Returns true if Hurl output uses ANSI code and false otherwise.
 fn color(arg_matches: &ArgMatches, default_value: bool) -> bool {
-    if has_flag(arg_matches, "color") {
-        return true;
-    }
     if has_flag(arg_matches, "no_color") {
         return false;
     }
+    if has_flag(arg_matches, "color") {
+        return true;
+    }
     default_value
 }
 
@@ -471,12 +451,18 @@ fn file_root(arg_matches: &ArgMatches, default_value: Option<String>) -> Option<
     get::<String>(arg_matches, "file_root").or(default_value)
 }
 
-fn follow_location(arg_matches: &ArgMatches, default_value: (bool, bool)) -> (bool, bool) {
-    let follow_location = has_flag(arg_matches, "follow_location")
-        || has_flag(arg_matches, "follow_location_trusted");
-    let follow_location_trusted = has_flag(arg_matches, "follow_location_trusted");
-    if follow_location || follow_location_trusted {
-        (follow_location, follow_location_trusted)
+fn follow_location(arg_matches: &ArgMatches, default_value: bool) -> bool {
+    if has_flag(arg_matches, "follow_location") || has_flag(arg_matches, "follow_location_trusted")
+    {
+        true
+    } else {
+        default_value
+    }
+}
+
+fn follow_location_trusted(arg_matches: &ArgMatches, default_value: bool) -> bool {
+    if has_flag(arg_matches, "follow_location_trusted") {
+        true
     } else {
         default_value
     }
@@ -973,25 +959,15 @@ fn variables(
 }
 
 fn verbosity(arg_matches: &ArgMatches, default_value: Option<Verbosity>) -> Option<Verbosity> {
-    match get::<String>(arg_matches, "verbosity") {
-        Some(value) => Verbosity::from_str(&value).ok(),
-        None => default_value,
-    }
-}
-
-fn verbose(arg_matches: &ArgMatches, default_value: bool) -> bool {
     if has_flag(arg_matches, "verbose") {
-        true
-    } else {
-        default_value
-    }
-}
-
-fn very_verbose(arg_matches: &ArgMatches, default_value: bool) -> bool {
-    if has_flag(arg_matches, "very_verbose") {
-        true
+        Some(Verbosity::Verbose)
+    } else if has_flag(arg_matches, "very_verbose") {
+        Some(Verbosity::Debug)
     } else {
-        default_value
+        match get::<String>(arg_matches, "verbosity") {
+            Some(value) => Verbosity::from_str(&value).ok(),
+            None => default_value,
+        }
     }
 }
 
diff --git a/packages/hurl/src/cli/options/context.rs b/packages/hurl/src/cli/options/context.rs
@@ -262,22 +262,26 @@ impl RunContext {
             .collect()
     }
 
-    /// Returns `Some(true)` if ANSI escape codes are explicitly enabled, `Some(false)` if ANSI escape
-    /// codes are explicitly disabled, `None` otherwise. .
-    pub fn use_color_env_var(&self) -> Option<bool> {
-        // According to the NO_COLOR spec, any presence of the variable should disable color, but to
-        // maintain backward compatibility with code < 7.1.0, we check that the NO_COLOR env is at
-        // least not empty.
+    /// Returns `Some(true)` if color is set through env, `Some(false)` if color is disable through env,
+    /// `None` otherwise.
+    pub fn color_env_var(&self) -> Option<bool> {
+        self.get_env_var_bool(HURL_COLOR)
+    }
+
+    /// Returns `Some(true)` if no color is set through env, `Some(false)` if no color is disable through env,
+    /// `None` otherwise.
+    pub fn no_color_env_var(&self) -> Option<bool> {
         if let Some(v) = self.env_vars.get("NO_COLOR") {
+            // According to the NO_COLOR spec, any presence of the variable should disable color, but to
+            // maintain backward compatibility with code < 7.1.0, we check that the NO_COLOR env is at
+            // least not empty.
             if !v.is_empty() {
-                Some(false)
+                Some(true)
             } else {
                 None
             }
-        } else if let Some(v) = self.get_env_var_bool(HURL_NO_COLOR) {
-            Some(!v)
         } else {
-            self.get_env_var_bool(HURL_COLOR)
+            self.get_env_var_bool(HURL_NO_COLOR)
         }
     }
 
@@ -367,28 +371,16 @@ mod tests {
 
         let env_vars = HashMap::from([("A".to_string(), "B".to_string())]);
         let ctx = RunContext::new(env_vars, stdin_term, stdout_term, stderr_term);
-        assert!(ctx.use_color_env_var().is_none());
+        assert!(ctx.color_env_var().is_none());
     }
 
     #[test]
-    fn context_has_env_var_color() {
+    fn context_has_color_env_var() {
         let stdin_term = true;
         let stdout_term = true;
         let stderr_term = true;
 
         let data = [
-            ("NO_COLOR", "0", Some(false)),
-            ("NO_COLOR", "1", Some(false)),
-            ("NO_COLOR", "true", Some(false)),
-            ("NO_COLOR", "TRUE", Some(false)),
-            ("NO_COLOR", "false", Some(false)),
-            ("NO_COLOR", "FALSE", Some(false)),
-            ("HURL_NO_COLOR", "0", Some(true)),
-            ("HURL_NO_COLOR", "1", Some(false)),
-            ("HURL_NO_COLOR", "true", Some(false)),
-            ("HURL_NO_COLOR", "TRUE", Some(false)),
-            ("HURL_NO_COLOR", "false", Some(true)),
-            ("HURL_NO_COLOR", "FALSE", Some(true)),
             ("HURL_COLOR", "0", Some(false)),
             ("HURL_COLOR", "1", Some(true)),
             ("HURL_COLOR", "true", Some(true)),
@@ -401,7 +393,41 @@ mod tests {
             let env_vars = HashMap::from([(name.to_string(), value.to_string())]);
             let ctx = RunContext::new(env_vars, stdin_term, stdout_term, stderr_term);
             assert_eq!(
-                ctx.use_color_env_var(),
+                ctx.color_env_var(),
+                expected,
+                "test env var {}={}",
+                name,
+                value
+            );
+        }
+    }
+
+    #[test]
+    fn context_has_no_color_env_var() {
+        let stdin_term = true;
+        let stdout_term = true;
+        let stderr_term = true;
+
+        let data = [
+            ("NO_COLOR", "0", Some(true)),
+            ("NO_COLOR", "1", Some(true)),
+            ("NO_COLOR", "true", Some(true)),
+            ("NO_COLOR", "TRUE", Some(true)),
+            ("NO_COLOR", "false", Some(true)),
+            ("NO_COLOR", "FALSE", Some(true)),
+            ("HURL_NO_COLOR", "0", Some(false)),
+            ("HURL_NO_COLOR", "1", Some(true)),
+            ("HURL_NO_COLOR", "true", Some(true)),
+            ("HURL_NO_COLOR", "TRUE", Some(true)),
+            ("HURL_NO_COLOR", "false", Some(false)),
+            ("HURL_NO_COLOR", "FALSE", Some(false)),
+        ];
+
+        for (name, value, expected) in data {
+            let env_vars = HashMap::from([(name.to_string(), value.to_string())]);
+            let ctx = RunContext::new(env_vars, stdin_term, stdout_term, stderr_term);
+            assert_eq!(
+                ctx.no_color_env_var(),
                 expected,
                 "test env var {}={}",
                 name,
diff --git a/packages/hurl/src/cli/options/env_vars.rs b/packages/hurl/src/cli/options/env_vars.rs
