Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions src/server/action_transfer_service_server_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,7 @@ fn applies_to_action(
configs: &tucana::shared::ModuleConfigurations,
action_identifier: &str,
) -> bool {
configs.module_configurations.iter().any(|project_cfg| {
project_cfg
.module_configurations
.iter()
.any(|cfg| cfg.identifier == action_identifier)
})
configs.module_identifier == action_identifier
}

fn overwrite_module_definition_sources(
Expand Down Expand Up @@ -611,10 +606,9 @@ impl ActionTransferService for AquilaActionTransferServiceServer {
}
tucana::aquila::action_transfer_request::Data::Result(execution_result) => {
log::debug!(
"Received execution result execution_id={} action={}, result={:#?}",
"Received execution result execution_id={} action={}",
execution_result.execution_identifier,
identifier,
execution_result
identifier
);

handle_result(execution_result, client.clone(), pending_replies.clone())
Expand Down Expand Up @@ -723,6 +717,23 @@ async fn forward_nats_to_action(
mod tests {
use super::*;

#[test]
fn module_configurations_apply_by_module_identifier() {
let configs = tucana::shared::ModuleConfigurations {
module_identifier: "gls-action".to_string(),
module_configurations: vec![tucana::shared::ModuleProjectConfigurations {
project_id: 1,
module_configurations: vec![tucana::shared::ModuleConfiguration {
identifier: "username".to_string(),
value: None,
}],
}],
};

assert!(applies_to_action(&configs, "gls-action"));
assert!(!applies_to_action(&configs, "another-action"));
}

#[test]
fn overwrite_module_definition_sources_uses_action_source() {
let mut module = tucana::shared::Module {
Expand Down
8 changes: 0 additions & 8 deletions src/server/runtime_execution_service_server_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,8 @@ impl ExecutionService for AquilaExecutionServiceServer {

let execution_id = execution_result.execution_identifier.clone();
let flow_id = execution_result.flow_id;
let node_result_count = execution_result.node_execution_results.len();
let result_status = execution_result_status(&execution_result);

log::info!(
"Received execution result from runtime execution_id={} flow_id={} result_status={} node_results={}",
execution_id,
flow_id,
result_status,
node_result_count
);
log::debug!(
"Forwarding execution result into Sagittarius stream execution_id={} flow_id={}",
execution_id,
Expand Down