Added support for custom certificates

Tasks/AzureCloudPowerShellDeployment/Publish-AzureCloudDeployment.ps1

@@ -16,6 +16,7 @@ try{
     $DiagnosticStorageAccountKeys = Get-VstsInput -Name DiagnosticStorageAccountKeys
     $NewServiceAdditionalArguments = Get-VstsInput -Name NewServiceAdditionalArguments
     $NewServiceAffinityGroup = Get-VstsInput -Name NewServiceAffinityGroup
+    $NewServiceCustomCertificates = Get-VstsInput -Name NewServiceCustomCertificates
 
     # Initialize Azure.
     Import-Module $PSScriptRoot\ps_modules\VstsAzureHelpers_
@@ -59,6 +60,10 @@ try{
         $azureService += " $NewServiceAdditionalArguments"
         Write-Host "$azureService"
         $azureService = Invoke-Expression -Command $azureService
+
+        #Add the custom certificates to the newly created Azure Cloud Service
+        $customCertificatesMap = Parse-CustomCertificates -CustomCertificates $NewServiceCustomCertificates
+        Add-CustomCertificates $serviceName $customCertificatesMap
     }
 
     $diagnosticExtensions = Get-DiagnosticsExtensions $StorageAccount $serviceConfigFile $storageAccountKeysMap

Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/de-de/resources.resjson

@@ -32,6 +32,8 @@
   "loc.input.help.NewServiceAdditionalArguments": "Übergeben Sie zusätzliche Argumente beim Erstellen eines neuen Dienstes. Diese werden an das Cmdlet \"New-AzureService\" übergeben, z. B. \"-Label 'MyTestService'\".",
   "loc.input.label.NewServiceAffinityGroup": "Affinitätsgruppe",
   "loc.input.help.NewServiceAffinityGroup": "Beim Erstellen des neuen Diensts wird diese Affinitätsgruppe anstelle eines Dienstspeicherorts berücksichtigt.",
+  "loc.input.label.NewServiceCustomCertificates": "Custom certificates to import",
+  "loc.input.help.NewServiceCustomCertificates": "Provide custom certificates in CertificatePfxBase64:CertificatePassword format. It’s recommended to save <certificate_password> as a secret variable. <br/><br/>For example,<br/> Certificate1: &lt;Certificate1_password&gt;<br/>Certificate2: &lt;Certificate2_password&gt;",
   "loc.messages.Couldnotgettheprimarystoragekeyforstorageaccount0Unabletoapplyanydiagnosticsextensions": "Der primäre Speicherschlüssel für das Speicherkonto \"{0}\" konnte nicht abgerufen werden. Es können keine Diagnoseextensions angewendet werden.",
   "loc.messages.Couldnotgettheprimarystoragekeyforthepublicconfigstorageaccount0Unabletoapplyanydiagnosticsextensions": "Der primäre Speicherschlüssel für das öffentliche Konfigurationsspeicherkonto \"{0}\" konnte nicht abgerufen werden. Es können keine Diagnoseextensions angewendet werden.",
   "loc.messages.Applyinganyconfigureddiagnosticsextensions": "Alle konfigurierten Diagnoseextensions werden angewendet.",
@@ -40,5 +42,7 @@
   "loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "Es wurde mehrere Dateien zum Bereitstellen mit dem Suchmuster \"{0}\" gefunden. Es darf maximal eine Datei vorhanden sein.",
   "loc.messages.Storagekeysaredefinedininvalidformat": "Die Speicherschlüssel wurden in einem ungültigen Format definiert.",
   "loc.messages.Unabletofind0usingprovidedsubscription": "\"{0}\" wurde unter Verwendung des angegebenen Abonnements nicht gefunden.",
-  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "Die aktuelle Version von Azure PowerShell bietet keine Unterstützung für ein externes Speicherkonto zum Konfigurieren der Diagnose."
+  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "Die aktuelle Version von Azure PowerShell bietet keine Unterstützung für ein externes Speicherkonto zum Konfigurieren der Diagnose.",
+  "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
+  "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
 }

Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/en-US/resources.resjson

@@ -32,6 +32,8 @@
   "loc.input.help.NewServiceAdditionalArguments": "Pass in additional arguments while creating a brand new service. These will be passed on to `New-AzureService` cmdlet. Eg: `-Label 'MyTestService'`",
   "loc.input.label.NewServiceAffinityGroup": "Affinity group",
   "loc.input.help.NewServiceAffinityGroup": "While creating new service, this affinity group will be considered instead of using service location.",
