fix: Fix PR Comments

Author: dk19y

.gitignore

@@ -49,3 +49,5 @@ book/
 .env*
 
 run-build.sh
+# Amazon Q CLI files
+.amazonq/

Cargo.lock

@@ -16,6 +16,7 @@ default = []
 # sentry = ["dep:sentry-tracing"]
 
 [dependencies]
+fig_os_shim.workspace = true
 fig_util.workspace = true
 parking_lot.workspace = true
 thiserror.workspace = true

crates/fig_log/Cargo.toml

@@ -3,7 +3,6 @@ use std::path::Path;
 use std::sync::Mutex;
 
 use fig_util::CHAT_BINARY_NAME;
-use fig_util::env_var::Q_LOG_LEVEL;
 use thiserror::Error;
 use tracing::info;
 use tracing::level_filters::LevelFilter;
@@ -193,7 +192,9 @@ pub fn initialize_logging<T: AsRef<Path>>(args: LogArgs<T>) -> Result<LogGuard,
 /// Returns a string identifying the current log level.
 pub fn get_log_level() -> String {
     Q_LOG_LEVEL_GLOBAL.lock().unwrap().clone().unwrap_or_else(|| {
-        std::env::var(Q_LOG_LEVEL).unwrap_or_else(|_| DEFAULT_FILTER.to_string()) // ALLOWED: fig_log doesn't have fig_os_shim dependency
+        fig_os_shim::Env::new()
+            .q_log_level()
+            .unwrap_or_else(|_| DEFAULT_FILTER.to_string())
     })
 }
 
@@ -245,7 +246,7 @@ fn create_filter_layer() -> EnvFilter {
         .lock()
         .unwrap()
         .clone()
-        .or_else(|| std::env::var(Q_LOG_LEVEL).ok()); // ALLOWED: fig_log doesn't have fig_os_shim dependency
+        .or_else(|| fig_os_shim::Env::new().q_log_level().ok());
 
     match log_level {
         Some(level) => EnvFilter::builder()

crates/fig_log/src/lib.rs

@@ -18,6 +18,7 @@ workspace = true
 bytes.workspace = true
 cfg-if.workspace = true
 cookie = "0.18.0"
+fig_os_shim.workspace = true
 fig_settings.workspace = true
 fig_util.workspace = true
 reqwest_cookie_store = "0.8.0"

crates/fig_request/Cargo.toml

@@ -23,7 +23,8 @@ pub fn create_default_root_cert_store() -> RootCertStore {
         let _ = root_cert_store.add(cert);
     }
 
-    let custom_cert = std::env::var("Q_CUSTOM_CERT") // ALLOWED: fig_request doesn't have fig_os_shim dependency
+    let custom_cert = fig_os_shim::Env::new()
+        .q_custom_cert()
         .ok()
         .or_else(|| fig_settings::state::get_string("Q_CUSTOM_CERT").ok().flatten());