diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs index 01537ceb46..9f71a7d807 100644 --- a/backend/windmill-worker/src/worker_flow.rs +++ b/backend/windmill-worker/src/worker_flow.rs @@ -3068,7 +3068,7 @@ async fn compute_next_flow_transform( let path = path.unwrap_or_else(|| get_path(flow_job, status, module)); let payload = raw_script_to_payload( - Some(path), + path, content, language, lock, @@ -3468,7 +3468,7 @@ async fn next_loop_iteration( }; return Ok(NextFlowTransform::Continue( ContinuePayload::SingleJob( - payload_from_simple_module(value, db, flow_job, module, Some(inner_path())).await?, + payload_from_simple_module(value, db, flow_job, module, inner_path()).await?, ), NextStatus::NextLoopIteration { next: ns, simple_input_transforms }, )); @@ -3659,7 +3659,7 @@ async fn payload_from_simple_module( db: &sqlx::Pool, flow_job: &QueuedJob, module: &FlowModule, - inner_path: Option, + inner_path: String, ) -> Result { let delete_after_use = module.delete_after_use.unwrap_or(false); Ok(match value { @@ -3678,7 +3678,7 @@ async fn payload_from_simple_module( concurrency_time_window_s, .. } => raw_script_to_payload( - path.or(inner_path), + path.unwrap_or_else(|| inner_path), content, language, lock, @@ -3706,8 +3706,7 @@ async fn payload_from_simple_module( concurrency_time_window_s, cache_ttl: module.cache_ttl.map(|x| x as i32), dedicated_worker: None, - path: inner_path - .unwrap_or_else(|| format!("{}/simple-flow", flow_job.script_path())), + path: inner_path, }, tag, delete_after_use, @@ -3718,7 +3717,7 @@ async fn payload_from_simple_module( } fn raw_script_to_payload( - path: Option, + path: String, content: String, language: windmill_common::scripts::ScriptLang, lock: Option, @@ -3732,7 +3731,7 @@ fn raw_script_to_payload( JobPayloadWithTag { payload: JobPayload::Code(RawCode { hash: None, - path, + path: Some(path), content, language, lock,