sentry-cli icon indicating copy to clipboard operation
sentry-cli copied to clipboard

Skip global config file if SENTRY_SKIP_GLOBAL_CONFIG exists

Open DmitryMoodys opened this issue 2 years ago • 2 comments

Ignore global config if SENTRY_SKIP_GLOBAL_CONFIG exists

Issue: https://github.com/getsentry/sentry-cli/issues/1607

DmitryMoodys avatar May 15 '23 21:05 DmitryMoodys

You can simplify this to:

diff --git src/config.rs src/config.rs
index 47d0f10..31b2616 100644
--- src/config.rs
+++ src/config.rs
@@ -500,20 +500,14 @@ fn load_global_config_file() -> Result<(PathBuf, Ini)> {
 }
 
 fn load_cli_config() -> Result<(PathBuf, Ini)> {
-    let mut rv = Ini::new();
-    let path: PathBuf;
-
-    match env::var("SENTRY_SKIP_GLOBAL_CONFIG") {
-        Ok(_) => {
-            path = find_project_config_file()
-                .ok_or_else(|| Error::msg("Failed to find project config file"))?;
-        }
-        Err(_) => {
-            let (global_filename, global_rv) = load_global_config_file()?;
-            path = global_filename;
-            rv = global_rv;
-        }
-    }
+    let (mut path, mut rv) = if env::var("SENTRY_SKIP_GLOBAL_CONFIG")
+        .map(|x| x.as_str() == "1")
+        .unwrap_or(false)
+    {
+        (PathBuf::new(), Ini::new())
+    } else {
+        load_global_config_file()?
+    };
 
     if let Some(project_config_path) = find_project_config_file() {
         let file_desc = format!(
@@ -529,6 +523,7 @@ fn load_cli_config() -> Result<(PathBuf, Ini)> {
                 rv.set_to(section, key.to_string(), value.to_owned());
             }
         }
+        path = project_config_path;
     }
 
     if let Ok(prop_path) = env::var("SENTRY_PROPERTIES") {

However, this change will break the behavior of sentry-cli login, as it's not possible to create a file from an empty PathBuf. We should most likely use cwd instead and log the warn/info about the skipping part + new default path used.

kamilogorek avatar May 16 '23 09:05 kamilogorek

This pull request has gone three weeks without activity. In another week, I will close it.

But! If you comment or otherwise update it, I will reset the clock, and if you label it Status: Backlog or Status: In Progress, I will leave it alone ... forever!


"A weed is but an unloved flower." ― Ella Wheeler Wilcox 🥀

github-actions[bot] avatar Jun 07 '23 00:06 github-actions[bot]