[Storage][DataMovement] Fix bugs associated with encoding special characters (Azure#51066)

jalauzon-msft · web-flow · commit 012e30561f01 · 2025-07-09T15:31:00.000-07:00
diff --git a/sdk/storage/Azure.Storage.DataMovement.Blobs.Files.Shares/assets.json b/sdk/storage/Azure.Storage.DataMovement.Blobs.Files.Shares/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "net",
   "TagPrefix": "net/storage/Azure.Storage.DataMovement.Blobs.Files.Shares",
-  "Tag": "net/storage/Azure.Storage.DataMovement.Blobs.Files.Shares_3cdf992080"
+  "Tag": "net/storage/Azure.Storage.DataMovement.Blobs.Files.Shares_430413f807"
 }
diff --git a/sdk/storage/Azure.Storage.DataMovement.Blobs.Files.Shares/tests/StartTransferCopyFromShareDirectoryTestBase.cs b/sdk/storage/Azure.Storage.DataMovement.Blobs.Files.Shares/tests/StartTransferCopyFromShareDirectoryTestBase.cs
@@ -102,22 +102,25 @@ protected override async Task CreateObjectInSourceAsync(
             }
         }
 
-        protected override async Task<IDisposingContainer<BlobContainerClient>> GetDestinationDisposingContainerAsync(BlobServiceClient service = null, string containerName = null, CancellationToken cancellationToken = default)
-            => await DestinationClientBuilder.GetTestContainerAsync(service, containerName);
-
-        protected override BlobContainerClient GetOAuthDestinationContainerClient(string containerName)
+        protected override async Task<IDisposingContainer<BlobContainerClient>> GetDestinationDisposingContainerOauthAsync(
+            string containerName = default,
+            CancellationToken cancellationToken = default)
         {
-            BlobClientOptions options = DestinationClientBuilder.GetOptions();
-            BlobServiceClient oauthService = DestinationClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential, options);
-            return oauthService.GetBlobContainerClient(containerName);
+            BlobServiceClient oauthService = DestinationClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential);
+            return await DestinationClientBuilder.GetTestContainerAsync(oauthService, containerName);
         }
 
-        protected override ShareClient GetOAuthSourceContainerClient(string containerName)
+        protected override async Task<IDisposingContainer<BlobContainerClient>> GetDestinationDisposingContainerAsync(BlobServiceClient service = null, string containerName = null, CancellationToken cancellationToken = default)
+            => await DestinationClientBuilder.GetTestContainerAsync(service, containerName);
+
+        protected override async Task<IDisposingContainer<ShareClient>> GetSourceDisposingContainerOauthAsync(
+            string containerName = default,
+            CancellationToken cancellationToken = default)
         {
             ShareClientOptions options = SourceClientBuilder.GetOptions();
             options.ShareTokenIntent = ShareTokenIntent.Backup;
             ShareServiceClient oauthService = SourceClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential, options);
-            return oauthService.GetShareClient(containerName);
+            return await SourceClientBuilder.GetTestShareAsync(oauthService, containerName);
         }
 
         protected override async Task<IDisposingContainer<ShareClient>> GetSourceDisposingContainerAsync(
diff --git a/sdk/storage/Azure.Storage.DataMovement.Blobs.Files.Shares/tests/StartTransferCopyToShareDirectoryTestBase.cs b/sdk/storage/Azure.Storage.DataMovement.Blobs.Files.Shares/tests/StartTransferCopyToShareDirectoryTestBase.cs
@@ -94,6 +94,16 @@ protected override async Task CreateObjectInDestinationAsync(ShareClient contain
             }
         }
 
+        protected override async Task<IDisposingContainer<ShareClient>> GetDestinationDisposingContainerOauthAsync(
+            string containerName = default,
+            CancellationToken cancellationToken = default)
+        {
+            ShareClientOptions options = DestinationClientBuilder.GetOptions();
+            options.ShareTokenIntent = ShareTokenIntent.Backup;
+            ShareServiceClient oauthService = DestinationClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential, options);
+            return await DestinationClientBuilder.GetTestShareAsync(oauthService, containerName);
+        }
+
         protected override async Task<IDisposingContainer<ShareClient>> GetDestinationDisposingContainerAsync(ShareServiceClient service = null, string containerName = null, CancellationToken cancellationToken = default)
             => await DestinationClientBuilder.GetTestShareAsync(service, containerName);
 
@@ -176,19 +186,12 @@ public ShareClientOptions GetShareOptions()
             return InstrumentClientOptions(options);
         }
 
