Removed purge delete flag

Author: Xynoclafe

src/Resources/ResourceManager/Implementation/CmdletBase/DeploymentStacksCmdletBase.cs

@@ -1,14 +1,11 @@
-using Microsoft.Azure.Commands.Common.Authentication;
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkClient;
 using Microsoft.Azure.Commands.ResourceManager.Cmdlets.Utilities;
 using Microsoft.Azure.Commands.ResourceManager.Common;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
 using System.Text;
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
@@ -20,11 +17,6 @@ public class DeploymentStacksCmdletBase : AzureRMCmdlet
         /// </summary>
         private DeploymentStacksSdkClient deploymentStacksSdkClient;
 
-        /// <summary>
-        /// Deployment stacks client instance field
-        /// </summary>
-        private DeploymentStacksSdkClient deploymentStacksSdkClientForDelete;
-
         /// <summary>
         /// Gets or sets the deployment stacks sdk client
         /// </summary>
@@ -45,26 +37,6 @@ public DeploymentStacksSdkClient DeploymentStacksSdkClient
             }
         }
 
-        /// <summary>
-        /// Gets or sets the deployment stacks sdk client with delete handler
-        /// </summary>
-        public DeploymentStacksSdkClient DeploymentStacksSdkClientForDelete
-        {
-            get
-            {
-                if (this.deploymentStacksSdkClientForDelete == null)
-                {
-                    this.deploymentStacksSdkClientForDelete = new DeploymentStacksSdkClient(DefaultContext, new StacksDeletePollingHandler());
-                }
-                return this.deploymentStacksSdkClientForDelete;
-            }
-
-            set
-            {
-                this.deploymentStacksSdkClientForDelete = value;
-            }
-        }
-
         protected Hashtable GetParameterObject(string parameterFile)
         {
             var parameters = new Hashtable();
@@ -109,27 +81,5 @@ protected Hashtable GetTemplateParameterObject(Hashtable templateParameterObject
             }
             return parameterObject;
         }
-
-            /// <summary>
-            /// Unregisters delegating handler if registered.
-            /// </summary>
-            protected void UnregisterDelegatingHandlerIfRegistered()
-        {
-            var apiExpandHandler = GetStacksHandler();
-
-            if (apiExpandHandler != null)
-            {
-                AzureSession.Instance.ClientFactory.RemoveHandler(apiExpandHandler.GetType());
-            }
-        }
-
-        /// <summary>
-        /// Returns expand handler, if exists.
-        /// </summary>
-        private DelegatingHandler GetStacksHandler()
-        {
-            return AzureSession.Instance.ClientFactory.GetCustomHandlers()?
-                .Where(handler => handler.GetType().Equals(typeof(StacksDeletePollingHandler))).FirstOrDefault();
-        }
     }
 }

src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzResourceGroupDeploymentStack.cs

@@ -50,10 +50,6 @@ public class RemoveAzResourceGroupDeploymentStack : DeploymentStacksCmdletBase
         [Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
         public SwitchParameter Force { get; set; }
 
-        [Parameter(Mandatory = false,
-        HelpMessage = "Delete all resources along with the stack.")]
-        public SwitchParameter PurgeResources { get; set; }
-
         #endregion
 
         #region Cmdlet Overrides
@@ -71,14 +67,12 @@ public override void ExecuteCmdlet()
 
                 string confirmationMessage = $"Are you sure you want to remove DeploymentStack '{Name}'";
 
-                string deleteBehavior = PurgeResources.IsPresent ? "all" : null;
-
                 ConfirmAction(
                     Force.IsPresent,
                     confirmationMessage,
                     "Deleting Deployment Stack ...",
                     Name,
-                    () => DeploymentStacksSdkClientForDelete.DeleteResourceGroupDeploymentStack(ResourceGroupName, Name, deleteBehavior)
+                    () => DeploymentStacksSdkClient.DeleteResourceGroupDeploymentStack(ResourceGroupName, Name)
                 );
 
                 WriteObject(true);
@@ -90,10 +84,6 @@ public override void ExecuteCmdlet()
                 else
                     WriteExceptionError(ex);
             }
-            finally
-            {
-                UnregisterDelegatingHandlerIfRegistered();
-            }
         }
 
         #endregion

src/Resources/ResourceManager/Implementation/DeploymentStacks/RemoveAzSubscriptionDeploymentStack.cs

