move azure_storage::xml to azure_core::xml behind xml feature (#1045)

Author: ctaggart

sdk/core/Cargo.toml

@@ -27,6 +27,7 @@ reqwest = { version = "0.11", features = [
 ], default-features = false, optional = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
+serde-xml-rs = { version = "0.5", optional = true }
 url = "2.2"
 uuid = { version = "1.0" }
 pin-project = "1.0"
@@ -51,3 +52,4 @@ enable_reqwest_gzip = ["reqwest/gzip"]
 enable_reqwest_rustls = ["reqwest/rustls-tls"]
 test_e2e = []
 azurite_workaround = []
+xml = ["serde-xml-rs"]

sdk/core/src/lib.rs

@@ -36,6 +36,9 @@ pub mod util;
 
 use uuid::Uuid;
 
+#[cfg(feature = "xml")]
+pub mod xml;
+
 pub use bytes_stream::*;
 pub use constants::*;
 pub use context::Context;

sdk/storage/src/core/xml.rs renamed to sdk/core/src/xml.rs

@@ -1,10 +1,10 @@
-use azure_core::error::{ErrorKind, ResultExt};
+use crate::error::{ErrorKind, ResultExt};
 
 /// The UTF8 [byte order marker](https://en.wikipedia.org/wiki/Byte_order_mark)
 const UTF8_BOM: [u8; 3] = [0xEF, 0xBB, 0xBF];
 
 /// Reads the XML from bytes.
-pub fn read_xml<'de, T: serde::de::Deserialize<'de>>(body: &[u8]) -> azure_core::Result<T> {
+pub fn read_xml<'de, T: serde::de::Deserialize<'de>>(body: &[u8]) -> crate::Result<T> {
     serde_xml_rs::from_reader(slice_bom(body)).with_context(ErrorKind::DataConversion, || {
         let t = core::any::type_name::<T>();
         let xml = std::str::from_utf8(body).unwrap_or("<XML IS NOT UTF-8>");
@@ -24,6 +24,7 @@ fn slice_bom(bytes: &[u8]) -> &[u8] {
 #[cfg(test)]
 mod test {
     use super::*;
+    use serde::Deserialize;
 
     #[test]
     fn test_slice_bom() {

sdk/storage/Cargo.toml

@@ -14,7 +14,7 @@ edition = "2021"
 
 [dependencies]
 async-trait = "0.1"
-azure_core = { path = "../core", version = "0.4" }
+azure_core = { path = "../core", version = "0.4", features = ["xml"] }
 base64 = "0.13"
 time = "0.3.10"
 futures = "0.3"

sdk/storage/src/core/mod.rs

@@ -17,7 +17,6 @@ pub mod parsing_xml;
 pub mod storage_shared_key_credential;
 mod stored_access_policy;
 pub use azure_core::error::{Error, ErrorKind, ResultExt};
-pub mod xml;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct IPRange {

sdk/storage/src/core/stored_access_policy.rs

@@ -1,5 +1,4 @@
-use crate::xml::read_xml;
-use azure_core::date;
+use azure_core::{date, xml::read_xml};
 use time::OffsetDateTime;
 
 #[derive(Debug, Clone, Default, PartialEq, Eq)]
@@ -117,7 +116,6 @@ struct AccessPolicy {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::xml::read_xml;
 
     #[test]
     fn parse_from_xml() {

sdk/storage_blobs/Cargo.toml

@@ -13,7 +13,7 @@ categories = ["api-bindings"]
 edition = "2021"
 
 [dependencies]
-azure_core = { path = "../core", version = "0.4" }
+azure_core = { path = "../core", version = "0.4", features = ["xml"] }
 azure_storage = { path = "../storage", version = "0.5", default-features = false }
 base64 = "0.13"
 bytes = "1.0"

sdk/storage_blobs/src/blob/operations/get_tags.rs

@@ -1,6 +1,5 @@
 use crate::prelude::*;
-use azure_core::{headers::*, prelude::*, RequestId};
-use azure_storage::xml::read_xml;
+use azure_core::{headers::*, prelude::*, xml::read_xml, RequestId};
 use time::OffsetDateTime;
 
 operation! {

sdk/storage_blobs/src/container/operations/list_blobs.rs

@@ -4,9 +4,9 @@ use azure_core::{
     error::Error,
     headers::{date_from_headers, request_id_from_headers, Headers},
     prelude::*,
+    xml::read_xml,
     Pageable, RequestId, Response as AzureResponse,
 };
-use azure_storage::xml::read_xml;
 use time::OffsetDateTime;
 
 operation! {

sdk/storage_blobs/src/options/tags.rs

@@ -154,7 +154,7 @@ impl Header for Tags {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use azure_storage::xml::read_xml;
+    use azure_core::xml::read_xml;
 
     #[test]
     fn parse_tags_xml() -> azure_core::Result<()> {

sdk/storage_blobs/src/service/operations/find_blobs_by_tags.rs

@@ -1,6 +1,5 @@
-use azure_core::prelude::*;
-use azure_core::Response as HttpResponse;
-use azure_storage::{headers::CommonStorageResponseHeaders, xml::read_xml};
+use azure_core::{prelude::*, xml::read_xml, Response as HttpResponse};
+use azure_storage::headers::CommonStorageResponseHeaders;
 
 use crate::prelude::BlobServiceClient;
 

sdk/storage_queues/Cargo.toml

@@ -13,7 +13,7 @@ categories = ["api-bindings"]
 edition = "2021"
 
 [dependencies]
-azure_core = { path = "../core", version = "0.4", default-features=false }
+azure_core = { path = "../core", version = "0.4", default-features=false, features = ["xml"] }
 azure_storage = { path = "../storage", version = "0.5", default-features=false }
 time = "0.3.10"
 futures = "0.3"

sdk/storage_queues/src/operations/get_messages.rs

@@ -1,6 +1,6 @@
 use crate::{clients::QueueClient, prelude::*, PopReceipt};
-use azure_core::{headers::Headers, prelude::*, Method, Response as AzureResponse};
-use azure_storage::core::{headers::CommonStorageResponseHeaders, xml::read_xml};
+use azure_core::{headers::Headers, prelude::*, xml::read_xml, Method, Response as AzureResponse};
+use azure_storage::core::headers::CommonStorageResponseHeaders;
 use serde::Deserialize;
 use std::convert::TryInto;
 use time::OffsetDateTime;

sdk/storage_queues/src/operations/get_queue_service_properties.rs

@@ -1,6 +1,6 @@
 use crate::{QueueServiceClient, QueueServiceProperties};
-use azure_core::{headers::Headers, Method, Response as AzureResponse};
-use azure_storage::core::{headers::CommonStorageResponseHeaders, xml::read_xml};
+use azure_core::{headers::Headers, xml::read_xml, Method, Response as AzureResponse};
+use azure_storage::core::headers::CommonStorageResponseHeaders;
 use std::convert::TryInto;
 
 operation! {

sdk/storage_queues/src/operations/get_queue_service_stats.rs

@@ -3,9 +3,10 @@ use azure_core::{
     date,
     error::{ErrorKind, ResultExt},
     headers::Headers,
+    xml::read_xml,
     Method, Response as AzureResponse,
 };
-use azure_storage::core::{headers::CommonStorageResponseHeaders, xml::read_xml};
+use azure_storage::core::headers::CommonStorageResponseHeaders;
 use std::convert::TryInto;
 use time::OffsetDateTime;
 

sdk/storage_queues/src/operations/list_queues.rs

@@ -1,8 +1,9 @@
 use crate::QueueServiceClient;
 use azure_core::{
-    error::Error, headers::Headers, prelude::*, Method, Pageable, Response as AzureResponse,
+    error::Error, headers::Headers, prelude::*, xml::read_xml, Method, Pageable,
+    Response as AzureResponse,
 };
-use azure_storage::{core::headers::CommonStorageResponseHeaders, xml::read_xml};
+use azure_storage::core::headers::CommonStorageResponseHeaders;
 use std::convert::TryInto;
 
 operation! {

sdk/storage_queues/src/operations/peek_messages.rs

@@ -1,6 +1,6 @@
 use crate::{clients::QueueClient, prelude::*};
-use azure_core::{headers::Headers, prelude::*, Method, Response as AzureResponse};
-use azure_storage::core::{headers::CommonStorageResponseHeaders, xml::read_xml};
+use azure_core::{headers::Headers, prelude::*, xml::read_xml, Method, Response as AzureResponse};
+use azure_storage::core::headers::CommonStorageResponseHeaders;
 use std::convert::TryInto;
 use time::OffsetDateTime;
 

sdk/storage_queues/src/operations/put_message.rs

@@ -1,6 +1,8 @@
 use crate::prelude::*;
-use azure_core::{date, headers::Headers, prelude::*, Method, Response as AzureResponse};
-use azure_storage::{core::headers::CommonStorageResponseHeaders, xml::read_xml};
+use azure_core::{
+    date, headers::Headers, prelude::*, xml::read_xml, Method, Response as AzureResponse,
+};
+use azure_storage::core::headers::CommonStorageResponseHeaders;
 use std::convert::TryInto;
 use time::OffsetDateTime;