resolved PR comments

Author: anusapan

src/ResourceManager/IotHub/Commands.IotHub.Test/ScenarioTestFile/PS-Test-Root-CA.cer

@@ -1,21 +1,19 @@
 -----BEGIN CERTIFICATE-----
-MIIDYzCCAkugAwIBAgIQXFJpo/ym7ZpFykG0LFTURDANBgkqhkiG9w0BAQsFADAt
+MIIDFTCCAf2gAwIBAgIQbVLsBg/TRY9NRrkdiQMMTDANBgkqhkiG9w0BAQsFADAt
 MSswKQYDVQQDDCJQUyBUZXN0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4X
-DTE3MTEyMjAwNTMwN1oXDTE4MTEyMjAxMTMwN1owLTErMCkGA1UEAwwiUFMgVGVz
+DTE3MTIwNDIxMzg1MloXDTI3MTIwNDIxNDg1MlowLTErMCkGA1UEAwwiUFMgVGVz
 dCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAJyuY7Kpb4T0Ft6B1OBpdzKpUzpadTgeVF7no9J7trb1SCbR
-77MUSX11nlUmN6ZYt2YbSg7yix7l49RIXqv6rfUmBSrvT3vUsAJt9RCXpfQrJxDc
-//sQkg2qDwl7J3bnbiRGZsvcVUsWP2NZ+40Mut8TWIoaOXf7P/AnoU34BgPExN4m
-R6GqKnPIN68vAa0DMmOLmSFisMDch48zr8/nshQ0hWvnK926pc/eB0drndeT9pxI
-lrcvZixN4a3tB16ogkqp3ZCcy+FdT2zPzVBI6JUgegigm/LINXIiOLXGSACd9lbx
-D1c+gtsnSYkxkOs+94wDCWrzLDQanIJj+wh6ISkCAwEAAaN/MH0wDgYDVR0PAQH/
-BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAtBgNVHREEJjAk
-giJQUyBUZXN0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB0GA1UdDgQWBBRc
-WYZk6amnFEnsy8MKDSF1xBEl+DANBgkqhkiG9w0BAQsFAAOCAQEAeXdapbR3OgZz
-wMBBHCJoqFRiPFRF2BBdDdftOL4Sn/xqiTdd86sF019pDqWF4h07G9abFekI8cSg
-zUP/9F9Qqk7z/binCB2bBCMGHOz0dvkjxuwNQt+aajco8+EAQUvzChUiati7U3mg
-RbediPKtcsB3YaonczYM8//8uNAzPaJEd9yYh8UpLtt0OLquPaqWHwSzIsL9eX3/
-xPoH/pQxJV06GGcbzfvUfO1QuFg8iVOqRFyQM+p4vkQjaGAXKxjU0n+PPxnnOhs6
-DlI2zvR4g2Hypw0RFiL5vVOuMQt73ozuZ0MfdePRkX+RZGYvtB11G2DghBdGgR1l
-O2t2hRjUnA==
+ggEPADCCAQoCggEBALYwbTT3RaEKQmTxV24angZaMGfJhZdDXnGE82PZhCooQnG0
+CmYzVc3w5+VLhFvwgOLO//bjDaMYbCWDee2bhcy9CKzHxXq/IsSNnOJpjAD0nDNO
+oQccI0aC6braGkKgv6MlQx5m8VT3aO9ydd981mHrkml8r/dozkLFBzIU79/bI1YB
+j6U9Botr6UQ0wmHkKiP34w38o/GPoPuHppqwKkG5OMTS+8y3x5qG/O40aVh5qgQr
+Ilw1BQf1ogSD83FW4OPKbzYJb2/+mhoJGhgq43XOeZ5lO4OSMyQVACLOgaNBESkB
+t5bUUleGmL8HQoPRTwsXa8rJ3tmk7j9bUIR7HO0CAwEAAaMxMC8wDgYDVR0PAQH/
+BAQDAgIEMB0GA1UdDgQWBBQ2ko8PrB6P+V63V5hLjnKPesZFJDANBgkqhkiG9w0B
+AQsFAAOCAQEAmWMBs5y2fQuCVV7KzWwb+mLUv5ArAVbe2H0lq1lfV+2vlbwOo2Y7
+jna4C1dNmHvuPElcn7ovfIODemB3f1j8RX4MVgcKo12IEKQ7dX7Qcmm9CoUZCv0M
+VQr3/WFYpkJGvjalpFNtm2SVQEHBMsNV36vnWyFw+ZrUKsgi78MxOSXCVuDzxMsI
+W2FePpPaGWPwdLpbzKKxW4+4797pOgSlY0XMIQS4nGlzHEUhdcCwIw/faMExyHSv
+277aE7MZ4pJdvbaz3HWSLcr2JogeULTu+Sm4btjrCe97hqm5NW5zqHgbcAOvlLUZ
+nHULagGHFflWjtLpI37mN1o3RRSJXfoSoQ==
 -----END CERTIFICATE-----

