chore(deps): define tonic, tonic-build as workspace dependencies (#3473)

this commit modifies the workspace manifest, defining tonic and tonic-build 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 <[email protected]>
linkerd · Dec 19, 2024 · 49804e7 · 49804e7
1 parent b513352
commit 49804e7
Show file tree

Hide file tree

Showing 22 changed files with 26 additions and 24 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -104,6 +104,8 @@ 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"] }
+tonic = { version = "0.10", default-features = false }
+tonic-build = { version = "0.10", default-features = false }
 # linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api.git", branch = "main" }
 
 # NB: hyperium/hyper#3796 backports the server connection builder's

diff --git a/linkerd/app/Cargo.toml b/linkerd/app/Cargo.toml
@@ -32,6 +32,6 @@ regex = "1"
 thiserror = "2"
 tokio = { version = "1", features = ["rt"] }
 tokio-stream = { version = "0.1", features = ["time", "sync"] }
-tonic = { version = "0.10", default-features = false, features = ["prost"] }
+tonic = { workspace = true, default-features = false, features = ["prost"] }
 tower = "0.4"
 tracing = "0.1"
diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml
@@ -26,7 +26,7 @@ serde_json = "1"
 thiserror = "2"
 tokio = { version = "1", features = ["macros", "sync", "parking_lot"] }
 tokio-stream = { version = "0.1", features = ["time"] }
-tonic = { version = "0.10", default-features = false, features = ["prost"] }
+tonic = { workspace = true, default-features = false, features = ["prost"] }
 tracing = "0.1"
 parking_lot = "0.12"
 pin-project = "1"

diff --git a/linkerd/app/gateway/Cargo.toml b/linkerd/app/gateway/Cargo.toml
@@ -16,7 +16,7 @@ linkerd-proxy-client-policy = { path = "../../proxy/client-policy" }
 once_cell = "1"
 thiserror = "2"
 tokio = { version = "1", features = ["sync"] }
-tonic = { version = "0.10", default-features = false }
+tonic = { workspace = true, default-features = false }
 tower = { version = "0.4", default-features = false }
 tracing = "0.1"
 

diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml
@@ -36,7 +36,7 @@ parking_lot = "0.12"
 rangemap = "1"
 thiserror = "2"
 tokio = { version = "1", features = ["sync"] }
-tonic = { version = "0.10", default-features = false }
+tonic = { workspace = true, default-features = false }
 tower = { version = "0.4", features = ["util"] }
 tracing = "0.1"
 

diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml
@@ -50,7 +50,7 @@ tokio-stream = { version = "0.1", features = ["sync"] }
 tokio-rustls = { workspace = true }
 rustls-pemfile = "2.2"
 tower = { version = "0.4", default-features = false }
-tonic = { version = "0.10", features = ["transport"], default-features = false }
+tonic = { workspace = true, features = ["transport"], default-features = false }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", default-features = false, features = [
     "fmt",

diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml
@@ -29,7 +29,7 @@ pin-project = "1"
 prometheus-client = "0.22"
 thiserror = "2"
 tokio = { version = "1", features = ["sync"] }
-tonic = { version = "0.10", default-features = false }
+tonic = { workspace = true, default-features = false }
 tower = { version = "0.4", features = ["util"] }
 tracing = "0.1"
 

diff --git a/linkerd/app/test/Cargo.toml b/linkerd/app/test/Cargo.toml
@@ -29,7 +29,7 @@ regex = "1"
 tokio = { version = "1", features = ["io-util", "net", "rt", "sync"] }
 tokio-test = "0.4"
 tokio-stream = { version = "0.1", features = ["sync"] }
-tonic = { version = "0.10", default-features = false, optional = true }
+tonic = { workspace = true, default-features = false, optional = true }
 tower = { version = "0.4", default-features = false }
 tracing = "0.1"
 thiserror = "2"

diff --git a/linkerd/opencensus/Cargo.toml b/linkerd/opencensus/Cargo.toml
@@ -14,7 +14,7 @@ linkerd-error = { path = "../error" }
 linkerd-metrics = { path = "../metrics" }
 linkerd-trace-context = { path = "../trace-context" }
 opencensus-proto = { path = "../../opencensus-proto" }
-tonic = { version = "0.10", default-features = false, features = [
+tonic = { workspace = true, default-features = false, features = [
     "prost",
     "codegen",
 ] }

diff --git a/linkerd/opentelemetry/Cargo.toml b/linkerd/opentelemetry/Cargo.toml
@@ -16,7 +16,7 @@ linkerd-trace-context = { path = "../trace-context" }
 opentelemetry = { version = "0.27", default-features = false, features = ["trace"] }
 opentelemetry_sdk = { version = "0.27", default-features = false, features = ["trace"] }
 opentelemetry-proto = { path = "../../opentelemetry-proto" }
-tonic = { version = "0.10", default-features = false, features = [
+tonic = { workspace = true, default-features = false, features = [
     "prost",
     "codegen",
 ] }

diff --git a/linkerd/proxy/api-resolve/Cargo.toml b/linkerd/proxy/api-resolve/Cargo.toml
@@ -24,6 +24,6 @@ http = { workspace = true }
 http-body = { workspace = true }
 pin-project = "1"
 prost = { workspace = true }
-tonic = { version = "0.10", default-features = false }
+tonic = { workspace = true, 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
@@ -21,7 +21,7 @@ ipnet = "2"
 http = { workspace = true }
 once_cell = { version = "1" }
 prost-types = { workspace = true, optional = true }
-tonic = { version = "0.10", default-features = false }
+tonic = { workspace = true, default-features = false }
 thiserror = { version = "2", optional = true }
 
 linkerd-error = { path = "../../error" }

diff --git a/linkerd/proxy/identity-client/Cargo.toml b/linkerd/proxy/identity-client/Cargo.toml
@@ -18,6 +18,6 @@ parking_lot = "0.12"
 pin-project = "1"
 thiserror = "2"
 tokio = { version = "1", features = ["time", "sync"] }
-tonic = { version = "0.10", default-features = false }
+tonic = { workspace = true, default-features = false }
 tracing = "0.1"
 http-body = { workspace = true }
diff --git a/linkerd/proxy/spire-client/Cargo.toml b/linkerd/proxy/spire-client/Cargo.toml
@@ -16,7 +16,7 @@ linkerd-tonic-watch = { path = "../../tonic-watch" }
 linkerd-exp-backoff = { path = "../../exp-backoff" }
 linkerd-stack = { path = "../../stack" }
 tokio = { version = "1", features = ["time", "sync"] }
-tonic = "0.10"
+tonic = { workspace = true }
 tower = "0.4"
 tracing = "0.1"
 x509-parser = "0.16.0"

diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml
@@ -27,7 +27,7 @@ rand = { version = "0.8" }
 thiserror = "2"
 tokio = { version = "1", features = ["time"] }
 tower = { version = "0.4", default-features = false }
-tonic = { version = "0.10", default-features = false }
+tonic = { workspace = true, default-features = false }
 tracing = "0.1"
 pin-project = "1"
 

diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml
@@ -20,7 +20,7 @@ prost-types = { workspace = true }
 regex = "1"
 tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
 tokio-stream = { version = "0.1", features = ["sync"] }
-tonic = { version = "0.10", default-features = false }
+tonic = { workspace = true, default-features = false }
 tower = { version = "0.4.13", features = ["retry", "util"] }
 thiserror = "2"
 tracing = "0.1"

diff --git a/linkerd/tonic-stream/Cargo.toml b/linkerd/tonic-stream/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 futures = { version = "0.3", default-features = false }
 linkerd-stack = { path = "../stack" }
 pin-project = "1"
-tonic = { version = "0.10", default-features = false }
+tonic = { workspace = true, default-features = false }
 tokio = { version = "1", features = ["time"] }
 tracing = "0.1"
 

diff --git a/linkerd/tonic-watch/Cargo.toml b/linkerd/tonic-watch/Cargo.toml
@@ -13,7 +13,7 @@ Provides a utility for creating robust watches from a service that returns a str
 futures = { version = "0.3", default-features = false }
 linkerd-error = { path = "../error" }
 linkerd-stack = { path = "../stack" }
-tonic = { version = "0.10", default-features = false }
+tonic = { workspace = true, default-features = false }
 tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
 tracing = "0.1"
 

diff --git a/opencensus-proto/Cargo.toml b/opencensus-proto/Cargo.toml
@@ -17,12 +17,12 @@ prost = { workspace = true }
 prost-types = { workspace = true }
 
 [dependencies.tonic]
-version = "0.10"
+workspace = true
 default-features = false
 features = ["prost", "codegen"]
 
 [dev-dependencies.tonic-build]
-version = "0.10"
+workspace = true
 default-features = false
 features = ["prost"]
 

diff --git a/opentelemetry-proto/Cargo.toml b/opentelemetry-proto/Cargo.toml
@@ -12,14 +12,14 @@ Vendored from https://github.com/open-telemetry/opentelemetry-rust/.
 """
 
 [dependencies]
-tonic = { version = "0.10", features = ["codegen", "prost", "transport"] }
+tonic = { workspace = true, features = ["codegen", "prost", "transport"] }
 prost = { workspace = true }
 opentelemetry = { version = "0.27", default-features = false, features = ["trace"] }
 opentelemetry_sdk = { version = "0.27", default-features = false, features = ["trace"] }
 
 [dev-dependencies]
 opentelemetry = { version = "0.27", default-features = false, features = ["trace", "testing"] }
-tonic-build = { version = "0.10", default-features = false, features = ["prost"] }
+tonic-build = { workspace = true, default-features = false, features = ["prost"] }
 
 [lib]
 doctest = false
diff --git a/spiffe-proto/Cargo.toml b/spiffe-proto/Cargo.toml
@@ -12,12 +12,12 @@ prost = { workspace = true }
 prost-types = { workspace = true }
 
 [dependencies.tonic]
-version = "0.10"
+workspace = true
 default-features = false
 features = ["prost", "codegen"]
 
 [dev-dependencies.tonic-build]
-version = "0.10"
+workspace = true
 default-features = false
 features = ["prost"]
 

diff --git a/tools/Cargo.toml b/tools/Cargo.toml
@@ -6,6 +6,6 @@ license = "Apache-2.0"
 publish = false
 
 [dependencies.tonic-build]
-version = "0.10"
+workspace = true
 default-features = false
 features = ["prost"]