[Storage][DataMovement] NFS File-to-File Copy Transfer Preservation (Azure#49266)

* NFS File-to-File Copy Transfer Preservation

* fixed tests

* create always sets fileType to Regular

* Added back assert for FileType + rerecord test

* Cleaned code to address comment

* Changes based on feedback

* Added Uri to StorageResourceItemProperties

* small fix

* small fix

* fixed tests

* removed linkCount and fileType

Author: nickliu-msft

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

@@ -244,6 +244,7 @@ protected override async Task<StorageResourceItemProperties> GetPropertiesAsync(
             // The properties could be populated during construction (from enumeration)
             if (ResourceProperties != default)
             {
+                ResourceProperties.Uri = Uri;
                 return ResourceProperties;
             }
             else
@@ -252,6 +253,7 @@ protected override async Task<StorageResourceItemProperties> GetPropertiesAsync(
                 StorageResourceItemProperties resourceProperties = blobProperties.ToStorageResourceProperties();
 
                 ResourceProperties = resourceProperties;
+                ResourceProperties.Uri = Uri;
                 return ResourceProperties;
             }
         }

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

@@ -269,6 +269,7 @@ protected override async Task<StorageResourceItemProperties> GetPropertiesAsync(
             // The properties could be populated during construction (from enumeration)
             if (ResourceProperties != default)
             {
+                ResourceProperties.Uri = Uri;
                 return ResourceProperties;
             }
             else
@@ -277,6 +278,7 @@ protected override async Task<StorageResourceItemProperties> GetPropertiesAsync(
                 StorageResourceItemProperties resourceProperties = blobProperties.ToStorageResourceProperties();
 
                 ResourceProperties = resourceProperties;
+                ResourceProperties.Uri = Uri;
                 return ResourceProperties;
             }
         }

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

@@ -255,6 +255,7 @@ protected override async Task<StorageResourceItemProperties> GetPropertiesAsync(
             // The properties could be populated during construction (from enumeration)
             if (ResourceProperties != default)
             {
+                ResourceProperties.Uri = Uri;
                 return ResourceProperties;
             }
             else
@@ -263,6 +264,7 @@ protected override async Task<StorageResourceItemProperties> GetPropertiesAsync(
                 StorageResourceItemProperties resourceProperties = blobProperties.ToStorageResourceProperties();
 
                 ResourceProperties = resourceProperties;
+                ResourceProperties.Uri = Uri;
                 return ResourceProperties;
             }
         }

sdk/storage/Azure.Storage.DataMovement.Blobs/tests/AppendBlobStorageResourceTests.cs

@@ -1560,6 +1560,7 @@ public async Task GetPropertiesAsync_NotCached()
             Assert.That(metadata, Is.EqualTo(metadataResult));
             mock.Verify(b => b.GetPropertiesAsync(It.IsAny<BlobRequestConditions>(), It.IsAny<CancellationToken>()),
                 Times.Once());
+            mock.Verify(b => b.Uri, Times.Once());
             mock.VerifyNoOtherCalls();
         }
 
@@ -1602,6 +1603,7 @@ public async Task GetPropertiesAsync_Cached()
             Assert.That(rawProperties, Is.EqualTo(result.RawProperties));
             mock.Verify(b => b.GetPropertiesAsync(It.IsAny<BlobRequestConditions>(), It.IsAny<CancellationToken>()),
                 Times.Never());
+            mock.Verify(b => b.Uri, Times.Once());
             mock.VerifyNoOtherCalls();
         }
 

sdk/storage/Azure.Storage.DataMovement.Blobs/tests/BlockBlobStorageResourceTests.cs

@@ -1272,6 +1272,7 @@ public async Task GetPropertiesAsync_NotCached()
             Assert.That(metadata, Is.EqualTo(metadataResult));
             mock.Verify(b => b.GetPropertiesAsync(It.IsAny<BlobRequestConditions>(), It.IsAny<CancellationToken>()),
                 Times.Once());
+            mock.Verify(b => b.Uri, Times.Once());
             mock.VerifyNoOtherCalls();
         }
 
@@ -1315,6 +1316,7 @@ public async Task GetPropertiesAsync_Cached()
             Assert.That(rawProperties, Is.EqualTo(result.RawProperties));
             mock.Verify(b => b.GetPropertiesAsync(It.IsAny<BlobRequestConditions>(), It.IsAny<CancellationToken>()),
                 Times.Never());
+            mock.Verify(b => b.Uri, Times.Once());
             mock.VerifyNoOtherCalls();
         }
 

sdk/storage/Azure.Storage.DataMovement.Blobs/tests/PageBlobStorageResourceTests.cs

@@ -1615,6 +1615,7 @@ public async Task GetPropertiesAsync_NotCached()
             Assert.That(metadata, Is.EqualTo(metadataResult));
             mock.Verify(b => b.GetPropertiesAsync(It.IsAny<BlobRequestConditions>(), It.IsAny<CancellationToken>()),
                 Times.Once());
+            mock.Verify(b => b.Uri, Times.Once());
             mock.VerifyNoOtherCalls();
         }
 
@@ -1657,6 +1658,7 @@ public async Task GetPropertiesAsync_Cached()
             Assert.That(rawProperties, Is.EqualTo(result.RawProperties));
             mock.Verify(b => b.GetPropertiesAsync(It.IsAny<BlobRequestConditions>(), It.IsAny<CancellationToken>()),
                 Times.Never());
+            mock.Verify(b => b.Uri, Times.Once());
             mock.VerifyNoOtherCalls();
         }
 

sdk/storage/Azure.Storage.DataMovement.Files.Shares/api/Azure.Storage.DataMovement.Files.Shares.net6.0.cs

@@ -40,6 +40,7 @@ public ShareFileStorageResourceOptions() { }
         public System.DateTimeOffset? FileLastWrittenOn { get { throw null; } set { } }
         public System.Collections.Generic.IDictionary<string, string> FileMetadata { get { throw null; } set { } }
         public bool? FilePermissions { get { throw null; } set { } }
+        public bool IsNfs { get { throw null; } set { } }
         public Azure.Storage.Files.Shares.Models.ShareFileRequestConditions SourceConditions { get { throw null; } set { } }
     }
 }

sdk/storage/Azure.Storage.DataMovement.Files.Shares/api/Azure.Storage.DataMovement.Files.Shares.net8.0.cs

@@ -40,6 +40,7 @@ public ShareFileStorageResourceOptions() { }
         public System.DateTimeOffset? FileLastWrittenOn { get { throw null; } set { } }
         public System.Collections.Generic.IDictionary<string, string> FileMetadata { get { throw null; } set { } }
         public bool? FilePermissions { get { throw null; } set { } }
+        public bool IsNfs { get { throw null; } set { } }
         public Azure.Storage.Files.Shares.Models.ShareFileRequestConditions SourceConditions { get { throw null; } set { } }
     }
 }

sdk/storage/Azure.Storage.DataMovement.Files.Shares/api/Azure.Storage.DataMovement.Files.Shares.netstandard2.0.cs

@@ -40,6 +40,7 @@ public ShareFileStorageResourceOptions() { }
         public System.DateTimeOffset? FileLastWrittenOn { get { throw null; } set { } }
         public System.Collections.Generic.IDictionary<string, string> FileMetadata { get { throw null; } set { } }
         public bool? FilePermissions { get { throw null; } set { } }
+        public bool IsNfs { get { throw null; } set { } }
         public Azure.Storage.Files.Shares.Models.ShareFileRequestConditions SourceConditions { get { throw null; } set { } }
     }
 }

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