[Storage] Make metadata a parameter for set_metadata API, StorageServiceProperties renamed to BlobServiceProperties

sdk/storage/azure_storage_blob/src/clients/blob_container_client.rs

@@ -28,7 +28,7 @@ use azure_core::{
     },
     Result,
 };
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};
 
 /// A client to interact with a specified Azure storage container.
 pub struct BlobContainerClient {
@@ -112,12 +112,14 @@ impl BlobContainerClient {
     ///
     /// # Arguments
     ///
+    /// * `metadata` - The metadata headers.
     /// * `options` - Optional configuration for the request.
     pub async fn set_metadata(
         &self,
+        metadata: HashMap<String, String>,
         options: Option<BlobContainerClientSetMetadataOptions<'_>>,
     ) -> Result<Response<(), NoFormat>> {
-        self.client.set_metadata(options).await
+        self.client.set_metadata(metadata, options).await
     }
 
     /// Marks the specified container for deletion. The container and any blobs contained within are later deleted during garbage collection.

sdk/storage/azure_storage_blob/src/clients/blob_service_client.rs

@@ -7,7 +7,7 @@ use crate::{
     models::{
         BlobServiceClientGetAccountInfoOptions, BlobServiceClientGetPropertiesOptions,
         BlobServiceClientListContainersSegmentOptions, BlobServiceClientSetPropertiesOptions,
-        ListContainersSegmentResponse, StorageServiceProperties,
+        BlobServiceProperties, ListContainersSegmentResponse,
     },
     pipeline::StorageHeadersPolicy,
     BlobContainerClient, BlobServiceClientOptions,
@@ -82,7 +82,7 @@ impl BlobServiceClient {
     pub async fn get_properties(
         &self,
         options: Option<BlobServiceClientGetPropertiesOptions<'_>>,
-    ) -> Result<Response<StorageServiceProperties, XmlFormat>> {
+    ) -> Result<Response<BlobServiceProperties, XmlFormat>> {
         self.client.get_properties(options).await
     }
 
@@ -106,7 +106,7 @@ impl BlobServiceClient {
     /// * `options` - Optional configuration for the request.
     pub async fn set_properties(
         &self,
-        storage_service_properties: RequestContent<StorageServiceProperties, XmlFormat>,
+        storage_service_properties: RequestContent<BlobServiceProperties, XmlFormat>,
         options: Option<BlobServiceClientSetPropertiesOptions<'_>>,
     ) -> Result<Response<(), NoFormat>> {
         self.client

sdk/storage/azure_storage_blob/src/clients/block_blob_client.rs

@@ -13,7 +13,7 @@ use crate::{
         BlobClientSetMetadataOptions, BlobClientSetPropertiesOptions, BlobClientSetTierOptions,
         BlockBlobClientCommitBlockListOptions, BlockBlobClientGetBlockListOptions,
         BlockBlobClientStageBlockOptions, BlockBlobClientUploadOptions, BlockList, BlockListType,
-        BlockLookupList, StorageServiceProperties,
+        BlockLookupList,
     },
     pipeline::StorageHeadersPolicy,
     BlobClientOptions, BlockBlobClientOptions,

sdk/storage/azure_storage_blob/src/models/mod.rs

@@ -36,16 +36,17 @@ pub use crate::generated::models::{
     BlobItemInternal, BlobMetadata, BlobName, BlobPropertiesInternal,
     BlobServiceClientGetAccountInfoOptions, BlobServiceClientGetAccountInfoResult,
     BlobServiceClientGetAccountInfoResultHeaders, BlobServiceClientGetPropertiesOptions,
-    BlobServiceClientListContainersSegmentOptions, BlobServiceClientSetPropertiesOptions, BlobTag,
-    BlobTags, BlobType, Block, BlockBlobClientCommitBlockListOptions,
-    BlockBlobClientCommitBlockListResult, BlockBlobClientCommitBlockListResultHeaders,
-    BlockBlobClientGetBlockListOptions, BlockBlobClientStageBlockOptions,
-    BlockBlobClientStageBlockResult, BlockBlobClientStageBlockResultHeaders,
-    BlockBlobClientUploadOptions, BlockBlobClientUploadResult, BlockBlobClientUploadResultHeaders,
-    BlockList, BlockListType, BlockLookupList, ContainerItem, CopyStatus, CorsRule, LeaseDuration,
-    LeaseState, LeaseStatus, ListBlobsFlatSegmentResponse, ListBlobsIncludeItem,
-    ListContainersIncludeType, ListContainersSegmentResponse, Logging, Metrics,
-    ObjectReplicationMetadata, PageBlobClientClearPagesOptions, PageBlobClientClearPagesResult,
+    BlobServiceClientListContainersSegmentOptions, BlobServiceClientSetPropertiesOptions,
+    BlobServiceProperties, BlobTag, BlobTags, BlobType, Block,
+    BlockBlobClientCommitBlockListOptions, BlockBlobClientCommitBlockListResult,
+    BlockBlobClientCommitBlockListResultHeaders, BlockBlobClientGetBlockListOptions,
+    BlockBlobClientStageBlockOptions, BlockBlobClientStageBlockResult,
+    BlockBlobClientStageBlockResultHeaders, BlockBlobClientUploadOptions,
+    BlockBlobClientUploadResult, BlockBlobClientUploadResultHeaders, BlockList, BlockListType,
+    BlockLookupList, ContainerItem, CopyStatus, CorsRule, LeaseDuration, LeaseState, LeaseStatus,
+    ListBlobsFlatSegmentResponse, ListBlobsIncludeItem, ListContainersIncludeType,
+    ListContainersSegmentResponse, Logging, Metrics, ObjectReplicationMetadata,
+    PageBlobClientClearPagesOptions, PageBlobClientClearPagesResult,
     PageBlobClientClearPagesResultHeaders, PageBlobClientCreateOptions, PageBlobClientCreateResult,
     PageBlobClientCreateResultHeaders, PageBlobClientGetPageRangesOptions,
     PageBlobClientResizeOptions, PageBlobClientResizeResult, PageBlobClientResizeResultHeaders,
@@ -54,6 +55,6 @@ pub use crate::generated::models::{
     PageBlobClientUploadPagesFromUrlResult, PageBlobClientUploadPagesOptions,
     PageBlobClientUploadPagesResult, PageBlobClientUploadPagesResultHeaders, PageList,
     PremiumPageBlobAccessTier, PublicAccessType, RehydratePriority, RetentionPolicy,
-    SequenceNumberActionType, StaticWebsite, StorageServiceProperties,
+    SequenceNumberActionType, StaticWebsite,
 };
 pub use extensions::*;

sdk/storage/azure_storage_blob/tests/blob_container_client.rs

@@ -64,12 +64,8 @@ async fn test_set_container_metadata(ctx: TestContext) -> Result<(), Box<dyn Err
 
     // Set Metadata With Values
     let update_metadata = HashMap::from([("hello".to_string(), "world".to_string())]);
-    let set_metadata_options = BlobContainerClientSetMetadataOptions {
-        metadata: Some(update_metadata.clone()),
-        ..Default::default()
-    };
     container_client
-        .set_metadata(Some(set_metadata_options))
+        .set_metadata(update_metadata.clone(), None)
         .await?;
 
     // Assert
@@ -78,7 +74,7 @@ async fn test_set_container_metadata(ctx: TestContext) -> Result<(), Box<dyn Err
     assert_eq!(update_metadata, response_metadata);
 
     // Set Metadata No Values (Clear Metadata)
-    container_client.set_metadata(None).await?;
+    container_client.set_metadata(HashMap::new(), None).await?;
 
     // Assert
     let response = container_client.get_properties(None).await?;
@@ -231,11 +227,10 @@ async fn test_container_lease_operations(ctx: TestContext) -> Result<(), Box<dyn
     let update_metadata = HashMap::from([("hello".to_string(), "world".to_string())]);
     let set_metadata_options = BlobContainerClientSetMetadataOptions {
         lease_id: Some(lease_id.clone()),
-        metadata: Some(update_metadata.clone()),
         ..Default::default()
     };
     container_client
-        .set_metadata(Some(set_metadata_options))
+        .set_metadata(update_metadata, Some(set_metadata_options))
         .await?;
 
     // Change Lease