[ffx] Fixed log check in strict mode

The handling of env vars in strict mode was incorrect (even after
fxr/1177196); one consequence was that the `log.enabled` compiled-in
default was being ignored, resulting in no logging occurring in
strict mode (which may actually be the right behavior, but it should
be explicit rather than dependent on a bug).

Fixed: 380520089
Change-Id: I30452890521317b14f686fa542fb311af0e3f4aa
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1178489
Commit-Queue: Steven Grady <[email protected]>
Reviewed-by: Casey Dahlin <[email protected]>

Author: Steven Grady

src/developer/ffx/config/src/api/query.rs

@@ -148,7 +148,7 @@ impl<'a> ConfigQuery<'a> {
                 .map_err(|e| ConfigError::new(e))?
                 .recursive_map(&|val| build(&ctx, val))
                 .recursive_map(&|val| workspace(&ctx, val));
-            if let Some(ref v) = cv.0 {
+            let cv = if let Some(ref v) = cv.0 {
                 // We want recursive mapping here, so that arrays that contain
                 // env variables get handled correctly.
                 let ev_res = cv.clone().recursive_map(&|val| env_var_strict(val));
@@ -163,9 +163,13 @@ impl<'a> ConfigQuery<'a> {
                         self.name.unwrap(),
                     )});
                 }
-            }
+                ev_res
+            } else {
+                cv
+            };
             // The problem is not with an env variable; keep going
-            let cv = cv.recursive_map(&T::handle_arrays).recursive_map(&validate_type::<T>);
+            let cv = cv.recursive_map(&T::handle_arrays);
+            let cv = cv.recursive_map(&validate_type::<T>);
             T::try_convert(cv)
         } else {
             let cv = self
@@ -202,15 +206,18 @@ impl<'a> ConfigQuery<'a> {
                 .map_err(|e| ConfigError::new(e))?
                 .recursive_map(&|val| build(&ctx, val))
                 .recursive_map(&|val| workspace(&ctx, val));
-            if let Some(ref v) = cv.0 {
+            let cv = if let Some(ref v) = cv.0 {
                 let ev_res = cv.clone().recursive_map(&|val| env_var_strict(val));
                 if ev_res.0.is_none() {
                     return Err(ConfigError::BadValue{ value: v.clone(), reason: format!(
                         "The value for {} contains a variable mapping, which is ignored in strict mode",
                         self.name.unwrap(),
                     )});
                 }
-            }
+                ev_res
+            } else {
+                cv
+            };
             // The problem is not with an env variable; keep going
             let cv = cv.recursive_map(&T::handle_arrays).recursive_map(&file_check);
             T::try_convert(cv)