From 15c8c7cecf779daa2b2a1c12e4523d9847631f2e Mon Sep 17 00:00:00 2001 From: weisd Date: Tue, 7 Apr 2026 17:21:22 +0800 Subject: [PATCH] chore: update s3s to 010ae03 (#2418) --- Cargo.lock | 26 +++++++++++++------------- Cargo.toml | 2 +- rustfs/src/app/bucket_usecase.rs | 12 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3b52ae633..8d0de0f17 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -203,7 +203,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -214,7 +214,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -3153,7 +3153,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -3433,7 +3433,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4688,7 +4688,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -4765,7 +4765,7 @@ dependencies = [ "portable-atomic", "portable-atomic-util", "serde_core", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -5675,7 +5675,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] @@ -8689,7 +8689,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -8748,7 +8748,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -8784,7 +8784,7 @@ checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "s3s" version = "0.14.0-dev" -source = "git+https://github.com/rustfs/s3s?rev=79bb9abe6b353025ef4572a25db8eb64f1409faf#79bb9abe6b353025ef4572a25db8eb64f1409faf" +source = "git+https://github.com/rustfs/s3s?rev=010ae03bdd8c93a9c046108190987bb0e6cb0692#010ae03bdd8c93a9c046108190987bb0e6cb0692" dependencies = [ "arc-swap", "arrayvec", @@ -9413,7 +9413,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -9742,7 +9742,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix 1.1.4", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -10715,7 +10715,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index bd7f37777..0b886abbd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -252,7 +252,7 @@ rumqttc = { package = "rumqttc-next", version = "0.29.0", features = ["websocket rustix = { version = "1.1.4", features = ["fs"] } rust-embed = { version = "8.11.0" } rustc-hash = { version = "2.1.2" } -s3s = { git = "https://github.com/rustfs/s3s", rev = "79bb9abe6b353025ef4572a25db8eb64f1409faf", features = ["minio"] } +s3s = { git = "https://github.com/rustfs/s3s", rev = "010ae03bdd8c93a9c046108190987bb0e6cb0692", features = ["minio"] } serial_test = "3.4.0" shadow-rs = { version = "1.7.1", default-features = false } siphasher = "1.0.2" diff --git a/rustfs/src/app/bucket_usecase.rs b/rustfs/src/app/bucket_usecase.rs index e23e5ef91..073753add 100644 --- a/rustfs/src/app/bucket_usecase.rs +++ b/rustfs/src/app/bucket_usecase.rs @@ -170,18 +170,18 @@ fn encode_list_objects_v2_value(value: &str, encoding_type: Option<&EncodingType } } -fn build_metadata_extension_user_metadata(user_defined: &HashMap) -> Option { +fn build_metadata_extension_user_metadata(user_defined: &HashMap) -> Option { let mut items = extract_user_defined_metadata(user_defined) .into_iter() .filter(|(key, _)| !key.is_empty()) - .map(|(key, value)| MinioMetadataEntry { key, value }) + .map(|(key, value)| UserMetadataEntry { key, value }) .collect::>(); items.sort_by(|left, right| left.key.cmp(&right.key)); if items.is_empty() { None } else { - Some(MinioUserMetadata { items }) + Some(UserMetadataCollection { items }) } } @@ -2729,7 +2729,7 @@ mod tests { assert_eq!(version.internal, Some(ObjectInternalInfo { k: 4, m: 2 })); assert_eq!( version.user_metadata.as_ref().map(|metadata| metadata.items.clone()), - Some(vec![MinioMetadataEntry { + Some(vec![UserMetadataEntry { key: "project".to_string(), value: "alpha".to_string(), }]) @@ -2745,7 +2745,7 @@ mod tests { assert!(marker.user_tags.is_none()); assert_eq!( marker.user_metadata.as_ref().map(|metadata| metadata.items.clone()), - Some(vec![MinioMetadataEntry { + Some(vec![UserMetadataEntry { key: "marker".to_string(), value: "true".to_string(), }]) @@ -2840,7 +2840,7 @@ mod tests { assert!(object.owner.is_some()); assert_eq!( object.user_metadata.as_ref().map(|metadata| metadata.items.clone()), - Some(vec![MinioMetadataEntry { + Some(vec![UserMetadataEntry { key: "project".to_string(), value: "alpha".to_string(), }])