scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-09-16 23:43:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor(workflow): make bundled child workflows authoritative

Browse source
This commit is contained in:
Bryan Helmkamp 2026-04-05 20:13:00 -04:00
parent bd70f805be
commit 2d0cacaa99
No known key found for this signature in database
1 changed files with 56 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
lib/crates/fabro-workflow/src/handler/manager_loop.rs
View file

@ -90,18 +90,23 @@ fn parse_child_graph(
.or_else(|| node.attrs.get("stack.child_dotfile"))
.and_then(|v| v.as_str())
{
let workflow = if let (Some(bundle), Some(current_workflow_path)) =
(&services.workflow_bundle, &services.workflow_path)
{
bundle
.resolve_child(current_workflow_path, path)
.cloned()
.map_or_else(
|| WorkflowInput::Path(PathBuf::from(path)),
WorkflowInput::Bundled,
)
} else {
WorkflowInput::Path(PathBuf::from(path))
let workflow = match (&services.workflow_bundle, &services.workflow_path) {
(Some(bundle), Some(current_workflow_path)) => WorkflowInput::Bundled(
bundle
.resolve_child(current_workflow_path, path)
.cloned()
.ok_or_else(|| {
FabroError::handler(format!(
"child workflow is not present in the persisted bundle: {path}"
))
})?,
),
(Some(_), None) => {
return Err(FabroError::engine(
"workflow bundle is missing the current workflow path".to_string(),
));
}
(None, _) => WorkflowInput::Path(PathBuf::from(path)),
};
let workflow_path = match &workflow {
WorkflowInput::Bundled(workflow) => Some(workflow.logical_path.clone()),
@ -595,6 +600,45 @@ mod tests {
assert_eq!(outcome.status, StageStatus::Success);
}
#[tokio::test]
async fn child_workflow_missing_from_bundle_does_not_fall_back_to_disk() {
let dir = tempfile::tempdir().unwrap();
let dot_path = dir.path().join("child.fabro");
std::fs::write(&dot_path, child_dot_succeeds()).unwrap();
let handler = SubWorkflowHandler;
let mut node = Node::new("manager");
node.attrs.insert(
"stack.child_workflow".to_string(),
AttrValue::String(dot_path.to_string_lossy().to_string()),
);
node.attrs
.insert("manager.max_cycles".to_string(), AttrValue::Integer(100));
node.attrs.insert(
"manager.poll_interval".to_string(),
AttrValue::Duration(Duration::from_millis(10)),
);
let mut services = make_services();
services.workflow_path = Some(PathBuf::from("workflow.fabro"));
services.workflow_bundle = Some(Arc::new(WorkflowBundle::new(HashMap::new())));
let context = Context::new();
let graph = Graph::new("test");
let outcome = handler
.execute(&node, &context, &graph, dir.path(), &services)
.await
.unwrap();
assert_eq!(outcome.status, StageStatus::Fail);
assert!(
outcome
.failure_reason()
.unwrap()
.contains("child workflow is not present in the persisted bundle")
);
}
#[tokio::test]
async fn max_cycles_exceeded_cancels_child() {
// Use a child that takes a long time (many nodes with sleep won't work, so use a