Merge pull request #252320 from pauljewellmsft/delete-refresh

Dev guide delete blobs refresh

Author: Court72

articles/storage/blobs/storage-blob-delete-java.md

@@ -30,17 +30,19 @@ This article shows how to delete blobs with the [Azure Storage client library fo
 
 To delete a blob, call one of these methods:
 
-- [delete](/java/api/com.azure.storage.blob.specialized.blobclientbase)
-- [deleteIfExists](/java/api/com.azure.storage.blob.specialized.blobclientbase)
+- [delete](/java/api/com.azure.storage.blob.specialized.blobclientbase#method-summary)
+- [deleteIfExists](/java/api/com.azure.storage.blob.specialized.blobclientbase#method-summary)
 
 The following example deletes a blob:
 
 :::code language="java" source="~/azure-storage-snippets/blobs/howto/Java/blob-devguide/blob-devguide-blobs/src/main/java/com/blobs/devguide/blobs/BlobDelete.java" id="Snippet_DeleteBlob":::
 
-The following example deletes a blob and its snapshots with a response:
+If the blob has any associated snapshots, you must delete all of its snapshots to delete the blob. The following example deletes a blob and its snapshots with a response:
 
 :::code language="java" source="~/azure-storage-snippets/blobs/howto/Java/blob-devguide/blob-devguide-blobs/src/main/java/com/blobs/devguide/blobs/BlobDelete.java" id="Snippet_DeleteBlobSnapshots":::
 
+To delete *only* the snapshots and not the blob itself, you can pass the parameter `DeleteSnapshotsOptionType.ONLY`.
+
 ## Restore a deleted blob
 
 Blob soft delete protects an individual blob and its versions, snapshots, and metadata from accidental deletes or overwrites by maintaining the deleted data in the system for a specified period of time. During the retention period, you can restore the blob to its state at deletion. After the retention period has expired, the blob is permanently deleted. For more information about blob soft delete, see [Soft delete for blobs](soft-delete-blob-overview.md).
@@ -56,17 +58,17 @@ How you restore a soft-deleted blob depends on whether or not your storage accou
 
 To restore deleted blobs, call the following method:
 
-- [undelete](/java/api/com.azure.storage.blob.specialized.blobclientbase)
+- [undelete](/java/api/com.azure.storage.blob.specialized.blobclientbase#method-summary)
 
 This method restores the content and metadata of a soft-deleted blob and any associated soft-deleted snapshots. Calling this method for a blob that hasn't been deleted has no effect.
 
 :::code language="java" source="~/azure-storage-snippets/blobs/howto/Java/blob-devguide/blob-devguide-blobs/src/main/java/com/blobs/devguide/blobs/BlobDelete.java" id="Snippet_RestoreBlob":::
 
 #### Restore soft-deleted objects when versioning is enabled
 
-To restore a soft-deleted blob when versioning is enabled, copy a previous version over the base blob. You can use the following method:
+If a storage account is configured to enable blob versioning, deleting a blob causes the current version of the blob to become the previous version. To restore a soft-deleted blob when versioning is enabled, copy a previous version over the base blob. You can use the following method:
 
-- [copyFromUrl](/java/api/com.azure.storage.blob.specialized.blobclientbase)
+- [copyFromUrl](/java/api/com.azure.storage.blob.specialized.blobclientbase#method-summary)
 
 This method restores the content and metadata of a soft-deleted blob and any associated soft-deleted snapshots. Calling this method for a blob that hasn't been deleted has no effect.
 

articles/storage/blobs/storage-blob-delete-python.md

@@ -34,11 +34,11 @@ To delete a blob, call the following method:
 
 The following example deletes a blob:
 
-:::code language="python" source="~/azure-storage-snippets/blobs/howto/python/blob-devguide-py/blob-devguide-blobs.py" id="Snippet_delete_blob":::
+:::code language="python" source="~/azure-storage-snippets/blobs/howto/python/blob-devguide-py/blob-devguide-delete-blobs.py" id="Snippet_delete_blob":::
 
 If the blob has any associated snapshots, you must delete all of its snapshots to delete the blob. The following example deletes a blob and its snapshots:
 
-:::code language="python" source="~/azure-storage-snippets/blobs/howto/python/blob-devguide-py/blob-devguide-blobs.py" id="Snippet_delete_blob_snapshots":::
+:::code language="python" source="~/azure-storage-snippets/blobs/howto/python/blob-devguide-py/blob-devguide-delete-blobs.py" id="Snippet_delete_blob_snapshots":::
 
 To delete *only* the snapshots and not the blob itself, you can pass the parameter `delete_snapshots="only"`.
 
@@ -61,17 +61,17 @@ To restore deleted blobs when versioning is disabled, call the following method:
 
 This method restores the content and metadata of a soft-deleted blob and any associated soft-deleted snapshots. Calling this method for a blob that hasn't been deleted has no effect.
 
-:::code language="python" source="~/azure-storage-snippets/blobs/howto/python/blob-devguide-py/blob-devguide-blobs.py" id="Snippet_restore_blob":::
+:::code language="python" source="~/azure-storage-snippets/blobs/howto/python/blob-devguide-py/blob-devguide-delete-blobs.py" id="Snippet_restore_blob":::
 
 #### Restore soft-deleted objects when versioning is enabled
 
-To restore a soft-deleted blob when versioning is enabled, copy a previous version over the base blob. You can use the following method:
+If a storage account is configured to enable blob versioning, deleting a blob causes the current version of the blob to become the previous version. To restore a soft-deleted blob when versioning is enabled, copy a previous version over the base blob. You can use the following method:
 
 - [start_copy_from_url](/python/api/azure-storage-blob/azure.storage.blob.blobclient#azure-storage-blob-blobclient-start-copy-from-url)
 
 The following code example gets the latest version of a deleted blob, and restores the latest version by copying it to the base blob:
 
-:::code language="python" source="~/azure-storage-snippets/blobs/howto/python/blob-devguide-py/blob-devguide-blobs.py" id="Snippet_restore_blob_version":::
+:::code language="python" source="~/azure-storage-snippets/blobs/howto/python/blob-devguide-py/blob-devguide-delete-blobs.py" id="Snippet_restore_blob_version":::
 
 ## Resources
 
@@ -86,7 +86,7 @@ The Azure SDK for Python contains libraries that build on top of the Azure REST
 
 ### Code samples
 
-- [View code samples from this article (GitHub)](https://github.com/Azure-Samples/AzureStorageSnippets/blob/master/blobs/howto/python/blob-devguide-py/blob-devguide-blobs.py)
+- [View code samples from this article (GitHub)](https://github.com/Azure-Samples/AzureStorageSnippets/blob/master/blobs/howto/python/blob-devguide-py/blob-devguide-delete-blobs.py)
 
 [!INCLUDE [storage-dev-guide-resources-python](../../../includes/storage-dev-guides/storage-dev-guide-resources-python.md)]
 

articles/storage/blobs/storage-blob-delete.md

@@ -35,14 +35,15 @@ To delete a blob, call either of these methods:
 - [DeleteIfExists](/dotnet/api/azure.storage.blobs.specialized.blobbaseclient.deleteifexists)
 - [DeleteIfExistsAsync](/dotnet/api/azure.storage.blobs.specialized.blobbaseclient.deleteifexistsasync)
 
-The following example deletes a blob.
+The following example deletes a blob:
 
-```csharp
-public static async Task DeleteBlob(BlobClient blob)
-{
-    await blob.DeleteAsync();
-}
-```
+:::code language="csharp" source="~/azure-storage-snippets/blobs/howto/dotnet/BlobDevGuideBlobs/DeleteBlob.cs" id="Snippet_DeleteBlob":::
+
+If the blob has any associated snapshots, you must delete all of its snapshots to delete the blob. The following example deletes a blob and its snapshots:
+
+:::code language="csharp" source="~/azure-storage-snippets/blobs/howto/dotnet/BlobDevGuideBlobs/DeleteBlob.cs" id="Snippet_DeleteBlobSnapshots":::
+
+To delete *only* the snapshots and not the blob itself, you can pass the parameter `DeleteSnapshotsOption.OnlySnapshots`.
 
 ## Restore a deleted blob
 
@@ -64,69 +65,22 @@ To restore deleted blobs when versioning is not enabled, call either of the foll
 
 These methods restore soft-deleted blobs and any deleted snapshots associated with them. Calling either of these methods for a blob that has not been deleted has no effect. The following example restores  all soft-deleted blobs and their snapshots in a container:
 
-```csharp
-public static async Task UndeleteBlobs(BlobContainerClient container)
-{
-    foreach (BlobItem blob in container.GetBlobs(BlobTraits.None, BlobStates.Deleted))
-    {
-        await container.GetBlockBlobClient(blob.Name).UndeleteAsync();
-    }
-}
-```
+:::code language="csharp" source="~/azure-storage-snippets/blobs/howto/dotnet/BlobDevGuideBlobs/DeleteBlob.cs" id="Snippet_RestoreBlob":::
 
 To restore a specific soft-deleted snapshot, first call the [Undelete](/dotnet/api/azure.storage.blobs.specialized.blobbaseclient.undelete) or [UndeleteAsync](/dotnet/api/azure.storage.blobs.specialized.blobbaseclient.undeleteasync) on the base blob, then copy the desired snapshot over the base blob. The following example restores a block blob to the most recently generated snapshot:
 
-```csharp
-public static async Task RestoreSnapshots(BlobContainerClient container, BlobClient blob)
-{
-    // Restore the deleted blob.
-    await blob.UndeleteAsync();
-
-    // List blobs in this container that match prefix.
-    // Include snapshots in listing.
-    Pageable<BlobItem> blobItems = container.GetBlobs
-                    (BlobTraits.None, BlobStates.Snapshots, prefix: blob.Name);
-
-    // Get the URI for the most recent snapshot.
-    BlobUriBuilder blobSnapshotUri = new BlobUriBuilder(blob.Uri)
-    {
-        Snapshot = blobItems
-                    .OrderByDescending(snapshot => snapshot.Snapshot)
-                    .ElementAtOrDefault(0)?.Snapshot
-    };
-
-    // Restore the most recent snapshot by copying it to the blob.
-    blob.StartCopyFromUri(blobSnapshotUri.ToUri());
-}
-```
+:::code language="csharp" source="~/azure-storage-snippets/blobs/howto/dotnet/BlobDevGuideBlobs/DeleteBlob.cs" id="Snippet_RestoreSnapshot":::
 
 #### Restore soft-deleted blobs when versioning is enabled
 
-To restore a soft-deleted blob when versioning is enabled, copy a previous version over the base blob. You can use either of the following methods:
+If a storage account is configured to enable blob versioning, deleting a blob causes the current version of the blob to become the previous version. To restore a soft-deleted blob when versioning is enabled, copy a previous version over the base blob. You can use either of the following methods:
 
 - [StartCopyFromUri](/dotnet/api/azure.storage.blobs.specialized.blobbaseclient.startcopyfromuri)
 - [StartCopyFromUriAsync](/dotnet/api/azure.storage.blobs.specialized.blobbaseclient.startcopyfromuriasync)
 
-```csharp
-public static void RestoreBlobsWithVersioning(BlobContainerClient container, BlobClient blob)
-{
-    // List blobs in this container that match prefix.
-    // Include versions in listing.
-    Pageable<BlobItem> blobItems = container.GetBlobs
-                    (BlobTraits.None, BlobStates.Version, prefix: blob.Name);
-
-    // Get the URI for the most recent version.
-    BlobUriBuilder blobVersionUri = new BlobUriBuilder(blob.Uri)
-    {
-        VersionId = blobItems
-                    .OrderByDescending(version => version.VersionId)
-                    .ElementAtOrDefault(0)?.VersionId
-    };
-
-    // Restore the most recently generated version by copying it to the base blob.
-    blob.StartCopyFromUri(blobVersionUri.ToUri());
-}
-```
+The following code example shows how to get the latest version of a deleted blob, and restore the latest version by copying it to the base blob:
+
+:::code language="csharp" source="~/azure-storage-snippets/blobs/howto/dotnet/BlobDevGuideBlobs/DeleteBlob.cs" id="Snippet_RestoreBlobWithVersioning":::
 
 ## Resources
 
@@ -139,6 +93,10 @@ The Azure SDK for .NET contains libraries that build on top of the Azure REST AP
 - [Delete Blob](/rest/api/storageservices/delete-blob) (REST API)
 - [Undelete Blob](/rest/api/storageservices/undelete-blob) (REST API)
 
+### Code samples
+
+- [View code samples from this article (GitHub)](https://github.com/Azure-Samples/AzureStorageSnippets/blob/master/blobs/howto/dotnet/BlobDevGuideBlobs/DeleteBlob.cs)
+
 [!INCLUDE [storage-dev-guide-resources-dotnet](../../../includes/storage-dev-guides/storage-dev-guide-resources-dotnet.md)]
 
 ### See also