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
16 changes: 8 additions & 8 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ opentelemetry = { version = "0.32.0", features = ["metrics"] }
tracing = { version = "0.1.41", features = ["log"] }
prost = "0.14.1"
tonic = "0.14.1"
tucana = { version = "0.0.75", features = ["all"] }
code0-flow = { version = "0.0.40", features = ["flow_config", "flow_health", "flow_telemetry"] }
tucana = { version = "0.0.76", features = ["all"] }
code0-flow = { version = "0.0.41", features = ["flow_config", "flow_health", "flow_telemetry"] }
serde_json = "1.0.140"
async-nats = "0.49.0"
tonic-health = "0.14.1"
Expand Down
3 changes: 2 additions & 1 deletion service.configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"runtimes": [
{
"identifier": "taurus",
"token": "HsCEzbCuaUtUGSCrvwsSbJSlS2HH6TrW0ZeEKUZGTiOH8vPEZxyAEOx974Ku72l4"
"token": "HsCEzbCuaUtUGSCrvwsSbJSlS2HH6TrW0ZeEKUZGTiOH8vPEZxyAEOx974Ku72l4",
"resolved_modules": ["taurus-boolean", "taurus-control", "taurus-http", "taurus-list", "taurus-number", "taurus-object", "taurus-text"]
},
{
"identifier": "draco-rest",
Expand Down
42 changes: 42 additions & 0 deletions src/configuration/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ pub struct ActionServiceConfiguration {
pub struct RuntimeServiceConfiguration {
token: String,
identifier: String,
#[serde(default)]
resolved_modules: Vec<String>,
}

#[derive(Serialize, Deserialize, Clone, Default)]
Expand Down Expand Up @@ -144,6 +146,24 @@ impl ServiceConfiguration {
}
}

pub fn collect_modules(&self) -> Vec<String> {
let actions: Vec<String> = self
.actions
.iter()
.map(|x| format!("action.{}", x.service_name))
.collect();
let runtime: Vec<String> = self
.runtimes
.iter()
.flat_map(|x| match x.resolved_modules.is_empty() {
true => vec![x.identifier.clone()],
false => x.resolved_modules.clone(),
})
.collect();

vec![actions, runtime].concat()
}

pub fn from_path(path: impl AsRef<Path>) -> Self {
let mut data = String::new();

Expand Down Expand Up @@ -203,14 +223,20 @@ mod tests {
RuntimeServiceConfiguration {
token: String::from("taurus-token"),
identifier: String::from("taurus"),
resolved_modules: vec![
String::from("taurus-boolean"),
String::from("taurus-number"),
],
},
RuntimeServiceConfiguration {
token: String::from("draco-rest-token"),
identifier: String::from("draco-rest"),
resolved_modules: vec![],
},
RuntimeServiceConfiguration {
token: String::from("draco-cron-token"),
identifier: String::from("draco-cron"),
resolved_modules: vec![],
},
],
}
Expand Down Expand Up @@ -278,6 +304,22 @@ mod tests {
assert!(!config.has_service(&String::from("action-token"), &String::from("taurus-x")));
}

#[test]
fn collect_modules_uses_definition_source_identifiers() {
let config = fixture();

assert_eq!(
config.collect_modules(),
vec![
String::from("action.action-identifier"),
String::from("taurus-boolean"),
String::from("taurus-number"),
String::from("draco-rest"),
String::from("draco-cron"),
]
);
}

#[test]
fn get_action_configuration_requires_matching_token_and_identifier() {
let config: ServiceConfiguration = SerializableServiceConfiguration {
Expand Down
11 changes: 10 additions & 1 deletion src/sagittarius/module_service_client_impl.rs
Original file line number Diff line number Diff line change
@@ -1,22 +1,30 @@
use crate::configuration::service::ServiceConfiguration;
use crate::{authorization::authorization::get_authorization_metadata, telemetry::errors};
use std::time::Duration;
use tonic::transport::Channel;
use tonic::{Extensions, Request};

pub struct SagittariusModuleServiceClient {
service: ServiceConfiguration,
client: tucana::sagittarius::module_service_client::ModuleServiceClient<Channel>,
token: String,
unary_rpc_timeout: Duration,
}

impl SagittariusModuleServiceClient {
pub fn new(channel: Channel, token: String, unary_rpc_timeout: Duration) -> Self {
pub fn new(
channel: Channel,
token: String,
unary_rpc_timeout: Duration,
service_configuration: ServiceConfiguration,
) -> Self {
let client = tucana::sagittarius::module_service_client::ModuleServiceClient::new(channel);

Self {
client,
token,
unary_rpc_timeout,
service: service_configuration,
}
}

Expand All @@ -40,6 +48,7 @@ impl SagittariusModuleServiceClient {
Extensions::new(),
tucana::sagittarius::ModuleUpdateRequest {
modules: modules_update_request.modules,
available_defintition_soruces: self.service.collect_modules(),
},
);
request.set_timeout(self.unary_rpc_timeout);
Expand Down
1 change: 1 addition & 0 deletions src/server/dynamic_server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ impl AquilaDynamicServer {
self.channel.clone(),
self.token.clone(),
self.sagittarius_unary_rpc_timeout,
self.service_configuration.clone(),
)));

info!("ModuleService started");
Expand Down