Azure storage queue partial implementation (#320)

Author: Francesco Cogno

Cargo.toml

@@ -7,5 +7,6 @@ members = [
   "azure_sdk_storage_blob",
   "azure_sdk_storage_core",
   "azure_sdk_storage_table",
-  "azure_sdk_cosmos"
+  "azure_sdk_cosmos",
+  "azure_sdk_storage_queue"
 ]

azure_sdk_core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name          = "azure_sdk_core"
-version       = "0.43.6"
+version       = "0.43.7"
 description   = "Rust wrappers around Microsoft Azure REST APIs - Core crate"
 readme        = "README.md"
 authors       = ["Francesco Cogno <[email protected]>", "Max Gortman <[email protected]>", "Dong Liu <[email protected]>"]

azure_sdk_core/src/errors.rs

@@ -1,20 +1,13 @@
 use crate::{enumerations::ParsingError, range::ParseError};
-use base64;
-use chrono;
-use http;
 use http::header::ToStrError;
 use hyper::{self, body, Body, StatusCode};
-use serde_json;
-use serde_xml_rs;
-use std;
 use std::io::Error as IOError;
 use std::num;
 use std::num::ParseIntError;
 use std::str;
 use std::str::ParseBoolError;
 use std::string;
 use url::ParseError as URLParseError;
-use uuid;
 use xml::BuilderError as XMLError;
 
 quick_error! {

azure_sdk_core/src/lib.rs

@@ -36,6 +36,7 @@ use crate::lease::LeaseId;
 use http::request::Builder;
 use http::HeaderMap;
 use std::collections::HashMap;
+use std::convert::TryFrom;
 mod stored_access_policy;
 pub use self::stored_access_policy::{StoredAccessPolicy, StoredAccessPolicyList};
 pub mod prelude;
@@ -486,6 +487,14 @@ pub trait IncludeMetadataSupport {
 
 pub trait IncludeMetadataOption {
     fn include_metadata(&self) -> bool;
+
+    fn to_uri_parameter(&self) -> Option<&'static str> {
+        if self.include_metadata() {
+            Some("include=metadata")
+        } else {
+            None
+        }
+    }
 }
 
 pub trait IncludeCopySupport {
@@ -524,31 +533,31 @@ pub trait IncludeListOptions:
 
         if self.include_metadata() {
             if !f_first {
-                s.push_str(",");
+                s.push(',');
             }
             s.push_str("metadata");
             f_first = false;
         }
 
         if self.include_uncommitted_blobs() {
             if !f_first {
-                s.push_str(",");
+                s.push(',');
             }
             s.push_str("uncommittedblobs");
             f_first = false;
         }
 
         if self.include_copy() {
             if !f_first {
-                s.push_str(",");
+                s.push(',');
             }
             s.push_str("copy");
             f_first = false;
         }
 
         if self.include_deleted() {
             if !f_first {
-                s.push_str(",");
+                s.push(',');
             }
             s.push_str("deleted");
         }
@@ -935,6 +944,10 @@ pub fn request_id_from_headers(headers: &HeaderMap) -> Result<RequestId, AzureEr
     Ok(Uuid::parse_str(request_id)?)
 }
 
+pub fn client_request_id_from_headers_optional(headers: &HeaderMap) -> Option<String> {
+    headers.get_as_str(CLIENT_REQUEST_ID).map(|s| s.to_owned())
+}
+
 pub fn content_md5_from_headers_optional(
     headers: &HeaderMap,
 ) -> Result<Option<[u8; 16]>, AzureError> {
@@ -945,6 +958,29 @@ pub fn content_md5_from_headers_optional(
     }
 }
 
+#[derive(Debug, Clone)]
+pub struct CommonStorageResponseHeaders {
+    pub request_id: RequestId,
+    pub client_request_id: Option<String>,
+    pub version: String,
+    pub date: DateTime<Utc>,
+    pub server: String,
+}
+
+impl TryFrom<&HeaderMap> for CommonStorageResponseHeaders {
+    type Error = AzureError;
+
+    fn try_from(headers: &HeaderMap) -> Result<Self, Self::Error> {
+        Ok(Self {
+            request_id: request_id_from_headers(headers)?,
+            client_request_id: client_request_id_from_headers_optional(headers),
+            version: version_from_headers(headers)?.to_owned(),
+            date: date_from_headers(headers)?,
+            server: server_from_headers(headers)?.to_owned(),
+        })
+    }
+}
+
 pub fn content_md5_from_headers(headers: &HeaderMap) -> Result<[u8; 16], AzureError> {
     let content_md5 = headers
         .get(CONTENT_MD5)
@@ -998,10 +1034,8 @@ pub fn content_crc64_from_headers(headers: &HeaderMap) -> Result<[u8; 8], AzureE
 pub fn consistency_from_headers(headers: &HeaderMap) -> Result<Consistency, AzureError> {
     if let Some(content_crc64) = content_crc64_from_headers_optional(headers)? {
         return Ok(Consistency::Crc64(content_crc64));
-    } else {
-        if let Some(content_md5) = content_md5_from_headers_optional(headers)? {
-            return Ok(Consistency::Md5(content_md5));
-        }
+    } else if let Some(content_md5) = content_md5_from_headers_optional(headers)? {
+        return Ok(Consistency::Md5(content_md5));
     }
 
     Err(AzureError::HeadersNotFound(vec![
@@ -1045,6 +1079,12 @@ pub fn continuation_token_from_headers_optional(
     }
 }
 
+#[inline]
+pub fn utc_date_from_rfc2822(date: &str) -> Result<DateTime<Utc>, AzureError> {
+    let date = DateTime::parse_from_rfc2822(date)?;
+    Ok(DateTime::from_utc(date.naive_utc(), Utc))
+}
+
 pub fn date_from_headers(headers: &HeaderMap) -> Result<DateTime<Utc>, AzureError> {
     let date = headers
         .get(DATE)

azure_sdk_core/src/parsing.rs

@@ -1,5 +1,4 @@
 use crate::errors::TraversingError;
-use chrono;
 use xml::Element;
 use xml::Xml::{CharacterNode, ElementNode};
 

azure_sdk_storage_core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name          = "azure_sdk_storage_core"
-version       = "0.44.3"
+version       = "0.44.4"
 description   = "Rust wrappers around Microsoft Azure REST APIs - Core storage crate"
 readme        = "README.md"
 authors       = ["Francesco Cogno <[email protected]>", "Max Gortman <[email protected]>", "Dong Liu <[email protected]>"]
@@ -15,7 +15,7 @@ categories    = ["api-bindings"]
 edition       = "2018"
 
 [dependencies]
-azure_sdk_core          = { path = "../azure_sdk_core", version = "0.43.5" }
+azure_sdk_core          = { path = "../azure_sdk_core", version = "0.43.6" }
 ring                    = "0.16"
 base64                  = "0.12"
 chrono                  = "0.4"

azure_sdk_storage_core/src/bearer_token_client.rs

@@ -14,6 +14,7 @@ pub struct BearerTokenClient<'a> {
     hc: hyper::Client<HttpsConnector<hyper::client::HttpConnector>>,
     blob_uri: String,
     table_uri: String,
+    queue_uri: String,
 }
 
 impl<'a> BearerTokenClient<'a> {
@@ -25,10 +26,12 @@ impl<'a> BearerTokenClient<'a> {
     ) -> Self {
         let blob_uri = format!("https://{}.blob.core.windows.net", account);
         let table_uri = format!("https://{}.table.core.windows.net", account);
+        let queue_uri = format!("https://{}.queue.core.windows.net", account);
 
         Self {
             account,
             bearer_token,
+            queue_uri,
             hc,
             blob_uri,
             table_uri,
@@ -90,6 +93,11 @@ impl<'a> Client for BearerTokenClient<'a> {
         &self.table_uri
     }
 
+    #[inline]
+    fn queue_uri(&self) -> &str {
+        &self.queue_uri
+    }
+
     #[inline]
     fn perform_request(
         &self,

azure_sdk_storage_core/src/client.rs

@@ -13,9 +13,10 @@ pub trait HttpHeaderAdder {
     fn add_headers(&self, builder: ::http::request::Builder) -> ::http::request::Builder;
 }
 
-pub trait Client: Send + Sync {
+pub trait Client: std::fmt::Debug + Send + Sync {
     fn blob_uri(&self) -> &str;
     fn table_uri(&self) -> &str;
+    fn queue_uri(&self) -> &str;
 
     /// Uri scheme + authority e.g. http://myaccount.table.core.windows.net/
     #[inline]
@@ -53,6 +54,9 @@ where
     fn table_uri(&self) -> &str {
         self.as_ref().table_uri()
     }
+    fn queue_uri(&self) -> &str {
+        self.as_ref().queue_uri()
+    }
 
     fn perform_request(
         &self,
@@ -87,6 +91,9 @@ where
     fn table_uri(&self) -> &str {
         self.as_ref().table_uri()
     }
+    fn queue_uri(&self) -> &str {
+        self.as_ref().queue_uri()
+    }
 
     fn perform_request(
         &self,
@@ -133,6 +140,7 @@ pub fn with_azure_sas(account: &str, sas_token: &str) -> KeyClient {
         client,
         format!("https://{}.blob.core.windows.net", account),
         format!("https://{}.table.core.windows.net", account),
+        format!("https://{}.queue.core.windows.net", account),
     )
 }
 
@@ -146,6 +154,7 @@ pub fn with_access_key(account: &str, key: &str) -> KeyClient {
         client,
         format!("https://{}.blob.core.windows.net", account),
         format!("https://{}.table.core.windows.net", account),
+        format!("https://{}.queue.core.windows.net", account),
     )
 }
 
@@ -167,6 +176,7 @@ pub fn from_connection_string(connection_string: &str) -> Result<KeyClient, Azur
                     client,
                     format!("https://{}.blob.core.windows.net", account),
                     format!("https://{}.table.core.windows.net", account), 
+                    format!("https://{}.queue.core.windows.net", account),
                 ))
             }
             ConnectionString {
@@ -180,6 +190,7 @@ pub fn from_connection_string(connection_string: &str) -> Result<KeyClient, Azur
                 client,
                 format!("https://{}.blob.core.windows.net", account),
                 format!("https://{}.table.core.windows.net", account), 
+                format!("https://{}.queue.core.windows.net", account),
             )),
             ConnectionString {
                 account_name: Some(account),
@@ -192,6 +203,7 @@ pub fn from_connection_string(connection_string: &str) -> Result<KeyClient, Azur
                 client,
                 format!("https://{}.blob.core.windows.net", account),
                 format!("https://{}.table.core.windows.net", account), 
+                format!("https://{}.queue.core.windows.net", account),
             )),
             _ => {
                 Err(AzureError::GenericErrorWithText(
@@ -219,6 +231,8 @@ pub fn with_emulator(blob_storage_url: &Url, table_storage_url: &Url) -> KeyClie
     debug!("blob_uri == {}", blob_uri);
     let table_uri = format!("{}devstoreaccount1", table_storage_url.as_str());
     debug!("table_uri == {}", table_uri);
+    let queue_uri = format!("{}devstoreaccount1", table_storage_url.as_str());
+    debug!("queue_uri == {}", queue_uri);
 
     KeyClient::new(
         "devstoreaccount1".to_owned(),
@@ -228,5 +242,6 @@ pub fn with_emulator(blob_storage_url: &Url, table_storage_url: &Url) -> KeyClie
         client,
         blob_uri,
         table_uri,
+        queue_uri,
     )
 }

azure_sdk_storage_core/src/key_client.rs

@@ -14,6 +14,7 @@ pub struct KeyClient {
     hc: hyper::Client<HttpsConnector<hyper::client::HttpConnector>>,
     blob_uri: String,
     table_uri: String,
+    queue_uri: String,
 }
 
 pub(crate) fn get_sas_token_parms(sas_token: &str) -> Vec<(String, String)> {
@@ -37,6 +38,7 @@ impl KeyClient {
         hc: hyper::Client<HttpsConnector<hyper::client::HttpConnector>>,
         blob_uri: String,
         table_uri: String,
+        queue_uri: String,
     ) -> Self {
         Self {
             account,
@@ -45,6 +47,7 @@ impl KeyClient {
             hc,
             blob_uri,
             table_uri,
+            queue_uri,
         }
     }
 
@@ -67,6 +70,11 @@ impl Client for KeyClient {
         &self.table_uri
     }
 
+    #[inline]
+    fn queue_uri(&self) -> &str {
+        &self.queue_uri
+    }
+
     fn perform_request(
         &self,
         uri: &str,

azure_sdk_storage_core/src/rest_client.rs

@@ -406,7 +406,7 @@ fn canonicalize_header(h: &HeaderMap) -> String {
         .filter(|(k, _v)| k.as_str().starts_with("x-ms"))
         .map(|(k, _)| k.as_str())
         .collect::<Vec<_>>();
-    v_headers.sort();
+    v_headers.sort_unstable();
 
     let mut can = String::new();
 
@@ -434,7 +434,7 @@ fn canonicalized_resource<CE: ClientEndpoint>(client_endpoint: &CE, u: &url::Url
     {
         let mut path = String::new();
         for p in paths {
-            path.push_str("/");
+            path.push('/');
             path.push_str(&*p);
         }