[Storage] Support container soft delete (#12914)

Author: blueww

src/Storage/Storage.Management.Test/ScenarioTests/StorageBlobTests.cs

@@ -93,5 +93,12 @@ public void TestStorageBlobLastAccessTimeTracking()
         {
             TestController.NewInstance.RunPsTest(_logger, "Test-StorageBlobLastAccessTimeTracking");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestStorageBlobContainerSoftDelete()
+        {
+            TestController.NewInstance.RunPsTest(_logger, "Test-StorageBlobContainerSoftDelete");
+        }
     }
 }

src/Storage/Storage.Management.Test/ScenarioTests/StorageBlobTests.ps1

@@ -746,3 +746,65 @@ function Test-StorageBlobLastAccessTimeTracking
 }
 
 
+
+<#
+.SYNOPSIS
+Test StorageAccount Blob Container SoftDelete in Service Properties
+.DESCRIPTION
+SmokeTest
+#>
+function Test-StorageBlobContainerSoftDelete
+{
+    # Setup
+    $rgname = Get-StorageManagementTestResourceName;
+
+    try
+    {
+        # Test
+        $stoname = 'sto' + $rgname;
+        $stotype = 'Standard_GRS';
+        $loc = Get-ProviderLocation_Canary ResourceManagement;
+        $kind = 'StorageV2'
+	
+        Write-Verbose "RGName: $rgname | Loc: $loc"
+        New-AzResourceGroup -Name $rgname -Location $loc;
+		
+        New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -Type $stotype -Kind $kind 
+        $stos = Get-AzStorageAccount -ResourceGroupName $rgname;
+
+		# Enable Blob Delete Retention Policy
+		$policy = Enable-AzStorageContainerDeleteRetentionPolicy -ResourceGroupName $rgname -StorageAccountName $stoname -PassThru -RetentionDays 30
+		Assert-AreEqual $true $policy.Enabled
+		Assert-AreEqual 30 $policy.Days
+		$property = Get-AzStorageBlobServiceProperty -ResourceGroupName $rgname -StorageAccountName $stoname
+		Assert-AreEqual $true $property.ContainerDeleteRetentionPolicy.Enabled
+		Assert-AreEqual 30 $property.ContainerDeleteRetentionPolicy.Days
+
+		# Create and delete container, then get container
+		$contaierName = "testcontaienr"
+		New-AzRmStorageContainer -ResourceGroupName $rgname -StorageAccountName $stoname -Name $contaierName 
+		Remove-AzRmStorageContainer -ResourceGroupName $rgname -StorageAccountName $stoname -Name $contaierName -Force
+		$cons = Get-AzRmStorageContainer -ResourceGroupName $rgname -StorageAccountName $stoname
+		Assert-AreEqual 0 $cons.Count
+		$cons = Get-AzRmStorageContainer -ResourceGroupName $rgname -StorageAccountName $stoname -IncludeDeleted
+		Assert-AreEqual 1 $cons.Count
+		Assert-AreEqual $contaierName $cons[0].Name
+		Assert-AreEqual $true $cons[0].Deleted
+
+
+		# Disable Blob Delete Retention Policy
+		$policy = Disable-AzStorageContainerDeleteRetentionPolicy -ResourceGroupName $rgname -StorageAccountName $stoname  -PassThru
+		Assert-AreEqual $false $policy.Enabled
+		$property = Get-AzStorageBlobServiceProperty -ResourceGroupName $rgname -StorageAccountName $stoname
+		Assert-AreEqual $false $property.ContainerDeleteRetentionPolicy.Enabled
+
+        Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
+

src/Storage/Storage.Management.Test/ScenarioTests/StorageDataPlaneTests.ps1

@@ -306,7 +306,43 @@ function Test-Blob
 		Assert-AreEqual $true $container.BlobContainerProperties.PreventEncryptionScopeOverride
 		$blob = Set-AzStorageBlobContent -Context $storageContext -File $localSrcFile -Container $containerName -Blob encryscopetest  -EncryptionScope $scopename
 		Assert-AreEqual $scopename $blob.BlobProperties.EncryptionScope
-		Remove-AzStorageContainer -Name $containerName2 -Force -Context $storageContext
+		Remove-AzStorageContainer -Name $containerName2 -Force -Context $storageContext	
+
+		# container softdelete test
+		## Enabled container softdelete,then create and delete a container
+		Enable-AzStorageContainerDeleteRetentionPolicy -ResourceGroupName $ResourceGroupName -Name $StorageAccountName -RetentionDays 3
+		$containerNamesoftdelete = "softdeletecontainer"
+		$newcontainerName = "newcontainer"
+		New-AzStorageContainer -Name $containerNamesoftdelete -Context $storageContext
+		Remove-AzStorageContainer -Name $containerNamesoftdelete -Context $storageContext -Force
+		## Get container without -IncludeDeleted, won't list out deleted containers
+		$deletedcontainer = Get-AzStorageContainer -Context $storageContext | ?{$_.IsDeleted}
+		Assert-AreEqual 0 $deletedcontainer.Count
+		## Get container with -IncludeDeleted, will list out deleted containers
+		$deletedcontainer = Get-AzStorageContainer -Context $storageContext -IncludeDeleted | ?{$_.IsDeleted}
+		Assert-AreEqual 1 $deletedcontainer.Count
+		Assert-AreEqual $true $deletedcontainer.IsDeleted
+		Assert-NotNull $deletedcontainer.VersionId
+		## restore container with pipeline, to same container name
+		sleep 60 # need wait for some time, or restore will fail with 409 (The specified container is being deleted.)
+		$deletedcontainer | Restore-AzStorageContainer  
+		$container =  Get-AzStorageContainer -Name $containerNamesoftdelete -Context $storageContext
+		Assert-AreEqual 1 $container.Count
+		Assert-Null $container.IsDeleted
+		Assert-Null $container.VersionId
+		## restore container with parameter, to a new container name
+		Remove-AzStorageContainer -Name $containerNamesoftdelete -Context $storageContext -Force
+		$deletedcontainer = Get-AzStorageContainer -Context $storageContext -IncludeDeleted | ?{$_.IsDeleted}
+		Assert-AreEqual 1 $deletedcontainer.Count
+		sleep 60 # need wait for some time, or restore will fail with 409 (The specified container is being deleted.)
+		Restore-AzStorageContainer -Name $deletedcontainer[0].Name -VersionId $deletedcontainer[0].VersionId -DestinationContainerName $newcontainerName -Context $storageContext
+		$container =  Get-AzStorageContainer -Name $newcontainerName -Context $storageContext
+		Assert-AreEqual 1 $container.Count
+		Assert-AreEqual $newcontainerName $container.Name
+		Assert-Null $container.IsDeleted
+		Assert-Null $container.VersionId
+		Disable-AzStorageContainerDeleteRetentionPolicy -ResourceGroupName $ResourceGroupName -Name $StorageAccountName 
+		Remove-AzStorageContainer -Name $newcontainerName -Context $storageContext -Force	
 
         # Clean Storage Account
         Remove-AzStorageContainer -Name $containerName -Force -Context $storageContext