diff --git a/Cargo.lock b/Cargo.lock index 22b313be2..4b4a77eb4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -226,18 +226,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "bstr" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" -dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde", -] - [[package]] name = "bumpalo" version = "3.12.0" @@ -480,14 +468,9 @@ version = "3.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" dependencies = [ - "atty", "bitflags", - "clap_derive 3.2.18", "clap_lex 0.2.4", "indexmap", - "once_cell", - "strsim", - "termcolor", "textwrap", ] @@ -498,7 +481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" dependencies = [ "bitflags", - "clap_derive 4.1.0", + "clap_derive", "clap_lex 0.3.1", "is-terminal", "once_cell", @@ -506,19 +489,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "clap_derive" -version = "3.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" -dependencies = [ - "heck 0.4.1", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "clap_derive" version = "4.1.0" @@ -754,13 +724,12 @@ dependencies = [ [[package]] name = "csv" -version = "1.1.6" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "af91f40b7355f82b0a891f50e70399475945bb0b0da4f1700ce60761c9d3e359" dependencies = [ - "bstr", "csv-core", - "itoa 0.4.8", + "itoa", "ryu", "serde", ] @@ -946,9 +915,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ "log", ] @@ -1305,7 +1274,7 @@ checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes", "fnv", - "itoa 1.0.5", + "itoa", ] [[package]] @@ -1346,7 +1315,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 1.0.5", + "itoa", "pin-project-lite", "socket2", "tokio", @@ -1420,22 +1389,21 @@ dependencies = [ [[package]] name = "inferno" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6e66fa9bb3c52f40d05c11b78919ff2f18993c2305bd8a62556d20cb3e9606f" +checksum = "2fb7c1b80a1dfa604bb4a649a5c5aeef3d913f7c520cb42b40e534e8a61bcdfc" dependencies = [ "ahash 0.8.3", - "atty", - "clap 3.2.23", + "clap 4.1.4", "crossbeam-channel", "crossbeam-utils", "dashmap", "env_logger", "indexmap", - "itoa 1.0.5", + "is-terminal", + "itoa", "log", "num-format", - "num_cpus", "once_cell", "quick-xml", "rgb", @@ -1503,12 +1471,6 @@ dependencies = [ "either", ] -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - [[package]] name = "itoa" version = "1.0.5" @@ -1891,7 +1853,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ "arrayvec", - "itoa 1.0.5", + "itoa", ] [[package]] @@ -1989,9 +1951,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "oorandom" @@ -2476,7 +2438,7 @@ dependencies = [ "combine", "crc16", "futures-util", - "itoa 1.0.5", + "itoa", "percent-encoding", "pin-project-lite", "rand", @@ -2926,7 +2888,7 @@ version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" dependencies = [ - "itoa 1.0.5", + "itoa", "ryu", "serde", ] @@ -2938,7 +2900,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.5", + "itoa", "ryu", "serde", ] @@ -2950,7 +2912,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fb06d4b6cdaef0e0c51fa881acb721bed3c924cfaa71d9c94a3b771dfdf6567" dependencies = [ "indexmap", - "itoa 1.0.5", + "itoa", "ryu", "serde", "unsafe-libyaml", @@ -3339,7 +3301,7 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" dependencies = [ - "itoa 1.0.5", + "itoa", "serde", "time-core", "time-macros", @@ -3428,7 +3390,6 @@ dependencies = [ "nix", "nu-ansi-term", "once_cell", - "rcgen", "serde", "serde_json", "subprocess", @@ -3493,9 +3454,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", diff --git a/Cargo.toml b/Cargo.toml index 2e9ae6524..deb072453 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,3 +13,24 @@ codegen-units = 1 [profile.bench] lto = "fat" codegen-units = 1 + +[workspace.dependencies] +bytes = "1.0.0" +tokio-openssl = "0.6.2" +tokio = { version = "1.25.0", features = ["full", "macros"] } +itertools = "0.10.1" +openssl = { version = "0.10.36", features = ["vendored"] } +anyhow = "1.0.42" +serde = { version = "1.0.111", features = ["derive"] } +serde_yaml = "0.9.17" +uuid = { version = "1.0.0", features = ["serde", "v4"] } +reqwest = "0.11.6" +redis = { version = "0.22.0", features = ["tokio-comp", "cluster"] } +cdrs-tokio = { git = "https://github.com/krojew/cdrs-tokio", branch = "8.0-dev" } +cassandra-protocol = { git = "https://github.com/krojew/cdrs-tokio", branch = "8.0-dev" } +tracing = "0.1.15" +tracing-subscriber = { version = "0.3.1", features = ["env-filter", "json"] } +nix = "0.26.0" +serde_json = "1.0" +rcgen = "0.10.0" +subprocess = "0.2.7" diff --git a/shotover-proxy/Cargo.toml b/shotover-proxy/Cargo.toml index e8b0af0f2..e8086be17 100644 --- a/shotover-proxy/Cargo.toml +++ b/shotover-proxy/Cargo.toml @@ -16,22 +16,22 @@ cassandra-cpp-driver-tests = ["test-helpers/cassandra-cpp-driver-tests"] [dependencies] pretty-hex = "0.3.0" hex = "0.4.3" -tokio = { version = "1.25.0", features = ["full", "macros"] } -tokio-util = { version = "0.7.0" } +tokio.workspace = true +tokio-util = { version = "0.7.7" } tokio-stream = "0.1.2" -bytes = "1.0.0" +bytes.workspace = true bytes-utils = "0.1.1" futures = "0.3" async-trait = "0.1.30" clap = { version = "4.0.4", features = ["cargo", "derive"] } derivative = "2.1.1" -itertools = "0.10.1" +itertools.workspace = true rand = { version = "0.8.4" } rand_distr = "0.4.1" cached = "0.42" pin-project-lite = "0.2" -tokio-openssl = "0.6.2" -openssl = { version = "0.10.36", features = ["vendored"] } +tokio-openssl.workspace = true +openssl.workspace = true async-recursion = "1.0" governor = { version = "0.5.0", default-features = false, features = ["std", "jitter", "quanta"] } nonzero_ext = "0.3.0" @@ -40,40 +40,40 @@ split-iter = "0.1.0" # Error handling thiserror = "1.0" -anyhow = "1.0.31" +anyhow.workspace = true backtrace = "0.3.66" # Parsers #cql3-parser = "0.3.1" cql3-parser = { version = "0.3.1", git = "https://github.com/rukai/rust-cql3-parser", branch = "identifier_ref" } -serde = { version = "1.0.111", features = ["derive"] } -serde_json = "1.0" -serde_yaml = "0.9.17" +serde.workspace = true +serde_json.workspace = true +serde_yaml.workspace = true bincode = "1.3.1" num = { version = "0.4.0", features = ["serde"] } -uuid = { version = "1.0.0", features = ["serde", "v4"] } +uuid.workspace = true bigdecimal = {version ="0.3.0", features = ["serde"] } base64 = "0.21.0" #Observability metrics = "0.20.0" metrics-exporter-prometheus = "0.11.0" -tracing = { version = "0.1.15", features = ["release_max_level_info"] } -tracing-subscriber = { version = "0.3.1", features = ["env-filter", "json"] } +tracing.workspace = true +tracing-subscriber.workspace = true tracing-appender = "0.2.0" hyper = { version = "0.14.14", features = ["server"] } halfbrown = "0.1.11" # Transform dependencies redis-protocol = { version = "4.0.1", features = ["decode-mut"] } -cassandra-protocol = { git = "https://github.com/krojew/cdrs-tokio", branch = "8.0-dev" } +cassandra-protocol.workspace = true crc16 = "0.4.0" ordered-float = { version = "3.0.0", features = ["serde"] } #Crypto rusoto_kms = "0.48.0" rusoto_signature = "0.48.0" -csv = "1.1.6" +csv = "1.2.0" strum_macros = "0.24" chacha20poly1305 = { version = "0.10.0", features = ["std"] } generic-array = { version = "0.14", features = ["serde"] } @@ -81,7 +81,7 @@ generic-array = { version = "0.14", features = ["serde"] } [dev-dependencies] rayon = "1.5.1" criterion = { git = "https://github.com/shotover/criterion.rs", branch = "0.4.0-bench_with_input_fn", features = ["async_tokio"] } -redis = { version = "0.22.0", features = ["tokio-comp", "cluster"] } +redis.workspace = true pcap = "1.0.0" pktparse = { version = "0.7.0", features = ["serde"] } tls-parser = "0.11.0" @@ -89,9 +89,9 @@ serial_test = "1.0.0" cassandra-cpp = { version = "1.2.0" } test-helpers = { path = "../test-helpers", features = ["cassandra-cpp-driver-tests"] } hex-literal = "0.3.3" -nix = "0.26.0" -reqwest = "0.11.6" -cdrs-tokio = { git = "https://github.com/krojew/cdrs-tokio", branch = "8.0-dev" } +nix.workspace = true +reqwest.workspace = true +cdrs-tokio.workspace = true rstest = "0.16.0" rdkafka = { version = "0.29", features = ["cmake-build"] } diff --git a/test-helpers/Cargo.toml b/test-helpers/Cargo.toml index 93380ff33..a6a325a79 100644 --- a/test-helpers/Cargo.toml +++ b/test-helpers/Cargo.toml @@ -11,26 +11,26 @@ license = "Apache-2.0" cassandra-cpp-driver-tests = ["cassandra-cpp"] [dependencies] -tracing = "0.1.15" -subprocess = "0.2.7" -anyhow = "1.0.42" -rcgen = "0.10.0" -serde_yaml = "0.9.0" +tracing.workspace = true +subprocess.workspace = true regex = "1.7.0" tokio-bin-process = { path = "../tokio-bin-process" } -cdrs-tokio = { git = "https://github.com/krojew/cdrs-tokio", branch = "8.0-dev" } -cassandra-protocol = { git = "https://github.com/krojew/cdrs-tokio", branch = "8.0-dev" } +cdrs-tokio.workspace = true +cassandra-protocol.workspace = true cassandra-cpp = { version = "1.2.0", optional = true } -openssl = { version = "0.10.36", features = ["vendored"] } -bytes = "1.0.0" scylla = { version = "0.7.0", features = ["ssl"] } +openssl.workspace = true +bytes.workspace = true ordered-float = { version = "3.0.0", features = ["serde"] } -tokio = { version = "1.25.0", features = ["full", "macros"] } -uuid = { version = "1.0.0", features = ["serde", "v4"] } -redis = { version = "0.22.0", features = ["tokio-comp", "cluster"] } +tokio.workspace = true +uuid.workspace = true +redis.workspace = true tokio-io-timeout = "1.1.1" -tokio-openssl = "0.6.2" -inferno = "0.11.13" -itertools = "0.10.1" -reqwest = "0.11.6" -tracing-subscriber = "0.3.16" +tokio-openssl.workspace = true +inferno = "0.11.15" +itertools.workspace = true +reqwest.workspace = true +tracing-subscriber.workspace = true +serde_yaml.workspace = true +anyhow.workspace = true +rcgen.workspace = true diff --git a/tokio-bin-process/Cargo.toml b/tokio-bin-process/Cargo.toml index 787d3bfcb..bb27d61eb 100644 --- a/tokio-bin-process/Cargo.toml +++ b/tokio-bin-process/Cargo.toml @@ -8,15 +8,14 @@ license = "Apache-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tracing = "0.1.15" -tracing-subscriber = { version = "0.3.1", features = ["env-filter", "json"] } -subprocess = "0.2.7" -anyhow = "1.0.42" -nix = "0.26.0" -rcgen = "0.10.0" -tokio = { version = "1.25.0", features = ["full", "macros"] } -serde = { version = "1.0.111", features = ["derive"] } -serde_json = "1.0.89" +tracing.workspace = true +tracing-subscriber.workspace = true +subprocess.workspace = true +anyhow.workspace = true +nix.workspace = true +tokio.workspace = true +serde.workspace = true +serde_json.workspace = true nu-ansi-term = "0.46.0" -itertools = "0.10.1" -once_cell = "1.16.0" +itertools.workspace = true +once_cell = "1.17.1"