Create azure_storage_queues crate from azure_storage::queue (#493)

Author: johnbatty

sdk/storage/Cargo.toml

@@ -131,23 +131,5 @@ required-features=["blob"]
 name="stream_blob_01"
 required-features=["blob"]
 [[example]]
-name="list_queues"
-required-features=["queue"]
-[[example]]
-name="queue_create"
-required-features=["queue"]
-[[example]]
-name="get_messages"
-required-features=["queue"]
-[[example]]
-name="peek_messages"
-required-features=["queue"]
-[[example]]
-name="delete_message"
-required-features=["queue"]
-[[example]]
-name="put_message"
-required-features=["queue"]
-[[example]]
 name="data_lake_00"
 required-features=["data_lake"]

sdk/storage/src/core/clients/storage_client.rs

@@ -27,7 +27,7 @@ impl StorageClient {
     }
 
     #[allow(dead_code)]
-    pub(crate) fn storage_account_client(&self) -> &StorageAccountClient {
+    pub fn storage_account_client(&self) -> &StorageAccountClient {
         self.storage_account_client.as_ref()
     }
 
@@ -64,7 +64,7 @@ impl StorageClient {
         )
     }
 
-    pub(crate) fn queue_url_with_segments<'a, I>(
+    pub fn queue_url_with_segments<'a, I>(
         &'a self,
         segments: I,
     ) -> Result<url::Url, url::ParseError>
@@ -93,32 +93,8 @@ impl StorageClient {
         crate::container::requests::ListContainersBuilder::new(self)
     }
 
-    #[cfg(feature = "queue")]
-    pub fn list_queues(&self) -> crate::queue::requests::ListQueuesBuilder {
-        crate::queue::requests::ListQueuesBuilder::new(self)
-    }
-
-    #[cfg(feature = "queue")]
-    pub fn get_queue_service_properties(
-        &self,
-    ) -> crate::queue::requests::GetQueueServicePropertiesBuilder {
-        crate::queue::requests::GetQueueServicePropertiesBuilder::new(self)
-    }
-
-    #[cfg(feature = "queue")]
-    pub fn set_queue_service_properties(
-        &self,
-    ) -> crate::queue::requests::SetQueueServicePropertiesBuilder {
-        crate::queue::requests::SetQueueServicePropertiesBuilder::new(self)
-    }
-
-    #[cfg(feature = "queue")]
-    pub fn get_queue_service_stats(&self) -> crate::queue::requests::GetQueueServiceStatsBuilder {
-        crate::queue::requests::GetQueueServiceStatsBuilder::new(self)
-    }
-
     #[allow(dead_code)]
