forked from extern/nushell
Use environment variable for env_conversions (#4566)
* Handle string->value env conv. with env. var. Also adds the environment variable for Path/PATH and removes it from config. * Simplify getting the string->value conversion * Refactor env conversion into its own function * Use env var for to_string conversion; Remove conf * Fix indentation in default config
This commit is contained in:
Jakub Žádník
GitHub
@ -1,6 +1,7 @@
|
||||
use std::collections::HashMap;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use nu_protocol::ast::PathMember;
|
||||
use nu_protocol::engine::{EngineState, Stack};
|
||||
use nu_protocol::{Config, PipelineData, ShellError, Value};
|
||||
|
||||
@ -11,63 +12,36 @@ const ENV_SEP: &str = ";";
|
||||
#[cfg(not(windows))]
|
||||
const ENV_SEP: &str = ":";
|
||||
|
||||
const ENV_CONVERSIONS: &str = "ENV_CONVERSIONS";
|
||||
|
||||
enum ConversionResult {
|
||||
Ok(Value),
|
||||
ConversionError(ShellError), // Failure during the conversion itself
|
||||
GeneralError(ShellError), // Other error not directly connected to running the conversion
|
||||
CellPathError, // Error looking up the ENV_VAR.to_/from_string fields in $env.ENV_CONVERSIONS
|
||||
}
|
||||
|
||||
/// Translate environment variables from Strings to Values. Requires config to be already set up in
|
||||
/// case the user defined custom env conversions in config.nu.
|
||||
///
|
||||
/// It returns Option instead of Result since we do want to translate all the values we can and
|
||||
/// skip errors. This function is called in the main() so we want to keep running, we cannot just
|
||||
/// exit.
|
||||
pub fn convert_env_values(
|
||||
engine_state: &mut EngineState,
|
||||
stack: &Stack,
|
||||
config: &Config,
|
||||
) -> Option<ShellError> {
|
||||
pub fn convert_env_values(engine_state: &mut EngineState, stack: &Stack) -> Option<ShellError> {
|
||||
let mut error = None;
|
||||
|
||||
let mut new_scope = HashMap::new();
|
||||
|
||||
for (name, val) in &engine_state.env_vars {
|
||||
if let Some(env_conv) = config.env_conversions.get(name) {
|
||||
if let Some((block_id, from_span)) = env_conv.from_string {
|
||||
let val_span = match val.span() {
|
||||
Ok(sp) => sp,
|
||||
Err(e) => {
|
||||
error = error.or(Some(e));
|
||||
continue;
|
||||
}
|
||||
};
|
||||
|
||||
let block = engine_state.get_block(block_id);
|
||||
|
||||
if let Some(var) = block.signature.get_positional(0) {
|
||||
let mut stack = stack.gather_captures(&block.captures);
|
||||
if let Some(var_id) = &var.var_id {
|
||||
stack.add_var(*var_id, val.clone());
|
||||
}
|
||||
|
||||
let result =
|
||||
eval_block(engine_state, &mut stack, block, PipelineData::new(val_span));
|
||||
|
||||
match result {
|
||||
Ok(data) => {
|
||||
let val = data.into_value(val_span);
|
||||
new_scope.insert(name.to_string(), val);
|
||||
}
|
||||
Err(e) => error = error.or(Some(e)),
|
||||
}
|
||||
} else {
|
||||
error = error.or_else(|| {
|
||||
Some(ShellError::MissingParameter(
|
||||
"block input".into(),
|
||||
from_span,
|
||||
))
|
||||
});
|
||||
}
|
||||
} else {
|
||||
new_scope.insert(name.to_string(), val.clone());
|
||||
match get_converted_value(engine_state, stack, name, val, "from_string") {
|
||||
ConversionResult::Ok(v) => {
|
||||
let _ = new_scope.insert(name.to_string(), v);
|
||||
}
|
||||
ConversionResult::ConversionError(e) => error = error.or(Some(e)),
|
||||
ConversionResult::GeneralError(_) => continue,
|
||||
ConversionResult::CellPathError => {
|
||||
let _ = new_scope.insert(name.to_string(), val.clone());
|
||||
}
|
||||
} else {
|
||||
new_scope.insert(name.to_string(), val.clone());
|
||||
}
|
||||
}
|
||||
|
||||
@ -86,36 +60,11 @@ pub fn env_to_string(
|
||||
stack: &Stack,
|
||||
config: &Config,
|
||||
) -> Result<String, ShellError> {
|
||||
if let Some(env_conv) = config.env_conversions.get(env_name) {
|
||||
if let Some((block_id, to_span)) = env_conv.to_string {
|
||||
let block = engine_state.get_block(block_id);
|
||||
|
||||
if let Some(var) = block.signature.get_positional(0) {
|
||||
let val_span = value.span()?;
|
||||
let mut stack = stack.gather_captures(&block.captures);
|
||||
|
||||
if let Some(var_id) = &var.var_id {
|
||||
stack.add_var(*var_id, value);
|
||||
}
|
||||
|
||||
Ok(
|
||||
// This one is OK to fail: We want to know if custom conversion is working
|
||||
eval_block(engine_state, &mut stack, block, PipelineData::new(val_span))?
|
||||
.into_value(val_span)
|
||||
.as_string()?,
|
||||
)
|
||||
} else {
|
||||
Err(ShellError::MissingParameter("block input".into(), to_span))
|
||||
}
|
||||
} else {
|
||||
// Do not fail here. Must succeed, otherwise setting a non-string env var would constantly
|
||||
// throw errors when running externals etc.
|
||||
Ok(value.into_string(ENV_SEP, config))
|
||||
}
|
||||
} else {
|
||||
// Do not fail here. Must succeed, otherwise setting a non-string env var would constantly
|
||||
// throw errors when running externals etc.
|
||||
Ok(value.into_string(ENV_SEP, config))
|
||||
match get_converted_value(engine_state, stack, env_name, &value, "to_string") {
|
||||
ConversionResult::Ok(v) => Ok(v.as_string()?),
|
||||
ConversionResult::ConversionError(e) => Err(e),
|
||||
ConversionResult::GeneralError(e) => Err(e),
|
||||
ConversionResult::CellPathError => Ok(value.into_string(ENV_SEP, config)),
|
||||
}
|
||||
}
|
||||
|
||||
@ -165,3 +114,71 @@ pub fn current_dir_str(engine_state: &EngineState, stack: &Stack) -> Result<Stri
|
||||
pub fn current_dir(engine_state: &EngineState, stack: &Stack) -> Result<PathBuf, ShellError> {
|
||||
current_dir_str(engine_state, stack).map(PathBuf::from)
|
||||
}
|
||||
|
||||
fn get_converted_value(
|
||||
engine_state: &EngineState,
|
||||
stack: &Stack,
|
||||
name: &str,
|
||||
orig_val: &Value,
|
||||
direction: &str,
|
||||
) -> ConversionResult {
|
||||
if let Some(env_conversions) = stack.get_env_var(engine_state, ENV_CONVERSIONS) {
|
||||
let env_span = match env_conversions.span() {
|
||||
Ok(span) => span,
|
||||
Err(e) => {
|
||||
return ConversionResult::GeneralError(e);
|
||||
}
|
||||
};
|
||||
let val_span = match orig_val.span() {
|
||||
Ok(span) => span,
|
||||
Err(e) => {
|
||||
return ConversionResult::GeneralError(e);
|
||||
}
|
||||
};
|
||||
|
||||
let path_members = &[
|
||||
PathMember::String {
|
||||
val: name.to_string(),
|
||||
span: env_span,
|
||||
},
|
||||
PathMember::String {
|
||||
val: direction.to_string(),
|
||||
span: env_span,
|
||||
},
|
||||
];
|
||||
|
||||
if let Ok(Value::Block {
|
||||
val: block_id,
|
||||
span: from_span,
|
||||
..
|
||||
}) = env_conversions.follow_cell_path(path_members)
|
||||
{
|
||||
let block = engine_state.get_block(block_id);
|
||||
|
||||
if let Some(var) = block.signature.get_positional(0) {
|
||||
let mut stack = stack.gather_captures(&block.captures);
|
||||
if let Some(var_id) = &var.var_id {
|
||||
stack.add_var(*var_id, orig_val.clone());
|
||||
}
|
||||
|
||||
let result =
|
||||
eval_block(engine_state, &mut stack, block, PipelineData::new(val_span));
|
||||
|
||||
match result {
|
||||
Ok(data) => ConversionResult::Ok(data.into_value(val_span)),
|
||||
Err(e) => ConversionResult::ConversionError(e),
|
||||
}
|
||||
} else {
|
||||
// This one is OK to fail: We want to know if custom conversion is working
|
||||
ConversionResult::ConversionError(ShellError::MissingParameter(
|
||||
"block input".into(),
|
||||
from_span,
|
||||
))
|
||||
}
|
||||
} else {
|
||||
ConversionResult::CellPathError
|
||||
}
|
||||
} else {
|
||||
ConversionResult::CellPathError
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user