-        protected override ShareClient GetOAuthDestinationContainerClient(string containerName)
-        {
-            ShareClientOptions options = DestinationClientBuilder.GetOptions();
-            options.ShareTokenIntent = ShareTokenIntent.Backup;
-            ShareServiceClient oauthService = DestinationClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential, options);
-            return oauthService.GetShareClient(containerName);
-        }
-
-        protected override BlobContainerClient GetOAuthSourceContainerClient(string containerName)
+        protected override async Task<IDisposingContainer<BlobContainerClient>> GetSourceDisposingContainerOauthAsync(
+            string containerName = default,
+            CancellationToken cancellationToken = default)
         {
-            BlobClientOptions options = SourceClientBuilder.GetOptions();
-            BlobServiceClient oauthService = SourceClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential, options);
-            return oauthService.GetBlobContainerClient(containerName);
+            BlobServiceClient oauthService = SourceClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential);
+            return await SourceClientBuilder.GetTestContainerAsync(oauthService, containerName);
         }
 
         // Blob to File always needs OAuth source container
diff --git a/sdk/storage/Azure.Storage.DataMovement.Blobs/CHANGELOG.md b/sdk/storage/Azure.Storage.DataMovement.Blobs/CHANGELOG.md
@@ -7,6 +7,8 @@
 ### Breaking Changes
 
 ### Bugs Fixed
+- Fixed an issue with Copy transfers where if the source file/directory name contained certain special characters, the destination file name would incorrectly contain the encoded version of these characters.
+- Fixed an issue with Upload transfers where file/directory names containing certain URL-encoded characters could cause the transfer to fail.
 
 ### Other Changes
 
diff --git a/sdk/storage/Azure.Storage.DataMovement.Blobs/assets.json b/sdk/storage/Azure.Storage.DataMovement.Blobs/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "net",
   "TagPrefix": "net/storage/Azure.Storage.DataMovement.Blobs",
-  "Tag": "net/storage/Azure.Storage.DataMovement.Blobs_5f8193db17"
+  "Tag": "net/storage/Azure.Storage.DataMovement.Blobs_1ebb672122"
 }
diff --git a/sdk/storage/Azure.Storage.DataMovement.Blobs/tests/StartTransferBlobDirectoryCopyTestBase.cs b/sdk/storage/Azure.Storage.DataMovement.Blobs/tests/StartTransferBlobDirectoryCopyTestBase.cs
@@ -234,25 +234,28 @@ await UploadPagesAsync(
             }
         }
 
+        protected override async Task<IDisposingContainer<BlobContainerClient>> GetDestinationDisposingContainerOauthAsync(
+            string containerName = default,
+            CancellationToken cancellationToken = default)
+        {
+            BlobServiceClient oauthService = DestinationClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential);
+            return await DestinationClientBuilder.GetTestContainerAsync(oauthService, containerName);
+        }
+
         protected override async Task<IDisposingContainer<BlobContainerClient>> GetDestinationDisposingContainerAsync(
             BlobServiceClient service = null,
             string containerName = null,
             CancellationToken cancellationToken = default)
             => await DestinationClientBuilder.GetTestContainerAsync(service, containerName);
 
-        private BlobContainerClient GetOAuthContainerClient(string containerName)
+        protected override async Task<IDisposingContainer<BlobContainerClient>> GetSourceDisposingContainerOauthAsync(
+            string containerName = default,
+            CancellationToken cancellationToken = default)
         {
-            BlobClientOptions options = SourceClientBuilder.GetOptions();
-            BlobServiceClient oauthService = SourceClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential, options);
-            return oauthService.GetBlobContainerClient(containerName);
+            BlobServiceClient oauthService = SourceClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential);
+            return await SourceClientBuilder.GetTestContainerAsync(oauthService, containerName);
         }
 
-        protected override BlobContainerClient GetOAuthDestinationContainerClient(string containerName)
-            => GetOAuthContainerClient(containerName);
-
-        protected override BlobContainerClient GetOAuthSourceContainerClient(string containerName)
-            => GetOAuthContainerClient(containerName);
-
         protected override async Task<IDisposingContainer<BlobContainerClient>> GetSourceDisposingContainerAsync(BlobServiceClient service = null, string containerName = null, CancellationToken cancellationToken = default)
         {
             DisposingBlobContainer disposingContainer = await SourceClientBuilder.GetTestContainerAsync(service, containerName);
diff --git a/sdk/storage/Azure.Storage.DataMovement.Files.Shares/CHANGELOG.md b/sdk/storage/Azure.Storage.DataMovement.Files.Shares/CHANGELOG.md
@@ -7,6 +7,8 @@
 ### Breaking Changes
 
 ### Bugs Fixed
+- Fixed an issue with Copy transfers where if the source file/directory name contained certain special characters, the destination file name would incorrectly contain the encoded version of these characters.
+- Fixed an issue with Upload transfers where file/directory names containing certain URL-encoded characters could cause the transfer to fail.
 
 ### Other Changes
 
diff --git a/sdk/storage/Azure.Storage.DataMovement.Files.Shares/assets.json b/sdk/storage/Azure.Storage.DataMovement.Files.Shares/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "net",
   "TagPrefix": "net/storage/Azure.Storage.DataMovement.Files.Shares",
-  "Tag": "net/storage/Azure.Storage.DataMovement.Files.Shares_f6f89a43f9"
+  "Tag": "net/storage/Azure.Storage.DataMovement.Files.Shares_90fc7c3256"
 }