+  "loc.input.label.NewServiceCustomCertificates": "Custom certificates to import",
+  "loc.input.help.NewServiceCustomCertificates": "Provide custom certificates in CertificatePfxBase64:CertificatePassword format. It’s recommended to save <certificate_password> as a secret variable. <br/><br/>For example,<br/> Certificate1: &lt;Certificate1_password&gt;<br/>Certificate2: &lt;Certificate2_password&gt;",
   "loc.messages.Couldnotgettheprimarystoragekeyforstorageaccount0Unabletoapplyanydiagnosticsextensions": "Could not get the primary storage key for storage account '{0}'. Unable to apply any diagnostics extensions.",
   "loc.messages.Couldnotgettheprimarystoragekeyforthepublicconfigstorageaccount0Unabletoapplyanydiagnosticsextensions": "Could not get the primary storage key for the public config storage account '{0}'. Unable to apply any diagnostics extensions.",
   "loc.messages.Applyinganyconfigureddiagnosticsextensions": "Applying any configured diagnostics extensions.",
@@ -40,5 +42,7 @@
   "loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "Found more than one file to deploy with search pattern {0}. There can be only one.",
   "loc.messages.Storagekeysaredefinedininvalidformat": "Storage keys are defined in invalid format.",
   "loc.messages.Unabletofind0usingprovidedsubscription": "Unable to find {0} using provided subscription",
-  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "Current version of azure powershell don't support external storage account for configuring diagnostics."
+  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "Current version of azure powershell don't support external storage account for configuring diagnostics.",
+  "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
+  "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
 }

Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/es-es/resources.resjson

@@ -32,6 +32,8 @@
   "loc.input.help.NewServiceAdditionalArguments": "Pase argumentos adicionales al crear un servicio completamente nuevo. Estos se pasarán al cmdlet \"New-AzureService\". Por ejemplo: \"-Label 'MiServicioDePrueba'\"",
   "loc.input.label.NewServiceAffinityGroup": "Grupo de afinidad",
   "loc.input.help.NewServiceAffinityGroup": "Mientras se crea el nuevo servicio, se tendrá en cuenta este grupo de afinidad en lugar de utilizar la ubicación del servicio.",
+  "loc.input.label.NewServiceCustomCertificates": "Custom certificates to import",
+  "loc.input.help.NewServiceCustomCertificates": "Provide custom certificates in CertificatePfxBase64:CertificatePassword format. It’s recommended to save <certificate_password> as a secret variable. <br/><br/>For example,<br/> Certificate1: &lt;Certificate1_password&gt;<br/>Certificate2: &lt;Certificate2_password&gt;",
   "loc.messages.Couldnotgettheprimarystoragekeyforstorageaccount0Unabletoapplyanydiagnosticsextensions": "No se puedo obtener la clave de almacenamiento principal para la cuenta de almacenamiento '{0}'. No se pueden aplicar las extensiones de diagnóstico.",
   "loc.messages.Couldnotgettheprimarystoragekeyforthepublicconfigstorageaccount0Unabletoapplyanydiagnosticsextensions": "No se puedo obtener la clave de almacenamiento principal para la cuenta de almacenamiento de configuración pública '{0}'. No se pueden aplicar las extensiones de diagnóstico.",
   "loc.messages.Applyinganyconfigureddiagnosticsextensions": "Aplicando todas las extensiones de diagnóstico configuradas.",
@@ -40,5 +42,7 @@
   "loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "Se encontró más de un archivo para implementar con el patrón de búsqueda {0}. Solo puede haber uno.",
   "loc.messages.Storagekeysaredefinedininvalidformat": "El formato de las claves de almacenamiento no está definido correctamente.",
   "loc.messages.Unabletofind0usingprovidedsubscription": "No se puede encontrar {0} con la suscripción proporcionada",
-  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "La versión actual de Azure PowerShell no admite una cuenta de almacenamiento externa para configurar el diagnóstico."
+  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "La versión actual de Azure PowerShell no admite una cuenta de almacenamiento externa para configurar el diagnóstico.",
+  "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
+  "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
 }

Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/fr-fr/resources.resjson

@@ -32,6 +32,8 @@
   "loc.input.help.NewServiceAdditionalArguments": "Passez des arguments supplémentaires durant la création d'un service. Ils sont passés à l'applet de commande 'New-AzureService'. Exemple : -Label 'MyTestService'",
   "loc.input.label.NewServiceAffinityGroup": "Groupe d'affinités",
   "loc.input.help.NewServiceAffinityGroup": "Durant la création d'un service, ce groupe d'affinités est pris en compte à la place de l'emplacement du service.",
