Fixed bug where ShareDirectoryClient.DeleteIfExists() and ShareFileCl…

sdk/storage/Azure.Storage.Files.Shares/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Release History
 
 ## 12.5.0-preview.2 (Unreleased)
-- Fixed bug where ShareDirectoryClient.Exists() and ShareFileClient.Exists() would thrown an exception when the directory or file's parent directory didn't exist.
+- Fixed bug where ShareDirectoryClient.Exists(), .DeleteIfExists() and ShareFileClient.Exists(), .DeleteIfExists() would thrown an exception when the directory or file's parent directory didn't exist.
 - Renamed ShareClient.SetTier() -> ShareClient.SetProperties().  SetProperties() can be used to set both Share Tier and Share Quota.
 - Changed ShareDeleteOptions.IncludeSnapshots -> .ShareSnapshotsDeleteOption, and added option to also delete Share Snapshots that have been leased.
 - Added additional info to exception messages.

sdk/storage/Azure.Storage.Files.Shares/src/ShareDirectoryClient.cs

@@ -912,7 +912,8 @@ internal async Task<Response<bool>> DeleteIfExistsInternal(
                 }
                 catch (RequestFailedException storageRequestFailedException)
                 when (storageRequestFailedException.ErrorCode == ShareErrorCode.ResourceNotFound
-                    || storageRequestFailedException.ErrorCode == ShareErrorCode.ShareNotFound)
+                    || storageRequestFailedException.ErrorCode == ShareErrorCode.ShareNotFound
+                    || storageRequestFailedException.ErrorCode == ShareErrorCode.ParentNotFound)
                 {
                     return Response.FromValue(false, default);
                 }

sdk/storage/Azure.Storage.Files.Shares/src/ShareFileClient.cs

@@ -928,7 +928,8 @@ private async Task<Response<bool>> DeleteIfExistsInternal(
                 }
                 catch (RequestFailedException storageRequestFailedException)
                 when (storageRequestFailedException.ErrorCode == ShareErrorCode.ResourceNotFound
-                    || storageRequestFailedException.ErrorCode == ShareErrorCode.ShareNotFound)
+                    || storageRequestFailedException.ErrorCode == ShareErrorCode.ShareNotFound
+                    || storageRequestFailedException.ErrorCode == ShareErrorCode.ParentNotFound)
                 {
                     return Response.FromValue(false, default);
                 }

sdk/storage/Azure.Storage.Files.Shares/tests/DirectoryClientTests.cs

@@ -434,6 +434,21 @@ public async Task DeleteIfExists_ShareNotExists()
             Assert.IsFalse(response.Value);
         }
 
+        [Test]
+        public async Task DeleteIfExists_ParentDirectoryNotExists()
+        {
+            // Arrange
+            await using DisposingShare test = await GetTestShareAsync();
+            ShareDirectoryClient parentDirectory = InstrumentClient(test.Share.GetDirectoryClient(GetNewDirectoryName()));
+            ShareDirectoryClient directory = InstrumentClient(parentDirectory.GetSubdirectoryClient(GetNewDirectoryName()));
+
+            // Act
+            Response<bool> response = await directory.DeleteIfExistsAsync();
+
+            // Assert
+            Assert.IsFalse(response.Value);
+        }
+
         [Test]
         public async Task DeleteIfExists_Error()
         {

sdk/storage/Azure.Storage.Files.Shares/tests/FileClientTests.cs

@@ -502,6 +502,21 @@ public async Task DeleteIfExistsAsync_ShareNotExists()
             Assert.IsFalse(response.Value);
         }
 
+        [Test]
+        public async Task DeleteIfExistsAsync_ParentDirectoryNotExists()
+        {
+            // Arrange
+            await using DisposingShare test = await GetTestShareAsync();
+            ShareDirectoryClient parentDirectory = InstrumentClient(test.Share.GetDirectoryClient(GetNewDirectoryName()));
+            ShareFileClient file = InstrumentClient(parentDirectory.GetFileClient(GetNewFileName()));
+
+            // Act
+            Response<bool> response = await file.DeleteIfExistsAsync();
+
+            // Assert
+            Assert.IsFalse(response.Value);
+        }
+
         [Test]
         public async Task DeleteIfExistsAsync_Error()
         {