Remove force parameter from Remove-AzureRmVmssDiagnosticsExtension

Author: zhencui

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/DiagnosticsExtensionTests.ps1

@@ -261,7 +261,7 @@ function Test-VmssDiagnosticsExtension
         Assert-AreNotEqual '' $storageAccountKey;
 
         # Remove without specifying extension name, diagnostic extension is expected to be removed.
-        $vmss = Remove-AzureRmVmssDiagnosticsExtension -VirtualMachineScaleSet $vmss -Force;
+        $vmss = Remove-AzureRmVmssDiagnosticsExtension -VirtualMachineScaleSet $vmss;
         $vmssDiagExtensions = $vmss.VirtualMachineProfile.ExtensionProfile.Extensions | Where-Object {$_.Publisher -eq $diagExtPublisher -and $_.Type -eq $diagExtType};
 
         Assert-Null $vmssDiagExtensions;
@@ -280,7 +280,7 @@ function Test-VmssDiagnosticsExtension
         $settings = $vmssDiagExtension.Settings;
         Assert-AreEqual $storagename $settings.storageAccount.Value;
 
-        Remove-AzureRmVmssDiagnosticsExtension -VirtualMachineScaleSet $vmss -Name $extname -Force;
+        Remove-AzureRmVmssDiagnosticsExtension -VirtualMachineScaleSet $vmss -Name $extname;
         Update-AzureRmVmss -ResourceGroupName $rgname -Name $vmssName -VirtualMachineScaleSet $vmss;
 
         $vmss = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;

src/ResourceManager/Compute/Commands.Compute/Extension/Diagnostics/RemoveAzureRmVmssDiagnosticsExtension.cs

@@ -43,10 +43,6 @@ public class RemoveAzureRmVmssDiagnosticsExtension : Microsoft.Azure.Commands.Re
             HelpMessage = "The extension name.")]
         public string Name { get; set; }
 
-        [Parameter(Mandatory = false,
-            HelpMessage = "To force the removal of the diagnostics extension from the VM scale set.")]
-        public SwitchParameter Force { get; set; }
-
         protected override void ProcessRecord()
         {
             if (ShouldProcess(this.VirtualMachineScaleSet.Name, Properties.Resources.RemoveVmssDiagnosticsExtensionAction))
@@ -68,15 +64,11 @@ protected override void ProcessRecord()
 
                     if (diagnosticsExtensions.Any())
                     {
-                        if (Force.IsPresent ||
-                            ShouldContinue(Properties.Resources.DiagnosticsExtensionRemovalConfirmation, Properties.Resources.DiagnosticsExtensionRemovalCaption))
-                        {
-                            this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile.Extensions = extensions.Except(diagnosticsExtensions).ToList();
+                        this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile.Extensions = extensions.Except(diagnosticsExtensions).ToList();
 
-                            if (this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile.Extensions.Count == 0)
-                            {
-                                this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile.Extensions = null;
-                            }
+                        if (this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile.Extensions.Count == 0)
+                        {
+                            this.VirtualMachineScaleSet.VirtualMachineProfile.ExtensionProfile.Extensions = null;
                         }
 
                         WriteObject(this.VirtualMachineScaleSet);

src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.dll-Help.xml

@@ -551,10 +551,4 @@ The file needs to be a PowerShell script (.ps1 or .psm1) or a ZIP archive (.zip)
   <data name="RemoveVmssDiagnosticsExtensionAction" xml:space="preserve">
     <value>Remove diagnostics extension from the VM scale set</value>
   </data>
-  <data name="DiagnosticsExtensionRemovalCaption" xml:space="preserve">
-    <value>Diagnostics extension removal operation</value>
-  </data>
-  <data name="DiagnosticsExtensionRemovalConfirmation" xml:space="preserve">
-    <value>This cmdlet will remove existing diagnostics extension. Do you want to continue?</value>
-  </data>
 </root>