+  "loc.input.label.NewServiceCustomCertificates": "Custom certificates to import",
+  "loc.input.help.NewServiceCustomCertificates": "Provide custom certificates in CertificatePfxBase64:CertificatePassword format. It’s recommended to save <certificate_password> as a secret variable. <br/><br/>For example,<br/> Certificate1: &lt;Certificate1_password&gt;<br/>Certificate2: &lt;Certificate2_password&gt;",
   "loc.messages.Couldnotgettheprimarystoragekeyforstorageaccount0Unabletoapplyanydiagnosticsextensions": "Impossible d'obtenir la clé de stockage principal pour le compte de stockage '{0}'. Impossible d'appliquer les extensions de diagnostic.",
   "loc.messages.Couldnotgettheprimarystoragekeyforthepublicconfigstorageaccount0Unabletoapplyanydiagnosticsextensions": "Impossible d'obtenir la clé de stockage principal pour le compte de stockage de configuration publique '{0}'. Impossible d'appliquer les extensions de diagnostic.",
   "loc.messages.Applyinganyconfigureddiagnosticsextensions": "Application des extensions de diagnostic configurées.",
@@ -40,5 +42,7 @@
   "loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "Détection de plusieurs fichiers à déployer correspondant au modèle de recherche {0}. Il ne peut y en avoir qu'un seul.",
   "loc.messages.Storagekeysaredefinedininvalidformat": "Les clés de stockage sont définies dans un format non valide.",
   "loc.messages.Unabletofind0usingprovidedsubscription": "{0} introuvable à l'aide de l'abonnement fourni",
-  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "La version actuelle d'Azure PowerShell ne prend pas en charge les comptes de stockage externes pour la configuration des diagnostics."
+  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "La version actuelle d'Azure PowerShell ne prend pas en charge les comptes de stockage externes pour la configuration des diagnostics.",
+  "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
+  "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
 }

Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/it-IT/resources.resjson

@@ -32,6 +32,8 @@
   "loc.input.help.NewServiceAdditionalArguments": "Consente di passare al cmdlet `New-AzureService` argomenti aggiuntivi durante la creazione di un nuovo servizio, ad esempio `-Label 'MyTestService'`",
   "loc.input.label.NewServiceAffinityGroup": "Gruppo di affinità",
   "loc.input.help.NewServiceAffinityGroup": "Durante la creazione del nuovo servizio invece della posizione del servizio verrà considerato questo gruppo di affinità.",
+  "loc.input.label.NewServiceCustomCertificates": "Custom certificates to import",
+  "loc.input.help.NewServiceCustomCertificates": "Provide custom certificates in CertificatePfxBase64:CertificatePassword format. It’s recommended to save <certificate_password> as a secret variable. <br/><br/>For example,<br/> Certificate1: &lt;Certificate1_password&gt;<br/>Certificate2: &lt;Certificate2_password&gt;",
   "loc.messages.Couldnotgettheprimarystoragekeyforstorageaccount0Unabletoapplyanydiagnosticsextensions": "Non è stato possibile ottenere la chiave di archiviazione primaria per l'account di archiviazione '{0}'. Non è possibile applicare le estensioni di diagnostica.",
   "loc.messages.Couldnotgettheprimarystoragekeyforthepublicconfigstorageaccount0Unabletoapplyanydiagnosticsextensions": "Non è stato possibile ottenere la chiave di archiviazione primaria per l'account di archiviazione '{0}' della configurazione pubblica. Non è possibile applicare le estensioni di diagnostica.",
   "loc.messages.Applyinganyconfigureddiagnosticsextensions": "Applicazione delle eventuali estensioni di diagnostica configurate.",
@@ -40,5 +42,7 @@
   "loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "Con il criterio di ricerca {0} sono stati trovati più file da distribuire. È possibile distribuirne uno solo.",
   "loc.messages.Storagekeysaredefinedininvalidformat": "Il formato usato per definire le chiavi di archiviazione non è valido.",
   "loc.messages.Unabletofind0usingprovidedsubscription": "{0} non è stato trovato con la sottoscrizione specificata",
-  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "La versione corrente di Azure PowerShell non supporta account di archiviazione esterni per la configurazione della diagnostica."
+  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "La versione corrente di Azure PowerShell non supporta account di archiviazione esterni per la configurazione della diagnostica.",
+  "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
+  "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
 }

Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/ja-jp/resources.resjson

@@ -32,6 +32,8 @@
   "loc.input.help.NewServiceAdditionalArguments": "新規のサービスの作成中に追加引数を渡します。これらは `New-AzureService` コマンドレットに渡されます。例: `-Label 'MyTestService'`",
   "loc.input.label.NewServiceAffinityGroup": "アフィニティ グループ",
   "loc.input.help.NewServiceAffinityGroup": "新しいサービスの作成中、サービスの場所を使用する代わりに、このアフィニティ グループが考慮されます。",
