From 0b26a07aba9e824bca5c224919e04808a72ef002 Mon Sep 17 00:00:00 2001 From: Francois Massot Date: Sat, 30 May 2026 10:34:27 +0200 Subject: [PATCH] =?UTF-8?q?fix(storage):=20restore=20TLS=20for=20opendal?= =?UTF-8?q?=20GCS=20backend=20after=200.55=E2=86=920.56=20bump?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit opendal 0.56 moved from reqwest 0.12 to reqwest 0.13. Because quickwit's workspace uses reqwest 0.12, Cargo no longer unifies features across the two separate majors. With `default-features = false`, opendal's reqwest 0.13 had no TLS backend, causing every GCS request to fail with: invalid URL, scheme is not http Explicitly enable `reqwest-rustls-tls` (an opendal default feature) so opendal's reqwest 0.13 is compiled with rustls regardless of the workspace reqwest version. Fixes #6477 Co-Authored-By: Claude Sonnet 4.6 --- quickwit/Cargo.lock | 112 ++++++++++++++++++++++++++++++++++++++++++++ quickwit/Cargo.toml | 2 +- 2 files changed, 113 insertions(+), 1 deletion(-) diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock index 240f857f62a..29e7757952a 100644 --- a/quickwit/Cargo.lock +++ b/quickwit/Cargo.lock @@ -2166,6 +2166,16 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "comfy-table" version = "7.2.2" @@ -5558,6 +5568,55 @@ dependencies = [ "jiff-tzdb", ] +[[package]] +name = "jni" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" +dependencies = [ + "cfg-if", + "combine", + "jni-macros", + "jni-sys", + "log", + "simd_cesu8", + "thiserror 2.0.18", + "walkdir", + "windows-link", +] + +[[package]] +name = "jni-macros" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" +dependencies = [ + "proc-macro2", + "quote", + "rustc_version", + "simd_cesu8", + "syn 2.0.117", +] + +[[package]] +name = "jni-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" +dependencies = [ + "jni-sys-macros", +] + +[[package]] +name = "jni-sys-macros" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" +dependencies = [ + "quote", + "syn 2.0.117", +] + [[package]] name = "jobserver" version = "0.1.34" @@ -9485,6 +9544,7 @@ version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" dependencies = [ + "aws-lc-rs", "bytes", "getrandom 0.3.4", "lru-slab", @@ -10044,13 +10104,19 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.9.0", + "hyper-rustls 0.27.9", "hyper-util", "js-sys", "log", "percent-encoding", "pin-project-lite", + "quinn", + "rustls 0.23.40", + "rustls-pki-types", + "rustls-platform-verifier", "sync_wrapper", "tokio", + "tokio-rustls 0.26.4", "tokio-util", "tower 0.5.3", "tower-http", @@ -10350,6 +10416,33 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.40", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki 0.103.13", + "security-framework", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -11049,6 +11142,16 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" +[[package]] +name = "simd_cesu8" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33" +dependencies = [ + "rustc_version", + "simdutf8", +] + [[package]] name = "simdutf8" version = "0.1.5" @@ -13343,6 +13446,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "webpki-root-certs" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webpki-roots" version = "0.26.11" diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml index 9048e3b61b4..3782629beb0 100644 --- a/quickwit/Cargo.toml +++ b/quickwit/Cargo.toml @@ -362,7 +362,7 @@ azure_storage_blobs = { version = "0.21", default-features = false, features = [ "enable_reqwest_rustls", ] } -opendal = { version = "0.56", default-features = false } +opendal = { version = "0.56", default-features = false, features = ["reqwest-rustls-tls"] } reqsign = { version = "0.18", default-features = false, features = ["google", "default-context"] } quickwit-actors = { path = "quickwit-actors" }