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
24 changes: 22 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ log = "0.4.26"
env_logger = "0.11.8"
prost = "0.14.1"
tonic = "0.14.1"
tucana = { version = "0.0.68", features = ["all"] }
tucana = { version = "0.0.70", features = ["all"] }
code0-flow = { version = "0.0.32", features = ["flow_health"] }
serde_json = "1.0.140"
async-nats = "0.47.0"
Expand Down
32 changes: 16 additions & 16 deletions src/configuration/service.rs
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
use serde::{Deserialize, Serialize};
use serde_json::from_str;
use std::{fs::File, io::Read};
use tucana::shared::{ActionConfigurations, helper::value::from_json_value};
use tucana::shared::{ModuleConfigurations, helper::value::from_json_value};

#[derive(Serialize, Deserialize, Clone)]
struct SerializableActionConfiguration {
struct SerializableModuleConfiguration {
identifier: String,
value: serde_json::Value,
}

#[derive(Serialize, Deserialize, Clone)]
struct SerializableActionProjectConfiguration {
struct SerializableModuleProjectConfiguration {
project_id: i64,
#[serde(default)]
configs: Vec<SerializableActionConfiguration>,
configs: Vec<SerializableModuleConfiguration>,
}

#[derive(Serialize, Deserialize, Clone)]
pub struct SerializableActionServiceConfiguration {
token: String,
identifier: String,
#[serde(default)]
configs: Vec<SerializableActionProjectConfiguration>,
configs: Vec<SerializableModuleProjectConfiguration>,
}

#[derive(Serialize, Deserialize, Clone, Default)]
Expand All @@ -36,7 +36,7 @@ pub struct SerializableServiceConfiguration {
pub struct ActionServiceConfiguration {
token: String,
service_name: String,
config: Vec<ActionConfigurations>,
config: Vec<ModuleConfigurations>,
}

#[derive(Serialize, Deserialize, Clone)]
Expand All @@ -51,34 +51,34 @@ pub struct ServiceConfiguration {
runtimes: Vec<RuntimeServiceConfiguration>,
}

impl From<SerializableActionConfiguration> for tucana::shared::ActionConfiguration {
fn from(value: SerializableActionConfiguration) -> Self {
impl From<SerializableModuleConfiguration> for tucana::shared::ModuleConfiguration {
fn from(value: SerializableModuleConfiguration) -> Self {
Self {
identifier: value.identifier,
value: Some(from_json_value(value.value)),
}
}
}

impl From<SerializableActionProjectConfiguration> for tucana::shared::ActionProjectConfiguration {
fn from(value: SerializableActionProjectConfiguration) -> Self {
impl From<SerializableModuleProjectConfiguration> for tucana::shared::ModuleProjectConfigurations {
fn from(value: SerializableModuleProjectConfiguration) -> Self {
Self {
project_id: value.project_id,
action_configurations: value.configs.into_iter().map(Into::into).collect(),
module_configurations: value.configs.into_iter().map(Into::into).collect(),
}
}
}

impl From<SerializableActionServiceConfiguration> for ActionServiceConfiguration {
fn from(value: SerializableActionServiceConfiguration) -> Self {
let action_identifier = value.identifier.clone();
let module_identifier = value.identifier.clone();

Self {
token: value.token,
service_name: value.identifier,
config: vec![ActionConfigurations {
action_identifier,
action_configurations: value.configs.into_iter().map(Into::into).collect(),
config: vec![ModuleConfigurations {
module_identifier,
module_configurations: value.configs.into_iter().map(Into::into).collect(),
}],
}
}
Expand Down Expand Up @@ -114,7 +114,7 @@ impl ServiceConfiguration {
pub fn get_action_configuration(
&self,
action_identifier: &String,
) -> Vec<ActionConfigurations> {
) -> Vec<ModuleConfigurations> {
match self
Comment thread
raphael-goetz marked this conversation as resolved.
.actions
.iter()
Expand Down
53 changes: 0 additions & 53 deletions src/sagittarius/action_configuration_service_client_impl.rs

This file was deleted.

56 changes: 0 additions & 56 deletions src/sagittarius/data_type_service_client_impl.rs

This file was deleted.

6 changes: 3 additions & 3 deletions src/sagittarius/flow_service_client_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub struct SagittariusFlowClient {
env: String,
token: String,
sagittarius_ready: Arc<AtomicBool>,
action_config_tx: broadcast::Sender<tucana::shared::ActionConfigurations>,
action_config_tx: broadcast::Sender<tucana::shared::ModuleConfigurations>,
}

impl SagittariusFlowClient {
Expand All @@ -31,7 +31,7 @@ impl SagittariusFlowClient {
token: String,
channel: Channel,
sagittarius_ready: Arc<AtomicBool>,
action_config_tx: broadcast::Sender<tucana::shared::ActionConfigurations>,
action_config_tx: broadcast::Sender<tucana::shared::ModuleConfigurations>,
) -> SagittariusFlowClient {
let client = FlowServiceClient::new(channel);

Expand Down Expand Up @@ -151,7 +151,7 @@ impl SagittariusFlowClient {
};
}
}
Data::ActionConfigurations(action_configurations) => {
Data::ModuleConfigurations(action_configurations) => {
if let Err(err) = self.action_config_tx.send(action_configurations) {
log::warn!("No action configuration receivers available: {:?}", err);
}
Expand Down
54 changes: 0 additions & 54 deletions src/sagittarius/flow_type_service_client_impl.rs

This file was deleted.

50 changes: 0 additions & 50 deletions src/sagittarius/function_service_client_impl.rs

This file was deleted.

Loading