diff --git a/Cargo.lock b/Cargo.lock index 2068893..ebd5dd6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -86,6 +86,12 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +[[package]] +name = "autocfg" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" + [[package]] name = "axum" version = "0.8.4" @@ -197,11 +203,20 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" +[[package]] +name = "chrono" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" +dependencies = [ + "num-traits", +] + [[package]] name = "code0-definition-reader" -version = "0.0.12" +version = "0.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7b9d030a57501b5c6bcbd667c5241a69335421008b155b55145b4e66e9a325" +checksum = "e3e3a3aec6ffc35ac360113d8b96206c38961afef56b0c5632cb77cd2f4429b9" dependencies = [ "serde", "serde_json", @@ -876,6 +891,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + [[package]] name = "object" version = "0.36.7" @@ -897,6 +921,43 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" +[[package]] +name = "pbjson" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "898bac3fa00d0ba57a4e8289837e965baa2dee8c3749f3b11d45a64b4223d9c3" +dependencies = [ + "base64", + "serde", +] + +[[package]] +name = "pbjson-build" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af22d08a625a2213a78dbb0ffa253318c5c79ce3133d32d296655a7bdfb02095" +dependencies = [ + "heck", + "itertools", + "prost", + "prost-types", +] + +[[package]] +name = "pbjson-types" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e748e28374f10a330ee3bb9f29b828c0ac79831a32bab65015ad9b661ead526" +dependencies = [ + "bytes", + "chrono", + "pbjson", + "pbjson-build", + "prost", + "prost-build", + "serde", +] + [[package]] name = "pem-rfc7468" version = "0.7.0" @@ -1813,15 +1874,20 @@ dependencies = [ [[package]] name = "tucana" -version = "0.0.36" +version = "0.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0addd0c58b8b458ba668404246c428d4c71382f5a83d29ac69649f5c575bdfc4" +checksum = "4e6300e0f85e9352904cace7b285366a10995dbf690c6ed8fa022cd57fa8607b" dependencies = [ + "pbjson", + "pbjson-build", + "pbjson-types", "prost", + "prost-build", "prost-types", "serde", "serde_json", "tonic", + "tonic-build", "tonic-prost", "tonic-prost-build", ] diff --git a/Cargo.toml b/Cargo.toml index 175d9b4..fc2cc0b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,12 +8,12 @@ homepage = "https://code0.tech" license = "Apache-2.0" [dependencies] -tucana = { version = "0.0.36", features = ["aquila"] } +tucana = { version = "0.0.39", features = ["aquila"] } async-trait = "0.1.85" log = "0.4.24" tonic = "0.14.1" dotenv = "0.15.0" -code0-definition-reader = "0.0.12" +code0-definition-reader = "0.0.18" tonic-health = "0.14.1" async-nats = "0.44.2" futures-core = "0.3.31" diff --git a/src/flow_definition/mod.rs b/src/flow_definition/mod.rs index 805eda1..dca95d1 100644 --- a/src/flow_definition/mod.rs +++ b/src/flow_definition/mod.rs @@ -24,7 +24,7 @@ impl FlowUpdateService { let mut runtime_definitions = Vec::new(); let mut flow_types = Vec::new(); - let definitions = match code0_definition_reader::parser::Parser::from_path(definition_path) + let definitions = match code0_definition_reader::package::Parser::from_path(definition_path) { Some(reader) => reader, None => {