Skip to content

Commit 6771e75

Browse files
authored
Merge pull request #34399 from teskje/update-reqwest
Update reqwest to 0.12.24
2 parents dcc5bac + 6ba37d5 commit 6771e75

File tree

25 files changed

+100
-210
lines changed

25 files changed

+100
-210
lines changed

Cargo.lock

Lines changed: 69 additions & 159 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,6 @@ launchdarkly-server-sdk = { git = "https://github.com/MaterializeInc/rust-server
337337
rdkafka = { git = "https://github.com/MaterializeInc/rust-rdkafka.git" }
338338
rdkafka-sys = { git = "https://github.com/MaterializeInc/rust-rdkafka.git" }
339339

340-
# Removes dependencies required for WASM support that create duplicated deps.
341-
reqwest-middleware = { git = "https://github.com/MaterializeInc/reqwest-middleware.git" }
342-
reqwest-retry = { git = "https://github.com/MaterializeInc/reqwest-middleware.git" }
343-
344340
# Need to upstream a few PRs related to test builders.
345341
#
346342
# Note: All changes in our fork of tiberius should be pushed to the `mz_changes` branch.

deny.toml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ skip = [
2020
{ name = "arrayvec", version = "0.5.2" },
2121
# One-time exception for base64 due to its prevalence in the crate graph.
2222
{ name = "base64", version = "0.13.1" },
23-
{ name = "base64", version = "0.21.5" },
2423
# `syn` is a core crate that a huge part of the ecosystem either directly, or
2524
# transitively depends on. They just released v2.0 which not all crates have
2625
# migrated to yet.
@@ -80,10 +79,6 @@ skip = [
8079
{ name = "tungstenite", version = "0.24.0" },
8180
{ name = "tokio-tungstenite", version = "0.24.0" },
8281

83-
# `axum 0.7.5` depends on both `sync_wrapper 1.*` and `axum-core 0.4.3`.
84-
# The latter depends on `sync_wrapper 0.1.*`.
85-
{ name = "sync_wrapper", version = "0.1.2" },
86-
8782
{ name = "memmap2", version = "0.5.4" },
8883

8984
{ name = "async-channel", version = "1.9.0" },
@@ -98,10 +93,7 @@ skip = [
9893
{ name = "rand_chacha", version = "0.3.0" },
9994
{ name = "rand_core", version = "0.5.1" },
10095
{ name = "rand_core", version = "0.6.2" },
101-
{ name = "reqwest", version = "0.11.24" },
10296
# Used by reqwest
103-
{ name = "system-configuration", version = "0.5.1" },
104-
{ name = "system-configuration-sys", version = "0.5.0" },
10597
{ name = "thiserror", version = "1.0.61" },
10698
{ name = "thiserror-impl", version = "1.0.61" },
10799
{ name = "twox-hash", version = "1.6.3" },
@@ -229,7 +221,6 @@ wrappers = [
229221
"launchdarkly-server-sdk",
230222
"launchdarkly-server-sdk-evaluation",
231223
"prometheus",
232-
"proptest",
233224
"rayon-core",
234225
"sharded-slab",
235226
]
@@ -261,8 +252,6 @@ ignore = [
261252
"RUSTSEC-2024-0388",
262253
# The creator of the crate `paste` has stated in the [`README.md`](https://github.com/dtolnay/paste/blob/master/README.md) that this project is not longer maintained as well as archived the repository
263254
"RUSTSEC-2024-0436",
264-
# TODO: Remove once https://github.com/MaterializeInc/materialize/pull/34277 lands
265-
"RUSTSEC-2025-0134",
266255
]
267256

268257
# Must be manually kept in sync with about.toml.

src/balancerd/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = tru
5858
mz-environmentd = { path = "../environmentd", default-features = false, features = ["test"] }
5959
mz-frontegg-mock = { path = "../frontegg-mock" }
6060
postgres = "0.19.12"
61-
reqwest = "0.11.24"
61+
reqwest = "0.12.24"
6262
tempfile = "3.23.0"
6363

6464
[features]

src/ccsr/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ workspace = true
1313
anyhow = "1.0.100"
1414
native-tls = "0.2.14"
1515
openssl = { version = "0.10.75", features = ["vendored"] }
16-
reqwest = { version = "0.11.13", features = [
16+
reqwest = { version = "0.12.24", features = [
1717
"blocking",
1818
"json",
1919
"native-tls-vendored",

src/cloud-api/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ workspace = true
1212
[dependencies]
1313
anyhow = "1.0.100"
1414
chrono = { version = "0.4.39", default-features = false, features = ["std"] }
15-
reqwest = { version = "0.11.4", features = ["json"] }
15+
reqwest = { version = "0.12.24", features = ["json"] }
1616
serde = { version = "1.0.219", features = ["derive"] }
1717
url = "2.5.7"
1818
thiserror = "2.0.17"

src/environmentd/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ rdkafka-sys = { version = "4.3.0", features = [
9696
] }
9797
rand = "0.9.2"
9898
regex = { version = "1.12.2", optional = true }
99-
reqwest = { version = "0.11.13", features = ["json"] }
99+
reqwest = { version = "0.12.24", features = ["json"] }
100100
rlimit = "0.10.2"
101101
semver = "1.0.27"
102102
sentry-tracing = "0.38.1"
@@ -156,7 +156,7 @@ rdkafka = { version = "0.29.0", features = [
156156
"libz-static",
157157
"zstd",
158158
] }
159-
reqwest = { version = "0.11.13", features = ["blocking"] }
159+
reqwest = { version = "0.12.24", features = ["blocking"] }
160160
serde_json = "1.0.145"
161161
serde_urlencoded = "0.7.1"
162162
similar-asserts = "1.7"

src/fivetran-destination/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ insta = "1.43"
4545
[build-dependencies]
4646
mz-build-tools = { path = "../build-tools", default-features = false, features = ["protobuf-src"] }
4747
prost-build = "0.13.5"
48-
reqwest = { version = "0.11.13", features = ["blocking", "native-tls-vendored"] }
48+
reqwest = { version = "0.12.24", features = ["blocking", "native-tls-vendored"] }
4949
tonic-build = "0.12.3"
5050

5151
[features]

src/frontegg-auth/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ lru = "0.14.0"
2020
mz-ore = { path = "../ore", features = ["network", "metrics"] }
2121
mz-repr = { path = "../repr" }
2222
prometheus = { version = "0.14.0", default-features = false }
23-
reqwest = { version = "0.11.13", features = ["json"] }
24-
reqwest-middleware = "0.2.2"
25-
reqwest-retry = "0.2.2"
23+
reqwest = "0.12.24"
24+
reqwest-middleware = { version = "0.4.2", features = ["json"] }
25+
reqwest-retry = "0.8.0"
2626
serde = { version = "1.0.219", features = ["derive"] }
2727
serde_json = "1.0.145"
2828
thiserror = "2.0.17"

src/frontegg-auth/src/client.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ impl Client {
3737
pub fn environmentd_default() -> Self {
3838
let retry_policy = ExponentialBackoff::builder()
3939
.retry_bounds(Duration::from_millis(200), Duration::from_secs(2))
40-
.backoff_exponent(2)
4140
.build_with_total_retry_duration(Duration::from_secs(30));
4241

4342
let client = reqwest::Client::builder()

0 commit comments

Comments
 (0)