chore(cargo.toml): define http-body as a workspace dependency

this is a follow-up to #3456, addressing a suggestion that was made during review: - <#3456 (review)> - <linkerd/linkerd2#8733> this commit modifies the workspace manifest, defining http-body as a common workspace dependency. no changes to the lockfile are made because this commit does not affect the dependency graph of the project. Signed-off-by: katelyn martin <kate@buoyant.io>
linkerd · Dec 16, 2024 · a7538d6 · a7538d6
1 parent 7e31e6b
commit a7538d6
Show file tree

Hide file tree

Showing 20 changed files with 20 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -98,6 +98,7 @@ lto = true
 
 [workspace.dependencies]
 http = { version = "0.2" }
+http-body = { version = "0.4" }
 hyper = { version = "0.14", default-features = false }
 linkerd2-proxy-api = "0.15.0"
 tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "logging"] }

diff --git a/linkerd/app/admin/Cargo.toml b/linkerd/app/admin/Cargo.toml
@@ -17,7 +17,7 @@ log-streaming = ["linkerd-tracing/stream"]
 [dependencies]
 deflate = { version = "1", optional = true, features = ["gzip"] }
 http = "0.2"
-http-body = "0.4"
+http-body = { workspace = true }
 hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
 futures = { version = "0.3", default-features = false }
 pprof = { version = "0.14", optional = true, features = ["prost-codec"] }

diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml
@@ -16,7 +16,7 @@ independently of the inbound and outbound proxy logic.
 bytes = "1"
 drain = { version = "0.1", features = ["retain"] }
 http = "0.2"
-http-body = "0.4"
+http-body = { workspace = true }
 hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
 futures = { version = "0.3", default-features = false }
 ipnet = "2.10"

diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml
@@ -21,7 +21,7 @@ bytes = "1"
 futures = { version = "0.3", default-features = false, features = ["executor"] }
 h2 = "0.3"
 http = "0.2"
-http-body = "0.4"
+http-body = { workspace = true }
 hyper = { workspace = true, features = [
     "backports",
     "deprecated",

diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml
@@ -53,7 +53,7 @@ linkerd-tonic-watch = { path = "../../tonic-watch" }
 
 [dev-dependencies]
 futures-util = "0.3"
-http-body = "0.4"
+http-body = { workspace = true }
 hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] }
 tokio = { version = "1", features = ["macros", "sync", "time"] }
 tokio-rustls = { workspace = true }

diff --git a/linkerd/app/test/Cargo.toml b/linkerd/app/test/Cargo.toml
@@ -16,7 +16,7 @@ client-policy = ["linkerd-proxy-client-policy", "tonic", "linkerd-http-route"]
 futures = { version = "0.3", default-features = false }
 h2 = "0.3"
 http = { workspace = true }
-http-body = "0.4"
+http-body = { workspace = true }
 hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
 linkerd-app-core = { path = "../core" }
 linkerd-http-route = { path = "../../http/route", optional = true }

diff --git a/linkerd/http/box/Cargo.toml b/linkerd/http/box/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 bytes = "1"
 futures = { version = "0.3", default-features = false }
 http = "0.2"
-http-body = "0.4"
+http-body = { workspace = true }
 pin-project = "1"
 
 linkerd-error = { path = "../../error" }

diff --git a/linkerd/http/classify/Cargo.toml b/linkerd/http/classify/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 futures = { version = "0.3", default-features = false }
 http = "0.2"
-http-body = "0.4"
+http-body = { workspace = true }
 pin-project = "1"
 tokio = { version = "1", default-features = false }
 tracing = "0.1"

diff --git a/linkerd/http/metrics/Cargo.toml b/linkerd/http/metrics/Cargo.toml
@@ -13,7 +13,7 @@ test-util = []
 bytes = "1"
 futures = { version = "0.3", default-features = false }
 http = { workspace = true }
-http-body = "0.4"
+http-body = { workspace = true }
 hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
 parking_lot = "0.12"
 pin-project = "1"

diff --git a/linkerd/http/prom/Cargo.toml b/linkerd/http/prom/Cargo.toml
@@ -16,7 +16,7 @@ test-util = []
 bytes = "1"
 futures = { version = "0.3", default-features = false }
 http = "0.2"