-    pub(crate) fn prepare_request(
+    pub fn prepare_request(
         &self,
         url: &str,
         method: &Method,

sdk/storage/src/core/mod.rs

@@ -17,7 +17,7 @@ pub use copy_progress::CopyProgress;
 pub(crate) mod parsing_xml;
 mod stored_access_policy;
 pub use errors::{Error, Result};
-pub(crate) mod xml;
+pub mod xml;
 
 #[derive(Debug, Clone, Eq, PartialEq, Copy, Serialize, Deserialize)]
 pub struct Yes;

sdk/storage/src/lib.rs

@@ -20,8 +20,6 @@ pub mod blob;
 pub mod core;
 #[cfg(feature = "data_lake")]
 pub mod data_lake;
-#[cfg(feature = "queue")]
-pub mod queue;
 #[cfg(feature = "table")]
 pub mod table;
 
@@ -32,7 +30,5 @@ pub use account::*;
 pub use blob::*;
 #[cfg(feature = "data_lake")]
 pub use data_lake::*;
-#[cfg(feature = "queue")]
-pub use queue::*;
 #[cfg(feature = "table")]
 pub use table::*;

sdk/storage/src/queue/prelude.rs

@@ -0,0 +1,31 @@
+[package]
+name = "azure_storage_queues"
+version = "0.1.0"
+description = "Rust wrappers around Microsoft Azure Storage Queues REST APIs"
+readme = "README.md"
+authors = ["Microsoft Corp."]
+license = "MIT"
+repository = "https://github.com/azure/azure-sdk-for-rust"
+homepage = "https://github.com/azure/azure-sdk-for-rust"
+documentation = "https://docs.rs/azure_storage_queues"
+keywords = ["sdk", "azure", "rest", "iot", "cloud"]
+categories = ["api-bindings"]
+edition = "2018"
+
+[dependencies]
+azure_core = { path = "../core", version = "0.1.0" }
+azure_storage = { path = "../storage", version = "0.1.0" }
+bytes = "1.0"
+chrono = { version = "0.4", features = ["serde"] }
+futures = "0.3"
+http = "0.2"
+log = "0.4"
+serde = { version = "1.0" }
+serde_derive = "1.0"
+serde_json = "1.0"
+serde-xml-rs = "0.4"
+uuid = { version = "0.8", features = ["v4"] }
+url = "2.2"
+
+[dev-dependencies]
+tokio = { version = "1.0", features = ["full"] }

sdk/storage_queues/Cargo.toml

@@ -0,0 +1,12 @@
+# Azure SDK for Rust - Azure Messaging Queues
+
+Azure Messaging Queues crate for the unofficial Microsoft Azure SDK for Rust. This crate is part of a collection of crates: for more information please refer to [https://github.com/azure/azure-sdk-for-rust](https://github.com/azure/azure-sdk-for-rust).
+
+## Usage
+
+To set this crate as a dependency, add this to your Cargo.toml
+
+```toml
+[dependencies]
+azure_messaging_queues = { version = "0.1.0", git = "https://github.com/Azure/azure-sdk-for-rust" }
+```

sdk/storage_queues/README.md

@@ -2,7 +2,7 @@
 extern crate log;
 use azure_core::prelude::*;
 use azure_storage::core::prelude::*;
-use azure_storage::queue::prelude::*;
+use azure_storage_queues::prelude::*;
 use std::error::Error;
 use std::time::Duration;
 
@@ -20,9 +20,10 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let http_client = new_http_client();
 
-    let queue = StorageAccountClient::new_access_key(http_client.clone(), &account, &master_key)
-        .as_storage_client()
-        .as_queue_client(queue_name);
+    let storage_account =
+        StorageAccountClient::new_access_key(http_client.clone(), &account, &master_key);
+
+    let queue = storage_account.as_queue_client(queue_name);
 
     trace!("getting messages");
 

sdk/storage/examples/delete_message.rs renamed to sdk/storage_queues/examples/delete_message.rs

@@ -2,7 +2,7 @@
 extern crate log;
 use azure_core::prelude::*;
 use azure_storage::core::prelude::*;
-use azure_storage::queue::prelude::*;
+use azure_storage_queues::prelude::*;
 use std::error::Error;
 use std::time::Duration;
 
@@ -20,9 +20,10 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let http_client = new_http_client();
 
-    let queue = StorageAccountClient::new_access_key(http_client.clone(), &account, &master_key)
-        .as_storage_client()
-        .as_queue_client(queue_name);
+    let storage_account =
+        StorageAccountClient::new_access_key(http_client.clone(), &account, &master_key);
+
+    let queue = storage_account.as_queue_client(queue_name);
 
     trace!("getting messages");
 

sdk/storage/examples/get_messages.rs renamed to sdk/storage_queues/examples/get_messages.rs

@@ -1,5 +1,6 @@
 use azure_core::prelude::*;
 use azure_storage::core::prelude::*;
+use azure_storage_queues::prelude::*;
 use futures::stream::StreamExt;
 use std::error::Error;
 use std::num::NonZeroU32;
@@ -14,23 +15,24 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let http_client = new_http_client();
 
-    let storage_account_client =
+    let storage_account =
         StorageAccountClient::new_access_key(http_client.clone(), &account, &master_key);
-    let storage_client = storage_account_client.as_storage_client();
+
+    let queue_service = storage_account.as_queue_service_client();
 
     println!("getting service stats");
-    let response = storage_client.get_queue_service_stats().execute().await?;
+    let response = queue_service.get_queue_service_stats().execute().await?;
     println!("get_queue_service_properties.response == {:#?}", response);
 
     println!("getting service properties");
-    let response = storage_client
+    let response = queue_service
         .get_queue_service_properties()
         .execute()
         .await?;
     println!("get_queue_service_stats.response == {:#?}", response);
 
     println!("enumerating queues starting with a");
-    let response = storage_client
+    let response = queue_service
         .list_queues()
         .prefix("a")
         .include_metadata(true)
@@ -41,7 +43,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     println!("streaming queues");
     let mut stream = Box::pin(
-        storage_client
+        queue_service
             .list_queues()
             .max_results(NonZeroU32::new(3u32).unwrap())
             .stream(),

sdk/storage/examples/list_queues.rs renamed to sdk/storage_queues/examples/list_queues.rs

@@ -2,7 +2,7 @@
 extern crate log;
 use azure_core::prelude::*;
 use azure_storage::core::prelude::*;
-use azure_storage::queue::prelude::*;
+use azure_storage_queues::prelude::*;
 use std::error::Error;
 
 #[tokio::main]
@@ -19,9 +19,10 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let http_client = new_http_client();
 
-    let queue = StorageAccountClient::new_access_key(http_client.clone(), &account, &master_key)
-        .as_storage_client()
-        .as_queue_client(queue_name);
+    let storage_account =
+        StorageAccountClient::new_access_key(http_client.clone(), &account, &master_key);
+
+    let queue = storage_account.as_queue_client(queue_name);
     println!("{:#?}", queue);
 
     trace!("peeking messages");

sdk/storage/examples/peek_messages.rs renamed to sdk/storage_queues/examples/peek_messages.rs

@@ -2,7 +2,7 @@
 extern crate log;
 use azure_core::prelude::*;
 use azure_storage::core::prelude::*;
-use azure_storage::queue::prelude::*;
+use azure_storage_queues::prelude::*;
 use std::error::Error;
 
 #[tokio::main]
@@ -19,12 +19,12 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let http_client = new_http_client();
 
-    let queue = StorageAccountClient::new_access_key(http_client.clone(), &account, &master_key)
-        .as_storage_client()
-        .as_queue_client(queue_name);
+    let storage_account =
+        StorageAccountClient::new_access_key(http_client.clone(), &account, &master_key);
 
-    trace!("putting message");
+    let queue = storage_account.as_queue_client(queue_name);
 
+    trace!("putting message");
     let response = queue
         .put_message()
         .client_request_id("optional correlation token")

sdk/storage/examples/put_message.rs renamed to sdk/storage_queues/examples/put_message.rs

@@ -2,7 +2,7 @@
 extern crate log;
 use azure_core::prelude::*;
 use azure_storage::core::prelude::*;
-use azure_storage::queue::prelude::*;
+use azure_storage_queues::prelude::*;
 use chrono::{Duration, Utc};
 use std::error::Error;
 
@@ -20,11 +20,10 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 
     let http_client = new_http_client();
 
-    let storage_account_client =
+    let storage_account =
         StorageAccountClient::new_access_key(http_client.clone(), &account, &master_key);
-    let queue = storage_account_client
-        .as_storage_client()
-        .as_queue_client(queue_name);
+
+    let queue = storage_account.as_queue_client(queue_name);
 
     trace!("creating queue");
 

sdk/storage/examples/queue_create.rs renamed to sdk/storage_queues/examples/queue_create.rs

@@ -1,4 +1,6 @@
 mod pop_receipt_client;
 mod queue_client;
+mod queue_service_client;
 pub use pop_receipt_client::{AsPopReceiptClient, PopReceiptClient};
 pub use queue_client::{AsQueueClient, QueueClient};
+pub use queue_service_client::{AsQueueServiceClient, QueueServiceClient};

sdk/storage/src/queue/clients/mod.rs renamed to sdk/storage_queues/src/clients/mod.rs

@@ -1,7 +1,7 @@
-use crate::core::clients::StorageClient;
-use crate::queue::prelude::*;
-use crate::queue::requests::*;
+use crate::prelude::*;
+use crate::requests::*;
 use azure_core::HttpClient;
+use azure_storage::core::clients::StorageClient;
 use std::sync::Arc;
 
 pub trait AsPopReceiptClient {

sdk/storage/src/queue/clients/pop_receipt_client.rs renamed to sdk/storage_queues/src/clients/pop_receipt_client.rs

@@ -1,5 +1,5 @@
-use crate::core::clients::StorageClient;
-use crate::queue::requests::*;
+use crate::requests::*;
+use azure_storage::core::clients::{AsStorageClient, StorageAccountClient, StorageClient};
 use std::fmt::Debug;
 use std::sync::Arc;
 
@@ -13,6 +13,12 @@ impl<QN: Into<String>> AsQueueClient<QN> for Arc<StorageClient> {
     }
 }
 
+impl<QN: Into<String>> AsQueueClient<QN> for Arc<StorageAccountClient> {
+    fn as_queue_client(&self, queue_name: QN) -> Arc<QueueClient> {
+        self.as_storage_client().as_queue_client(queue_name)
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct QueueClient {
     storage_client: Arc<StorageClient>,