move xml dependencies to storage & add AzureStorageError (#250)

Author: ctaggart

sdk/core/Cargo.toml

@@ -13,7 +13,6 @@ categories = ["api-bindings"]
 edition = "2018"
 
 [dependencies]
-RustyXML = "0.3"
 base64 = "0.13"
 chrono = "0.4"
 http = "0.2"
@@ -24,7 +23,6 @@ thiserror = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-serde-xml-rs = "0.4"
 url = "2.2"
 uuid = { version = "0.8" }
 bytes = "1.0"

sdk/core/src/errors.rs

@@ -9,7 +9,6 @@ use std::str;
 use std::str::ParseBoolError;
 use std::string;
 use url::ParseError as URLParseError;
-use xml::BuilderError as XMLError;
 
 #[derive(Debug, thiserror::Error)]
 pub enum ParsingError {
@@ -173,8 +172,6 @@ pub enum AzureError {
     PermissionError(#[from] PermissionError),
     #[error("IO error: {}", 0)]
     IOError(#[from] IOError),
-    #[error("XML error: {}", 0)]
-    XMLError(#[from] XMLError),
     #[error("UnexpectedXMLError: {}", 0)]
     UnexpectedXMLError(String),
     #[error("Azure Path parse error: {}", 0)]
@@ -224,8 +221,6 @@ pub enum AzureError {
     UTF8Error(#[from] str::Utf8Error),
     #[error("FromUTF8 error: {}", 0)]
     FromUtf8Error(#[from] string::FromUtf8Error),
-    #[error("XML deserialization error: {}", 0)]
-    SerdeXMLDeserializationError(#[from] serde_xml_rs::Error),
     #[error("A required header is missing: {}", 0)]
     MissingHeaderError(String),
     #[error(

sdk/core/src/models/mod.rs

@@ -1,5 +1,2 @@
 pub(crate) mod etag;
 pub mod lease;
-mod stored_access_policy;
-
-pub use stored_access_policy::{StoredAccessPolicy, StoredAccessPolicyList};

sdk/core/src/parsing.rs

@@ -1,6 +1,4 @@
 use crate::errors::TraversingError;
-use xml::Element;
-use xml::Xml::{CharacterNode, ElementNode};
 
 pub trait FromStringOptional<T> {
     fn from_str_optional(s: &str) -> Result<T, TraversingError>;
@@ -101,280 +99,9 @@ pub fn from_azure_time(s: &str) -> Result<chrono::DateTime<chrono::Utc>, chrono:
     }
 }
 
-#[inline]
-pub fn traverse_single_must<'a>(
-    node: &'a Element,
-    path: &[&str],
-) -> Result<&'a Element, TraversingError> {
-    let vec = traverse(node, path, false)?;
-    if vec.len() > 1 {
-        return Err(TraversingError::MultipleNode(
-            path[path.len() - 1].to_owned(),
-        ));
-    }
-
-    Ok(vec[0])
-}
-
-pub fn traverse_single_optional<'a>(
-    node: &'a Element,
-    path: &[&str],
-) -> Result<Option<&'a Element>, TraversingError> {
-    let vec = traverse(node, path, true)?;
-    if vec.len() > 1 {
-        return Err(TraversingError::MultipleNode(
-            path[path.len() - 1].to_owned(),
-        ));
-    }
-
-    if vec.is_empty() {
-        return Ok(None);
-    }
-
-    Ok(Some(vec[0]))
-}
-
-#[inline]
-pub fn traverse<'a>(
-    node: &'a Element,
-    path: &[&str],
-    ignore_empty_leaf: bool,
-) -> Result<Vec<&'a Element>, TraversingError> {
-    trace!(
-        "traverse(node == {:?}, path == {:?}, ignore_empty_leaf == {})",
-        node,
-        path,
-        ignore_empty_leaf
-    );
-    // debug!("path.len() == {:?}", path.len());
-
-    if path.is_empty() {
-        return Ok(vec![node]);
-    }
-
-    let mut curnode = node;
-
-    for (x, item) in path.iter().enumerate() {
-        // debug!("x == {}, path[x] == {}", x, path[x]);
-
-        let vec = find_subnodes(curnode, item);
-        if vec.is_empty() {
-            if (x + 1) >= path.len() && ignore_empty_leaf {
-                return Ok(vec);
-            } else {
-                return Err(TraversingError::PathNotFound((*item).to_owned()));
-            }
-        }
-
-        if vec.len() > 1 && (x + 1) < path.len() {
-            return Err(TraversingError::MultipleNode((*item).to_owned()));
-        }
-
-        if (x + 1) >= path.len() {
-            return Ok(vec);
-        }
-
-        curnode = vec[0];
-    }
-
-    unreachable!();
-}
-
-#[inline]
-pub fn find_subnodes<'a>(node: &'a Element, subnode: &str) -> Vec<&'a Element> {
-    node.children
-        .iter()
-        .filter(|x| match **x {
-            ElementNode(ref mynode) => mynode.name == subnode,
-            _ => false,
-        })
-        .map(|x| match *x {
-            ElementNode(ref mynode) => mynode,
-            _ => unreachable!(),
-        })
-        .collect::<Vec<_>>()
-}
-
-#[inline]
-pub fn inner_text(node: &Element) -> Result<&str, TraversingError> {
-    for child in &node.children {
-        match *child {
-            CharacterNode(ref txt) => return Ok(txt),
-            _ => continue,
-        };
-    }
-
-    Ok("")
-
-    //debug!("\n!!! node == {}", node);
-    //Err(TraversingError::TextNotFound)
-}
-
-#[inline]
-pub fn cast_optional<'a, T>(node: &'a Element, path: &[&str]) -> Result<Option<T>, TraversingError>
-where
-    T: FromStringOptional<T>,
-{
-    match traverse_single_optional(node, path)? {
-        Some(e) => match inner_text(e) {
-            Ok(txt) => Ok(Some(T::from_str_optional(txt)?)),
-            Err(_) => Ok(None),
-        },
-        None => Ok(None),
-    }
-}
-
-#[inline]
-pub fn cast_must<'a, T>(node: &'a Element, path: &[&str]) -> Result<T, TraversingError>
-where
-    T: FromStringOptional<T>,
-{
-    let node = traverse_single_must(node, path)?;
-    let itxt = inner_text(node)?;
-    T::from_str_optional(itxt)
-}
-
 #[cfg(test)]
 mod test {
     use chrono::{Datelike, Timelike};
-    use xml::Element;
-
-    const XML: &'static str = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<EnumerationResults \
-                               ServiceEndpoint=\"http://mindrust.blob.core.windows.net/\">
-  \
-                               <Containers>
-    <Container>
-      <Name>pippo</Name>
-      \
-                               <Properties>
-        <Last-Modified>Mon, 23Nov 2015 21:12:35 \
-                               GMT</Last-Modified>
-        <Etag>\"0x8D2F44ACF757699\"</Etag>
-        \
-                               <LeaseStatus>unlocked</LeaseStatus>
-        \
-                               <LeaseState>available</LeaseState>
-                               \
-                               <SomeNumber>256</SomeNumber>
-      </Properties>
-    </Container>
-    \
-                               <Container>
-      <Name>pluto</Name>
-      <Properties>
-        \
-                               <Last-Modified>Mon, 23Nov 2015 21:12:35 GMT</Last-Modified>
-        \
-                               <Etag>\"0xAA2F44ACF757699\"</Etag>
-        \
-                               <LeaseStatus>locked</LeaseStatus>
-        \
-                               <LeaseState>available</LeaseState>
-      </Properties>
-    \
-                               </Container>
-  </Containers>
-  <NextMarker />
-</EnumerationResults>";
-
-    #[test]
-    fn test_cast_optional_1() {
-        let elem: Element = XML.parse().unwrap();
-
-        let sub1 = super::traverse(&elem, &["Containers", "Container"], false).unwrap();
-
-        {
-            let num = super::cast_optional::<u64>(sub1[0], &["Properties", "SomeNumber"]).unwrap();
-            assert_eq!(Some(256u64), num);
-        }
-
-        {
-            let num2 = super::cast_optional::<u64>(sub1[1], &["Properties", "SomeNumber"]).unwrap();
-            assert_eq!(None, num2);
-        }
-    }
-
-    #[test]
-    fn test_first_1() {
-        let elem: Element = XML.parse().unwrap();
-
-        let sub1 = super::find_subnodes(&elem, "Containers");
-        assert_eq!(1, sub1.len());
-
-        let sub2 = super::find_subnodes(&sub1[0], "Container");
-        assert_eq!(2, sub2.len());
-    }
-
-    #[test]
-    fn test_inner_2() {
-        let elem: Element = XML.parse().unwrap();
-
-        let mut sub = super::find_subnodes(&elem, "Containers");
-        sub = super::find_subnodes(&sub[0], "Container");
-        sub = super::find_subnodes(&sub[0], "Properties");
-        sub = super::find_subnodes(&sub[0], "LeaseStatus");
-
-        if let Ok(inner) = super::inner_text(&sub[0]) {
-            assert_eq!(inner, "unlocked");
-        } else {
-            panic!("should have found CharacterNode");
-        }
-    }
-
-    #[test]
-    fn test_traverse_1() {
-        let elem: Element = XML.parse().unwrap();
-
-        let mut res = super::traverse(&elem, &["Containers", "Container"], false).unwrap();
-        res = super::traverse(res[0], &["Properties", "LeaseStatus"], false).unwrap();
-
-        if let Ok(inner) = super::inner_text(&res[0]) {
-            assert_eq!(inner, "unlocked");
-        } else {
-            panic!("should have found CharacterNode");
-        }
-    }
-
-    #[test]
-    fn test_traverse_2() {
-        let elem: Element = XML.parse().unwrap();
-
-        let mut res = super::traverse(&elem, &["Containers", "Container"], false).unwrap();
-        res = super::traverse(res[1], &["Properties", "LeaseStatus"], false).unwrap();
-
-        if let Ok(inner) = super::inner_text(&res[0]) {
-            assert_eq!(inner, "locked");
-        } else {
-            panic!("should have found CharacterNode");
-        }
-    }
-
-    #[test]
-    fn test_traverse_single_must_1() {
-        let elem: Element = XML.parse().unwrap();
-
-        let res = super::traverse(&elem, &["Containers", "Container"], false).unwrap();
-        let res_final =
-            super::traverse_single_must(res[1], &["Properties", "LeaseStatus"]).unwrap();
-
-        if let Ok(inner) = super::inner_text(res_final) {
-            assert_eq!(inner, "locked");
-        } else {
-            panic!("should have found CharacterNode");
-        }
-    }
-
-    #[test]
-    fn test_traverse_single_optional_1() {
-        let elem: Element = XML.parse().unwrap();
-
-        let res = super::traverse(&elem, &["Containers", "Container"], false).unwrap();
-        let res_final =
-            super::traverse_single_optional(res[1], &["Properties", "Pinocchio"]).unwrap();
-
-        assert_eq!(res_final, None);
-    }
 
     #[test]
     fn test_from_azure_time() {

sdk/core/src/prelude.rs

@@ -2,6 +2,5 @@ pub use crate::errors::AzureError;
 pub use crate::etag::Etag;
 pub use crate::request_options::*;
 pub use crate::{
-    AddAsHeader, AppendToUrlQuery, Consistency, HttpClient, RequestId, SessionToken,
-    StoredAccessPolicy, StoredAccessPolicyList, EMPTY_BODY,
+    AddAsHeader, AppendToUrlQuery, Consistency, HttpClient, RequestId, SessionToken, EMPTY_BODY,
 };

sdk/storage/Cargo.toml

@@ -20,7 +20,6 @@ chrono = "0.4"
 http = "0.2"
 futures = "0.3"
 log = "0.4"
-quick-error = "1.2"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"

sdk/storage/src/account/responses/get_account_information_response.rs

@@ -1,4 +1,4 @@
-use azure_core::errors::AzureError;
+use crate::AzureStorageError;
 use azure_core::headers::{
     account_kind_from_headers, date_from_headers, request_id_from_headers, sku_name_from_headers,
 };
@@ -17,7 +17,7 @@ pub struct GetAccountInformationResponse {
 impl GetAccountInformationResponse {
     pub(crate) fn from_headers(
         headers: &HeaderMap,
-    ) -> Result<GetAccountInformationResponse, AzureError> {
+    ) -> Result<GetAccountInformationResponse, AzureStorageError> {
         let request_id = request_id_from_headers(headers)?;
         let date = date_from_headers(headers)?;
         let sku_name = sku_name_from_headers(headers)?;