@@ -45,10 +45,6 @@ public class RemoveAzSubscriptionDeploymentStack : DeploymentStacksCmdletBase
         [Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
         public SwitchParameter Force { get; set; }
 
-        [Parameter(Mandatory = false,
-        HelpMessage = "Delete all resources along with the stack.")]
-        public SwitchParameter PurgeResources { get; set; }
-
         #endregion
 
         #region Cmdlet Overrides
@@ -61,14 +57,12 @@ public override void ExecuteCmdlet()
 
                 string confirmationMessage = $"Are you sure you want to remove DeploymentStack '{Name}'";
 
-                string deleteBehavior = PurgeResources.IsPresent ? "all" : null;
-
                 ConfirmAction(
                     Force.IsPresent,
                     confirmationMessage,
                     "Deleting Deployment Stack ...",
                     Name,
-                    () => DeploymentStacksSdkClientForDelete.DeleteSubscriptionDeploymentStack(Name, deleteBehavior)
+                    () => DeploymentStacksSdkClient.DeleteSubscriptionDeploymentStack(Name)
                 );
 
                 WriteObject(true);
@@ -80,10 +74,6 @@ public override void ExecuteCmdlet()
                 else
                     WriteExceptionError(ex);
             }
-            finally
-            {
-                UnregisterDelegatingHandlerIfRegistered();
-            }
         }
 
         #endregion

src/Resources/ResourceManager/SdkClient/DeploymentStacksSdkClient.cs

@@ -32,17 +32,6 @@ public class DeploymentStacksSdkClient
 
         public DeploymentStacksSdkClient(IDeploymentStacksClient deploymentStacksClient)
         {
-            //Remove delegationHandler - Temporarily being used for purge delete calls
-            //TODO: remove once cascade delete is implemented
-
-            var customHandlers = AzureSession.Instance.ClientFactory.GetCustomHandlers();
-            var StacksDeletePollingHandler = customHandlers?.Where(handler => handler.GetType().Equals(typeof(StacksDeletePollingHandler))).FirstOrDefault();
-
-            if (StacksDeletePollingHandler != null)
-            {
-                AzureSession.Instance.ClientFactory.RemoveHandler(StacksDeletePollingHandler.GetType());
-            }
-
             this.DeploymentStacksClient = deploymentStacksClient;
         }
 
@@ -61,16 +50,6 @@ public DeploymentStacksSdkClient(IAzureContext context)
             this.azureContext = context;
         }
 
-        //TODO: remove once cascade delete is implemented
-        public DeploymentStacksSdkClient(IAzureContext context, StacksDeletePollingHandler handler)
-        {
-            AzureSession.Instance.ClientFactory.AddHandler(handler);
-            this.DeploymentStacksClient =
-                AzureSession.Instance.ClientFactory.CreateArmClient<DeploymentStacksClient>(context,
-                    AzureEnvironment.Endpoint.ResourceManager);
-            this.azureContext = context;
-        }
-
         public PSDeploymentStack GetResourceGroupDeploymentStack(
             string resourceGroupName,
             string deploymentStackName,
@@ -422,10 +401,10 @@ internal void DeleteSubscriptionDeploymentStackSnapshot(string stackname, string
             return;
         }
 
-        internal void DeleteResourceGroupDeploymentStack(string resourceGroupName, string name, string deleteBehavior = null)
+        internal void DeleteResourceGroupDeploymentStack(string resourceGroupName, string name)
         {
             var deleteResponse = DeploymentStacksClient.DeploymentStacks
-                .DeleteAtResourceGroupWithHttpMessagesAsync(resourceGroupName, name, deleteBehavior)
+                .DeleteAtResourceGroupWithHttpMessagesAsync(resourceGroupName, name)
                 .GetAwaiter()
                 .GetResult();
 
@@ -439,10 +418,10 @@ internal void DeleteResourceGroupDeploymentStack(string resourceGroupName, strin
             return;
         }
 
-        internal void DeleteSubscriptionDeploymentStack(string name, string deleteBehavior = null)
+        internal void DeleteSubscriptionDeploymentStack(string name)
         {
             var deleteResponse = DeploymentStacksClient.DeploymentStacks
-                .DeleteAtSubscriptionWithHttpMessagesAsync(name, deleteBehavior)
+                .DeleteAtSubscriptionWithHttpMessagesAsync(name)
                 .GetAwaiter()
                 .GetResult();