Added optional -UpdateBehavior for New cmdlets and added polling to New and Set cmdlets

Author: Xynoclafe

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

@@ -101,6 +101,10 @@ public class NewAzResourceGroupDeploymentStack : DeploymentStacksCmdletBase
             HelpMessage = "Description for the stack")]
         public string Description { get; set; }
 
+        [Parameter(Mandatory = false, ValueFromPipeline = true,
+            HelpMessage = "Update behavior for the stack. Value can be \"Detach\" or \"Purge\".")]
+        public String UpdateBehavior { get; set; }
+
         [Parameter(Mandatory = false,
         HelpMessage = "Do not ask for confirmation when overwriting an existing stack.")]
         public SwitchParameter Force { get; set; }
@@ -152,8 +156,8 @@ public override void ExecuteCmdlet()
                         ParameterUri,
                         parameters,
                         Description,
-                        "Detach"
-                        );
+                        UpdateBehavior == null ? "detach" : UpdateBehavior
+                        ) ;
                     WriteObject(deploymentStack);
                 };
 

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

@@ -99,6 +99,10 @@ public class NewAzSubscriptionDeploymentStack : DeploymentStacksCmdletBase
             HelpMessage = "Location of the stack")]
         public string Location { get; set; }
 
+        [Parameter(Mandatory = false, ValueFromPipeline = true,
+            HelpMessage = "Update behavior for the stack. Value can be \"Detach\" or \"Purge\".")]
+        public String UpdateBehavior { get; set; }
+
         [Parameter(Mandatory = false,
         HelpMessage = "Do not ask for confirmation when overwriting an existing stack.")]
         public SwitchParameter Force { get; set; }
@@ -150,7 +154,7 @@ public override void ExecuteCmdlet()
                     ParameterUri,
                     parameters,
                     Description,
-                    "Detach"
+                    UpdateBehavior == null ? "detach" : UpdateBehavior
                     );
                     WriteObject(deploymentStack);
                 };

src/Resources/ResourceManager/SdkClient/DeploymentStacksSdkClient.cs

@@ -16,6 +16,8 @@
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System.Management.Automation;
 using System.Linq;
+using Microsoft.Rest.Azure;
+using System.Threading.Tasks;
 
 namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.SdkClient
 {
@@ -25,6 +27,8 @@ public class DeploymentStacksSdkClient
 
         private IAzureContext azureContext;
 
+        public Action<string> VerboseLogger { get; set; }
+
         public DeploymentStacksSdkClient(IDeploymentStacksClient deploymentStacksClient)
         {
             this.DeploymentStacksClient = deploymentStacksClient;
@@ -350,7 +354,14 @@ string updateBehavior
 
 
             var deploymentStack = DeploymentStacksClient.DeploymentStacks.BeginCreateOrUpdateAtResourceGroup(resourceGroupName, deploymentStackName, deploymentStackModel);
-            return new PSDeploymentStack(deploymentStack);
+            var getStackFunc = this.GetStackAction(deploymentStackName, "resourceGroup", resourceGroupName);
+
+            var finalStack = this.waitStackCompletion(
+                getStackFunc,
+                "succeeded",
+                "failed"
+                );
+            return new PSDeploymentStack(finalStack);
         }
 
         internal void DeleteResourceGroupDeploymentStackSnapshot(string resourceGroupName, string name, string snapshotName)
@@ -474,7 +485,70 @@ string updateBehavior
             }
 
             var deploymentStack = DeploymentStacksClient.DeploymentStacks.BeginCreateOrUpdateAtSubscription(deploymentStackName, deploymentStackModel);
-            return new PSDeploymentStack(deploymentStack);
+            var getStackFunc = this.GetStackAction(deploymentStackName, "subscription");
+
+            var finalStack = this.waitStackCompletion(
+                getStackFunc,
+                "succeeded",
+                "failed"
+                );
+
+            return new PSDeploymentStack(finalStack);
+        }
+
+        private DeploymentStack waitStackCompletion(Func<Task<AzureOperationResponse<DeploymentStack>>> getStack, params string[] status)
+        {
+            //Poll stack deployment based on RetryAfter. If no RetyrAfter is present, polling status in two phases.
+            //Phase one: poll every 5 seconds for 400 seconds. If not completed in this duration, move to phase two
+            //Phase two: poll every 60 seconds
+            DeploymentStack stack;
+
+            const int counterUnit = 1000;
+            int step = 5;
+            int phaseOne = 400;
+            do
+            {
+                WriteVerbose(string.Format("Checking stack deployment status", step));
+                TestMockSupport.Delay(step * counterUnit);
+
+                if (phaseOne > 0)
+                    phaseOne -= step;
+
+                var getStackTask = getStack();
+
+                using (var getResult = getStackTask.ConfigureAwait(false).GetAwaiter().GetResult())
+                {
+                    stack = getResult.Body;
+                    var response = getResult.Response;
+
+                    if (response != null && 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.Equals(stack.ProvisioningState, StringComparison.OrdinalIgnoreCase)));
+
+            return stack;
+        }
+
+        Func<Task<AzureOperationResponse<DeploymentStack>>> GetStackAction(string stackName, string scope, string rgName = null)
+        {
+            switch(scope)
+            {
+                case "subscription":
+                    return () => DeploymentStacksClient.DeploymentStacks.GetAtSubscriptionWithHttpMessagesAsync(stackName);
+
+                case "resourceGroup":
+                    return () => DeploymentStacksClient.DeploymentStacks.GetAtResourceGroupWithHttpMessagesAsync(rgName, stackName);
+
+                default:
+                    throw new NotImplementedException();
+            }
         }
 
         public PSDeploymentStack UpdateResourceGroupDeploymentStack(
@@ -529,5 +603,13 @@ string description
             var deploymentStack = DeploymentStacksClient.DeploymentStacks.BeginCreateOrUpdateAtResourceGroup(resourceGroupName, deploymentStackName, deploymentStackModel);
             return new PSDeploymentStack(deploymentStack);
         }
+
+        private void WriteVerbose(string progress)
+        {
+            if (VerboseLogger != null)
+            {
+                VerboseLogger(progress);
+            }
+        }
     }
 }