9046091164
This adds a test to make sure that the default value of the auto update setting is always true. We manually re-applied the broken code from last week, and confirmed that this test fails with that code. Release Notes: - N/A --------- Co-authored-by: Ben Kunkle <ben@zed.dev> Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
85 lines
2.5 KiB
Rust
85 lines
2.5 KiB
Rust
use crate::environment::EnvironmentErrorMessage;
|
|
use std::process::ExitStatus;
|
|
|
|
#[cfg(not(any(target_os = "windows", test, feature = "test-support")))]
|
|
use {collections::HashMap, std::path::Path, util::ResultExt};
|
|
|
|
#[derive(Clone)]
|
|
pub enum DirenvError {
|
|
NotFound,
|
|
FailedRun,
|
|
NonZeroExit(ExitStatus, Vec<u8>),
|
|
InvalidJson,
|
|
}
|
|
|
|
impl From<DirenvError> for Option<EnvironmentErrorMessage> {
|
|
fn from(value: DirenvError) -> Self {
|
|
match value {
|
|
DirenvError::NotFound => None,
|
|
DirenvError::FailedRun | DirenvError::NonZeroExit(_, _) => {
|
|
Some(EnvironmentErrorMessage(String::from(
|
|
"Failed to run direnv. See logs for more info",
|
|
)))
|
|
}
|
|
DirenvError::InvalidJson => Some(EnvironmentErrorMessage(String::from(
|
|
"Direnv returned invalid json. See logs for more info",
|
|
))),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(not(any(target_os = "windows", test, feature = "test-support")))]
|
|
pub async fn load_direnv_environment(
|
|
env: &HashMap<String, String>,
|
|
dir: &Path,
|
|
) -> Result<HashMap<String, Option<String>>, DirenvError> {
|
|
let Ok(direnv_path) = which::which("direnv") else {
|
|
return Err(DirenvError::NotFound);
|
|
};
|
|
|
|
let args = &["export", "json"];
|
|
let Some(direnv_output) = smol::process::Command::new(&direnv_path)
|
|
.args(args)
|
|
.envs(env)
|
|
.env("TERM", "dumb")
|
|
.current_dir(dir)
|
|
.output()
|
|
.await
|
|
.log_err()
|
|
else {
|
|
return Err(DirenvError::FailedRun);
|
|
};
|
|
|
|
if !direnv_output.status.success() {
|
|
log::error!(
|
|
"Loading direnv environment failed ({}), stderr: {}",
|
|
direnv_output.status,
|
|
String::from_utf8_lossy(&direnv_output.stderr)
|
|
);
|
|
return Err(DirenvError::NonZeroExit(
|
|
direnv_output.status,
|
|
direnv_output.stderr,
|
|
));
|
|
}
|
|
|
|
let output = String::from_utf8_lossy(&direnv_output.stdout);
|
|
if output.is_empty() {
|
|
// direnv outputs nothing when it has no changes to apply to environment variables
|
|
return Ok(HashMap::default());
|
|
}
|
|
|
|
match serde_json::from_str(&output) {
|
|
Ok(env) => Ok(env),
|
|
Err(err) => {
|
|
log::error!(
|
|
"json parse error {}, while parsing output of `{} {}`:\n{}",
|
|
err,
|
|
direnv_path.display(),
|
|
args.join(" "),
|
|
output
|
|
);
|
|
Err(DirenvError::InvalidJson)
|
|
}
|
|
}
|
|
}
|