DataMovment StorageResourceContainer internal hooks to protected APIs

sdk/storage/Azure.Storage.DataMovement.Blobs/src/Azure.Storage.DataMovement.Blobs.csproj

@@ -49,6 +49,7 @@
     <Compile Include="$(AzureStorageDataMovementSharedSources)JobPlanExtensions.cs" LinkBase="Shared\DataMovement" />
     <Compile Include="$(AzureStorageDataMovementSharedSources)ResponseExtensions.cs" LinkBase="Shared\DataMovement" />
     <Compile Include="$(AzureStorageDataMovementSharedSources)LocalTransferCheckpointer.cs" LinkBase="Shared\DataMovement" />
+    <Compile Include="$(AzureStorageDataMovementSharedSources)StorageResourceContainerInternal.cs" LinkBase="Shared\DataMovement" />
     <Compile Include="$(AzureStorageDataMovementSharedSources)TransferCheckpointer.cs" LinkBase="Shared\DataMovement" />
   </ItemGroup>
   <ItemGroup>

sdk/storage/Azure.Storage.DataMovement.Blobs/src/BlobStorageResourceContainer.cs

@@ -15,7 +15,7 @@ namespace Azure.Storage.DataMovement.Blobs
     /// <summary>
     /// The Storage Resource class for the Blob Client. Supports blob prefix directories as well as the root container.
     /// </summary>
-    internal class BlobStorageResourceContainer : StorageResourceContainer
+    internal class BlobStorageResourceContainer : StorageResourceContainerInternal
     {
         internal BlobContainerClient BlobContainerClient { get; }
         internal string DirectoryPrefix { get; }

sdk/storage/Azure.Storage.DataMovement.Files.Shares/src/Azure.Storage.DataMovement.Files.Shares.csproj

@@ -31,6 +31,9 @@
     <Compile Include="$(AzureCoreSharedSources)CancellationHelper.cs" LinkBase="SharedCore" />
     <Compile Include="$(AzureCoreSharedSources)SyncAsyncEventHandlerExtensions.cs" LinkBase="Shared\Core" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="$(AzureStorageDataMovementSharedSources)StorageResourceContainerInternal.cs" LinkBase="Shared\DataMovement" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Azure.Core" />
   </ItemGroup>

sdk/storage/Azure.Storage.DataMovement.Files.Shares/src/ShareDirectoryStorageResourceContainer.cs

@@ -11,7 +11,7 @@
 
 namespace Azure.Storage.DataMovement.Files.Shares
 {
-    internal class ShareDirectoryStorageResourceContainer : StorageResourceContainer
+    internal class ShareDirectoryStorageResourceContainer : StorageResourceContainerInternal
     {
         internal ShareFileStorageResourceOptions ResourceOptions { get; set; }
         internal PathScanner PathScanner { get; set; }
@@ -47,20 +47,5 @@ protected override async IAsyncEnumerable<StorageResource> GetStorageResourcesAs
                 yield return new ShareFileStorageResourceItem(client, ResourceOptions);
             }
         }
-
-        #region Protected Hooks
-        // Internal func to access protected member for testing.
-        internal async IAsyncEnumerable<StorageResource> GetStorageResourcesInternal(
-            [EnumeratorCancellation] CancellationToken cancellationToken = default)
-        {
-            await foreach (StorageResource resource in GetStorageResourcesAsync(cancellationToken).ConfigureAwait(false))
-            {
-                yield return resource;
-            }
-        }
-
-        internal StorageResourceItem GetStorageResourceReferenceInternal(string path)
-            => GetStorageResourceReference(path);
-        #endregion
     }
 }

sdk/storage/Azure.Storage.DataMovement.Files.Shares/tests/ShareDirectoryStorageResourceContainerTests.cs

@@ -49,7 +49,7 @@ public async Task GetStorageResourcesCallsPathScannerCorrectly()
 
             // Verify StorageResourceContainer correctly invokes path scanner and returns the given files
             List<ShareFileClient> results = new();
-            await foreach (StorageResource res in resource.GetStorageResourcesInternal())
+            await foreach (StorageResource res in resource.GetStorageResourcesInternalAsync())
             {
                 Assert.That(res, Is.TypeOf(typeof(ShareFileStorageResourceItem)));
                 results.Add((res as ShareFileStorageResourceItem).ShareFileClient);

sdk/storage/Azure.Storage.DataMovement/src/Shared/StorageResourceContainerInternal.cs

@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System.Collections.Generic;
+using System.Threading;
+
+namespace Azure.Storage.DataMovement
+{
+    /// <summary>
+    /// Middle class between the public type and implementation class.
+    /// Gives internal hook methods to protected methods of
+    /// <see cref="StorageResourceContainer"/>, allowing for internal
+    /// package use as well as testing access.
+    /// </summary>
+    internal abstract class StorageResourceContainerInternal : StorageResourceContainer
+    {
+        internal IAsyncEnumerable<StorageResource> GetStorageResourcesInternalAsync(
+            CancellationToken cancellationToken = default)
+            => GetStorageResourcesAsync(cancellationToken);
+
+        internal StorageResourceItem GetStorageResourceReferenceInternal(string path)
+            => GetStorageResourceReference(path);
+    }
+}