Based on review comments, the following changes have been made:

- Updated change logs to mention unreleased
- Removed all functions list from the README.md
- Renaming examples to samples to match pattern in other languages
- Removed singular helper functions and exists helper functions
- Adjusting code based on update to the dependencies
- Changed StorageServiceProperties to QueueServiceProperties
- Exposing clients and client options from the crate root
- Update test names to reflect operation

Author: lsiddiquee

sdk/storage/azure_storage_queue/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Release History
 
-## 0.1.0 (2025-06-17)
+## 0.1.0 (Unreleased)
 
 ### Features Added
 

sdk/storage/azure_storage_queue/Cargo.toml

@@ -13,6 +13,15 @@ documentation = "https://docs.rs/azure_storage_queue"
 keywords = ["sdk", "azure", "storage", "queue", "queues"]
 categories = ["api-bindings"]
 
+# Manual example definitions pointing to samples/ directory
+[[example]]
+name = "queue_client"
+path = "samples/queue_client.rs"
+
+[[example]]
+name = "queue_service_client"
+path = "samples/queue_service_client.rs"
+
 [features]
 default = ["reqwest"]
 reqwest = ["dep:reqwest"]

sdk/storage/azure_storage_queue/README.md

@@ -39,7 +39,7 @@ az storage account create -n my-storage-account-name -g my-resource-group
 In order to interact with the Azure Queue service, you'll need to create an instance of a client, `QueueClient`. The [Azure Identity] library makes it easy to add Microsoft Entra ID support for authenticating Azure SDK clients with their corresponding Azure services:
 
 ```rust no_run
-use azure_storage_queue::clients::{QueueClient, QueueClientOptions};
+use azure_storage_queue::{QueueClient, QueueClientOptions};
 use azure_identity::DefaultAzureCredential;
 
 #[tokio::main]
@@ -60,70 +60,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
 You may need to specify RBAC roles to access Queues via Microsoft Entra ID. Please see [Assign an Azure role for access to queue data] for more details.
 
-## Features
-
-### QueueServiceClient
-
-The `QueueServiceClient` provides operations to interact with the Azure Storage Queue service at the account level.
-
-| Method                | Parameters                                                                                                                                         | Return Type                                                            | Description                                                                                                                                                                                              |
-|-----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `new`                 | `endpoint: &str`<br>`credential: Arc<dyn TokenCredential>`<br>`options: Option<QueueServiceClientOptions>`                                         | `Result<Self>`                                                         | Creates a new QueueServiceClient using Entra ID authentication                                                                                                                                           |
-| `endpoint`            | `&self`                                                                                                                                            | `&Url`                                                                 | Returns the endpoint URL of the Azure storage account                                                                                                                                                    |
-| `queue_client`        | `&self`<br>`queue_name: String`                                                                                                                    | `QueueClient`                                                          | Returns a new QueueClient instance for a specific queue                                                                                                                                                  |
-| `create_queue`        | `&self`<br>`queue_name: &str`<br>`options: Option<QueueClientCreateOptions<'_>>`                                                                   | `Result<Response<(), NoFormat>>`                                       | Creates a new queue under the account                                                                                                                                                                    |
-| `delete_queue`        | `&self`<br>`queue_name: &str`<br>`options: Option<QueueClientDeleteOptions<'_>>`                                                                   | `Result<Response<(), NoFormat>>`                                       | Permanently deletes the specified queue                                                                                                                                                                  |
-| `get_properties`      | `&self`<br>`options: Option<QueueServiceClientGetPropertiesOptions<'_>>`                                                                           | `Result<Response<StorageServiceProperties, XmlFormat>>`                | Retrieves the properties of the queue service                                                                                                                                                            |
-| `set_properties`      | `&self`<br>`storage_service_properties: RequestContent<StorageServiceProperties>`<br>`options: Option<QueueServiceClientSetPropertiesOptions<'_>>` | `Result<Response<(), NoFormat>>`                                       | Sets the properties of the queue service                                                                                                                                                                 |
-| `list_queues`         | `&self`<br>`options: Option<QueueServiceClientListQueuesOptions<'_>>`                                                                              | `Result<PageIterator<Response<ListQueuesResponse, XmlFormat>>>`        | Lists queues in the storage account with pagination                                                                                                                                                      |
-| `get_statistics`      | `&self`<br>`options: Option<QueueServiceClientGetStatisticsOptions<'_>>`                                                                           | `Result<Response<StorageServiceStats, XmlFormat>>`                     | Retrieves statistics related to replication for the Queue service. It is only available on the secondary location endpoint when read-access geo-redundant replication is enabled for the storage account |
-
----
-
-### QueueClient
-
-The `QueueClient` provides operations to interact with a specific Azure Storage Queue.
-
-| Method       | Parameters                                                                                                                | Return Type    | Description                                                  |
-|--------------|---------------------------------------------------------------------------------------------------------------------------|----------------|--------------------------------------------------------------|
-| `new`        | `endpoint: &str`<br>`queue_name: &str`<br>`credential: Arc<dyn TokenCredential>`<br>`options: Option<QueueClientOptions>` | `Result<Self>` | Creates a new QueueClient using Entra ID authentication      |
-| `endpoint`   | `&self`                                                                                                                   | `&Url`         | Returns the endpoint URL of the Azure storage account        |
-| `queue_name` | `&self`                                                                                                                   | `&str`         | Returns the name of the queue this client is associated with |
-
-#### Queue Management
-
-| Method                 | Parameters                                                 | Return Type                      | Description                                 |
-|------------------------|------------------------------------------------------------|----------------------------------|---------------------------------------------|
-| `create`               | `&self`<br>`options: Option<QueueClientCreateOptions<'_>>` | `Result<Response<(), NoFormat>>` | Creates a new queue                         |
-| `create_if_not_exists` | `&self`<br>`options: Option<QueueClientCreateOptions<'_>>` | `Result<Response<(), NoFormat>>` | Creates a queue if it doesn't already exist |
-| `delete`               | `&self`<br>`options: Option<QueueClientDeleteOptions<'_>>` | `Result<Response<(), NoFormat>>` | Permanently deletes the queue               |
-| `delete_if_exists`     | `&self`<br>`options: Option<QueueClientDeleteOptions<'_>>` | `Result<Response<(), NoFormat>>` | Deletes the queue if it exists              |
-| `exists`               | `&self`                                                    | `Result<bool>`                   | Checks if the queue exists                  |
-| `clear`                | `&self`<br>`options: Option<QueueClientClearOptions<'_>>`  | `Result<Response<(), NoFormat>>` | Clears all messages in the queue            |
-
-#### Metadata Operations
-
-| Method         | Parameters                                                      | Return Type                                                | Description                         |
-|----------------|-----------------------------------------------------------------|------------------------------------------------------------|-------------------------------------|
-| `set_metadata` | `&self`<br>`options: Option<QueueClientSetMetadataOptions<'_>>` | `Result<Response<(), NoFormat>>`                           | Sets the metadata for the queue     |
-| `get_metadata` | `&self`<br>`options: Option<QueueClientGetMetadataOptions<'_>>` | `Result<Response<QueueClientGetMetadataResult, NoFormat>>` | Retrieves the metadata of the queue |
-
-#### Message Operations
-
-| Method             | Parameters                                                                                                                                       | Return Type                                                      | Description                                             |
-|--------------------|--------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------|---------------------------------------------------------|
-| `send_message`     | `&self`<br>`queue_message: RequestContent<QueueMessage>`<br>`options: Option<QueueClientSendMessageOptions<'_>>`                                 | `Result<Response<Option<SentMessage>, XmlFormat>>`               | Sends a message to the queue                            |
-| `receive_message`  | `&self`<br>`options: Option<QueueClientReceiveMessagesOptions<'_>>`                                                                              | `Result<Response<Option<ReceivedMessage>, XmlFormat>>`           | Retrieves a single message from the front of the queue  |
-| `receive_messages` | `&self`<br>`options: Option<QueueClientReceiveMessagesOptions<'_>>`                                                                              | `Result<Response<ListOfReceivedMessage, XmlFormat>>`             | Retrieves multiple messages from the front of the queue |
-| `peek_message`     | `&self`<br>`options: Option<QueueClientPeekMessagesOptions<'_>>`                                                                                 | `Result<Response<Option<PeekedMessage>, XmlFormat>>`             | Peeks a single message without removing it              |
-| `peek_messages`    | `&self`<br>`options: Option<QueueClientPeekMessagesOptions<'_>>`                                                                                 | `Result<Response<ListOfPeekedMessage, XmlFormat>>`               | Peeks multiple messages without removing them           |
-| `delete_message`   | `&self`<br>`message_id: &str`<br>`pop_receipt: &str`<br>`options: Option<QueueClientDeleteMessageOptions<'_>>`                                   | `Result<Response<(), NoFormat>>`                                 | Deletes a specific message from the queue               |
-| `update_message`   | `&self`<br>`message_id: &str`<br>`pop_receipt: &str`<br>`visibility_timeout: i32`<br>`options: Option<QueueClientUpdateOptions<'_>>`             | `Result<Response<(), NoFormat>>`                                 | Updates a specific message in the queue                 |
-
 ## Examples
 
