Skip to content

Commit 1ca4177

Browse files
Remove native-tls from transitive dependencies (#6537)
Switch azure_identity, google-cloud-auth, and pulsar to rustls-only TLS backends, eliminating native-tls, hyper-tls, tokio-native-tls and related packages from the dependency tree entirely.
1 parent 515d752 commit 1ca4177

5 files changed

Lines changed: 9 additions & 86 deletions

File tree

LICENSE-3rdparty.csv

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ const-oid,https://github.com/RustCrypto/formats,Apache-2.0 OR MIT,RustCrypto Dev
179179
const-oid,https://github.com/RustCrypto/formats/tree/master/const-oid,Apache-2.0 OR MIT,RustCrypto Developers
180180
const-random,https://github.com/tkaitchuck/constrandom,MIT OR Apache-2.0,Tom Kaitchuck <Tom.Kaitchuck@gmail.com>
181181
const-random-macro,https://github.com/tkaitchuck/constrandom,MIT OR Apache-2.0,Tom Kaitchuck <Tom.Kaitchuck@gmail.com>
182-
const_fn,https://github.com/taiki-e/const_fn,Apache-2.0 OR MIT,The const_fn Authors
183182
const_format,https://github.com/rodrimati1992/const_format_crates,Zlib,rodrimati1992 <rodrimatt1985@gmail.com>
184183
const_format_proc_macros,https://github.com/rodrimati1992/const_format_crates,Zlib,rodrimati1992 <rodrimatt1985@gmail.com>
185184
constant_time_eq,https://github.com/cesarb/constant_time_eq,CC0-1.0 OR MIT-0 OR Apache-2.0,Cesar Eduardo Barros <cesarb@cesarb.eti.br>
@@ -380,7 +379,6 @@ hybrid-array,https://github.com/RustCrypto/hybrid-array,MIT OR Apache-2.0,RustCr
380379
hyper,https://github.com/hyperium/hyper,MIT,Sean McArthur <sean@seanmonstar.com>
381380
hyper-rustls,https://github.com/rustls/hyper-rustls,Apache-2.0 OR ISC OR MIT,The hyper-rustls Authors
382381
hyper-timeout,https://github.com/hjr3/hyper-timeout,MIT OR Apache-2.0,Herman J. Radtke III <herman@hermanradtke.com>
383-
hyper-tls,https://github.com/hyperium/hyper-tls,MIT OR Apache-2.0,Sean McArthur <sean@seanmonstar.com>
384382
hyper-util,https://github.com/hyperium/hyper-util,MIT,Sean McArthur <sean@seanmonstar.com>
385383
iana-time-zone,https://github.com/strawlab/iana-time-zone,MIT OR Apache-2.0,"Andrew Straw <strawman@astraw.com>, René Kijewski <rene.kijewski@fu-berlin.de>, Ryan Lopopolo <rjl@hyperbo.la>"
386384
iana-time-zone-haiku,https://github.com/strawlab/iana-time-zone,MIT OR Apache-2.0,René Kijewski <crates.io@k6i.de>
@@ -492,7 +490,6 @@ mrecordlog,https://github.com/quickwit-oss/mrecordlog,MIT,The mrecordlog Authors
492490
multimap,https://github.com/havarnov/multimap,MIT OR Apache-2.0,Håvar Nøvik <havar.novik@gmail.com>
493491
murmur3,https://github.com/stusmall/murmur3,MIT OR Apache-2.0,Stu Small <stuart.alan.small@gmail.com>
494492
murmurhash32,https://github.com/quickwit-inc/murmurhash32,MIT,Paul Masurel <paul.masurel@gmail.com>
495-
native-tls,https://github.com/rust-native-tls/rust-native-tls,MIT OR Apache-2.0,Steven Fackler <sfackler@gmail.com>
496493
new_debug_unreachable,https://github.com/mbrubeck/rust-debug-unreachable,MIT,"Matt Brubeck <mbrubeck@limpet.net>, Jonathan Reem <jonathan.reem@gmail.com>"
497494
new_string_template,https://github.com/hasezoey/new_string_template,MIT,hasezoey <hasezoey@gmail.com>
498495
nibble_vec,https://github.com/michaelsproul/rust_nibble_vec,MIT,Michael Sproul <micsproul@gmail.com>
@@ -519,7 +516,6 @@ num-traits,https://github.com/rust-num/num-traits,MIT OR Apache-2.0,The Rust Pro
519516
num_cpus,https://github.com/seanmonstar/num_cpus,MIT OR Apache-2.0,Sean McArthur <sean@seanmonstar.com>
520517
num_enum,https://github.com/illicitonion/num_enum,BSD-3-Clause OR MIT OR Apache-2.0,"Daniel Wagner-Hall <dawagner@gmail.com>, Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>, Vincent Esche <regexident@gmail.com>"
521518
num_enum_derive,https://github.com/illicitonion/num_enum,BSD-3-Clause OR MIT OR Apache-2.0,"Daniel Wagner-Hall <dawagner@gmail.com>, Daniel Henry-Mantilla <daniel.henry.mantilla@gmail.com>, Vincent Esche <regexident@gmail.com>"
522-
num_threads,https://github.com/jhpratt/num_threads,MIT OR Apache-2.0,Jacob Pratt <open-source@jhpratt.dev>
523519
numfmt,https://github.com/kurtlawrence/numfmt,MIT,Kurt Lawrence <kurtlawrence.info>
524520
oauth2,https://github.com/ramosbugs/oauth2-rs,MIT OR Apache-2.0,"Alex Crichton <alex@alexcrichton.com>, Florin Lipan <florinlipan@gmail.com>, David A. Ramos <ramos@cs.stanford.edu>"
525521
objc2-core-foundation,https://github.com/madsmtm/objc2,Zlib OR Apache-2.0 OR MIT,The objc2-core-foundation Authors
@@ -853,7 +849,6 @@ tinyvec_macros,https://github.com/Soveu/tinyvec_macros,MIT OR Apache-2.0 OR Zlib
853849
tokio,https://github.com/tokio-rs/tokio,MIT,Tokio Contributors <team@tokio.rs>
854850
tokio-macros,https://github.com/tokio-rs/tokio,MIT,Tokio Contributors <team@tokio.rs>
855851
tokio-metrics,https://github.com/tokio-rs/tokio-metrics,MIT,Tokio Contributors <team@tokio.rs>
856-
tokio-native-tls,https://github.com/tokio-rs/tls,MIT,Tokio Contributors <team@tokio.rs>
857852
tokio-retry2,https://github.com/naomijub/tokio-retry,MIT,"Julia Naomi <jnboeira@outlook.com>, Sam Rijs <srijs@airpost.net>"
858853
tokio-rustls,https://github.com/rustls/tokio-rustls,MIT OR Apache-2.0,The tokio-rustls Authors
859854
tokio-stream,https://github.com/tokio-rs/tokio,MIT,Tokio Contributors <team@tokio.rs>
@@ -891,7 +886,6 @@ typetag,https://github.com/dtolnay/typetag,MIT OR Apache-2.0,David Tolnay <dtoln
891886
typetag-impl,https://github.com/dtolnay/typetag,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
892887
typify-impl,https://github.com/oxidecomputer/typify,Apache-2.0,The typify-impl Authors
893888
typify-macro,https://github.com/oxidecomputer/typify,Apache-2.0,The typify-macro Authors
894-
tz-rs,https://github.com/x-hgg-x/tz-rs,MIT OR Apache-2.0,x-hgg-x
895889
ua-parser,https://github.com/ua-parser/uap-rust,Apache-2.0,The ua-parser Authors
896890
ucd-trie,https://github.com/BurntSushi/ucd-generate,MIT OR Apache-2.0,Andrew Gallant <jamslam@gmail.com>
897891
ulid,https://github.com/dylanhart/ulid-rs,MIT,dylanhart <dylan96hart@gmail.com>

quickwit/Cargo.lock

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

quickwit/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,10 @@ futures-util = { version = "0.3", default-features = false }
139139
glob = "0.3"
140140
# We can't directly update google-cloud-auth to 1.3 and google-cloud-gax to 1.4, because the latest version
141141
# of google-cloud-pubsub is "0.30" which explicitly depends on: google-cloud-auth ^0.17 and google-cloud-gax ^0.19.
142-
google-cloud-auth = "0.17.2"
142+
google-cloud-auth = { version = "0.17.2", default-features = false, features = ["rustls-tls"] }
143143
google-cloud-gax = "0.19.2"
144144
google-cloud-googleapis = { version = "0.16", features = ["pubsub"] }
145-
google-cloud-pubsub = "0.30"
145+
google-cloud-pubsub = { version = "0.30", default-features = false, features = ["auth", "rustls-tls"] }
146146
governor = "0.10.4"
147147
heck = "0.5"
148148
hex = "0.4"
@@ -213,7 +213,7 @@ prost-types = "0.14"
213213
pulsar = { version = "6.7", default-features = false, features = [
214214
"auth-oauth2",
215215
"compression",
216-
"tokio-runtime",
216+
"tokio-rustls-runtime",
217217
] }
218218
quanta = "0.12"
219219
quick_cache = "0.6.21"
@@ -357,7 +357,7 @@ aws-smithy-types = { version = "1.4", features = [
357357
aws-types = "1.3"
358358

359359
azure_core = { version = "0.21", features = ["hmac_rust", "enable_reqwest_rustls"] }
360-
azure_identity = { version = "0.21" }
360+
azure_identity = { version = "0.21", default-features = false, features = ["enable_reqwest_rustls"] }
361361
azure_storage = { version = "0.21", default-features = false, features = [
362362
"enable_reqwest_rustls",
363363
] }

quickwit/quickwit-proto/src/codegen/quickwit/quickwit.search.rs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

quickwit/quickwit-storage/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ quickwit-common = { workspace = true, features = ["testsuite"] }
8080
azure = [
8181
"azure_core",
8282
"azure_identity",
83+
"azure_identity/enable_reqwest_rustls",
8384
"azure_storage",
8485
"azure_storage_blobs",
8586
"azure_core/hmac_rust",

0 commit comments

Comments
 (0)