From 070a29513fdec57edb1ead3de2a1347e01e736e4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Mar 2025 11:24:55 +0000 Subject: [PATCH 1/2] Update Rust crate object_store to v0.12.0 --- Cargo.lock | 37 ++++++++++--------------------------- Cargo.toml | 2 +- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d0d10532feb..f3c9adcbf3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2929,9 +2929,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ "either", ] @@ -3457,18 +3457,21 @@ dependencies = [ [[package]] name = "object_store" -version = "0.11.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cfccb68961a56facde1163f9319e0d15743352344e7808a11795fb99698dcaf" +checksum = "e9ce831b09395f933addbc56d894d889e4b226eba304d4e7adbab591e26daf1e" dependencies = [ "async-trait", "base64 0.22.1", "bytes", "chrono", + "form_urlencoded", "futures", + "http 1.2.0", + "http-body-util", "humantime", "hyper 1.6.0", - "itertools 0.13.0", + "itertools 0.14.0", "md-5", "parking_lot", "percent-encoding", @@ -3478,7 +3481,8 @@ dependencies = [ "ring", "serde", "serde_json", - "snafu", + "serde_urlencoded", + "thiserror 2.0.12", "tokio", "tracing", "url", @@ -4902,27 +4906,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "snafu" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223891c85e2a29c3fe8fb900c1fae5e69c2e42415e3177752e8718475efa5019" -dependencies = [ - "snafu-derive", -] - -[[package]] -name = "snafu-derive" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c3c6b7927ffe7ecaa769ee0e3994da3b8cafc8f444578982c83ecb161af917" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "socket2" version = "0.5.8" diff --git a/Cargo.toml b/Cargo.toml index bd505d13dbd..e81caf7c90f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -102,7 +102,7 @@ mockall = "=0.13.1" moka = { version = "=0.12.10", default-features = false, features = ["future"] } native-tls = "=0.2.14" oauth2 = "=5.0.0" -object_store = { version = "=0.11.2", features = ["aws"] } +object_store = { version = "=0.12.0", features = ["aws"] } p256 = "=0.13.2" parking_lot = "=0.12.3" paste = "=1.0.15" From f38623bb97c9437ea3920376e6e55cd5fa155407 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Mon, 10 Mar 2025 12:30:22 +0100 Subject: [PATCH 2/2] objectstore: Adjust to API changes --- src/worker/jobs/index_version_downloads_archive/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/worker/jobs/index_version_downloads_archive/mod.rs b/src/worker/jobs/index_version_downloads_archive/mod.rs index 317d205f550..5ba49c7af24 100644 --- a/src/worker/jobs/index_version_downloads_archive/mod.rs +++ b/src/worker/jobs/index_version_downloads_archive/mod.rs @@ -126,7 +126,7 @@ impl FileSet { #[derive(Serialize, Debug, Eq)] struct File { name: String, - size: usize, + size: u64, } impl Ord for File {