Reverting Certificate cmdlets to use PSH-defined types

Author: Dragos Avadanei

src/ResourceManager/KeyVault/Commands.KeyVault.Test/Scripts/VaultManagementTests.ps1

@@ -373,9 +373,9 @@ function Initialize-TemporaryState
                 "objectId" = $objectId
                 "applicationId" = ""
                 "permissions" = @{
-                    "keys" = @("all")
-                    "secrets" = @("all")
-                    "certificates" = @("all")
+                    "keys" = @("all", "purge")
+                    "secrets" = @("all", "purge")
+                    "certificates" = @("all", "purge")
                     "storage" = @("all")
                 }
             }

src/ResourceManager/KeyVault/Commands.KeyVault/Commands/GetAzureKeyVaultCertificate.cs

@@ -28,7 +28,7 @@ namespace Microsoft.Azure.Commands.KeyVault
     [Cmdlet(VerbsCommon.Get, CmdletNoun.AzureKeyVaultCertificate,        
         DefaultParameterSetName = ByVaultNameParameterSet,
         HelpUri = Constants.KeyVaultHelpUri)]
-    [OutputType(typeof(List<CertificateIdentityItem>), typeof(KeyVaultCertificate), typeof(DeletedCertificateBundle), typeof(List<DeletedCertificateIdentityItem>))]
+    [OutputType(typeof(List<CertificateIdentityItem>), typeof(KeyVaultCertificate), typeof(DeletedKeyVaultCertificate), typeof(List<DeletedCertificateIdentityItem>))]
     public class GetAzureKeyVaultCertificate : KeyVaultCmdletBase
     {
         #region Parameter Set Names
@@ -131,7 +131,7 @@ protected override void ProcessRecord()
                         break;
                     }
 
-                    DeletedCertificateBundle deletedCert = DataServiceClient.GetDeletedCertificate(VaultName, Name);
+                    DeletedKeyVaultCertificate deletedCert = DeletedKeyVaultCertificate.FromDeletedCertificateBundle( DataServiceClient.GetDeletedCertificate(VaultName, Name) );
                     WriteObject( deletedCert );
 
                     break;

src/ResourceManager/KeyVault/Commands.KeyVault/Commands/RemoveAzureKeyVaultCertificate.cs

@@ -16,7 +16,6 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.KeyVault.Models;
 using KeyVaultProperties = Microsoft.Azure.Commands.KeyVault.Properties;
-using Microsoft.Azure.KeyVault.Models;
 
 namespace Microsoft.Azure.Commands.KeyVault
 {
@@ -27,7 +26,7 @@ namespace Microsoft.Azure.Commands.KeyVault
         SupportsShouldProcess = true,
         ConfirmImpact = ConfirmImpact.High,
         HelpUri = Constants.KeyVaultHelpUri)]
-    [OutputType(typeof(DeletedCertificateBundle))]
+    [OutputType(typeof(DeletedKeyVaultCertificate))]
     public class RemoveAzureKeyVaultCertificate : KeyVaultCmdletBase
     {
         #region Input Parameter Definitions
@@ -55,7 +54,8 @@ public class RemoveAzureKeyVaultCertificate : KeyVaultCmdletBase
         /// <summary>
         /// If present, do not ask for confirmation
         /// </summary>
-        [Parameter(HelpMessage = "Do not ask for confirmation.")]
+        [Parameter( Mandatory = false,
+                    HelpMessage = "Do not ask for confirmation.")]
         public SwitchParameter Force { get; set; }
 
         /// <summary>
@@ -65,7 +65,8 @@ public class RemoveAzureKeyVaultCertificate : KeyVaultCmdletBase
                     HelpMessage = "Permanently remove the previously deleted certificate." )]
         public SwitchParameter InRemovedState { get; set; }
 
-        [Parameter(HelpMessage = "Cmdlet does not return an object by default. If this switch is specified, the cmdlet returns the certificate object that was deleted.")]
+        [Parameter( Mandatory = false,
+                    HelpMessage = "Cmdlet does not return an object by default. If this switch is specified, the cmdlet returns the certificate object that was deleted.")]
         public SwitchParameter PassThru { get; set; }
 
         #endregion
@@ -90,7 +91,7 @@ protected override void ProcessRecord()
                 return;
             }
 
-            DeletedCertificateBundle certBundle = null;
+            DeletedKeyVaultCertificate certBundle = null;
 
             ConfirmAction(
                 Force.IsPresent,
@@ -103,7 +104,7 @@ protected override void ProcessRecord()
                     KeyVaultProperties.Resources.RemoveCertWhatIfMessage,
                     Name),
                 Name,
-                () => { certBundle = this.DataServiceClient.DeleteCertificate(VaultName, Name); });
+                () => { certBundle = DeletedKeyVaultCertificate.FromDeletedCertificateBundle( this.DataServiceClient.DeleteCertificate(VaultName, Name) ); });
 
             if (PassThru.IsPresent)
             {

src/ResourceManager/KeyVault/Commands.KeyVault/Models/KeyVaultCertificate.cs

@@ -19,9 +19,10 @@
 
 namespace Microsoft.Azure.Commands.KeyVault.Models
 {
-    public class KeyVaultCertificate
+    public class KeyVaultCertificate 
     {
         public string Name { get; set; }
+        public string VaultName { get; set; }
         public X509Certificate2 Certificate { get; set; }
         public string Id { get; internal set; }
         public string KeyId { get; internal set; }
@@ -46,6 +47,12 @@ public KeyVaultCertificate( CertificateBundle certificateBundle )
             {
                 Id = certificateBundle.CertificateIdentifier.Identifier;
                 Name = certificateBundle.CertificateIdentifier.Name;
+
+                // TODO [dragosav] Bring Certificate classes on par with keys/secrets:
+                //  - inherit from ObjectIdentifier
+                //  - constructors should accept the VaultUriHelper as a parameter
+                var vaultUri = new Uri( certificateBundle.CertificateIdentifier.Vault );
+                VaultName = vaultUri.Host.Split( '.' ).First( );
             }
 
             if ( certificateBundle.Cer != null )