Regenerated client and adjusted the crate to allow metadata to be an argument in the method directly rather than in the option bag.

Author: lsiddiquee

sdk/storage/azure_storage_queue/samples/queue_client.rs

@@ -13,8 +13,7 @@ use azure_identity::DefaultAzureCredential;
 use azure_storage_queue::{
     models::{
         QueueClientGetMetadataResultHeaders, QueueClientPeekMessagesOptions,
-        QueueClientReceiveMessagesOptions, QueueClientSetMetadataOptions, QueueClientUpdateOptions,
-        QueueMessage, SentMessage,
+        QueueClientReceiveMessagesOptions, QueueClientUpdateOptions, QueueMessage, SentMessage,
     },
     QueueClient,
 };
@@ -97,14 +96,15 @@ async fn send_and_update_message(
 async fn set_and_get_metadata(
     queue_client: &QueueClient,
 ) -> Result<(), Box<dyn std::error::Error>> {
-    let metadata_options = Some(QueueClientSetMetadataOptions {
-        metadata: Some(HashMap::from([
-            ("key1".to_string(), "value1".to_string()),
-            ("key2".to_string(), "value2".to_string()),
-        ])),
-        ..Default::default()
-    });
-    let result = queue_client.set_metadata(metadata_options).await;
+    let result = queue_client
+        .set_metadata(
+            HashMap::from([
+                ("key1".to_string(), "value1".to_string()),
+                ("key2".to_string(), "value2".to_string()),
+            ]),
+            None,
+        )
+        .await;
     log_operation_result(&result, "set_metadata");
 
     let result = queue_client.get_metadata(None).await;
@@ -115,6 +115,17 @@ async fn set_and_get_metadata(
         println!("Metadata - {}: {}", key, value);
     }
 
+    let result = queue_client.set_metadata(HashMap::new(), None).await;
+    log_operation_result(&result, "set_metadata_empty");
+
+    let result = queue_client.get_metadata(None).await;
+    log_operation_result(&result, "get_metadata_empty");
+
+    let metadata = result.unwrap().metadata().unwrap_or_default();
+    for (key, value) in metadata {
+        println!("Metadata - {}: {}", key, value);
+    }
+
     Ok(())
 }
 

sdk/storage/azure_storage_queue/src/clients/queue_client.rs

@@ -10,7 +10,7 @@ use azure_core::{
     http::{NoFormat, RawResponse, RequestContent, Response, StatusCode, Url, XmlFormat},
     xml, Bytes, Result,
 };
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};
 
 /// A client to interact with a specific Azure storage queue, although that queue may not yet exist.
 pub struct QueueClient {
@@ -158,7 +158,10 @@ impl QueueClient {
     ///
     /// # Arguments
     ///
-    /// * `options` - Optional parameters for the request, including the metadata to set for the queue
+    /// * `metadata` - A HashMap containing the metadata key-value pairs to set for the queue.
+    ///   This will replace all existing metadata on the queue. If an empty HashMap is provided, all
+    ///   existing metadata will be deleted from the queue.
+    /// * `options` - Optional parameters for the request
     ///
     /// # Returns
     ///
@@ -169,9 +172,10 @@ impl QueueClient {
     /// Returns an error if the queue doesn't exist or if the request fails
     pub async fn set_metadata(
         &self,
+        metadata: HashMap<String, String>,
         options: Option<QueueClientSetMetadataOptions<'_>>,
     ) -> Result<Response<(), NoFormat>> {
-        self.client.set_metadata(options).await
+        self.client.set_metadata(metadata, options).await
     }
 
     /// Retrieves the metadata of the specified queue.

sdk/storage/azure_storage_queue/src/generated/clients/queue_client.rs

@@ -6,7 +6,7 @@ use azure_core_test::{recorded, Recording, TestContext};
 use azure_storage_queue::{
     models::{
         QueueClientPeekMessagesOptions, QueueClientReceiveMessagesOptions,
-        QueueClientSetMetadataOptions, QueueClientUpdateOptions, QueueMessage,
+        QueueClientUpdateOptions, QueueMessage,
     },
     QueueClient, QueueClientOptions,
 };
@@ -122,15 +122,15 @@ async fn test_set_metadata(ctx: TestContext) -> Result<()> {
     let test_result = async {
         // Set metadata for the queue
 
-        let metadata_options = Some(QueueClientSetMetadataOptions {
-            metadata: Some(HashMap::from([
-                ("key1".to_string(), "value1".to_string()),
-                ("key2".to_string(), "value2".to_string()),
-            ])),
-            ..Default::default()
-        });
-
-        let response = queue_client.set_metadata(metadata_options).await?;
+        let response = queue_client
+            .set_metadata(
+                HashMap::from([
+                    ("key1".to_string(), "value1".to_string()),
+                    ("key2".to_string(), "value2".to_string()),
+                ]),
+                None,
+            )
+            .await?;
 
         assert_successful_response(&response);
 

sdk/storage/azure_storage_queue/src/generated/models/method_options.rs

@@ -1,4 +1,4 @@
 directory: specification/storage/Microsoft.QueueStorage
-commit: b5e461fffa843a48cb45b233f7d53d69739ad477
+commit: 32a39e8db24d3042d9c7a786efd2569690537138
 repo: Azure/azure-rest-api-specs
 additionalDirectories: