From b51335220b07785ec1017345800470b67ed501f2 Mon Sep 17 00:00:00 2001 From: katelyn martin Date: Sun, 1 Dec 2024 00:00:00 +0000 Subject: [PATCH] chore(deps): define prost, prost-types as workspace dependencies (#3473) this commit modifies the workspace manifest, defining prost and prost-types as common workspace dependencies. no changes to the lockfile are made because this commit does not affect the dependency graph of the project. * linkerd/linkerd2#8733 Signed-off-by: katelyn martin --- Cargo.toml | 2 ++ linkerd/proxy/api-resolve/Cargo.toml | 2 +- linkerd/proxy/client-policy/Cargo.toml | 2 +- linkerd/proxy/server-policy/Cargo.toml | 2 +- linkerd/proxy/tap/Cargo.toml | 2 +- linkerd/service-profiles/Cargo.toml | 2 +- linkerd/transport-header/Cargo.toml | 2 +- opencensus-proto/Cargo.toml | 4 ++-- opentelemetry-proto/Cargo.toml | 2 +- spiffe-proto/Cargo.toml | 4 ++-- 10 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 49d05c6e56..d4e6fb07a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,6 +101,8 @@ http = { version = "0.2" } http-body = { version = "0.4" } hyper = { version = "0.14", default-features = false } linkerd2-proxy-api = "0.15.0" +prost = { version = "0.12" } +prost-types = { version = "0.12" } tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "logging"] } # linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api.git", branch = "main" } diff --git a/linkerd/proxy/api-resolve/Cargo.toml b/linkerd/proxy/api-resolve/Cargo.toml index 2041adea9b..19eb3af708 100644 --- a/linkerd/proxy/api-resolve/Cargo.toml +++ b/linkerd/proxy/api-resolve/Cargo.toml @@ -23,7 +23,7 @@ linkerd-identity = { path = "../../identity" } http = { workspace = true } http-body = { workspace = true } pin-project = "1" -prost = "0.12" +prost = { workspace = true } tonic = { version = "0.10", default-features = false } tower = { version = "0.4", default-features = false } tracing = "0.1" diff --git a/linkerd/proxy/client-policy/Cargo.toml b/linkerd/proxy/client-policy/Cargo.toml index a4b8f93368..091ab0d7ce 100644 --- a/linkerd/proxy/client-policy/Cargo.toml +++ b/linkerd/proxy/client-policy/Cargo.toml @@ -20,7 +20,7 @@ ahash = "0.8" ipnet = "2" http = { workspace = true } once_cell = { version = "1" } -prost-types = { version = "0.12", optional = true } +prost-types = { workspace = true, optional = true } tonic = { version = "0.10", default-features = false } thiserror = { version = "2", optional = true } diff --git a/linkerd/proxy/server-policy/Cargo.toml b/linkerd/proxy/server-policy/Cargo.toml index d673a3850a..21ee77a70f 100644 --- a/linkerd/proxy/server-policy/Cargo.toml +++ b/linkerd/proxy/server-policy/Cargo.toml @@ -14,7 +14,7 @@ test-util = [] governor = { version = "0.8", default-features = false, features = ["std"] } ipnet = "2" http = { workspace = true } -prost-types = { version = "0.12", optional = true } +prost-types = { workspace = true, optional = true } thiserror = "2" linkerd-http-route = { path = "../../http/route" } diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml index 4f2f7823ab..e63dace3c6 100644 --- a/linkerd/proxy/tap/Cargo.toml +++ b/linkerd/proxy/tap/Cargo.toml @@ -22,7 +22,7 @@ linkerd-proxy-http = { path = "../http" } linkerd-stack = { path = "../../stack" } linkerd-tls = { path = "../../tls" } parking_lot = "0.12" -prost-types = "0.12" +prost-types = { workspace = true } rand = { version = "0.8" } thiserror = "2" tokio = { version = "1", features = ["time"] } diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml index 0b09c22a69..a0852ce552 100644 --- a/linkerd/service-profiles/Cargo.toml +++ b/linkerd/service-profiles/Cargo.toml @@ -16,7 +16,7 @@ http = { workspace = true } http-body = { workspace = true } linkerd2-proxy-api = { workspace = true, features = ["destination"] } once_cell = "1.20" -prost-types = "0.12" +prost-types = { workspace = true } regex = "1" tokio = { version = "1", features = ["macros", "rt", "sync", "time"] } tokio-stream = { version = "0.1", features = ["sync"] } diff --git a/linkerd/transport-header/Cargo.toml b/linkerd/transport-header/Cargo.toml index 3f5d45384f..68779b0e6e 100644 --- a/linkerd/transport-header/Cargo.toml +++ b/linkerd/transport-header/Cargo.toml @@ -14,7 +14,7 @@ linkerd-dns-name = { path = "../dns/name" } linkerd-error = { path = "../error" } linkerd-io = { path = "../io" } linkerd-stack = { path = "../stack" } -prost = "0.12" +prost = { workspace = true } tokio = { version = "1", features = ["time"] } tracing = "0.1" diff --git a/opencensus-proto/Cargo.toml b/opencensus-proto/Cargo.toml index c339c66335..93f8fcd255 100644 --- a/opencensus-proto/Cargo.toml +++ b/opencensus-proto/Cargo.toml @@ -13,8 +13,8 @@ Vendored from https://github.com/census-instrumentation/opencensus-proto/. [dependencies] bytes = "1" -prost = "0.12" -prost-types = "0.12" +prost = { workspace = true } +prost-types = { workspace = true } [dependencies.tonic] version = "0.10" diff --git a/opentelemetry-proto/Cargo.toml b/opentelemetry-proto/Cargo.toml index 94009ad322..7ddf51b360 100644 --- a/opentelemetry-proto/Cargo.toml +++ b/opentelemetry-proto/Cargo.toml @@ -13,7 +13,7 @@ Vendored from https://github.com/open-telemetry/opentelemetry-rust/. [dependencies] tonic = { version = "0.10", features = ["codegen", "prost", "transport"] } -prost = "0.12" +prost = { workspace = true } opentelemetry = { version = "0.27", default-features = false, features = ["trace"] } opentelemetry_sdk = { version = "0.27", default-features = false, features = ["trace"] } diff --git a/spiffe-proto/Cargo.toml b/spiffe-proto/Cargo.toml index 9e1790e63c..37c481af58 100644 --- a/spiffe-proto/Cargo.toml +++ b/spiffe-proto/Cargo.toml @@ -8,8 +8,8 @@ publish = false [dependencies] bytes = "1" -prost = "0.12" -prost-types = "0.12" +prost = { workspace = true } +prost-types = { workspace = true } [dependencies.tonic] version = "0.10"