[Storage] [DataMovement] Fixed Preservation during Directory Overwrite

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_430413f807"
+  "Tag": "net/storage/Azure.Storage.DataMovement.Blobs.Files.Shares_926acae5b7"
 }

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_90fc7c3256"
+  "Tag": "net/storage/Azure.Storage.DataMovement.Files.Shares_bedde4490a"
 }

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

@@ -79,7 +79,7 @@ public static string GetFilePermission(
             return default;
         }
 
-        public static string GetFilePermission(
+        public static string GetDirectoryPermission(
             this ShareFileStorageResourceOptions options,
             StorageResourceContainerProperties sourceProperties)
         {

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

@@ -170,15 +170,15 @@ protected override async Task CreateIfNotExistsAsync(
             CancellationToken cancellationToken = default)
         {
             IDictionary<string, string> metadata = ResourceOptions?.GetDirectoryMetadata(sourceProperties?.RawProperties);
-            string filePermission = ResourceOptions?.GetFilePermission(sourceProperties);
+            string directoryPermission = ResourceOptions?.GetDirectoryPermission(sourceProperties);
             FileSmbProperties smbProperties = ResourceOptions?.GetFileSmbProperties(sourceProperties);
             FilePosixProperties filePosixProperties = ResourceOptions?.GetFilePosixProperties(sourceProperties);
 
             ShareDirectoryCreateOptions options = new ShareDirectoryCreateOptions
             {
                 Metadata = metadata,
                 SmbProperties = smbProperties,
-                FilePermission = new() { Permission = filePermission },
+                FilePermission = new() { Permission = directoryPermission },
                 PosixProperties = filePosixProperties
             };
 
@@ -187,6 +187,49 @@ await ShareDirectoryClient.CreateIfNotExistsAsync(
                 cancellationToken: cancellationToken).ConfigureAwait(false);
         }
 
+        protected override async Task CreateAsync(
+            bool overwrite,
+            StorageResourceContainerProperties sourceProperties,
+            CancellationToken cancellationToken = default)
+        {
+            bool exists = await ShareDirectoryClient.ExistsAsync(cancellationToken).ConfigureAwait(false);
+            if (!overwrite && exists)
+            {
+                throw Errors.ShareDirectoryAlreadyExists(ShareDirectoryClient.Path);
+            }
+
+            IDictionary<string, string> metadata = ResourceOptions?.GetDirectoryMetadata(sourceProperties?.RawProperties);
+            string directoryPermission = ResourceOptions?.GetDirectoryPermission(sourceProperties);
+            FileSmbProperties smbProperties = ResourceOptions?.GetFileSmbProperties(sourceProperties);
+            FilePosixProperties posixProperties = ResourceOptions?.GetFilePosixProperties(sourceProperties);
+
+            // If overwrite mode set and directory exists, then just set Properties, Permissions, and Metadata for preservation.
+            if (overwrite && exists)
+            {
+                await ShareDirectoryClient.SetMetadataAsync(metadata).ConfigureAwait(false);
+                await ShareDirectoryClient.SetHttpHeadersAsync(new()
+                {
+                    FilePermission = new() { Permission = directoryPermission },
+                    SmbProperties = smbProperties,
+                    PosixProperties = posixProperties
+                }, cancellationToken: cancellationToken).ConfigureAwait(false);
+            }
+            else
+            {
+                ShareDirectoryCreateOptions options = new ShareDirectoryCreateOptions
+                {
+                    Metadata = metadata,
+                    FilePermission = new() { Permission = directoryPermission },
+                    SmbProperties = smbProperties,
+                    PosixProperties = posixProperties
+                };
+
+                await ShareDirectoryClient.CreateIfNotExistsAsync(
+                    options: options,
+                    cancellationToken: cancellationToken).ConfigureAwait(false);
+            }
+        }
+
         protected override async Task ValidateTransferAsync(
             string transferId,
             StorageResource sourceResource,

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

@@ -431,6 +431,9 @@ internal partial class Errors
         public static InvalidOperationException ShareFileAlreadyExists(string pathName)
             => new InvalidOperationException($"Share File `{pathName}` already exists. Cannot overwrite file.");
 
+        public static InvalidOperationException ShareDirectoryAlreadyExists(string pathName)
+            => new InvalidOperationException($"Share Directory `{pathName}` already exists. Cannot overwrite directory.");
+
         public static ArgumentException ProtocolSetMismatch(string endpoint, ShareProtocol setProtocol, ShareProtocol actualProtocol)
             => new ArgumentException($"The Protocol set on the {endpoint} '{setProtocol}' does not match the actual Protocol of the share '{actualProtocol}'.");
 

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

@@ -7,6 +7,7 @@
 using System.Threading.Tasks;
 using Azure.Storage.Test.Shared;
 using BaseShares::Azure.Storage.Files.Shares;
+using BaseShares::Azure.Storage.Files.Shares.Models;
 using SharesClientBuilder = Azure.Storage.Test.Shared.ClientBuilder<
     BaseShares::Azure.Storage.Files.Shares.ShareServiceClient,
     BaseShares::Azure.Storage.Files.Shares.ShareClientOptions>;
@@ -101,5 +102,24 @@ public static async Task<DisposingShare> GetTestShareSasNfsAsync(
             ShareClient share = clientBuilder.AzureCoreRecordedTestBase.InstrumentClient(sasService.GetShareClient(shareName));
             return await DisposingShare.CreateNfsAsync(share, metadata);
         }
+
+        public static async Task<DisposingShare> GetTestShareOauthNfsAsync(
+            this SharesClientBuilder clientBuilder,
+            TokenCredential tokenCredential,
+            ShareServiceClient service = default,
+            string shareName = default,
+            IDictionary<string, string> metadata = default,
+            ShareClientOptions options = default,
+            CancellationToken cancellationToken = default)
+        {
+            CancellationHelper.ThrowIfCancellationRequested(cancellationToken);
+            options ??= clientBuilder.GetOptions();
+            options.ShareTokenIntent = ShareTokenIntent.Backup;
+            service ??= clientBuilder.GetServiceClientFromOauthConfig(clientBuilder.Tenants.TestConfigPremiumFile, tokenCredential, options);
+            metadata ??= new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            shareName ??= clientBuilder.GetNewShareName();
+            ShareClient share = clientBuilder.AzureCoreRecordedTestBase.InstrumentClient(service.GetShareClient(shareName));
+            return await DisposingShare.CreateNfsAsync(share, metadata);
+        }
     }
 }