[Storage] Navigation Methods Between Clients + Storage Test Helpers (#2502)

Author: vincenttran-msft

sdk/storage/assets.json

@@ -1,6 +1,6 @@
 {
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "rust",
-  "Tag": "rust/azure_storage_blob_9f4842ba91",
+  "Tag": "rust/azure_storage_blob_99380d9553",
   "TagPrefix": "rust/azure_storage_blob"
 }

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

@@ -104,8 +104,7 @@ impl BlobClient {
         &self,
         options: Option<BlobClientGetPropertiesOptions<'_>>,
     ) -> Result<Response<BlobClientGetPropertiesResult>> {
-        let response = self.client.get_properties(options).await?;
-        Ok(response)
+        self.client.get_properties(options).await
     }
 
     /// Sets system properties on the blob.
@@ -117,8 +116,7 @@ impl BlobClient {
         &self,
         options: Option<BlobClientSetPropertiesOptions<'_>>,
     ) -> Result<Response<()>> {
-        let response = self.client.set_properties(options).await?;
-        Ok(response)
+        self.client.set_properties(options).await
     }
 
     /// Downloads a blob from the service, including its metadata and properties.
@@ -128,8 +126,7 @@ impl BlobClient {
         &self,
         options: Option<BlobClientDownloadOptions<'_>>,
     ) -> Result<Response<BlobClientDownloadResult>> {
-        let response = self.client.download(options).await?;
-        Ok(response)
+        self.client.download(options).await
     }
 
     /// Creates a new blob from a data source.
@@ -156,10 +153,9 @@ impl BlobClient {
 
         let block_blob_client = self.client.get_block_blob_client();
 
-        let response = block_blob_client
+        block_blob_client
             .upload(data, content_length, Some(options))
-            .await?;
-        Ok(response)
+            .await
     }
 
     /// Sets user-defined metadata for the specified blob as one or more name-value pairs. Each call to this operation
@@ -173,8 +169,7 @@ impl BlobClient {
         &self,
         options: Option<BlobClientSetMetadataOptions<'_>>,
     ) -> Result<Response<()>> {
-        let response = self.client.set_metadata(options).await?;
-        Ok(response)
+        self.client.set_metadata(options).await
     }
 
     /// Deletes the blob.
@@ -186,8 +181,7 @@ impl BlobClient {
         &self,
         options: Option<BlobClientDeleteOptions<'_>>,
     ) -> Result<Response<()>> {
-        let response = self.client.delete(options).await?;
-        Ok(response)
+        self.client.delete(options).await
     }
 
     /// Writes to a blob based on blocks specified by the list of IDs and content that make up the blob.
@@ -202,8 +196,7 @@ impl BlobClient {
         options: Option<BlockBlobClientCommitBlockListOptions<'_>>,
     ) -> Result<Response<BlockBlobClientCommitBlockListResult>> {
         let block_blob_client = self.client.get_block_blob_client();
-        let response = block_blob_client.commit_block_list(blocks, options).await?;
-        Ok(response)
+        block_blob_client.commit_block_list(blocks, options).await
     }
 
     /// Creates a new block to be later committed as part of a blob.
@@ -223,10 +216,9 @@ impl BlobClient {
         options: Option<BlockBlobClientStageBlockOptions<'_>>,
     ) -> Result<Response<BlockBlobClientStageBlockResult>> {
         let block_blob_client = self.client.get_block_blob_client();
-        let response = block_blob_client
+        block_blob_client
             .stage_block(block_id, content_length, body, options)
-            .await?;
-        Ok(response)
+            .await
     }
 
     /// Retrieves the list of blocks that have been uploaded as part of a block blob.
@@ -241,8 +233,7 @@ impl BlobClient {
         options: Option<BlockBlobClientGetBlockListOptions<'_>>,
     ) -> Result<Response<BlockList>> {
         let block_blob_client = self.client.get_block_blob_client();
-        let response = block_blob_client.get_block_list(list_type, options).await?;
-        Ok(response)
+        block_blob_client.get_block_list(list_type, options).await
     }
 
     /// Sets the tier on a blob. Standard tiers are only applicable for Block blobs, while Premium tiers are only applicable

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

@@ -4,9 +4,9 @@
 use crate::{
     generated::clients::BlobContainerClient as GeneratedBlobContainerClient,
     generated::models::BlobContainerClientGetPropertiesResult, pipeline::StorageHeadersPolicy,
-    BlobContainerClientCreateOptions, BlobContainerClientDeleteOptions,
-    BlobContainerClientGetPropertiesOptions, BlobContainerClientOptions,
-    BlobContainerClientSetMetadataOptions,
+    BlobClient, BlobClientOptions, BlobContainerClientCreateOptions,
+    BlobContainerClientDeleteOptions, BlobContainerClientGetPropertiesOptions,
+    BlobContainerClientOptions, BlobContainerClientSetMetadataOptions,
 };
 use azure_core::{
     credentials::TokenCredential,
@@ -22,6 +22,7 @@ use std::sync::Arc;
 pub struct BlobContainerClient {
     endpoint: Url,
     container_name: String,
+    credential: Arc<dyn TokenCredential>,
     client: GeneratedBlobContainerClient,
 }
 
@@ -59,18 +60,39 @@ impl BlobContainerClient {
 
         let client = GeneratedBlobContainerClient::new(
             endpoint,
-            credential,
+            credential.clone(),
             container_name.clone(),
             Some(options),
         )?;
 
         Ok(Self {
             endpoint: endpoint.parse()?,
             container_name,
+            credential,
             client,
         })
     }
 
+    /// Returns a new instance of BlobClient.
+    ///
+    /// # Arguments
+    ///
+    /// * `blob_name` - The name of the blob.
+    /// * `options` - Optional configuration for the client.
+    pub fn blob_client(
+        &self,
+        blob_name: String,
+        options: Option<BlobClientOptions>,
+    ) -> Result<BlobClient> {
+        BlobClient::new(
+            self.endpoint().as_str(),
+            self.container_name().to_string(),
+            blob_name,
+            self.credential.clone(),
+            options,
+        )
+    }
+
     /// Gets the endpoint of the Storage account this client is connected to.
     pub fn endpoint(&self) -> &Url {
         &self.endpoint
@@ -90,8 +112,7 @@ impl BlobContainerClient {
         &self,
         options: Option<BlobContainerClientCreateOptions<'_>>,
     ) -> Result<Response<()>> {
-        let response = self.client.create(options).await?;
-        Ok(response)
+        self.client.create(options).await
     }
 
     /// Sets user-defined metadata for the specified container as one or more name-value pairs. Each call to this operation
@@ -105,8 +126,7 @@ impl BlobContainerClient {
         &self,
         options: Option<BlobContainerClientSetMetadataOptions<'_>>,
     ) -> Result<Response<()>> {
-        let response = self.client.set_metadata(options).await?;
-        Ok(response)
+        self.client.set_metadata(options).await
     }
 
     /// Marks the specified container for deletion. The container and any blobs contained within are later deleted during garbage collection.
@@ -118,8 +138,7 @@ impl BlobContainerClient {
         &self,
         options: Option<BlobContainerClientDeleteOptions<'_>>,
     ) -> Result<Response<()>> {
-        let response = self.client.delete(options).await?;
-        Ok(response)
+        self.client.delete(options).await
     }
 
     /// Returns all user-defined metadata and system properties for the specified container.
@@ -132,8 +151,6 @@ impl BlobContainerClient {
         &self,
         options: Option<BlobContainerClientGetPropertiesOptions<'_>>,
     ) -> Result<Response<BlobContainerClientGetPropertiesResult>> {
-        let response = self.client.get_properties(options).await?;
-
-        Ok(response)
+        self.client.get_properties(options).await
     }
 }

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

@@ -3,8 +3,8 @@
 
 use crate::{
     generated::clients::BlobServiceClient as GeneratedBlobServiceClient,
-    models::StorageServiceProperties, pipeline::StorageHeadersPolicy,
-    BlobServiceClientGetPropertiesOptions, BlobServiceClientOptions,
+    models::StorageServiceProperties, pipeline::StorageHeadersPolicy, BlobContainerClient,
+    BlobContainerClientOptions, BlobServiceClientGetPropertiesOptions, BlobServiceClientOptions,
 };
 use azure_core::{
     credentials::TokenCredential,
@@ -19,6 +19,7 @@ use std::sync::Arc;
 /// A client to interact with an Azure storage account.
 pub struct BlobServiceClient {
     endpoint: Url,
+    credential: Arc<dyn TokenCredential>,
     client: GeneratedBlobServiceClient,
 }
 
@@ -52,14 +53,34 @@ impl BlobServiceClient {
             .per_try_policies
             .push(Arc::new(oauth_token_policy) as Arc<dyn Policy>);
 
-        let client = GeneratedBlobServiceClient::new(endpoint, credential, Some(options))?;
+        let client = GeneratedBlobServiceClient::new(endpoint, credential.clone(), Some(options))?;
 
         Ok(Self {
             endpoint: endpoint.parse()?,
+            credential,
             client,
         })
     }
 
+    /// Returns a new instance of BlobContainerClient.
+    ///
+    /// # Arguments
+    ///
+    /// * `container_name` - The name of the container.
+    /// * `options` - Optional configuration for the client.
+    pub fn blob_container_client(
+        &self,
+        container_name: String,
+        options: Option<BlobContainerClientOptions>,
+    ) -> Result<BlobContainerClient> {
+        BlobContainerClient::new(
+            self.endpoint().as_str(),
+            container_name,
+            self.credential.clone(),
+            options,
+        )
+    }
+
     /// Gets the endpoint of the Storage account this client is connected to.
     pub fn endpoint(&self) -> &Url {
         &self.endpoint
@@ -74,7 +95,6 @@ impl BlobServiceClient {
         &self,
         options: Option<BlobServiceClientGetPropertiesOptions<'_>>,
     ) -> Result<Response<StorageServiceProperties>> {
-        let response = self.client.get_properties(options).await?;
-        Ok(response)
+        self.client.get_properties(options).await
     }
 }