From ccf5554c4293467b7e0bff10c65a2718c62d1c5f Mon Sep 17 00:00:00 2001 From: Erin Power Date: Mon, 2 Jan 2023 10:21:38 +0100 Subject: [PATCH 1/6] Update dependencies --- Cargo.toml | 46 ++++++++++++------------- src/config.rs | 2 +- src/filters/concatenate_bytes/config.rs | 4 +-- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c2023aa2d0..2a58dc5235 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,49 +41,49 @@ test = true quilkin-macros = { version = "0.5.0-dev", path = "./macros" } # Crates.io -arc-swap = { version = "1.5.1", features = ["serde"] } +arc-swap = { version = "1.6.0", features = ["serde"] } async-stream = "0.3.3" base64 = "0.13.1" base64-serde = "0.6.1" -bytes = { version = "1.2.1", features = ["serde"] } -cached = "0.40.0" +bytes = { version = "1.3.0", features = ["serde"] } +cached = "0.41.0" chrono = "0.4.23" -clap = { version = "4.0.29", features = ["cargo", "derive", "env"] } +clap = { version = "4.0.32", features = ["cargo", "derive", "env"] } dashmap = "5.4.0" dirs2 = "3.0.1" either = "1.8.0" -enum-map = "2.4.1" +enum-map = "2.4.2" eyre = "0.6.8" futures = "0.3.25" hyper = { version = "0.14.23", features = ["http2"] } -hyper-rustls = { version = "0.23.1", features = ["http2", "webpki-roots"] } +hyper-rustls = { version = "0.23.2", features = ["http2", "webpki-roots"] } ipnetwork = "0.20.0" k8s-openapi = { version = "0.16.0", features = ["v1_22", "schemars"] } -kube = { version = "0.76.0", features = ["derive", "runtime", "rustls-tls", "client"], default-features = false } +kube = { version = "0.77.0", features = ["derive", "runtime", "rustls-tls", "client"], default-features = false } maxminddb = "0.23.0" notify = "5.0.0" -num_cpus = "1.14.0" -once_cell = "1.16.0" +num_cpus = "1.15.0" +once_cell = "1.17.0" parking_lot = "0.12.1" prometheus = { version = "0.13.3", default-features = false } -prost = "0.11.2" -prost-types = "0.11.2" +prost = "0.11.5" +prost-types = "0.11.5" rand = "0.8.5" regex = "1.7.0" schemars = { version = "0.8.11", features = ["chrono", "bytes", "url"] } -serde = { version = "1.0.147", features = ["derive", "rc"] } -serde_json = "1.0.88" +serde = { version = "1.0.152", features = ["derive", "rc"] } +serde_json = "1.0.91" serde_regex = "1.1.0" -serde_stacker = "0.1.6" -serde_yaml = "0.9.14" -snap = "1.0.5" +serde_stacker = "0.1.7" +serde_yaml = "0.9.16" +snap = "1.1.0" socket2 = "0.4.7" stable-eyre = "0.2.2" tempdir = "0.3.7" -thiserror = "1.0.37" -tokio = { version = "1.21.2", features = ["rt-multi-thread", "fs", "signal", "test-util", "parking_lot", "tracing"] } +thiserror = "1.0.38" +tokio = { version = "1.23.0", features = ["rt-multi-thread", "fs", "signal", "test-util", "parking_lot", "tracing"] } tokio-stream = { version = "0.1.11", features = ["sync"] } -tonic = "0.8.2" +tonic = "0.8.3" tracing = "0.1.37" tracing-futures = { version = "0.2.5", features = ["futures-03"] } tracing-subscriber = { version = "0.3.16", features = ["json", "env-filter"] } @@ -98,14 +98,14 @@ sys-info = "0.9.1" [dev-dependencies] regex = "1.7.0" criterion = { version = "0.4.0", features = ["html_reports"] } -once_cell = "1.16.0" +once_cell = "1.17.0" tracing-test = "0.2.3" pretty_assertions = "1.3.0" [build-dependencies] -tonic-build = { version = "0.8.2", default_features = false, features = ["transport", "prost"] } -prost-build = "0.11.2" -built = { version = "0.5.1", features = ["git2"] } +tonic-build = { version = "0.8.4", default_features = false, features = ["transport", "prost"] } +prost-build = "0.11.5" +built = { version = "0.5.2", features = ["git2"] } protobuf-src = { version = "1.1.0", optional = true } [features] diff --git a/src/config.rs b/src/config.rs index 825ccc861f..ffd7a18b64 100644 --- a/src/config.rs +++ b/src/config.rs @@ -44,7 +44,7 @@ use metrics::Metrics; pub use self::{builder::Builder, config_type::ConfigType, error::ValidationError, slot::Slot}; -base64_serde_type!(Base64Standard, base64::STANDARD); +base64_serde_type!(pub Base64Standard, base64::STANDARD); // For some log messages on the hot path (potentially per-packet), we log 1 out // of every `LOG_SAMPLING_RATE` occurrences to avoid spamming the logs. diff --git a/src/filters/concatenate_bytes/config.rs b/src/filters/concatenate_bytes/config.rs index 2b042b3c5d..c733ba4f71 100644 --- a/src/filters/concatenate_bytes/config.rs +++ b/src/filters/concatenate_bytes/config.rs @@ -14,13 +14,11 @@ * limitations under the License. */ -use base64_serde::base64_serde_type; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use super::proto; - -base64_serde_type!(Base64Standard, base64::STANDARD); +use crate::config::Base64Standard; #[derive(Serialize, Deserialize, Debug, Eq, PartialEq, JsonSchema)] pub enum Strategy { From ada5e4173b40b280b78f5421869ce3958607ead6 Mon Sep 17 00:00:00 2001 From: Erin Power Date: Mon, 2 Jan 2023 13:51:48 +0100 Subject: [PATCH 2/6] Use workspace dependencies --- Cargo.toml | 14 ++++++++++---- agones/Cargo.toml | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2a58dc5235..c1d3e04384 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,6 +17,12 @@ [workspace] members = [".", "./macros", "./agones"] +[workspace.dependencies] +kube = { version = "0.77.0", features = ["derive", "runtime", "rustls-tls", "client"], default-features = false } +k8s-openapi = { version = "0.16.0", features = ["v1_22", "schemars"] } +tokio = { version = "1.23.0", features = ["rt-multi-thread", "fs", "signal", "test-util", "parking_lot", "tracing"] } +base64 = "0.13.1" + [package] name = "quilkin" version = "0.5.0-dev" @@ -43,7 +49,7 @@ quilkin-macros = { version = "0.5.0-dev", path = "./macros" } # Crates.io arc-swap = { version = "1.6.0", features = ["serde"] } async-stream = "0.3.3" -base64 = "0.13.1" +base64.workspace = true base64-serde = "0.6.1" bytes = { version = "1.3.0", features = ["serde"] } cached = "0.41.0" @@ -58,8 +64,7 @@ futures = "0.3.25" hyper = { version = "0.14.23", features = ["http2"] } hyper-rustls = { version = "0.23.2", features = ["http2", "webpki-roots"] } ipnetwork = "0.20.0" -k8s-openapi = { version = "0.16.0", features = ["v1_22", "schemars"] } -kube = { version = "0.77.0", features = ["derive", "runtime", "rustls-tls", "client"], default-features = false } +k8s-openapi.workspace = true maxminddb = "0.23.0" notify = "5.0.0" num_cpus = "1.15.0" @@ -81,7 +86,7 @@ socket2 = "0.4.7" stable-eyre = "0.2.2" tempdir = "0.3.7" thiserror = "1.0.38" -tokio = { version = "1.23.0", features = ["rt-multi-thread", "fs", "signal", "test-util", "parking_lot", "tracing"] } +tokio.workspace = true tokio-stream = { version = "0.1.11", features = ["sync"] } tonic = "0.8.3" tracing = "0.1.37" @@ -91,6 +96,7 @@ tryhard = "0.5.0" url = { version = "2.3.1", features = ["serde"] } uuid = { version = "1.2.2", default-features = false, features = ["v4"] } lasso = { version = "0.6.0", features = ["multi-threaded"] } +kube.workspace = true [target.'cfg(target_os = "linux")'.dependencies] sys-info = "0.9.1" diff --git a/agones/Cargo.toml b/agones/Cargo.toml index 1679c7a0e3..7e74d3174c 100644 --- a/agones/Cargo.toml +++ b/agones/Cargo.toml @@ -24,8 +24,8 @@ description = "End to end integration tests to be run against a Kubernetes clust readme = "README.md" [dependencies] -base64 = "0.13.0" -k8s-openapi = { version = "0.16.0", features = ["v1_22"] } -kube = { version = "0.76.0", features = ["runtime", "derive"] } +base64.workspace = true +k8s-openapi.workspace = true +kube.workspace = true quilkin = { path = "../" } -tokio = { version = "1.21.2", features = ["sync", "parking_lot"] } +tokio.workspace = true From 2adae7cb622ec1101a6b478400435b84456a3718 Mon Sep 17 00:00:00 2001 From: XAMPPRocky <4464295+XAMPPRocky@users.noreply.github.com> Date: Thu, 5 Jan 2023 19:17:37 +0100 Subject: [PATCH 3/6] Update agones/Cargo.toml Co-authored-by: Mark Mandel --- agones/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agones/Cargo.toml b/agones/Cargo.toml index 7e74d3174c..de2c5d7751 100644 --- a/agones/Cargo.toml +++ b/agones/Cargo.toml @@ -26,6 +26,6 @@ readme = "README.md" [dependencies] base64.workspace = true k8s-openapi.workspace = true -kube.workspace = true +kube.workspace = { workspace = true, features = ["runtime", "derive"] } quilkin = { path = "../" } tokio.workspace = true From e0714c922d733a115a89acfc76f5ee69c451251f Mon Sep 17 00:00:00 2001 From: XAMPPRocky <4464295+XAMPPRocky@users.noreply.github.com> Date: Thu, 5 Jan 2023 19:27:20 +0100 Subject: [PATCH 4/6] Update Cargo.toml --- agones/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agones/Cargo.toml b/agones/Cargo.toml index de2c5d7751..4cae56a1db 100644 --- a/agones/Cargo.toml +++ b/agones/Cargo.toml @@ -26,6 +26,6 @@ readme = "README.md" [dependencies] base64.workspace = true k8s-openapi.workspace = true -kube.workspace = { workspace = true, features = ["runtime", "derive"] } +kube = { workspace = true, features = ["runtime", "derive"] } quilkin = { path = "../" } tokio.workspace = true From 4676e8cecbc6818c6da3d72e616e5469d45072be Mon Sep 17 00:00:00 2001 From: XAMPPRocky <4464295+XAMPPRocky@users.noreply.github.com> Date: Tue, 10 Jan 2023 10:23:38 +0100 Subject: [PATCH 5/6] Update Cargo.toml Co-authored-by: Mark Mandel --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index c1d3e04384..1441569c8c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ members = [".", "./macros", "./agones"] [workspace.dependencies] kube = { version = "0.77.0", features = ["derive", "runtime", "rustls-tls", "client"], default-features = false } k8s-openapi = { version = "0.16.0", features = ["v1_22", "schemars"] } -tokio = { version = "1.23.0", features = ["rt-multi-thread", "fs", "signal", "test-util", "parking_lot", "tracing"] } +tokio = { version = "1.24.0", features = ["rt-multi-thread", "fs", "signal", "test-util", "parking_lot", "tracing"] } base64 = "0.13.1" [package] From dd7d3c3c366b52a326cb71094bc4500b9d3fef11 Mon Sep 17 00:00:00 2001 From: XAMPPRocky <4464295+XAMPPRocky@users.noreply.github.com> Date: Tue, 10 Jan 2023 10:23:46 +0100 Subject: [PATCH 6/6] Update agones/Cargo.toml Co-authored-by: Mark Mandel --- agones/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agones/Cargo.toml b/agones/Cargo.toml index 4cae56a1db..af46371fd9 100644 --- a/agones/Cargo.toml +++ b/agones/Cargo.toml @@ -26,6 +26,6 @@ readme = "README.md" [dependencies] base64.workspace = true k8s-openapi.workspace = true -kube = { workspace = true, features = ["runtime", "derive"] } +kube = { workspace = true, features = ["openssl-tls", "client", "derive", "runtime"] } quilkin = { path = "../" } tokio.workspace = true