Merge pull request Azure#697 from vivsriaus/dev

Add Complete to DeploymentMode when creating new deployment

Author: yugangw-msft

src/ResourceManager/Resources/Commands.Resources.Test/Models.ResourceGroups/ResourceClientTests.cs

@@ -1016,7 +1016,7 @@ public void TestTemplateShowsErrorMessage()
                 }))
                 .Callback((string rg, string dn, Deployment d, CancellationToken c) => { deploymentFromValidate = d; });
 
-            IEnumerable<PSResourceManagerError> error = resourcesClient.ValidatePSResourceGroupDeployment(parameters);
+            IEnumerable<PSResourceManagerError> error = resourcesClient.ValidatePSResourceGroupDeployment(parameters, DeploymentMode.Incremental);
             Assert.Equal(2, error.Count());
         }
 
@@ -1054,7 +1054,7 @@ public void TestTemplateShowsSuccessMessage()
                 }))
                 .Callback((string rg, string dn, Deployment d, CancellationToken c) => { deploymentFromValidate = d; });
 
-            IEnumerable<PSResourceManagerError> error = resourcesClient.ValidatePSResourceGroupDeployment(parameters);
+            IEnumerable<PSResourceManagerError> error = resourcesClient.ValidatePSResourceGroupDeployment(parameters, DeploymentMode.Incremental);
             Assert.Equal(0, error.Count());
             progressLoggerMock.Verify(f => f("Template is valid."), Times.Once());
         }

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceGroupTests.cs

@@ -74,7 +74,7 @@ public void TestNewDeploymentAndProviderRegistration()
             ResourcesController.NewInstance.RunPsTest("Test-NewDeploymentAndProviderRegistration");
         }
 
-        [Fact(Skip = "Known test failure")]
+        [Fact]
         public void TestNewResourceGroupWithTemplate()
         {
             ResourcesController.NewInstance.RunPsTest("Test-NewResourceGroupWithTemplateThenGetWithAndWithoutDetails");

src/ResourceManager/Resources/Commands.Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceGroupTests/TestNewResourceGroupWithTemplate.json

@@ -16,6 +16,7 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Resources.Models;
 using Microsoft.Azure.Commands.Resources.ResourceGroupDeployments;
+using Microsoft.Azure.Management.Resources.Models;
 using Moq;
 using Xunit;
 
@@ -75,9 +76,9 @@ public void ValidatesPSResourceGroupDeploymentWithUserTemplate()
                 }
             };
             resourcesClientMock.Setup(f => f.ValidatePSResourceGroupDeployment(
-                It.IsAny<ValidatePSResourceGroupDeploymentParameters>()))
+                It.IsAny<ValidatePSResourceGroupDeploymentParameters>(), DeploymentMode.Incremental))
                 .Returns(expected)
-                .Callback((ValidatePSResourceGroupDeploymentParameters p) => { actualParameters = p; });
+                .Callback((ValidatePSResourceGroupDeploymentParameters p, DeploymentMode m) => { actualParameters = p; m = DeploymentMode.Incremental; });
 
             cmdlet.ResourceGroupName = resourceGroupName;
             cmdlet.TemplateFile = expectedParameters.TemplateFile;
@@ -123,9 +124,9 @@ public void ValidatesPSResourceGroupDeploymentWithGalleryTemplate()
                 }
             };
             resourcesClientMock.Setup(f => f.ValidatePSResourceGroupDeployment(
-                It.IsAny<ValidatePSResourceGroupDeploymentParameters>()))
+                It.IsAny<ValidatePSResourceGroupDeploymentParameters>(), DeploymentMode.Incremental))
                 .Returns(expected)
-                .Callback((ValidatePSResourceGroupDeploymentParameters p) => { actualParameters = p; });
+                .Callback((ValidatePSResourceGroupDeploymentParameters p, DeploymentMode m) => { actualParameters = p; m = DeploymentMode.Incremental; });
 
             cmdlet.ResourceGroupName = resourceGroupName;
             cmdlet.GalleryTemplateIdentity = expectedParameters.GalleryTemplateIdentity;

src/ResourceManager/Resources/Commands.Resources.Test/Templates/TestAzureResourceGroupTemplateCommandTests.cs

@@ -12,11 +12,14 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Management.Resources.Models;
 
 namespace Microsoft.Azure.Commands.Resources.Models
 {
     public class CreatePSResourceGroupDeploymentParameters : ValidatePSResourceGroupDeploymentParameters
     {
         public string DeploymentName { get; set; }
+
+        public DeploymentMode DeploymentMode { get; set; }
     }
 }

src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/CreatePSDeploymentParameters.cs

