Added RetryAfter support for New-AzureRmResourceGroupDeployment

Author: luanshixia

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj

@@ -134,6 +134,7 @@
     <Compile Include="Extensions\JsonExtensions.cs" />
     <Compile Include="Extensions\ObjectExtensions.cs" />
     <Compile Include="Extensions\PsObjectExtensions.cs" />
+    <Compile Include="Extensions\SdkClientExtensions.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="Handlers\AuthenticationHandler.cs" />
     <Compile Include="Handlers\RetryHandler.cs" />

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Extensions/SdkClientExtensions.cs

@@ -0,0 +1,59 @@
+// ----------------------------------------------------------------------------------
+//
+// 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.
+// ----------------------------------------------------------------------------------
+
+namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Extensions
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Net.Http;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.Azure.Management.ResourceManager;
+    using Microsoft.Azure.Management.ResourceManager.Models;
+
+    /// <summary>
+    /// SDK client extension methods
+    /// </summary>
+    public static class SdkClientExtensions
+    {
+        /// <summary>
+        /// Get a deployment with HTTP response (so headers are accessible).
+        /// </summary>
+        /// <param name="operations">The operations group for this extension method.</param>
+        /// <param name="resourceGroupName">The name of the resource group to get. The name is case insensitive.</param>
+        /// <param name="deploymentName">The name of the deployment.</param>
+        /// <returns>A tuple of the deployment and the HTTP response.</returns>
+        public static Tuple<DeploymentExtended, HttpResponseMessage> GetDeploymentWithResponseMessage(this IDeploymentsOperations operations, string resourceGroupName, string deploymentName)
+        {
+            return Task.Factory.StartNew(s => ((IDeploymentsOperations)s).GetDeploymentWithResponseMessageAsync(resourceGroupName, deploymentName), operations, CancellationToken.None, TaskCreationOptions.None, TaskScheduler.Default).Unwrap().GetAwaiter().GetResult();
+        }
+
+        /// <summary>
+        /// Get a deployment with HTTP response (so headers are accessible).
+        /// </summary>
+        /// <param name="operations">The operations group for this extension method.</param>
+        /// <param name="resourceGroupName">The name of the resource group to get. The name is case insensitive.</param>
+        /// <param name="deploymentName">The name of the deployment.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>A tuple of the deployment and the HTTP response.</returns>
+        public static async Task<Tuple<DeploymentExtended, HttpResponseMessage>> GetDeploymentWithResponseMessageAsync(this IDeploymentsOperations operations, string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, deploymentName, null, cancellationToken).ConfigureAwait(false))
+            {
+                return Tuple.Create(_result.Body, _result.Response);
+            }
+        }
+    }
+}

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/RestClients/ResourceManagerRestRestClient.cs

@@ -285,7 +285,7 @@ public Task<OperationResult> GetOperationResult<TType>(
         /// <summary>
         /// Put a single resource.
         /// </summary>
-        /// <param name="resourceId">The subscription Id.</param>
+        /// <param name="resourceId">The resource Id.</param>
         /// <param name="apiVersion">The API version to use.</param>
         /// <param name="resource">The resource to put.</param>
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> used to cancel the request.</param>

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/SdkClient/ResourceManagerSdkClient.cs

@@ -18,6 +18,7 @@
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Runtime.Serialization.Formatters;
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
@@ -313,8 +314,9 @@ private DeploymentExtended WaitDeploymentStatus(
             params ProvisioningState[] status)
         {
             DeploymentExtended deployment;
+            HttpResponseMessage response;
 
-            // Poll deployment state and deployment operations with two phases. In phase one, poll every 5 seconds. Phase one 
+            // Poll deployment state and deployment operations after RetryAfter, or if no RetryAfter provided, with two phases: In phase one, poll every 5 seconds. Phase one 
             // takes 400 seconds. In phase two, poll every 60 seconds. 
             const int counterUnit = 1000;
             int step = 5;
@@ -335,9 +337,17 @@ private DeploymentExtended WaitDeploymentStatus(
                     job(resourceGroup, deploymentName, basicDeployment);
                 }
 
-                deployment = ResourceManagementClient.Deployments.Get(resourceGroup, deploymentName);
-
-                step = phaseOne > 0 ? 5 : 60;
+                var tuple = ResourceManagementClient.Deployments.GetDeploymentWithResponseMessage(resourceGroup, deploymentName);
+                deployment = tuple.Item1;
+                response = tuple.Item2;
+                if (response.Headers.RetryAfter != null && response.Headers.RetryAfter.Delta.HasValue)
+                {
+                    step = response.Headers.RetryAfter.Delta.Value.Seconds;
+                }
+                else
+                {
+                    step = phaseOne > 0 ? 5 : 60;
+                }
 
             } while (!status.Any(s => s.ToString().Equals(deployment.Properties.ProvisioningState, StringComparison.OrdinalIgnoreCase)));