From 2444994b62e82bf243d34d1516c071b2f1337191 Mon Sep 17 00:00:00 2001 From: Raphael Taylor-Davies <1781103+tustvold@users.noreply.github.com> Date: Tue, 27 Dec 2022 10:22:56 +0000 Subject: [PATCH] Update quick-xml to 0.27 (#3395) * Update quick-xml * Fix Azure --- object_store/Cargo.toml | 2 +- object_store/src/aws/client.rs | 4 ++-- object_store/src/azure/client.rs | 4 ++-- object_store/src/gcp/mod.rs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/object_store/Cargo.toml b/object_store/Cargo.toml index fd033d55d666..a9cc151b985a 100644 --- a/object_store/Cargo.toml +++ b/object_store/Cargo.toml @@ -44,7 +44,7 @@ walkdir = "2" # Cloud storage support base64 = { version = "0.20", default-features = false, features = ["std"], optional = true } -quick-xml = { version = "0.26.0", features = ["serialize"], optional = true } +quick-xml = { version = "0.27.0", features = ["serialize"], optional = true } serde = { version = "1.0", default-features = false, features = ["derive"], optional = true } serde_json = { version = "1.0", default-features = false, optional = true } rand = { version = "0.8", default-features = false, features = ["std", "std_rng"], optional = true } diff --git a/object_store/src/aws/client.rs b/object_store/src/aws/client.rs index 0e22bfc97e22..b40bcbacf99e 100644 --- a/object_store/src/aws/client.rs +++ b/object_store/src/aws/client.rs @@ -189,9 +189,9 @@ struct CompleteMultipart { #[derive(Debug, Serialize)] struct MultipartPart { - #[serde(rename = "$unflatten=ETag")] + #[serde(rename = "ETag")] e_tag: String, - #[serde(rename = "$unflatten=PartNumber")] + #[serde(rename = "PartNumber")] part_number: usize, } diff --git a/object_store/src/azure/client.rs b/object_store/src/azure/client.rs index 50f836377add..556a2ad2b292 100644 --- a/object_store/src/azure/client.rs +++ b/object_store/src/azure/client.rs @@ -410,7 +410,6 @@ impl TryFrom for ListResult { let common_prefixes = value .blobs .blob_prefix - .unwrap_or_default() .into_iter() .map(|x| Ok(Path::parse(x.name)?)) .collect::>()?; @@ -437,7 +436,8 @@ impl TryFrom for ListResult { #[derive(Debug, Clone, PartialEq, Eq, Deserialize)] #[serde(rename_all = "PascalCase")] struct Blobs { - pub blob_prefix: Option>, + #[serde(default)] + pub blob_prefix: Vec, #[serde(rename = "Blob", default)] pub blobs: Vec, } diff --git a/object_store/src/gcp/mod.rs b/object_store/src/gcp/mod.rs index c83ab6493cb9..c1424d9713c1 100644 --- a/object_store/src/gcp/mod.rs +++ b/object_store/src/gcp/mod.rs @@ -221,9 +221,9 @@ struct InitiateMultipartUploadResult { #[derive(serde::Serialize, Debug)] #[serde(rename_all = "PascalCase", rename(serialize = "Part"))] struct MultipartPart { - #[serde(rename = "$unflatten=PartNumber")] + #[serde(rename = "PartNumber")] part_number: usize, - #[serde(rename = "$unflatten=ETag")] + #[serde(rename = "ETag")] e_tag: String, }