-<!-- TODO: Update the link below when the PR is merged -->
-Executable examples of all the functions provided by this SDK can be found in the [queue_client.rs]<!--(https://github.com/Azure/azure-sdk-for-rust/tree/main/sdk/storage/azure_storage_queue/examples/queue_client.rs)--> file in the examples directory.
+<!-- TODO: Uncomment the links below when the PR is merged -->
+You can find executable examples for all major SDK functions in:
+- [queue_client.rs]<!--(https://github.com/Azure/azure-sdk-for-rust/tree/main/sdk/storage/azure_storage_queue/samples/queue_client.rs)-->
+- [queue_service_client.rs]<!--(https://github.com/Azure/azure-sdk-for-rust/tree/main/sdk/storage/azure_storage_queue/samples/queue_service_client.rs)-->
 
 ## Next steps
 
@@ -139,7 +81,7 @@ When you submit a pull request, a CLA-bot will automatically determine whether y
 
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [[email protected]](mailto:[email protected]) with any additional questions or comments.
 
-<!-- TODO: Update the links below when the crate is published -->
+<!-- TODO: Uncomment the links below when the PR is merged -->
 <!-- LINKS -->
 [Azure subscription]: https://azure.microsoft.com/free/
 [Azure storage account]: https://learn.microsoft.com/azure/storage/common/storage-account-overview

sdk/storage/azure_storage_queue/assets.json

@@ -1,6 +1,6 @@
 {
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "rust",
-  "Tag": "rust/azure_storage_queue_d6e20c5b11",
+  "Tag": "rust/azure_storage_queue_3ebef0dc87",
   "TagPrefix": "rust/azure_storage_queue"
 }

sdk/storage/azure_storage_queue/examples/README.md renamed to sdk/storage/azure_storage_queue/samples/README.md

@@ -1,7 +1,7 @@
 /// Generates a random queue name with a suffix to ensure uniqueness.
 pub fn get_random_queue_name() -> String {
     use rand::Rng;
-    let mut rng = rand::thread_rng();
-    let random_suffix: u32 = rng.gen_range(1000..9999);
+    let mut rng = rand::rng();
+    let random_suffix: u32 = rng.random_range(1000..9999);
     format!("sdk-test-queue-{}", random_suffix)
 }

sdk/storage/azure_storage_queue/examples/helpers/endpoint.rs renamed to sdk/storage/azure_storage_queue/samples/helpers/endpoint.rs

@@ -11,12 +11,12 @@ use azure_core::{
 };
 use azure_identity::DefaultAzureCredential;
 use azure_storage_queue::{
-    clients::QueueClient,
     models::{
         QueueClientGetMetadataResultHeaders, QueueClientPeekMessagesOptions,
         QueueClientReceiveMessagesOptions, QueueClientSetMetadataOptions, QueueClientUpdateOptions,
         QueueMessage, SentMessage,
     },
+    QueueClient,
 };
 
 async fn send_message(
@@ -169,56 +169,6 @@ async fn peek_and_receive_messages(
     Ok(())
 }
 
-async fn peek_and_receive_message(
-    queue_client: &QueueClient,
-) -> Result<(), Box<dyn std::error::Error>> {
-    _ = send_message(queue_client, "Message 1 from Rust Queue SDK").await;
-    _ = send_message(queue_client, "Message 2 from Rust Queue SDK").await;
-
-    let options = QueueClientPeekMessagesOptions {
-        number_of_messages: Some(5),
-        ..Default::default()
-    };
-
-    let result = queue_client.peek_message(Some(options)).await;
-    log_operation_result(&result, "peek_message");
-
-    if let Ok(response) = result {
-        let message = response.into_body().await?;
-        if let Some(message) = message {
-            println!(
-                "Successfully peeked message ({}): {}",
-                message.message_id.unwrap(),
-                message.message_text.unwrap_or_default()
-            );
-        }
-    }
-
-    loop {
-        let result = queue_client.receive_message(None).await;
-        log_operation_result(&result, "receive_message");
-
-        if let Ok(response) = result {
-            let message = response.into_body().await?;
-            if let Some(msg) = message {
-                println!(
-                    "Successfully received message ({}): {}",
-                    msg.message_id.unwrap(),
-                    msg.message_text.unwrap_or_default()
-                );
-            } else {
-                // No more messages available
-                break;
-            }
-        } else {
-            // Error occurred, break the loop
-            break;
-        }
-    }
-
-    Ok(())
-}
-
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let credential = DefaultAzureCredential::new()?;
@@ -236,9 +186,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let result = queue_client.exists().await;
     log_operation_result(&result, "check_exists");
 
-    let result = queue_client.create_if_not_exists(None).await;
-    log_operation_result(&result, "create_if_not_exists");
-
     // Set and get queue metadata
     set_and_get_metadata(&queue_client).await?;
 
@@ -265,9 +212,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     // Peek and Receive messages
     peek_and_receive_messages(&queue_client).await?;
 
-    // Peek and Receive message
-    peek_and_receive_message(&queue_client).await?;
-
     // Cleanup
     let result = queue_client.delete(None).await;
     log_operation_result(&result, "delete");
@@ -277,8 +221,5 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let result = non_existing_queue_client.exists().await;
     log_operation_result(&result, "check_non_existent");
 
-    let result = non_existing_queue_client.delete_if_exists(None).await;
-    log_operation_result(&result, "delete_if_exists");
-
     Ok(())
 }