Fixed bug where DataLakeFileClient.Upload() could not upload read-onl…

…y files. (#14864)
Azure · Sep 3, 2020 · 69cf78f · 69cf78f
1 parent 7aab376
commit 69cf78f
Show file tree

Hide file tree

Showing 9 changed files with 856 additions and 417 deletions.
diff --git a/sdk/storage/Azure.Storage.Files.DataLake/CHANGELOG.md b/sdk/storage/Azure.Storage.Files.DataLake/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 12.5.0-preview.1 (Unreleased)
 - Fixed bug where Stream returned from DataLakeFileClient.OpenWrite() did not flush while disposing preventing compatibility with using keyword.
+- Fixed bug where DataLakeFileClient.Upload() could not upload read-only files.
 
 ## 12.4.0 (2020-08-31)
 - Fixed bug where DataLakeFileClient.Upload() would deadlock if the content stream's position was not 0.

diff --git a/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileClient.cs b/sdk/storage/Azure.Storage.Files.DataLake/src/DataLakeFileClient.cs
@@ -3110,7 +3110,7 @@ public virtual Response<PathInfo> Upload(
             StorageTransferOptions transferOptions = default,
             CancellationToken cancellationToken = default)
         {
-            using (FileStream stream = new FileStream(path, FileMode.Open))
+            using (FileStream stream = new FileStream(path, FileMode.Open, FileAccess.Read))
             {
                 return StagedUploadInternal(
                     stream,
@@ -3226,7 +3226,7 @@ public virtual async Task<Response<PathInfo>> UploadAsync(
             DataLakeFileUploadOptions options,
             CancellationToken cancellationToken = default)
         {
-            using (FileStream stream = new FileStream(path, FileMode.Open))
+            using (FileStream stream = new FileStream(path, FileMode.Open, FileAccess.Read))
             {
                 return await StagedUploadInternal(
                     stream,

diff --git a/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs b/sdk/storage/Azure.Storage.Files.DataLake/tests/FileClientTests.cs
@@ -2861,7 +2861,9 @@ public async Task UploadAsync_FileLarge()
         }
 
         [Test]
-        public async Task UploadAsync_MinFile()
+        [TestCase(false)]
+        [TestCase(true)]
+        public async Task UploadAsync_MinFile(bool readOnlyFile)
         {
             // Arrange
             await using DisposingFileSystem test = await GetNewFileSystem();
@@ -2878,12 +2880,18 @@ public async Task UploadAsync_MinFile()
                 {
                     File.WriteAllBytes(path, data);
 
+                    if (readOnlyFile)
+                    {
+                        File.SetAttributes(path, FileAttributes.ReadOnly);
+                    }
+
                     await file.UploadAsync(path);
                 }
                 finally
                 {
                     if (File.Exists(path))
                     {
+                        File.SetAttributes(path, FileAttributes.Normal);
                         File.Delete(path);
                     }
                 }

diff --git a/...orage.Files.DataLake/tests/SessionRecords/FileClientTests/UploadAsync_MinFile(False).json b/...orage.Files.DataLake/tests/SessionRecords/FileClientTests/UploadAsync_MinFile(False).json