diff --git a/sdk/storage/Azure.Storage.DataMovement.Files.Shares/tests/ShareDirectoryStartTransferCopyTests.cs b/sdk/storage/Azure.Storage.DataMovement.Files.Shares/tests/ShareDirectoryStartTransferCopyTests.cs
@@ -88,26 +88,30 @@ protected override async Task<IDisposingContainer<ShareClient>> GetDestinationDi
             CancellationToken cancellationToken = default)
             => await DestinationClientBuilder.GetTestShareAsync(service, containerName, cancellationToken: cancellationToken);
 
+        protected override async Task<IDisposingContainer<ShareClient>> GetDestinationDisposingContainerOauthAsync(
+            string containerName = default,
+            CancellationToken cancellationToken = default)
+        {
+            ShareClientOptions options = DestinationClientBuilder.GetOptions();
+            options.ShareTokenIntent = ShareTokenIntent.Backup;
+            ShareServiceClient oauthService = DestinationClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential, options);
+            return await DestinationClientBuilder.GetTestShareAsync(oauthService, containerName, cancellationToken: cancellationToken);
+        }
+
         protected override StorageResourceContainer GetDestinationStorageResourceContainer(
             ShareClient containerClient,
             string prefix,
             TransferPropertiesTestType propertiesTestType = default)
             => new ShareDirectoryStorageResourceContainer(containerClient.GetDirectoryClient(prefix), GetShareFileStorageResourceOptions(propertiesTestType));
 
-        protected override ShareClient GetOAuthSourceContainerClient(string containerName)
+        protected override async Task<IDisposingContainer<ShareClient>> GetSourceDisposingContainerOauthAsync(
+            string containerName = default,
+            CancellationToken cancellationToken = default)
         {
             ShareClientOptions options = SourceClientBuilder.GetOptions();
             options.ShareTokenIntent = ShareTokenIntent.Backup;
             ShareServiceClient oauthService = SourceClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential, options);
-            return oauthService.GetShareClient(containerName);
-        }
-
-        protected override ShareClient GetOAuthDestinationContainerClient(string containerName)
-        {
-            ShareClientOptions options = DestinationClientBuilder.GetOptions();
-            options.ShareTokenIntent = ShareTokenIntent.Backup;
-            ShareServiceClient oauthService = DestinationClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential, options);
-            return oauthService.GetShareClient(containerName);
+            return await SourceClientBuilder.GetTestShareAsync(oauthService, containerName, cancellationToken: cancellationToken);
         }
 
         protected override async Task<IDisposingContainer<ShareClient>> GetSourceDisposingContainerAsync(ShareServiceClient service = null, string containerName = null, CancellationToken cancellationToken = default)
diff --git a/sdk/storage/Azure.Storage.DataMovement/CHANGELOG.md b/sdk/storage/Azure.Storage.DataMovement/CHANGELOG.md
@@ -7,6 +7,8 @@
 ### Breaking Changes
 
 ### Bugs Fixed
+- Fixed an issue with Copy transfers where if the source file/directory name contained certain special characters, the destination file name would incorrectly contain the encoded version of these characters.
+- Fixed an issue with Upload transfers where file/directory names containing certain URL-encoded characters could cause the transfer to fail.
 
 ### Other Changes
 
diff --git a/sdk/storage/Azure.Storage.DataMovement/assets.json b/sdk/storage/Azure.Storage.DataMovement/assets.json
@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "net",
   "TagPrefix": "net/storage/Azure.Storage.DataMovement",