+  "loc.input.label.NewServiceCustomCertificates": "Custom certificates to import",
+  "loc.input.help.NewServiceCustomCertificates": "Provide custom certificates in CertificatePfxBase64:CertificatePassword format. It’s recommended to save <certificate_password> as a secret variable. <br/><br/>For example,<br/> Certificate1: &lt;Certificate1_password&gt;<br/>Certificate2: &lt;Certificate2_password&gt;",
   "loc.messages.Couldnotgettheprimarystoragekeyforstorageaccount0Unabletoapplyanydiagnosticsextensions": "ストレージ アカウント '{0}' の主ストレージ キーを取得できません。診断拡張機能を適用できません。",
   "loc.messages.Couldnotgettheprimarystoragekeyforthepublicconfigstorageaccount0Unabletoapplyanydiagnosticsextensions": "公開構成ストレージ アカウント '{0}' の主ストレージ キーを取得できませんでした。診断拡張機能を適用できません。",
   "loc.messages.Applyinganyconfigureddiagnosticsextensions": "構成済み診断拡張機能を適用しています。",
@@ -40,5 +42,7 @@
   "loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "検索パターン {0} で、展開するファイルが複数見つかりました。1 つだけ指定してください。",
   "loc.messages.Storagekeysaredefinedininvalidformat": "ストレージ キーが無効な形式で定義されています。",
   "loc.messages.Unabletofind0usingprovidedsubscription": "指定したサブスクリプションを使用する {0} が見つかりません",
-  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "Azure PowerShell の現在のバージョンでは、診断を構成するための外部ストレージ アカウントはサポートしていません。"
+  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "Azure PowerShell の現在のバージョンでは、診断を構成するための外部ストレージ アカウントはサポートしていません。",
+  "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
+  "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
 }

Tasks/AzureCloudPowerShellDeployment/Strings/resources.resjson/ko-KR/resources.resjson

@@ -32,6 +32,8 @@
   "loc.input.help.NewServiceAdditionalArguments": "새 서비스를 만드는 동안 추가 인수에서 전달합니다. 이러한 인수는 `New-AzureService` cmdlet에 전달됩니다. 예: `-Label 'MyTestService'`",
   "loc.input.label.NewServiceAffinityGroup": "선호도 그룹",
   "loc.input.help.NewServiceAffinityGroup": "새 서비스를 만드는 동안 서비스 위치를 사용하는 대신 이 선호도 그룹이 고려됩니다.",
+  "loc.input.label.NewServiceCustomCertificates": "Custom certificates to import",
+  "loc.input.help.NewServiceCustomCertificates": "Provide custom certificates in CertificatePfxBase64:CertificatePassword format. It’s recommended to save <certificate_password> as a secret variable. <br/><br/>For example,<br/> Certificate1: &lt;Certificate1_password&gt;<br/>Certificate2: &lt;Certificate2_password&gt;",
   "loc.messages.Couldnotgettheprimarystoragekeyforstorageaccount0Unabletoapplyanydiagnosticsextensions": "저장소 계정 '{0}'의 기본 저장소 키를 가져올 수 없습니다. 진단 확장을 적용할 수 없습니다.",
   "loc.messages.Couldnotgettheprimarystoragekeyforthepublicconfigstorageaccount0Unabletoapplyanydiagnosticsextensions": "공용 구성 저장소 계정 '{0}'의 기본 저장소 키를 가져올 수 없습니다. 진단 확장을 적용할 수 없습니다.",
   "loc.messages.Applyinganyconfigureddiagnosticsextensions": "구성된 모든 진단 확장을 적용하는 중입니다.",
@@ -40,5 +42,7 @@
   "loc.messages.Foundmorethanonefiletodeploywithsearchpattern0Therecanbeonlyone": "검색 패턴 {0}(으)로 배포할 파일을 두 개 이상 찾았습니다. 하나만 있을 수 있습니다.",
   "loc.messages.Storagekeysaredefinedininvalidformat": "저장소 키가 잘못된 형식으로 정의되어 있습니다.",
   "loc.messages.Unabletofind0usingprovidedsubscription": "제공한 구독을 사용하여 {0}을(를) 찾을 수 없습니다.",
-  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "현재 버전의 Azure Powershell에서는 외부 저장소 계정을 사용하여 진단을 구성할 수 없습니다."
+  "loc.messages.Currentversionofazurepowershelldontsupportexternalstorageaccountforconfiguringdiagnostics": "현재 버전의 Azure Powershell에서는 외부 저장소 계정을 사용하여 진단을 구성할 수 없습니다.",
+  "loc.messages.Addinganyconfiguredcustomcertificates": "Adding any configured custom certificates.",
+  "loc.messages.Customcertificatesaredefinedininvalidformat": "Custom certificates are defined in invalid format."
 }