Merge pull request Azure#10367 from a-santamaria/sf-remove-addappcert

Remove cmdlet Add-AzServiceFabricApplicationCertificate

Author: wyunchi-ms

src/ServiceFabric/ServiceFabric.Test/ScenarioTests/TestServiceFabric.cs

@@ -167,22 +167,6 @@ public void TestRemoveAzureRmServiceFabricNodeType()
             TestController.NewInstance.RunPsTest(_logger, "Test-RemoveAzureRmServiceFabricNodeType");
         }
 
-        [Fact, TestPriority(0)]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestAddAzureRmServiceFabricApplicationCertificate()
-        {
-            ServiceFabricCmdletBase.TestAppCert = true;
-            TestController.NewInstance.RunPsTest(_logger, "Test-AddAzureRmServiceFabricApplicationCertificate");
-        }
-
-        [Fact, TestPriority(0)]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestAddAzureRmServiceFabricApplicationCertificateRollback()
-        {
-            ServiceFabricCmdletBase.TestAppCert = true;
-            TestController.NewInstance.RunPsTest(_logger, "Test-AddAzureRmServiceFabricApplicationCertificateRollback");
-        }
-
         [Fact, TestPriority(0)]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void DefaultTemplateFilesAvailable()

src/ServiceFabric/ServiceFabric.Test/ScenarioTests/TestServiceFabric.ps1

@@ -293,39 +293,4 @@ function Test-SetAzureRmServiceFabricUpgradeType
 	$cluster = Set-AzServiceFabricUpgradeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -UpgradeMode Manual -Verbose
 	$clusters = Get-AzServiceFabricCluster -ClusterName $clusterName -ResourceGroupName $resourceGroupName 
 	Assert-AreEqual $clusters[0].UpgradeMode 'Manual'
-}
-
-function Test-AddAzureRmServiceFabricApplicationCertificate
-{
-	$clusterName = Get-ClusterName
-	$resourcGroup = Get-ResourceGroupName
-	$certSecert = Get-CertAppSecretUrl
-	$res = Add-AzServiceFabricApplicationCertificate -ResourceGroupName $resourcGroup -Name $clusterName -SecretIdentifier $certSecert
-	Assert-NotNull $res.CertificateThumbprint
-}
-
-function Test-AddAzureRmServiceFabricApplicationCertificateRollback
-{
-	$clusterName = Get-ClusterName
-	$resourcGroup = Get-ResourceGroupName
-	$certWU_SecretId = Get-CertWUSecretUrl
-
-	$exceptionThrown = $false
-	Try
-	{
-		$res = Add-AzureRmServiceFabricApplicationCertificate -ResourceGroupName $resourcGroup -Name $clusterName -SecretIdentifier $certWU_SecretId
-	}
-	Catch [System.Exception]
-	{
-		$Exception = $PSitem.Exception
-		while ($Exception.InnerException -ne $null)
-		{
-			$Exception = $Exception.InnerException
-		}
-		
-		Assert-AreEqual $true ($Exception.Message -match 'is different from the location of the VM') ("unexpected error message: " + $Exception.Message )
-		$exceptionThrown = $true
-	}
-
-	Assert-AreEqual $true $exceptionThrown "Expected Exception keyvault in different location than VMSS not thrown"
 }

src/ServiceFabric/ServiceFabric/Az.ServiceFabric.psd1

@@ -76,8 +76,7 @@ NestedModules = @('.\Microsoft.Azure.PowerShell.Cmdlets.ServiceFabric.dll')
 FunctionsToExport = @()
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
-CmdletsToExport = 'Add-AzServiceFabricApplicationCertificate', 
-               'Add-AzServiceFabricClientCertificate', 
+CmdletsToExport = 'Add-AzServiceFabricClientCertificate', 
                'Add-AzServiceFabricClusterCertificate', 'Add-AzServiceFabricNode', 
                'Add-AzServiceFabricNodeType', 'Get-AzServiceFabricCluster', 
                'New-AzServiceFabricCluster', 

src/ServiceFabric/ServiceFabric/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Remove Add-AzServiceFabricApplicationCertificate cmdlet as this scenario is covered by Add-AzVmssSecret.
 
 ## Version 1.2.0
 * Fixed typo in example for `Update-AzServiceFabricReliability` reference documentation

src/ServiceFabric/ServiceFabric/Commands/AddAzureRmServiceFabricApplicationCertificate.cs

@@ -16,7 +16,6 @@ namespace Microsoft.Azure.Commands.ServiceFabric.Common
 {
     public static class CmdletNoun
     {
-        public const string AzureRmServiceFabricApplicationCertificate = "AzureRmServiceFabricApplicationCertificate";
         public const string AzureRmServiceFabricClientCertificate = "AzureRmServiceFabricClientCertificate";
         public const string AzureRmServiceFabricClusterCertificate = "AzureRmServiceFabricClusterCertificate";
         public const string AzureRmServiceFabricNode = "AzureRmServiceFabricNode";