src/ResourceManager/IotHub/Commands.IotHub.Test/ScenarioTests/IotHubTests.cs

@@ -34,11 +34,11 @@ public IotHubTests(ITestOutputHelper output)
         public void TestAzureIotHubLifeCycle()
         {
             IotHubController.NewInstance.RunPsTestWorkflow(
-                    () => { return new[] { string.Format("{0} {1} {2} {3} {4}", "Test-AzureRmIotHubLifecycle", "northeurope", "powershelliothub", "powershellrg", "S1") }; },
-                    null,
-                    null,
-                    TestUtilities.GetCallingClass(),
-                    TestUtilities.GetCurrentMethodName());
+                () => { return new[] { string.Format("{0} {1} {2} {3} {4}", "Test-AzureRmIotHubLifecycle", "northeurope", "powershelliothub", "powershellrg", "S1") }; },
+                null,
+                null,
+                TestUtilities.GetCallingClass(),
+                TestUtilities.GetCurrentMethodName());
         }
     }
 }

src/ResourceManager/IotHub/Commands.IotHub.Test/ScenarioTests/IotHubTests.ps1

@@ -229,7 +229,7 @@ function Test-AzureRmIotHubLifecycle
 	# Add Certificate
 	$certificatePath = "ScenarioTestFile\PS-Test-Root-CA.cer"
 	$certificateSubject = "CN=PS Test Root Certificate Authority"
-	$certificateThumbprint = "43039D39B36FDB44D98AFA79B56F70A66CED01C2"
+	$certificateThumbprint = "38303FC7371EC78DDE3E18D732C8414EE50969C7"
 	$certificateType = "Microsoft.Devices/IotHubs/Certificates"
 	$certificateName = "TestCertificate"
 	$newCertificate = Add-AzureRmIotHubCertificate -ResourceGroupName $ResourceGroupName -Name $IotHubName -CertificateName $certificateName -Path $certificatePath

src/ResourceManager/IotHub/Commands.IotHub.Test/SessionRecords/Microsoft.Azure.Commands.IotHub.Test.ScenarioTests.IotHubTests/TestAzureIotHubLifeCycle.json

@@ -18,6 +18,7 @@ namespace Microsoft.Azure.Commands.Management.IotHub
     using System.Globalization;
     using System.IO;
     using System.Management.Automation;
+    using System.Text;
     using Microsoft.Azure.Commands.Management.IotHub.Common;
     using Microsoft.Azure.Commands.Management.IotHub.Models;
     using Microsoft.Azure.Management.IotHub;
@@ -84,20 +85,29 @@ public override void ExecuteCmdlet()
                         break;
                 }
 
-                CertificateBodyDescription certificateBodyDescription = new CertificateBodyDescription();
-                certificateBodyDescription.Certificate = certificate;
-
-                CertificateDescription certificateDescription;
-                if (this.Etag != null)
+                try
                 {
-                    certificateDescription = this.IotHubClient.Certificates.CreateOrUpdate(this.ResourceGroupName, this.Name, this.CertificateName, certificateBodyDescription, this.Etag);
+                    certificate = Encoding.UTF8.GetString(Encoding.UTF8.GetBytes(certificate));
+
+                    CertificateBodyDescription certificateBodyDescription = new CertificateBodyDescription();
+                    certificateBodyDescription.Certificate = certificate;
+
+                    CertificateDescription certificateDescription;
+                    if (this.Etag != null)
+                    {
+                        certificateDescription = this.IotHubClient.Certificates.CreateOrUpdate(this.ResourceGroupName, this.Name, this.CertificateName, certificateBodyDescription, this.Etag);
+                    }
+                    else
+                    {
+                        certificateDescription = this.IotHubClient.Certificates.CreateOrUpdate(this.ResourceGroupName, this.Name, this.CertificateName, certificateBodyDescription);
+                    }
+
+                    this.WriteObject(IotHubUtils.ToPSCertificateDescription(certificateDescription), true);
                 }
