Fix API version used for polling cascade delete requests

Author: Xynoclafe

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

@@ -1,11 +1,14 @@
-using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+using Microsoft.Azure.Commands.Common.Authentication;
+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
@@ -17,6 +20,11 @@ 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>
@@ -37,6 +45,26 @@ 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();
@@ -61,5 +89,27 @@ protected Hashtable GetParameterObject(string parameterFile)
             }
             return parameters;
         }
+
+        /// <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

@@ -78,7 +78,7 @@ public override void ExecuteCmdlet()
                     confirmationMessage,
                     "Deleting Deployment Stack ...",
                     Name,
-                    () => DeploymentStacksSdkClient.DeleteResourceGroupDeploymentStack(ResourceGroupName, Name, deleteBehavior)
+                    () => DeploymentStacksSdkClientForDelete.DeleteResourceGroupDeploymentStack(ResourceGroupName, Name, deleteBehavior)
                 );
 
                 WriteObject(true);
@@ -90,6 +90,10 @@ public override void ExecuteCmdlet()
                 else
                     WriteExceptionError(ex);
             }
+            finally
+            {
+                UnregisterDelegatingHandlerIfRegistered();
+            }
         }
 
         #endregion

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

@@ -68,7 +68,7 @@ public override void ExecuteCmdlet()
                     confirmationMessage,
                     "Deleting Deployment Stack ...",
                     Name,
-                    () => DeploymentStacksSdkClient.DeleteSubscriptionDeploymentStack(Name, deleteBehavior)
+                    () => DeploymentStacksSdkClientForDelete.DeleteSubscriptionDeploymentStack(Name, deleteBehavior)
                 );
 
                 WriteObject(true);
@@ -80,6 +80,10 @@ public override void ExecuteCmdlet()
                 else
                     WriteExceptionError(ex);
             }
+            finally
+            {
+                UnregisterDelegatingHandlerIfRegistered();
+            }
         }
 
         #endregion

src/Resources/ResourceManager/SdkClient/DeploymentStacksSdkClient.cs

@@ -31,6 +31,17 @@ 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;
         }
 
@@ -49,6 +60,16 @@ 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,

src/Resources/ResourceManager/SdkClient/StacksDeletePollingHandler.cs

@@ -0,0 +1,81 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+using System;
+using System.Linq;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+//TODO: remove once cascade delete is implemented
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkClient
+{
+    public class StacksDeletePollingHandler : DelegatingHandler, ICloneable
+    {
+        private const string SubscriptionSegment = "/subscriptions/";
+        private const string ExpandString = "2021-04-01";
+
+        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+
+            if (request.Method == HttpMethod.Get)
+            {
+                var requestUri = request.RequestUri.GetLeftPart(UriPartial.Path);
+                var test = request.RequestUri.GetLeftPart(UriPartial.Query);
+                var lastSubscriptionsSegmentIndex = requestUri.LastIndexOf(SubscriptionSegment, StringComparison.InvariantCultureIgnoreCase);
+
+                if (lastSubscriptionsSegmentIndex >= 0)
+                {
+                    var segments = requestUri
+                        .Substring(lastSubscriptionsSegmentIndex)
+                        .CoalesceString()
+                        .Trim('/')
+                        .SplitRemoveEmpty('/');
+
+                    if (IsDeletePollingRequest(segments))
+                    {
+                        
+                        var fullUri = request.RequestUri.ToString();
+                        var splitUri = fullUri.Split('?');
+                        if(splitUri[1].Equals("api-version=2021-05-01-preview", StringComparison.InvariantCultureIgnoreCase))
+                        {
+                            string uriString = splitUri[0];
+                            UriBuilder uri = new UriBuilder(uriString);
+                            var addQueryString = "?api-version=" + ExpandString;
+                            var apiString = uri.ToString() + addQueryString;
+                            request.RequestUri = new Uri(apiString);
+                        }
+                    }
+                }
+            }
+            
+            return base.SendAsync(request, cancellationToken);
+        }
+
+        private bool IsDeletePollingRequest(string[] segments)
+        {
+            if("operationresults".Equals(segments[2], StringComparison.InvariantCultureIgnoreCase))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        public object Clone()
+        {
+            return new StacksDeletePollingHandler();
+        }
+    }
+}

src/Resources/Resources.Test/sampleTemplateParams.json

@@ -1,6 +1,6 @@
 {
   "hostingPlanName": {
-    "value": "xDeploymentTestHost26668"
+    "value": "xDeploymentTestHost26669"
   },
   "siteLocation": {
     "value": "East US"