diff --git a/Cargo.lock b/Cargo.lock index d431f38045..31808460b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -941,6 +941,51 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", + "itoa 1.0.11", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite 0.2.14", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + [[package]] name = "backtrace" version = "0.3.71" @@ -2707,9 +2752,9 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65e3984a414cce451bd6fa931298c2b384924ddc1b6201adec3b0c0c148dabfa" dependencies = [ - "prost", + "prost 0.9.0", "prost-types", - "tonic", + "tonic 0.6.2", ] [[package]] @@ -3790,6 +3835,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + [[package]] name = "matrixmultiply" version = "0.3.8" @@ -4569,6 +4620,15 @@ dependencies = [ "prost-derive", ] +[[package]] +name = "prost" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" +dependencies = [ + "bytes", +] + [[package]] name = "prost-build" version = "0.9.0" @@ -4582,7 +4642,7 @@ dependencies = [ "log", "multimap", "petgraph", - "prost", + "prost 0.9.0", "prost-types", "regex", "tempfile", @@ -4609,7 +4669,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" dependencies = [ "bytes", - "prost", + "prost 0.9.0", ] [[package]] @@ -5158,19 +5218,6 @@ dependencies = [ "webpki 0.21.4", ] -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.1", - "log", - "ring 0.16.20", - "sct 0.6.1", - "webpki 0.21.4", -] - [[package]] name = "rustls" version = "0.20.9" @@ -6588,17 +6635,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" -dependencies = [ - "rustls 0.19.1", - "tokio", - "webpki 0.21.4", -] - [[package]] name = "tokio-rustls" version = "0.23.4" @@ -6728,10 +6764,9 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost", + "prost 0.9.0", "prost-derive", "tokio", - "tokio-rustls 0.22.0", "tokio-stream", "tokio-util 0.6.10", "tower", @@ -6741,6 +6776,36 @@ dependencies = [ "tracing-futures", ] +[[package]] +name = "tonic" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.7", + "bytes", + "h2 0.3.26", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost 0.12.4", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tonic-build" version = "0.6.2" @@ -7095,7 +7160,7 @@ dependencies = [ "hyper 0.14.28", "hyper-rustls 0.24.2", "log", - "prost", + "prost 0.9.0", "prost-types", "serde", "simd-json", @@ -7105,7 +7170,7 @@ dependencies = [ "testcontainers", "thiserror", "tokio", - "tonic", + "tonic 0.11.0", "tremor-codec", "tremor-common", "tremor-config", @@ -7148,7 +7213,7 @@ dependencies = [ "test-case", "thiserror", "tokio", - "tonic", + "tonic 0.11.0", "tremor-common", "tremor-config", "tremor-connectors", @@ -7222,8 +7287,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c6cfab2469df1b6c86199844e008f549cc6b19ca59ef0b43b68b8a62f21d63b" dependencies = [ "async-channel 1.9.0", - "prost", - "tonic", + "prost 0.9.0", + "tonic 0.6.2", "tonic-build", ] diff --git a/tremor-connectors-gcp/Cargo.toml b/tremor-connectors-gcp/Cargo.toml index 7cbb60596f..7b8a85c830 100644 --- a/tremor-connectors-gcp/Cargo.toml +++ b/tremor-connectors-gcp/Cargo.toml @@ -36,7 +36,7 @@ gouth = { version = "0.2", default-features = true } prost = { version = "0.9.0", default-features = true } prost-types = { version = "0.9.0", default-features = true } tokio = { version = "1.34", default-features = true } -tonic = { version = "0.6.1", default-features = true, features = [ +tonic = { version = "0.11.0", default-features = true, features = [ "transport", "tls", ] } diff --git a/tremor-connectors-otel/Cargo.toml b/tremor-connectors-otel/Cargo.toml index d2aec50317..0f7f120b4b 100644 --- a/tremor-connectors-otel/Cargo.toml +++ b/tremor-connectors-otel/Cargo.toml @@ -29,7 +29,7 @@ tokio = { version = "1.34", default-features = false } simd-json = { version = "0.13", default-features = true } # opentelemetry -tonic = { version = "0.6.1", default-features = false, features = [ +tonic = { version = "0.11.0", default-features = false, features = [ "transport", "tls", ] }