Skip to content

Commit

Permalink
chore(deps): upgrade to hyper 1.x
Browse files Browse the repository at this point in the history 
note: this commit will not compile, code changes are intentionally
elided from this commit.

this commit upgrades hyper, http, tonic, prost, related dependencies,
and their assorted cargo features.

see <linkerd/linkerd2#8733>.

Signed-off-by: katelyn martin <[email protected]>
  • Loading branch information
@cratelyn
cratelyn committed Jan 16, 2025
1 parent a4a55fa commit aadec9f
Show file tree
Hide file tree
Showing 16 changed files with 487 additions and 322 deletions.
760 changes: 466 additions & 294 deletions Cargo.lock
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,18 +98,18 @@ lto = true

[workspace.dependencies]
bytes = { version = "1" }
h2 = { version = "0.3" }
http = { version = "0.2" }
http-body = { version = "0.4" }
hyper = { version = "0.14.32", default-features = false }
prost = { version = "0.12" }
prost-types = { version = "0.12" }
h2 = { version = "0.4" }
http = { version = "1" }
http-body = { version = "1" }
hyper = { version = "1", default-features = false }
prost = { version = "0.13" }
prost-types = { version = "0.13" }
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 }
tonic = { version = "0.12", default-features = false }
tonic-build = { version = "0.12", default-features = false }

[workspace.dependencies.linkerd2-proxy-api]
version = "0.15.0"
Expand Down
2 changes: 1 addition & 1 deletion hyper-balance/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ publish = false
futures = { version = "0.3", default-features = false }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated"] }
hyper = { workspace = true }
pin-project = "1"
tower = { version = "0.4", default-features = false, features = ["load"] }
tokio = { version = "1", features = ["macros"] }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/admin/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bytes = { workspace = true }
deflate = { version = "1", optional = true, features = ["gzip"] }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
futures = { version = "0.3", default-features = false }
pprof = { version = "0.14", optional = true, features = ["prost-codec"] }
serde = "1"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ bytes = { workspace = true }
drain = { version = "0.1", features = ["retain"] }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
futures = { version = "0.3", default-features = false }
ipnet = "2.10"
prometheus-client = "0.22"
Expand Down
4 changes: 2 additions & 2 deletions linkerd/app/inbound/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ path = "../../proxy/server-policy"
features = ["proto"]

[target.'cfg(fuzzing)'.dependencies]
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
linkerd-app-test = { path = "../test" }
arbitrary = { version = "1", features = ["derive"] }
libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
Expand All @@ -54,7 +54,7 @@ linkerd-meshtls-rustls = { path = "../../meshtls/rustls", features = [
] }

[dev-dependencies]
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
linkerd-app-test = { path = "../test" }
linkerd-http-metrics = { path = "../../http/metrics", features = ["test-util"] }
linkerd-idle-cache = { path = "../../idle-cache", features = ["test-util"] }
Expand Down
3 changes: 0 additions & 3 deletions linkerd/app/integration/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,8 @@ h2 = { workspace = true }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = [
"backports",
"deprecated",
"http1",
"http2",
"stream",
"client",
"server",
] }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/outbound/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ linkerd-tonic-watch = { path = "../../tonic-watch" }
[dev-dependencies]
futures-util = "0.3"
http-body = { workspace = true }
hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
tokio = { version = "1", features = ["macros", "sync", "time"] }
tokio-rustls = { workspace = true }
tokio-test = "0.4"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/test/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ futures = { version = "0.3", default-features = false }
h2 = { workspace = true }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
linkerd-app-core = { path = "../core" }
linkerd-http-route = { path = "../../http/route", optional = true }
linkerd-identity = { path = "../../identity" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/executor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ HTTP runtime components for Linkerd.
"""

[dependencies]
hyper = { workspace = true, features = ["deprecated"] }
hyper = { workspace = true }
tokio = { version = "1", features = ["rt"] }
tracing = "0.1"
2 changes: 1 addition & 1 deletion linkerd/http/metrics/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ bytes = { workspace = true }
futures = { version = "0.3", default-features = false }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
parking_lot = "0.12"
pin-project = "1"
tokio = { version = "1", features = ["time"] }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/retry/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ linkerd-metrics = { path = "../../metrics" }
linkerd-stack = { path = "../../stack" }

[dev-dependencies]
hyper = { workspace = true, features = ["deprecated"] }
hyper = { workspace = true }
linkerd-tracing = { path = "../../tracing", features = ["ansi"] }
tokio = { version = "1", features = ["macros", "rt"] }
2 changes: 1 addition & 1 deletion linkerd/http/upgrade/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ drain = "0.1"
futures = { version = "0.3", default-features = false }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, default-features = false, features = ["deprecated", "client"] }
hyper = { workspace = true, default-features = false, features = ["client"] }
pin-project = "1"
tokio = { version = "1", default-features = false }
tower = { version = "0.4", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/metrics/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test_util = []
deflate = { version = "1", features = ["gzip"] }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
linkerd-http-box = { path = "../http/box" }
linkerd-stack = { path = "../stack", optional = true }
linkerd-system = { path = "../system", optional = true }
Expand Down
4 changes: 0 additions & 4 deletions linkerd/proxy/http/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,10 @@ http = { workspace = true }
http-body = { workspace = true }
httparse = "1"
hyper = { workspace = true, features = [
"backports",
"client",
"deprecated",
"http1",
"http2",
"server",
"stream",
"runtime",
] }
hyper-balance = { path = "../../../hyper-balance" }
parking_lot = "0.12"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/tap/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ publish = false
bytes = { workspace = true }
http = { workspace = true }
http-body = { workspace = true }
hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] }
hyper = { workspace = true, features = ["http1", "http2"] }
futures = { version = "0.3", default-features = false }
ipnet = "2.10"
linkerd2-proxy-api = { workspace = true, features = ["tap"] }
Expand Down

0 comments on commit aadec9f

Please sign in to comment.