From bf528b79828cefa084d5a68b4c2391bd7917aea8 Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 12 Apr 2026 12:16:20 +0200 Subject: [PATCH 1/4] dependencies: updated code0-flow --- Cargo.lock | 34 +++++++--------------------------- Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1bce4fa..8a4d73f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -195,7 +195,7 @@ dependencies = [ "tokio", "tonic", "tonic-health", - "tucana 0.0.68", + "tucana", "uuid", ] @@ -271,9 +271,9 @@ dependencies = [ [[package]] name = "code0-flow" -version = "0.0.29" +version = "0.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eacee3742e78ea0b84a3e5cb9eabd1eecb71391d362c42f36c941db6994016f" +checksum = "8401c34395889c3587792864120d2ff4354d24e79db8ffb01c17accc550d0de6" dependencies = [ "async-nats", "async-trait", @@ -286,7 +286,7 @@ dependencies = [ "tokio", "tonic", "tonic-health", - "tucana 0.0.65", + "tucana", "walkdir", ] @@ -338,7 +338,7 @@ dependencies = [ "cron 0.16.0", "log", "tokio", - "tucana 0.0.68", + "tucana", ] [[package]] @@ -1506,7 +1506,7 @@ dependencies = [ "serde_json", "tokio", "tonic", - "tucana 0.0.68", + "tucana", ] [[package]] @@ -2152,26 +2152,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tucana" -version = "0.0.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5670bcb2c6c455486e3b5be8b829d7a07bbd06a427d7c6db873259855f34e613" -dependencies = [ - "pbjson", - "pbjson-build", - "pbjson-types", - "prost", - "prost-build", - "prost-types", - "serde", - "serde_json", - "tonic", - "tonic-build", - "tonic-prost", - "tonic-prost-build", -] - [[package]] name = "tucana" version = "0.0.68" @@ -2436,7 +2416,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index be03ceb..9c7d3a5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ version = "0.0.0" edition = "2024" [workspace.dependencies] -code0-flow = { version = "0.0.29" } +code0-flow = { version = "0.0.30" } tucana = { version = "0.0.68", features = ["aquila"] } serde_json = { version = "1.0.138" } log = "0.4.27" From c412b8c8c7bc0a0c5c128f686befa294e21862dc Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 12 Apr 2026 12:22:01 +0200 Subject: [PATCH 2/4] feat: added aquila token as env --- crates/base/src/config.rs | 10 ++++++++++ crates/base/src/runner.rs | 1 + 2 files changed, 11 insertions(+) diff --git a/crates/base/src/config.rs b/crates/base/src/config.rs index 37a9bc7..00c466b 100644 --- a/crates/base/src/config.rs +++ b/crates/base/src/config.rs @@ -42,6 +42,11 @@ pub struct AdapterConfig { /// URL of the Aquila server to connect to. pub aquila_url: String, + /// Aquila Token + /// + /// Token for verifing to Aquila. + pub aquila_token: String, + /// Definition Path /// /// Path to the root definition folder. @@ -73,6 +78,10 @@ impl AdapterConfig { "AQUILA_URL", String::from("grpc://localhost:50051"), ); + let aquila_token = code0_flow::flow_config::env_with_default( + "AQUILA_TOKEN", + String::from("token"), + ); let environment = code0_flow::flow_config::env_with_default("ENVIRONMENT", Environment::Development); @@ -94,6 +103,7 @@ impl AdapterConfig { grpc_port, grpc_host, aquila_url, + aquila_token, definition_path, with_health_service, draco_variant, diff --git a/crates/base/src/runner.rs b/crates/base/src/runner.rs index aa04a27..4a87ae9 100644 --- a/crates/base/src/runner.rs +++ b/crates/base/src/runner.rs @@ -87,6 +87,7 @@ impl ServerRunner { let definition_service = FlowUpdateService::from_url( config.aquila_url.clone(), config.definition_path.as_str(), + config.aquila_token.clone(), ) .await; definition_service.send().await; From a0764a9a1c9acb26cf5521144759f43a17b02f94 Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 12 Apr 2026 12:33:43 +0200 Subject: [PATCH 3/4] ref: cargo fmt --- crates/base/src/config.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/crates/base/src/config.rs b/crates/base/src/config.rs index 00c466b..b2e1df6 100644 --- a/crates/base/src/config.rs +++ b/crates/base/src/config.rs @@ -78,10 +78,8 @@ impl AdapterConfig { "AQUILA_URL", String::from("grpc://localhost:50051"), ); - let aquila_token = code0_flow::flow_config::env_with_default( - "AQUILA_TOKEN", - String::from("token"), - ); + let aquila_token = + code0_flow::flow_config::env_with_default("AQUILA_TOKEN", String::from("token")); let environment = code0_flow::flow_config::env_with_default("ENVIRONMENT", Environment::Development); From 0036be642fc1de63a229d71b45374b6c6e72df8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20G=C3=B6tz?= <52959657+raphael-goetz@users.noreply.github.com> Date: Sun, 12 Apr 2026 12:35:33 +0200 Subject: [PATCH 4/4] Update crates/base/src/config.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Raphael Götz <52959657+raphael-goetz@users.noreply.github.com> --- crates/base/src/config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/base/src/config.rs b/crates/base/src/config.rs index b2e1df6..ca139aa 100644 --- a/crates/base/src/config.rs +++ b/crates/base/src/config.rs @@ -44,7 +44,7 @@ pub struct AdapterConfig { /// Aquila Token /// - /// Token for verifing to Aquila. + /// Token used to authenticate with Aquila. pub aquila_token: String, /// Definition Path