Storage crate reorg and cleanup

sdk/core/src/macros.rs

@@ -66,9 +66,9 @@ macro_rules! create_enum {
             )*
         }
 
-        impl ::std::convert::Into<&'static str> for $name {
-            fn into(self) -> &'static str {
-                match self {
+        impl ::std::convert::From<$name> for &'static str {
+            fn from(e: $name) -> Self {
+                match e {
                     $(
                         $name::$variant => $value,
                     )*

sdk/core/src/parsing.rs

@@ -30,7 +30,7 @@ impl FromStringOptional<bool> for bool {
 
 impl FromStringOptional<chrono::DateTime<chrono::Utc>> for chrono::DateTime<chrono::Utc> {
     fn from_str_optional(s: &str) -> Result<chrono::DateTime<chrono::Utc>, TraversingError> {
-        from_azure_time(s).map_err(|e| TraversingError::DateTimeParseError(e))
+        from_azure_time(s).map_err(TraversingError::DateTimeParseError)
     }
 }
 
@@ -82,8 +82,7 @@ pub mod rfc2822_time_format_optional {
         S: Serializer,
     {
         if let Some(date) = date {
-            let s = format!("{}", date.to_rfc2822());
-            serializer.serialize_str(&s)
+            serializer.serialize_str(&date.to_rfc2822())
         } else {
             serializer.serialize_none()
         }
@@ -150,9 +149,7 @@ pub fn traverse<'a>(
     // debug!("path.len() == {:?}", path.len());
 
     if path.is_empty() {
-        let mut vec = Vec::new();
-        vec.push(node);
-        return Ok(vec);
+        return Ok(vec![node]);
     }
 
     let mut curnode = node;
@@ -234,7 +231,7 @@ where
 {
     let node = traverse_single_must(node, path)?;
     let itxt = inner_text(node)?;
-    Ok(T::from_str_optional(itxt)?)
+    T::from_str_optional(itxt)
 }
 
 #[cfg(test)]

sdk/core/src/request_options/ba512_range.rs

@@ -37,11 +37,11 @@ impl BA512Range {
     }
 }
 
-impl Into<Range> for BA512Range {
-    fn into(self) -> Range {
-        Range {
-            start: self.start(),
-            end: self.end(),
+impl From<BA512Range> for Range {
+    fn from(range: BA512Range) -> Self {
+        Self {
+            start: range.start(),
+            end: range.end(),
         }
     }
 }

sdk/core/src/request_options/metadata.rs

@@ -7,14 +7,22 @@ use std::collections::HashMap;
 #[derive(Debug, Clone)]
 pub struct Metadata(HashMap<String, Bytes>);
 
-impl Metadata {
-    pub fn new() -> Self {
-        Self(HashMap::new())
+impl Default for Metadata {
+    fn default() -> Self {
+        Self::new()
     }
+}
 
-    pub fn as_mut(&mut self) -> &mut HashMap<String, Bytes> {
+impl AsMut<HashMap<String, Bytes>> for Metadata {
+    fn as_mut(&mut self) -> &mut HashMap<String, Bytes> {
         &mut self.0
     }
+}
+
+impl Metadata {
+    pub fn new() -> Self {
+        Self(HashMap::new())
+    }
 
     pub fn insert<K, V>(&mut self, k: K, v: V) -> Option<Bytes>
     where
@@ -28,8 +36,12 @@ impl Metadata {
         self.0.len()
     }
 
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
     pub fn get(&self, k: &str) -> Option<Bytes> {
-        self.0.get(k).map(|b| b.clone())
+        self.0.get(k).cloned()
     }
 }
 

sdk/core/src/util.rs

@@ -98,8 +98,8 @@ fn format<D: Display>(value: D) -> String {
 pub fn to_str_without_bom(bytes: &bytes::Bytes) -> Result<&str, std::str::Utf8Error> {
     let s = from_utf8(bytes)?;
 
-    Ok(if s.starts_with('\u{FEFF}') {
-        &s[3..]
+    Ok(if let Some(stripped) = s.strip_prefix('\u{FEFF}') {
+        stripped
     } else {
         s
     })

sdk/storage/Cargo.toml

@@ -19,40 +19,184 @@ base64 = "0.13"
 chrono = "0.4"
 http = "0.2"
 futures = "0.3"
-hyper = "0.14"
 log = "0.4"
-mime = "0.3"
 quick-error = "1.2"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 serde-xml-rs = "0.4"
-time = "0.2"
 url = "2.2"
 uuid = { version = "0.8", features = ["v4"] }
-smallvec = { version = "1.6", features = ["serde"] }
 bytes = "1.0"
-hyper-rustls = "0.22"
 md5 = "0.7"
 RustyXML = "0.3"
-percent-encoding = "2.1"
-failure = "0.1"
 thiserror = "1.0"
 once_cell = "1.7"
 
 [dev-dependencies]
 tokio = { version = "1.0", features = ["macros"] }
 env_logger = "0.8"
 azure_identity = { path = "../identity" }
-url = "2.2"
 reqwest = "0.11"
 
 [features]
-default = ["account", "blob", "queue", "table", "data_lake"]
-test_e2e = ["account", "blob", "queue", "table", "data_lake"]
-account = []
+default = ["storage_account", "blob_storage", "queue_storage", "table_storage", "data_lake_storage"]
+test_e2e = ["storage_account", "blob_storage", "queue_storage", "table_storage", "data_lake_storage"]
+storage_account = []
 azurite_workaround = []
-blob = []
-queue = []
-table = []
-data_lake = []
+blob_storage = []
+queue_storage = []
+table_storage = []
+data_lake_storage = []
+
+
+
+# This section specifies the required features for the examples. 
+
+[[example]]
+name="table_00"
+required-features = ["table_storage"]
+
+
+
+
+[[example]]
+name="account00"
+required-features = ["storage_account"]
+
+
+
+
+[[example]]
+name="blob_00"
+required-features=["blob_storage"]
+
+[[example]]
+name="blob_01"
+required-features=["blob_storage"]
+
+[[example]]
+name="blob_02_bearer_token"
+required-features=["blob_storage"]
+
+[[example]]
+name="blob_04"
+required-features=["blob_storage"]
+
+[[example]]
+name="blob_05_default_credential"
+required-features=["blob_storage"]
+
+[[example]]
+name="blob_range"
+required-features=["blob_storage"]
+
+[[example]]
+name="connection_string_builder"
+required-features=["blob_storage"]
+
+[[example]]
+name="connection_string"
+required-features=["blob_storage"]
+
+[[example]]
+name="container_00"
+required-features=["blob_storage"]
+
+[[example]]
+name="container_01"
+required-features=["blob_storage"]
+
+[[example]]
+name="container_and_blob"
+required-features=["blob_storage"]
+
+[[example]]
+name="copy_blob_from_url"
+required-features=["blob_storage"]
+
+[[example]]
+name="copy_blob"
+required-features=["blob_storage"]
+
+[[example]]
+name="count_blobs"
+required-features=["blob_storage"]
+
+[[example]]
+name="emulator_00"
+required-features=["blob_storage"]
+
+[[example]]
+name="list_blobs_00"
+required-features=["blob_storage"]
+
+[[example]]
+name="list_blobs_01"
+required-features=["blob_storage"]
+
+[[example]]
+name="list_containers2"
+required-features=["blob_storage"]
+
+[[example]]
+name="put_append_blob_00"
+required-features=["blob_storage"]
+
+[[example]]
+name="put_block_blob_00"
+required-features=["blob_storage"]
+
+[[example]]
+name="put_page_blob_00"
+required-features=["blob_storage"]
+
+#[[example]]
+#name="sas00"
+#required-features=["blob_storage"]
+
+[[example]]
+name="shared_access_signature"
+required-features=["blob_storage"]
+
+[[example]]
+name="stream_blob_00"
+required-features=["blob_storage"]
+
+[[example]]
+name="stream_blob_01"
+required-features=["blob_storage"]
+
+
+
+
+[[example]]
+name="list_queues"
+required-features=["queue_storage"]
+
+[[example]]
+name="queue_create"
+required-features=["queue_storage"]
+
+[[example]]
+name="get_messages"
+required-features=["queue_storage"]
+
+[[example]]
+name="peek_messages"
+required-features=["queue_storage"]
+
+[[example]]
+name="delete_message"
+required-features=["queue_storage"]
+
+[[example]]
+name="put_message"
+required-features=["queue_storage"]
+
+
+
+
+[[example]]
+name="data_lake_00"
+required-features=["data_lake_storage"]

sdk/storage/examples/blob_00.rs

@@ -1,7 +1,8 @@
 #[macro_use]
 extern crate log;
 use azure_core::prelude::*;
-use azure_storage::clients::*;
+use azure_storage::blob_storage::prelude::*;
+use azure_storage::core::prelude::*;
 use futures::stream::StreamExt;
 use std::error::Error;
 use std::sync::Arc;

sdk/storage/examples/blob_01.rs

@@ -1,4 +1,5 @@
 use azure_core::prelude::*;
+use azure_storage::blob_storage::prelude::*;
 use azure_storage::core::prelude::*;
 use std::error::Error;
 use std::sync::Arc;

sdk/storage/examples/blob_02_bearer_token.rs

@@ -2,6 +2,7 @@
 extern crate log;
 
 use azure_core::prelude::*;
+use azure_storage::blob_storage::prelude::*;
 use azure_storage::core::prelude::*;
 use std::error::Error;
 use std::sync::Arc;

sdk/storage/examples/blob_04.rs

@@ -1,5 +1,5 @@
 use azure_core::prelude::*;
-use azure_storage::blob::prelude::*;
+use azure_storage::blob_storage::prelude::*;
 use azure_storage::core::prelude::*;
 use bytes::{BufMut, Bytes};
 use std::error::Error;

sdk/storage/examples/blob_05_default_credential.rs

@@ -4,6 +4,7 @@ extern crate log;
 use azure_core::prelude::*;
 use azure_core::TokenCredential;
 use azure_identity::token_credentials::DefaultCredential;
+use azure_storage::blob_storage::prelude::*;
 use azure_storage::core::prelude::*;
 use std::error::Error;
 use std::sync::Arc;

sdk/storage/examples/blob_range.rs

@@ -1,4 +1,5 @@
 use azure_core::prelude::*;
+use azure_storage::blob_storage::prelude::*;
 use azure_storage::core::prelude::*;
 use futures::stream::StreamExt;
 use std::error::Error;