diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock index 79841fcb371..c90afb43dc9 100644 --- a/quickwit/Cargo.lock +++ b/quickwit/Cargo.lock @@ -204,7 +204,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -215,7 +215,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1878,7 +1878,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] @@ -3196,7 +3196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -4641,7 +4641,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -5553,7 +5553,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5734,7 +5734,7 @@ version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "chrono", "getrandom 0.2.17", "http 1.5.0", @@ -6176,7 +6176,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d8fae84b431384b68627d0f9b3b1245fcf9f46f6c0e3dc902e9dce64edd1967" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] @@ -7802,7 +7802,6 @@ dependencies = [ "fnv", "futures", "google-cloud-auth", - "google-cloud-gax", "google-cloud-googleapis", "google-cloud-pubsub", "itertools 0.15.0", @@ -8483,7 +8482,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls 0.23.46", - "socket2 0.5.10", + "socket2 0.6.5", "thiserror 2.0.21", "tokio", "tracing", @@ -8522,9 +8521,9 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.5", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -9362,7 +9361,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -9442,7 +9441,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -9697,7 +9696,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b55fb86dfd3a2f5f76ea78310a88f96c4ea21a3031f8d212443d56123fd0521" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -10238,7 +10237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -10504,7 +10503,7 @@ dependencies = [ "cfg-if", "libc", "psm", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -10885,10 +10884,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand 2.5.0", - "getrandom 0.3.4", + "getrandom 0.4.3", "once_cell", "rustix 1.1.5", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -10897,7 +10896,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8c27177b12a6399ffc08b98f76f7c9a1f4fe9fc967c784c5a071fa8d93cf7e1" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -12341,7 +12340,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml index 10c9c222bf2..3d6421ea1b6 100644 --- a/quickwit/Cargo.toml +++ b/quickwit/Cargo.toml @@ -91,10 +91,10 @@ fnv = "1" futures = "0.3" futures-util = { version = "0.3", default-features = false } glob = "0.3" -# We can't directly update google-cloud-auth to 1.3 and google-cloud-gax to 1.4, because the latest version -# of google-cloud-pubsub is "0.30" which explicitly depends on: google-cloud-auth ^0.17 and google-cloud-gax ^0.19. +# These are yoshidan's google-cloud-rust crates. Their crates.io names now belong to Google's official SDK, +# with an unrelated API from google-cloud-auth 0.18, google-cloud-gax 0.20 and google-cloud-pubsub 0.31 on, +# so they can't be bumped past google-cloud-pubsub 0.30 (which requires google-cloud-auth ^0.17). google-cloud-auth = { version = "0.17", default-features = false, features = ["rustls-tls"] } -google-cloud-gax = "0.19" google-cloud-googleapis = { version = "0.16", features = ["pubsub"] } google-cloud-pubsub = { version = "0.30", default-features = false, features = ["auth", "rustls-tls"] } governor = "0.10" diff --git a/quickwit/quickwit-indexing/Cargo.toml b/quickwit/quickwit-indexing/Cargo.toml index a0dc08b0ee5..efc08674d09 100644 --- a/quickwit/quickwit-indexing/Cargo.toml +++ b/quickwit/quickwit-indexing/Cargo.toml @@ -24,7 +24,6 @@ flume = { workspace = true } fnv = { workspace = true } futures = { workspace = true } google-cloud-auth = { workspace = true, optional = true } -google-cloud-gax = { workspace = true, optional = true } google-cloud-googleapis = { workspace = true, optional = true } google-cloud-pubsub = { workspace = true, optional = true } itertools = { workspace = true } @@ -68,7 +67,6 @@ quickwit-storage = { workspace = true } [features] gcp-pubsub = [ "dep:google-cloud-auth", - "dep:google-cloud-gax", "dep:google-cloud-googleapis", "dep:google-cloud-pubsub", ] diff --git a/quickwit/quickwit-indexing/src/source/gcp_pubsub_source.rs b/quickwit/quickwit-indexing/src/source/gcp_pubsub_source.rs index 53f26e46d00..bc7c6b84478 100644 --- a/quickwit/quickwit-indexing/src/source/gcp_pubsub_source.rs +++ b/quickwit/quickwit-indexing/src/source/gcp_pubsub_source.rs @@ -19,7 +19,6 @@ use anyhow::Context; use async_trait::async_trait; use bytes::Bytes; use google_cloud_auth::credentials::CredentialsFile; -use google_cloud_gax::retry::RetrySetting; use google_cloud_pubsub::client::{Client, ClientConfig}; use google_cloud_pubsub::subscription::Subscription; use quickwit_actors::{ActorExitStatus, Mailbox}; @@ -133,7 +132,8 @@ impl GcpPubSubSource { max_messages_per_pull=%max_messages_per_pull, "starting GCP PubSub source" ); - if !subscription.exists(Some(RetrySetting::default())).await? { + // `None` makes the client use its default retry setting. + if !subscription.exists(None).await? { anyhow::bail!("GCP PubSub subscription `{subscription_name}` does not exist"); } Ok(Self {