-  "Tag": "net/storage/Azure.Storage.DataMovement_80d90a8906"
+  "Tag": "net/storage/Azure.Storage.DataMovement_2dbe8c115b"
 }
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/LocalDirectoryStorageResourceContainer.cs b/sdk/storage/Azure.Storage.DataMovement/src/LocalDirectoryStorageResourceContainer.cs
@@ -29,13 +29,7 @@ internal class LocalDirectoryStorageResourceContainer : StorageResourceContainer
         public LocalDirectoryStorageResourceContainer(string path)
         {
             Argument.AssertNotNullOrWhiteSpace(path, nameof(path));
-            UriBuilder uriBuilder= new UriBuilder()
-            {
-                Scheme = Uri.UriSchemeFile,
-                Host = "",
-                Path = path,
-            };
-            _uri = uriBuilder.Uri;
+            _uri = PathScanner.GetEncodedUriFromPath(path);
         }
 
         /// <summary>
@@ -107,9 +101,8 @@ protected internal override Task CreateIfNotExistsAsync(CancellationToken cancel
 
         protected internal override StorageResourceContainer GetChildStorageResourceContainer(string path)
         {
-            UriBuilder uri = new UriBuilder(_uri);
-            uri.Path = Path.Combine(uri.Path, path);
-            return new LocalDirectoryStorageResourceContainer(uri.Uri);
+            Uri concatPath = _uri.AppendToPath(path);
+            return new LocalDirectoryStorageResourceContainer(concatPath);
         }
 
         protected internal override Task<StorageResourceContainerProperties> GetPropertiesAsync(CancellationToken cancellationToken = default)
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/LocalFileStorageResource.cs b/sdk/storage/Azure.Storage.DataMovement/src/LocalFileStorageResource.cs
@@ -40,13 +40,7 @@ internal class LocalFileStorageResource : StorageResourceItem
         public LocalFileStorageResource(string path)
         {
             Argument.AssertNotNullOrWhiteSpace(path, nameof(path));
-            UriBuilder uriBuilder = new UriBuilder()
-            {
-                Scheme = Uri.UriSchemeFile,
-                Host = "",
-                Path = path,
-            };
-            _uri = uriBuilder.Uri;
+            _uri = PathScanner.GetEncodedUriFromPath(path);
         }
 
         /// <summary>
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/Shared/PathScanner.cs b/sdk/storage/Azure.Storage.DataMovement/src/Shared/PathScanner.cs
@@ -4,8 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
+using System.Runtime.InteropServices;
 
 namespace Azure.Storage.DataMovement
 {
@@ -88,6 +88,39 @@ public IEnumerable<FileSystemInfo> Scan(bool continueOnError = true)
             }
         }
 
