Skip to content

Commit 024c56b

Browse files
author
Samuel Anudeep
committed
Merge pull request #164 from MabOneSdk/dev1
FI from dev1 into release
2 parents 82bef5a + d8b8821 commit 024c56b

File tree

3 files changed

+56
-29
lines changed

3 files changed

+56
-29
lines changed

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/RemoveAzureRMBackupVault.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,23 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
2424
[Cmdlet(VerbsCommon.Remove, "AzureRmBackupVault")]
2525
public class RemoveAzureRMBackupVault : AzureBackupVaultCmdletBase
2626
{
27+
[Parameter(Position = 1, Mandatory = false, HelpMessage = "Confirm deletion of vault")]
28+
public SwitchParameter Force { get; set; }
29+
2730
protected override void ProcessRecord()
2831
{
2932
ExecutionBlock(() =>
3033
{
3134
base.ProcessRecord();
3235

33-
if (!AzureBackupClient.DeleteVault(Vault.ResourceGroupName, Vault.Name))
34-
{
35-
throw new Exception(Resources.ResourceNotFoundMessage);
36-
}
36+
ConfirmAction(Force, Resources.DeleteVaultCaption, Resources.DeleteVaultMessage, "",
37+
() =>
38+
{
39+
if (!AzureBackupClient.DeleteVault(Vault.ResourceGroupName, Vault.Name))
40+
{
41+
throw new Exception(Resources.ResourceNotFoundMessage);
42+
}
43+
});
3744
});
3845
}
3946
}

src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.Designer.cs

Lines changed: 39 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.resx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,4 +505,10 @@ Please contact Microsoft for further assistant.</value>
505505
<data name="RemoveProtectionPolicyWarning" xml:space="preserve">
506506
<value>Are you sure you want to remove the protection policy '{0}'</value>
507507
</data>
508+
<data name="DeleteVaultCaption" xml:space="preserve">
509+
<value>Delete Vault</value>
510+
</data>
511+
<data name="DeleteVaultMessage" xml:space="preserve">
512+
<value>This operation will delete the vault. Are you sure you want to delete the vault?</value>
513+
</data>
508514
</root>

0 commit comments

Comments
 (0)