-                else
+                catch(Exception e)
                 {
-                    certificateDescription = this.IotHubClient.Certificates.CreateOrUpdate(this.ResourceGroupName, this.Name, this.CertificateName, certificateBodyDescription);
+                    throw e;
                 }
-
-                this.WriteObject(IotHubUtils.ToPSCertificateDescription(certificateDescription), true);
             }
         }
     }

src/ResourceManager/IotHub/Commands.IotHub/IotHub/AddAzureRmIotHubCertificate.cs

@@ -14,7 +14,6 @@
 
 namespace Microsoft.Azure.Commands.Management.IotHub
 {
-    using System;
     using System.Management.Automation;
     using Microsoft.Azure.Management.IotHub;
 
@@ -55,17 +54,7 @@ public override void ExecuteCmdlet()
         {
             if (ShouldProcess(Name, Properties.Resources.RemoveIotHubCertificate))
             {
-                try
-                {
-                    this.IotHubClient.Certificates.Delete(this.ResourceGroupName, this.Name, this.CertificateName, this.Etag);
-                }
-                catch (Exception e)
-                {
-                    if (!e.Message.Contains("NotFound"))
-                    {
-                        throw e;
-                    }
-                }
+                this.IotHubClient.Certificates.Delete(this.ResourceGroupName, this.Name, this.CertificateName, this.Etag);
             }
         }
     }

src/ResourceManager/IotHub/Commands.IotHub/IotHub/RemoveAzureRmIotHubCertificate.cs

@@ -18,6 +18,7 @@ namespace Microsoft.Azure.Commands.Management.IotHub
     using System.Globalization;
     using System.IO;
     using System.Management.Automation;
+    using System.Text;
     using Microsoft.Azure.Commands.Management.IotHub.Common;
     using Microsoft.Azure.Commands.Management.IotHub.Models;
     using Microsoft.Azure.Management.IotHub;
@@ -85,11 +86,20 @@ public override void ExecuteCmdlet()
                         break;
                 }
 
-                CertificateVerificationDescription certificateVerificationDescription = new CertificateVerificationDescription();
-                certificateVerificationDescription.Certificate = certificate;
+                try
+                {
+                    certificate = Encoding.UTF8.GetString(Encoding.UTF8.GetBytes(certificate));
+
+                    CertificateVerificationDescription certificateVerificationDescription = new CertificateVerificationDescription();
+                    certificateVerificationDescription.Certificate = certificate;
 
-                CertificateDescription certificateDescription = this.IotHubClient.Certificates.Verify(this.ResourceGroupName, this.Name, this.CertificateName, certificateVerificationDescription, this.Etag);
-                this.WriteObject(IotHubUtils.ToPSCertificateDescription(certificateDescription), true);
+                    CertificateDescription certificateDescription = this.IotHubClient.Certificates.Verify(this.ResourceGroupName, this.Name, this.CertificateName, certificateVerificationDescription, this.Etag);
+                    this.WriteObject(IotHubUtils.ToPSCertificateDescription(certificateDescription), true);
+                }
+                catch(Exception e)
+                {
+                    throw e;
+                }
             }
         }
     }

src/ResourceManager/IotHub/Commands.IotHub/IotHub/SetAzureRmIotHubVerifiedCertificate.cs

@@ -151,6 +151,6 @@
     <value>Update IoT Hub </value>
   </data>
   <data name="VerifyIotHubCertificate" xml:space="preserve">
-    <value>Add an Iot Hub Verified Certificate</value>
+    <value>Verify an Iot Hub Certificate</value>
   </data>
 </root>