-http-body = "0.4"
+http-body = { workspace = true }
 parking_lot = "0.12"
 pin-project = "1"
 prometheus-client = "0.22"

diff --git a/linkerd/http/retain/Cargo.toml b/linkerd/http/retain/Cargo.toml
@@ -13,7 +13,7 @@ This is mostly intended to support cache eviction.
 
 [dependencies]
 http = "0.2"
-http-body = "0.4"
+http-body = { workspace = true }
 pin-project = "1"
 tower = { version = "0.4", default-features = false }
 

diff --git a/linkerd/http/retry/Cargo.toml b/linkerd/http/retry/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 bytes = "1"
 futures = { version = "0.3", default-features = false }
-http-body = "0.4"
+http-body = { workspace = true }
 http = "0.2"
 parking_lot = "0.12"
 tokio = { version = "1", features = ["macros", "rt"] }

diff --git a/linkerd/http/stream-timeouts/Cargo.toml b/linkerd/http/stream-timeouts/Cargo.toml
@@ -12,7 +12,7 @@ Tower middleware to express deadlines on streams.
 [dependencies]
 futures = { version = "0.3", default-features = false }
 http = { workspace = true }
-http-body = "0.4"
+http-body = { workspace = true }
 parking_lot = "0.12"
 pin-project = "1"
 thiserror = "2"

diff --git a/linkerd/http/upgrade/Cargo.toml b/linkerd/http/upgrade/Cargo.toml
@@ -14,7 +14,7 @@ bytes = "1"
 drain = "0.1"
 futures = { version = "0.3", default-features = false }
 http = { workspace = true }
-http-body = "0.4"
+http-body = { workspace = true }
 hyper = { workspace = true, default-features = false, features = ["deprecated", "client"] }
 pin-project = "1"
 tokio = { version = "1", default-features = false }

diff --git a/linkerd/opencensus/Cargo.toml b/linkerd/opencensus/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 futures = { version = "0.3", default-features = false }
 http = { workspace = true }
-http-body = "0.4"
+http-body = { workspace = true }
 linkerd-error = { path = "../error" }
 linkerd-metrics = { path = "../metrics" }
 linkerd-trace-context = { path = "../trace-context" }

diff --git a/linkerd/opentelemetry/Cargo.toml b/linkerd/opentelemetry/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 futures = { version = "0.3", default-features = false }
 http = "0.2"
-http-body = "0.4"
+http-body = { workspace = true }
 linkerd-error = { path = "../error" }
 linkerd-metrics = { path = "../metrics" }
 linkerd-trace-context = { path = "../trace-context" }

diff --git a/linkerd/proxy/api-resolve/Cargo.toml b/linkerd/proxy/api-resolve/Cargo.toml
@@ -21,7 +21,7 @@ linkerd-tonic-stream = { path = "../../tonic-stream" }
 linkerd-tls = { path = "../../tls" }
 linkerd-identity = { path = "../../identity" }
 http = "0.2"
-http-body = "0.4"
+http-body = { workspace = true }
 pin-project = "1"
 prost = "0.12"
 tonic = { version = "0.10", default-features = false }

diff --git a/linkerd/proxy/http/Cargo.toml b/linkerd/proxy/http/Cargo.toml
@@ -18,7 +18,7 @@ drain = "0.1"
 futures = { version = "0.3", default-features = false }
 h2 = "0.3"
 http = { workspace = true }
-http-body = "0.4"
+http-body = { workspace = true }
 httparse = "1"
 hyper = { workspace = true, features = [
     "backports",

diff --git a/linkerd/proxy/identity-client/Cargo.toml b/linkerd/proxy/identity-client/Cargo.toml
@@ -20,4 +20,4 @@ thiserror = "2"
 tokio = { version = "1", features = ["time", "sync"] }
 tonic = { version = "0.10", default-features = false }
 tracing = "0.1"
-http-body = "0.4"
+http-body = { workspace = true }
diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml
@@ -13,7 +13,7 @@ Implements client layers for Linkerd ServiceProfiles.
 bytes = "1"
 futures = { version = "0.3", default-features = false }
 http = { workspace = true }
-http-body = "0.4"
+http-body = { workspace = true }
 linkerd2-proxy-api = { workspace = true, features = ["destination"] }
 once_cell = "1.20"
 prost-types = "0.12"