Added parameter ContentType in Import-AzKeyVaultCertificate to support importing pem via certificate string (Azure#19174)

Author: BethanyZhou

src/KeyVault/KeyVault/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Added parameter `ContentType` in `Import-AzKeyVaultCertificate` to support importing pem via certificate string
 * Allowed `DnsName` in `New-AzKeyVaultCertificatePolicy` to accept an empty list [#18954]
 
 ## Version 4.6.1

src/KeyVault/KeyVault/Commands/Certificate/ImportAzureKeyVaultCertificate.cs

@@ -88,6 +88,15 @@ public class ImportAzureKeyVaultCertificate : KeyVaultCmdletBase
                    HelpMessage = "Base64 encoded representation of the certificate object to import. This certificate needs to contain the private key.")]
         public string CertificateString { get; set; }
 
+        /// <summary>
+        /// Specifies type of the certificate to be imported.
+        /// </summary>
+        [Parameter(Mandatory = false,
+                   ParameterSetName = ImportWithPrivateKeyFromStringParameterSet,
+                   HelpMessage = "Specifies the type of the certificate to be imported. Regards certificate string as PFX format by default.")]
+        [PSArgumentCompleter(Constants.Pkcs12ContentType, Constants.PemContentType)]
+        public string ContentType { get; set; } = Constants.Pkcs12ContentType;
+
         /// <summary>
         /// Password
         /// </summary>
@@ -190,7 +199,7 @@ public override void ExecuteCmdlet()
                         break;
 
                     case ImportWithPrivateKeyFromStringParameterSet:
-                        certBundle = this.DataServiceClient.ImportCertificate(VaultName, Name, CertificateString, Password, Tag?.ConvertToDictionary());
+                        certBundle = this.Track2DataClient.ImportCertificate(VaultName, Name, CertificateString, Password, Tag?.ConvertToDictionary(), ContentType);
 
                         break;
                 }

src/KeyVault/KeyVault/Track2Models/Track2KeyVaultDataServiceClient.cs

@@ -7,6 +7,8 @@
 using System.Collections.Generic;
 using System.Security;
 using System.Security.Cryptography.X509Certificates;
+using System.Text;
+
 using KeyVaultProperties = Microsoft.Azure.Commands.KeyVault.Properties;
 
 namespace Microsoft.Azure.Commands.KeyVault.Track2Models
@@ -239,7 +241,7 @@ public IEnumerable<PSDeletedKeyVaultCertificateIdentityItem> GetDeletedCertifica
 
         public PSKeyVaultCertificate ImportCertificate(string vaultName, string certName, string certificate, SecureString certPassword, IDictionary<string, string> tags, string contentType = Constants.Pkcs12ContentType)
         {
-            throw new NotImplementedException();
+            return VaultClient.ImportCertificate(vaultName, certName, Encoding.ASCII.GetBytes(certificate), certPassword, tags, contentType);
         }
 
         public PSKeyVaultCertificate ImportCertificate(string vaultName, string certName, byte[] certificate, SecureString certPassword, IDictionary<string, string> tags, string contentType = Constants.Pkcs12ContentType)