Detach managed hsm from key vault command

src/KeyVault/KeyVault.Test/ScenarioTests/ManagedHsmManagementTests.ps1

@@ -18,16 +18,16 @@ Tests CRUD for Managed Hsm.
 #>
 function Test-ManagedHsmCRUD {
     $rgName = getAssetName
-    $rgLocation = Get-Location "Microsoft.Resources" "resourceGroups" "West US"
+    $rgLocation = Get-Location "Microsoft.Resources" "resourceGroups" "eastus2euap"
     $hsmName = getAssetName
-    $hsmLocation = Get-Location "Microsoft.KeyVault" "managedHSMs" "East US 2"
+    $hsmLocation = Get-Location "Microsoft.KeyVault" "managedHSMs" "eastus2euap"
     $administrator = "c1be1392-39b8-4521-aafc-819a47008545"
     New-AzResourceGroup -Name $rgName -Location $rgLocation
 
     try {
-        # Test create a default Managed HSM
-        $hsm = New-AzKeyVault -Name $hsmName -ResourceGroupName $rgName -Location $hsmLocation -Administrator $administrator -Hsm
-        Assert-AreEqual $hsmName $hsm.VaultName
+        # Test create a default managed hsm
+        $hsm = New-AzManagedHsm -Name $hsmName -ResourceGroupName $rgName -Location $hsmLocation -Administrator $administrator
+        Assert-AreEqual $hsmName $hsm.Name
         Assert-AreEqual $rgName $hsm.ResourceGroupName
         Assert-AreEqual $hsmLocation $hsm.Location
         Assert-AreEqual 1  $hsm.InitialAdminObjectIds.Count
@@ -37,23 +37,23 @@ function Test-ManagedHsmCRUD {
         # Default retention days
         Assert-AreEqual 90 $hsm.SoftDeleteRetentionInDays "By default SoftDeleteRetentionInDays should be 90"
 
-        # Test get Managed HSM
-        $got = Get-AzKeyVault -Name $hsmName -ResourceType Hsm           
+        # Test get managed hsm
+        $got = Get-AzManagedHsm -Name $hsmName    
         Assert-NotNull $got
-        Assert-AreEqual $hsmName $got.VaultName
+        Assert-AreEqual $hsmName $got.Name
         Assert-AreEqual $rgName $got.ResourceGroupName
         Assert-AreEqual $hsmLocation $got.Location
 
-        # Test throws for existing vault
-        Assert-Throws { New-AzKeyVault -VaultName $hsmName -ResourceGroupName $rgname -Location $vaultLocation -Administrator $administrator -Hsm}
+        # Test throws for existing managed hsm
+        Assert-Throws { New-AzManagedHsm -Name $hsmName -ResourceGroupName $rgName -Location $hsmLocation -Administrator $administrator }
 
-        # Test remove Managed HSM
-        Remove-AzKeyVault -InputObject $got -Hsm -Force
-        $deletedMhsm = Get-AzKeyVault -VaultName $hsmName -ResourceGroupName $rgName
+        # Test remove managed hsm
+        Remove-AzManagedHsm -InputObject $got -Force
+        $deletedMhsm = Get-AzManagedHsm -Name $hsmName -ResourceGroupName $rgName
         Assert-Null $deletedMhsm
 
         # Test throws for resourcegroup nonexistent
-        Assert-Throws { New-AzKeyVault -VaultName (getAssetName) -ResourceGroupName (getAssetName) -Location $vaultLocation -Administrator $administrator -Hsm}
+        Assert-Throws {  New-AzManagedHsm -Name (getAssetName) -ResourceGroupName (getAssetName) -Location $hsmLocation -Administrator $administrator }
     }
 
     finally {

src/KeyVault/KeyVault/Az.KeyVault.psd1

@@ -88,7 +88,10 @@ CmdletsToExport = 'Add-AzKeyVaultCertificate', 'Update-AzKeyVaultCertificate',
                'Remove-AzKeyVaultCertificateIssuer', 
                'Remove-AzKeyVaultCertificateOperation', 
                'Set-AzKeyVaultCertificateIssuer', 
-               'Set-AzKeyVaultCertificatePolicy', 'Get-AzKeyVault', 'New-AzKeyVault', 
+               'Set-AzKeyVaultCertificatePolicy', 
+               'Get-AzManagedHsm', 'New-AzManagedHsm', 
+               'Remove-AzManagedHsm', 
+               'Get-AzKeyVault', 'New-AzKeyVault', 
                'Remove-AzKeyVault', 'Undo-AzKeyVaultRemoval', 
                'Remove-AzKeyVaultAccessPolicy', 'Set-AzKeyVaultAccessPolicy', 
                'Backup-AzKeyVaultKey', 'Get-AzKeyVaultKey', 'Get-AzKeyVaultSecret', 

src/KeyVault/KeyVault/Commands/GetAzureKeyVault.cs

@@ -85,12 +85,6 @@ public class GetAzureKeyVault : KeyVaultManagementCmdletBase
             HelpMessage = "Specifies whether to show the previously deleted vaults in the output.")]
         public SwitchParameter InRemovedState { get; set; }
 
-        [Parameter(Mandatory = false,
-            ParameterSetName = GetVaultParameterSet,
-            HelpMessage = "Specifies the type of Vault / HSM to be shown. If omitted, both will be listed.")]
-        [Alias("Type")]
-        public ResourceTypeName ResourceType { get; set; }
-
         /// <summary>
         /// Tag value
         /// </summary>
@@ -104,68 +98,22 @@ public class GetAzureKeyVault : KeyVaultManagementCmdletBase
         #endregion
         public override void ExecuteCmdlet()
         {
-            ResourceTypeName? resourceTypeName = null;
-            if (MyInvocation.BoundParameters.ContainsKey(nameof(ResourceType)))
-            {
-                resourceTypeName = this.ResourceType;
-            }
-
             switch (ParameterSetName)
             {
                 case GetVaultParameterSet:
                     ResourceGroupName = string.IsNullOrWhiteSpace(ResourceGroupName) ? GetResourceGroupName(VaultName) : ResourceGroupName;
-                    ResourceGroupName = string.IsNullOrWhiteSpace(ResourceGroupName) ? GetResourceGroupName(VaultName, true) : ResourceGroupName;
-
-                    PSKeyVaultIdentityItem vault = null;
 
                     if (ShouldGetByName(ResourceGroupName, VaultName))
                     {
-                        switch (resourceTypeName)
-                        {
-                            case ResourceTypeName.Vault:
-                                vault = KeyVaultManagementClient.GetVault(
-                                                            VaultName,
-                                                            ResourceGroupName,
-                                                            ActiveDirectoryClient);
-                                WriteObject(FilterByTag((PSKeyVault)vault, Tag));
-                                break;
-
-                            case ResourceTypeName.Hsm:
-                                vault = KeyVaultManagementClient.GetManagedHsm(
-                                                            VaultName,
-                                                            ResourceGroupName,
-                                                            ActiveDirectoryClient);
-                                WriteObject(FilterByTag((PSManagedHsm)vault, Tag));
-                                break;
-
-                            default:
-                                // Search both Vaults and ManagedHsms 
-                                vault = KeyVaultManagementClient.GetVault(
-                                                            VaultName,
-                                                            ResourceGroupName,
-                                                            ActiveDirectoryClient);
-                                if (vault == null)
-                                {
-                                    vault = KeyVaultManagementClient.GetManagedHsm(
-                                                            VaultName,
-                                                            ResourceGroupName,
-                                                            ActiveDirectoryClient);
-                                    WriteObject(FilterByTag((PSManagedHsm)vault, Tag));
-                                }
-                                else
-                                {
-                                    WriteObject(FilterByTag((PSKeyVault)vault, Tag));
-                                }
-                                break;
-                        }
+                        PSKeyVault vault = KeyVaultManagementClient.GetVault(
+                                                    VaultName,
+                                                    ResourceGroupName,
+                                                    ActiveDirectoryClient);
+                        WriteObject(FilterByTag(vault, Tag));
                     }
                     else
                     {
-                        WriteObject(
-                            TopLevelWildcardFilter(
-                                ResourceGroupName, VaultName, 
-                                ListVaults(ResourceGroupName, Tag, resourceTypeName)),
-                            true);
+                        WriteObject(TopLevelWildcardFilter(ResourceGroupName, VaultName, ListVaults(ResourceGroupName, Tag)), true);
                     }
 
                     break;

src/KeyVault/KeyVault/Commands/GetAzureManagedHsm.cs

@@ -0,0 +1,74 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Management.Automation;
+using Microsoft.Azure.Commands.KeyVault.Models;
+using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
+
+namespace Microsoft.Azure.Commands.KeyVault.Commands
+{
+    [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "ManagedHsm")]
+    [OutputType(typeof(PSManagedHsm), typeof(PSKeyVaultIdentityItem))]
+    public class GetAzureManagedHsm : KeyVaultManagementCmdletBase
+    {
+        #region Input Parameter Definitions
+
+        /// <summary>
+        /// Hsm name
+        /// </summary>
+        [Parameter(Mandatory = false,
+            Position = 0,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Hsm name. Cmdlet constructs the FQDN of a hsm based on the name and currently selected environment.")]
+        [ResourceNameCompleter("Microsoft.KeyVault/managedHSMs", "ResourceGroupName")]
+        [Alias(Constants.Name)]
+        [ValidateNotNullOrEmpty]
+        [SupportsWildcards]
+        public string HsmName { get; set; }
+
+        /// <summary>
+        /// Resource group name
+        /// </summary>
+        [Parameter(Mandatory = false,
+            Position = 1,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Specifies the name of the resource group associated with the managed hsm being queried.")]
+        [ResourceGroupCompleter]
+        [ValidateNotNullOrEmpty]
+        [SupportsWildcards]
+        public string ResourceGroupName { get; set; }
+
+        /// <summary>
+        /// Tag value
+        /// </summary>
+        [Parameter(
+            Mandatory = false,
+            ValueFromPipelineByPropertyName = true,
+            HelpMessage = "Specifies the key and optional value of the specified tag to filter the list of managed hsms by.")]
+        public Hashtable Tag { get; set; }
+
+        #endregion
+
+        public override void ExecuteCmdlet()
+        {
+            ResourceGroupName = string.IsNullOrWhiteSpace(ResourceGroupName) ? GetResourceGroupName(HsmName, true) : ResourceGroupName;
+
+            if (ShouldGetByName(ResourceGroupName, HsmName))
+            {
+                PSManagedHsm mhsm = KeyVaultManagementClient.GetManagedHsm(
+                                                HsmName,
+                                                ResourceGroupName,
+                                                ActiveDirectoryClient);
+                WriteObject(FilterByTag(mhsm, Tag));
+            }
+            else
+            {              
+                WriteObject(
+                    TopLevelWildcardFilter(
+                        ResourceGroupName, HsmName,
+                        FilterByTag(
+                            KeyVaultManagementClient.ListManagedHsms(ResourceGroupName, ActiveDirectoryClient), Tag)),
+                    true);
+            }
+        }
+    }
+}