scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-10-09 03:20:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

dedupe dense settings resolution in create

Browse source
This commit is contained in:
Bryan Helmkamp 2026-04-23 16:35:04 -04:00
parent cdec45cbc3
commit 8eb92b5a74
No known key found for this signature in database
1 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/crates/fabro-workflow/src/operations/create.rs
View file

@ -16,7 +16,7 @@ use fabro_sandbox::daytona::detect_repo_info;
use fabro_store::Database;
use fabro_template::{TemplateContext, render as render_template};
use fabro_types::settings::SettingsLayer;
use fabro_types::settings::run::RunMode;
use fabro_types::settings::run::{RunMode, RunNamespace};
use fabro_types::{RunId, RunProvenance};
use fabro_util::json::normalize_json_value;
use tokio::task::spawn_blocking;
@ -84,11 +84,12 @@ pub async fn create(
cwd: request.cwd,
})
.map_err(|err| Error::Parse(err.to_string()))?;
let settings = resolved.settings.clone();
let resolved_settings = WorkflowSettingsBuilder::from_layer(&settings)
.map_err(|errors| Error::Precondition(errors.to_string()))?;
if WorkflowSettingsBuilder::from_layer(&resolved.settings).map_or(true, |settings| {
settings.run.execution.mode != RunMode::DryRun
}) {
validate_sandbox_provider(&resolved.settings)?;
if resolved_settings.run.execution.mode != RunMode::DryRun {
validate_sandbox_provider(&resolved_settings.run)?;
}
let CreateRunInput {
@ -107,9 +108,6 @@ pub async fn create(
configured_providers,
} = request;
let settings = resolved.settings.clone();
let resolved_settings = WorkflowSettingsBuilder::from_layer(&settings)
.map_err(|errors| Error::Precondition(errors.to_string()))?;
let run_id = run_id.unwrap_or_else(RunId::new);
let storage = Storage::new(storage_root);
let run_dir = storage.run_scratch(&run_id).root().to_path_buf();
@ -271,12 +269,8 @@ fn store_error(err: impl std::fmt::Display) -> Error {
Error::engine(err.to_string())
}
fn validate_sandbox_provider(settings: &SettingsLayer) -> Result<(), Error> {
let resolved = WorkflowSettingsBuilder::from_layer(settings)
.map_err(|errors| Error::Precondition(errors.to_string()))?;
resolved
.run
.sandbox
fn validate_sandbox_provider(run: &RunNamespace) -> Result<(), Error> {
run.sandbox
.provider
.parse::<SandboxProvider>()
.map_err(|err| Error::Precondition(format!("Invalid sandbox provider: {err}")))?;