Skip to content

Support multiple files in SENTRY_DOTENV_PATH #2454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 19, 2025
Merged

Support multiple files in SENTRY_DOTENV_PATH #2454

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
687e5ae
Support multiple files in SENTRY_DOTENV_PATH
Apr 8, 2025
95f0a3a
Introduced new variable for multiple .env files
Apr 9, 2025
326e10d
Clean up `SENTRY_DOTENV_PATHS` code
szokeasaurusrex May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 24 additions & 17 deletions src/utils/system.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ use std::panic::{self, Location, PanicHookInfo};
use std::process;
use std::{env, thread};

use anyhow::{Error, Result};
use anyhow::{Context as _, Error, Result};
use console::style;
use dotenvy::Result as DotenvResult;
use lazy_static::lazy_static;
use regex::{Captures, Regex};

Expand Down Expand Up @@ -101,7 +100,7 @@ pub fn set_panic_hook() {
pub struct QuietExit(pub i32);

/// Loads a .env file
pub fn load_dotenv() -> DotenvResult<()> {
pub fn load_dotenv() -> Result<()> {
let load_dotenv_unset = env::var("SENTRY_LOAD_DOTENV")
.map(|x| x.as_str() != "1")
.unwrap_or(false);
Expand All @@ -110,21 +109,29 @@ pub fn load_dotenv() -> DotenvResult<()> {
return Ok(());
}

match env::var("SENTRY_DOTENV_PATH") {
Ok(path) => dotenvy::from_path(path),
Err(_) => dotenvy::dotenv().map(|_| ()),
let custom_dotenv_paths: &[_] = if let Ok(path) = env::var("SENTRY_DOTENV_PATH") {
&[path]
} else if let Ok(paths) = env::var("SENTRY_DOTENV_PATHS") {
&paths
.split(",")
.map(|path| path.trim())
.filter(|path| !path.is_empty())
.map(|path| path.to_string())
.collect::<Vec<_>>()
} else {
// Fallback to default dotenv
dotenvy::dotenv()
.map_or_else(|e| if e.not_found() { Ok(()) } else { Err(e) }, |_| Ok(()))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tbh I think this map_or_else is really hard to understand, but it was already that way before. This isn't a blocker IMO.

.context("We found a .env file, but failed to load it.")?;
return Ok(());
};

for path in custom_dotenv_paths {
dotenvy::from_path_override(path)
.with_context(|| format!("Failed to load custom .env file: {}", path))?;
}
.map_or_else(
|error| {
// We only propagate errors if the .env file was found and failed to load.
if error.not_found() {
Ok(())
} else {
Err(error)
}
},
|_| Ok(()),
)

Ok(())
}

/// Custom panic hook for Sentry CLI
Expand Down