@@ -302,7 +302,7 @@ public virtual List<GenericResourceExtended> FilterResources(FilterResourcesOpti
         public virtual PSResourceGroupDeployment ExecuteDeployment(CreatePSResourceGroupDeploymentParameters parameters)
         {
             parameters.DeploymentName = GenerateDeploymentName(parameters);
-            Deployment deployment = CreateBasicDeployment(parameters);
+            Deployment deployment = CreateBasicDeployment(parameters, parameters.DeploymentMode);
             TemplateValidationInfo validationInfo = CheckBasicDeploymentErrors(parameters.ResourceGroupName, parameters.DeploymentName, deployment);
 
             if (validationInfo.Errors.Count != 0)
@@ -563,9 +563,9 @@ public virtual void CancelDeployment(string resourceGroup, string deploymentName
         /// </summary>
         /// <param name="parameters">The deployment create options</param>
         /// <returns>True if valid, false otherwise.</returns>
-        public virtual List<PSResourceManagerError> ValidatePSResourceGroupDeployment(ValidatePSResourceGroupDeploymentParameters parameters)
+        public virtual List<PSResourceManagerError> ValidatePSResourceGroupDeployment(ValidatePSResourceGroupDeploymentParameters parameters, DeploymentMode deploymentMode)
         {
-            Deployment deployment = CreateBasicDeployment(parameters);
+            Deployment deployment = CreateBasicDeployment(parameters, deploymentMode);
             TemplateValidationInfo validationInfo = CheckBasicDeploymentErrors(parameters.ResourceGroupName, Guid.NewGuid().ToString(), deployment);
 
             if (validationInfo.Errors.Count == 0)

src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.ResourceManager.cs

@@ -324,12 +324,12 @@ private List<DeploymentOperation> GetNewOperations(List<DeploymentOperation> old
             return newOperations;
         }
 
-        private Deployment CreateBasicDeployment(ValidatePSResourceGroupDeploymentParameters parameters)
+        private Deployment CreateBasicDeployment(ValidatePSResourceGroupDeploymentParameters parameters, DeploymentMode deploymentMode)
         {
             Deployment deployment = new Deployment
             {
                 Properties = new DeploymentProperties {
-                    Mode = DeploymentMode.Incremental,
+                    Mode = deploymentMode,
                     Template = GetTemplate(parameters.TemplateFile, parameters.GalleryTemplateIdentity),
                     Parameters = GetDeploymentParameters(parameters.TemplateParameterObject)
                 }

src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs

@@ -14,6 +14,7 @@
 
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Resources.Models;
+using Microsoft.Azure.Management.Resources.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.Resources
@@ -34,20 +35,47 @@ public class NewAzureResourceGroupDeploymentCommand : ResourceWithParameterBaseC
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
 
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The deployment mode.")]
+        public DeploymentMode Mode { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
+        public SwitchParameter Force { get; set; }
+
+        public NewAzureResourceGroupDeploymentCommand()
+        {
+            this.Mode = DeploymentMode.Incremental;
+        }
+
         public override void ExecuteCmdlet()
         {
             CreatePSResourceGroupDeploymentParameters parameters = new CreatePSResourceGroupDeploymentParameters()
             {
                 ResourceGroupName = ResourceGroupName,
                 DeploymentName = Name,
+                DeploymentMode = Mode,
                 GalleryTemplateIdentity = GalleryTemplateIdentity,
                 TemplateFile = TemplateUri ?? this.TryResolvePath(TemplateFile),
                 TemplateParameterObject = GetTemplateParameterObject(TemplateParameterObject),
                 TemplateVersion = TemplateVersion,
                 StorageAccountName = StorageAccountName
             };
 
-            WriteObject(ResourcesClient.ExecuteDeployment(parameters));
+            if(this.Mode == DeploymentMode.Complete)
+            {
+                this.ConfirmAction(
+                    this.Force,
+                    "Are you sure you want to use the complete deployment mode? Resources in the resource group '" + ResourceGroupName + "' which are not included in the template will be deleted.",
+                    "Creating a deployment with Complete mode",
+                    ResourceGroupName,
+                    () =>
+                    {
+                        WriteObject(ResourcesClient.ExecuteDeployment(parameters));
+                    });
+            }
+            else
+            {
+                WriteObject(ResourcesClient.ExecuteDeployment(parameters));
+            }
         }
     }
 }

src/ResourceManager/Resources/Commands.Resources/ResourceGroupDeployments/NewAzureResourceGroupDeploymentCommand.cs

@@ -15,6 +15,7 @@
 using System.Collections.Generic;
 using System.Management.Automation;
 using Microsoft.Azure.Commands.Resources.Models;
+using Microsoft.Azure.Management.Resources.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.Azure.Commands.Resources.ResourceGroupDeployments
@@ -29,6 +30,14 @@ public class TestAzureResourceGroupTemplateCommand : ResourceWithParameterBaseCm
         [ValidateNotNullOrEmpty]
         public string ResourceGroupName { get; set; }
 
+        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The deployment mode.")]
+        public DeploymentMode Mode { get; set; }
+
+        public TestAzureResourceGroupTemplateCommand()
+        {
+            this.Mode = DeploymentMode.Incremental;
+        }
+
         public override void ExecuteCmdlet()
         {
             ValidatePSResourceGroupDeploymentParameters parameters = new ValidatePSResourceGroupDeploymentParameters()
@@ -41,7 +50,7 @@ public override void ExecuteCmdlet()
                 StorageAccountName = StorageAccountName
             };
 
-            WriteObject(ResourcesClient.ValidatePSResourceGroupDeployment(parameters));
+            WriteObject(ResourcesClient.ValidatePSResourceGroupDeployment(parameters, Mode));
         }
     }
 }