+        /// <summary>
+        /// Gets a file Uri that is fully encoded even if the path contains already
+        /// encoded characters (double encoded in this case). <see cref="Uri.LocalPath"/>
+        /// can be used to get decoded version for use with File IO.
+        /// </summary>
+        public static Uri GetEncodedUriFromPath(string path)
+        {
+            // The Uri class will normalize slashes but for Windows, do it
+            // ahead of time to make the remainning logic common. Only do
+            // this for Windows as \ can be a valid character for Linux/Mac.
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                path = path.Replace("\\", "/");
+            }
+
+            // Encode each part of the path (except the first one) separately
+            // and then reassemble into a Uri. This is done as Uri can be inconsistent
+            // whether it encodes or not and we want to be sure to preserve any encoding
+            // on disk.
+            string[] pathParts = path.Split('/');
+            List<string> encodedParts = [pathParts.First()];
+            encodedParts.AddRange(pathParts.Skip(1).Select(Uri.EscapeDataString));
+            string encodedPath = string.Join("/", encodedParts);
+
+            UriBuilder uriBuilder = new()
+            {
+                Scheme = Uri.UriSchemeFile,
+                Host = "",
+                Path = encodedPath,
+            };
+            return uriBuilder.Uri;
+        }
+
         private static IEnumerable<string> EnumerateDirectories(string path)
         {
             return Directory.EnumerateDirectories(path);
diff --git a/sdk/storage/Azure.Storage.DataMovement/src/TransferJobInternal.cs b/sdk/storage/Azure.Storage.DataMovement/src/TransferJobInternal.cs
@@ -5,6 +5,7 @@
 using System.Buffers;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
@@ -333,6 +334,8 @@ private async IAsyncEnumerable<JobPartInternal> EnumerateAndCreateJobPartsAsync(
                     string subContainerPath = string.IsNullOrEmpty(containerUriPath)
                         ? current.Uri.GetPath()
                         : current.Uri.GetPath().Substring(containerUriPath.Length + 1);
+                    // Decode the container name as it was pulled from encoded Uri and will be re-encoded on destination.
+                    subContainerPath = WebUtility.UrlDecode(subContainerPath);
                     StorageResourceContainer subContainer =
                         _destinationResourceContainer.GetChildStorageResourceContainer(subContainerPath);
 
@@ -368,6 +371,8 @@ private async IAsyncEnumerable<JobPartInternal> EnumerateAndCreateJobPartsAsync(
                             {
                                 string containerUriPath = _sourceResourceContainer.Uri.GetPath();
                                 sourceName = current.Uri.GetPath().Substring(containerUriPath.Length + 1);
+                                // Decode the resource name as it was pulled from encoded Uri and will be re-encoded on destination.
+                                sourceName = WebUtility.UrlDecode(sourceName);
                             }
 
                             StorageResourceItem sourceItem = (StorageResourceItem)current;
diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/LocalDirectoryStorageResourceTests.cs b/sdk/storage/Azure.Storage.DataMovement/tests/LocalDirectoryStorageResourceTests.cs
diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/LocalFileStorageResourceTests.cs b/sdk/storage/Azure.Storage.DataMovement/tests/LocalFileStorageResourceTests.cs
diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryCopyTestBase.cs b/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryCopyTestBase.cs
diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryDownloadTestBase.cs b/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferDirectoryDownloadTestBase.cs
diff --git a/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferUploadDirectoryTestBase.cs b/sdk/storage/Azure.Storage.DataMovement/tests/Shared/StartTransferUploadDirectoryTestBase.cs

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`"AssetsRepo": "Azure/azure-sdk-assets",`
`3`	`3`	`"AssetsRepoPrefixPath": "net",`
`4`	`4`	`"TagPrefix": "net/storage/Azure.Storage.DataMovement.Blobs.Files.Shares",`
`5`		`- "Tag": "net/storage/Azure.Storage.DataMovement.Blobs.Files.Shares_3cdf992080"`
	`5`	`+ "Tag": "net/storage/Azure.Storage.DataMovement.Blobs.Files.Shares_430413f807"`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,22 +102,25 @@ protected override async Task CreateObjectInSourceAsync(`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
`105`		`- protected override async Task<IDisposingContainer<BlobContainerClient>> GetDestinationDisposingContainerAsync(BlobServiceClient service = null, string containerName = null, CancellationToken cancellationToken = default)`
`106`		`- => await DestinationClientBuilder.GetTestContainerAsync(service, containerName);`
`107`		`-`
`108`		`- protected override BlobContainerClient GetOAuthDestinationContainerClient(string containerName)`
	`105`	`+ protected override async Task<IDisposingContainer<BlobContainerClient>> GetDestinationDisposingContainerOauthAsync(`
	`106`	`+ string containerName = default,`
	`107`	`+ CancellationToken cancellationToken = default)`
`109`	`108`	`{`
`110`		`- BlobClientOptions options = DestinationClientBuilder.GetOptions();`
`111`		`- BlobServiceClient oauthService = DestinationClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential, options);`
`112`		`- return oauthService.GetBlobContainerClient(containerName);`
	`109`	`+ BlobServiceClient oauthService = DestinationClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential);`
	`110`	`+ return await DestinationClientBuilder.GetTestContainerAsync(oauthService, containerName);`
`113`	`111`	`}`
`114`	`112`
`115`		`- protected override ShareClient GetOAuthSourceContainerClient(string containerName)`
	`113`	`+ protected override async Task<IDisposingContainer<BlobContainerClient>> GetDestinationDisposingContainerAsync(BlobServiceClient service = null, string containerName = null, CancellationToken cancellationToken = default)`
	`114`	`+ => await DestinationClientBuilder.GetTestContainerAsync(service, containerName);`
	`115`	`+`
	`116`	`+ protected override async Task<IDisposingContainer<ShareClient>> GetSourceDisposingContainerOauthAsync(`
	`117`	`+ string containerName = default,`
	`118`	`+ CancellationToken cancellationToken = default)`
`116`	`119`	`{`
`117`	`120`	`ShareClientOptions options = SourceClientBuilder.GetOptions();`
`118`	`121`	`options.ShareTokenIntent = ShareTokenIntent.Backup;`
`119`	`122`	`ShareServiceClient oauthService = SourceClientBuilder.GetServiceClientFromOauthConfig(Tenants.TestConfigOAuth, TestEnvironment.Credential, options);`
`120`		`- return oauthService.GetShareClient(containerName);`
	`123`	`+ return await SourceClientBuilder.GetTestShareAsync(oauthService, containerName);`
`121`	`124`	`}`
`122`	`125`
`123`	`126`	`protected override async Task<IDisposingContainer<ShareClient>> GetSourceDisposingContainerAsync(`