Add requested changes

azdevxps · azdevxps · commit a815e1953119 · 2017-10-18T13:51:53.000-07:00
diff --git a/src/ResourceManager/Profile/Commands.Profile/Default/ClearAzureRmDefault.cs b/src/ResourceManager/Profile/Commands.Profile/Default/ClearAzureRmDefault.cs
@@ -14,6 +14,8 @@
 
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+using Microsoft.Azure.Commands.Common.Authentication.ResourceManager;
+using Microsoft.Azure.Commands.Profile.Common;
 using Microsoft.Azure.Commands.Profile.Properties;
 using Microsoft.Azure.Commands.ResourceManager.Common;
 using Microsoft.Azure.Management.Internal.Resources;
@@ -28,7 +30,7 @@ namespace Microsoft.Azure.Commands.Profile.Default
     [Cmdlet(VerbsCommon.Clear, "AzureRmDefault", DefaultParameterSetName = ResourceGroupParameterSet,
          SupportsShouldProcess = true)]
     [OutputType(typeof(bool))]
-    public class ClearAzureRMDefaultCommand : AzureRMCmdlet
+    public class ClearAzureRMDefaultCommand : AzureContextModificationCmdlet
     {
         private const string ResourceGroupParameterSet = "ResourceGroup";
 
@@ -47,21 +49,23 @@ public override void ExecuteCmdlet()
             // If no parameters are specified, clear all defaults
             if (!ResourceGroup)
             {
-                if (Force.IsPresent || ShouldContinue(Resources.RemoveDefaultsMessage, Resources.RemoveDefaultsCaption))
-                {
-                    if (context.IsPropertySet(Resources.DefaultResourceGroupKey))
+                if (ShouldProcess(string.Format(Resources.DefaultResourceGroupTarget), Resources.DefaultResourceGroupRemovalWarning)) {
+                    if (Force.IsPresent || ShouldContinue(Resources.RemoveDefaultsMessage, Resources.RemoveDefaultsCaption))
                     {
-                        context.ExtendedProperties.Remove(Resources.DefaultResourceGroupKey);
-                        if (PassThru.IsPresent)
+                        if (context.IsPropertySet(Resources.DefaultResourceGroupKey))
                         {
-                            WriteObject(true);
+                            ModifyContext((profile, client) => RemoveDefaultProperty(profile));
+                            if (PassThru.IsPresent)
+                            {
+                                WriteObject(true);
+                            }
                         }
-                    }
-                    else
-                    {
-                        if (PassThru.IsPresent)
+                        else
                         {
-                            WriteObject(false);
+                            if (PassThru.IsPresent)
+                            {
+                                WriteObject(false);
+                            }
                         }
                     }
                 }
@@ -74,7 +78,7 @@ public override void ExecuteCmdlet()
                 {
                     if (ShouldProcess(string.Format(Resources.DefaultResourceGroupTarget), Resources.DefaultResourceGroupRemovalWarning))
                     {
-                        context.ExtendedProperties.Remove(Resources.DefaultResourceGroupKey);
+                        ModifyContext((profile, client) => RemoveDefaultProperty(profile));
                         if (PassThru.IsPresent)
                         {
                             WriteObject(true);
@@ -90,5 +94,11 @@ public override void ExecuteCmdlet()
                 }
             }
         }
+
+        private void RemoveDefaultProperty(IProfileOperations profile)
+        {
+            var context = profile.DefaultContext;
+            context.ExtendedProperties.Remove(Resources.DefaultResourceGroupKey);
+        }
     }
 }
diff --git a/src/ResourceManager/Profile/Commands.Profile/Default/SetAzureRMDefault.cs b/src/ResourceManager/Profile/Commands.Profile/Default/SetAzureRMDefault.cs
@@ -14,6 +14,8 @@
 
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
+using Microsoft.Azure.Commands.Common.Authentication.ResourceManager;
+using Microsoft.Azure.Commands.Profile.Common;
 using Microsoft.Azure.Commands.Profile.Models;
 using Microsoft.Azure.Commands.Profile.Properties;
 using Microsoft.Azure.Commands.ResourceManager.Common;
@@ -29,7 +31,7 @@ namespace Microsoft.Azure.Commands.Profile.Default
     [Cmdlet(VerbsCommon.Set, "AzureRmDefault", DefaultParameterSetName = ResourceGroupNameParameterSet,
         SupportsShouldProcess = true)]
     [OutputType(typeof(PSResourceGroup))]
-    public class SetAzureRMDefaultCommand : AzureRMCmdlet
+    public class SetAzureRMDefaultCommand : AzureContextModificationCmdlet
     {
         private const string ResourceGroupNameParameterSet = "ResourceGroupName";
 
@@ -43,28 +45,34 @@ public class SetAzureRMDefaultCommand : AzureRMCmdlet
         public override void ExecuteCmdlet()
         {
             IAzureContext context = AzureRmProfileProvider.Instance.Profile.DefaultContext;
-            IResourceManagementClient client = AzureSession.Instance.ClientFactory.CreateCustomArmClient<ResourceManagementClient>(
+            IResourceManagementClient resourceManagementclient = AzureSession.Instance.ClientFactory.CreateCustomArmClient<ResourceManagementClient>(
                                 context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager),
                                 AzureSession.Instance.AuthenticationFactory.GetServiceClientCredentials(context, AzureEnvironment.Endpoint.ResourceManager),
                                 AzureSession.Instance.ClientFactory.GetCustomHandlers());
-            client.SubscriptionId = context.Subscription.Id;
+            resourceManagementclient.SubscriptionId = context.Subscription.Id;
 
             if (ResourceGroupName != null)
             {
                 ResourceGroup defaultResourceGroup;
                 if (ShouldProcess(Resources.DefaultResourceGroupTarget, string.Format(Resources.DefaultResourceGroupChangeWarning, ResourceGroupName)))
                 {
-                    if (!client.ResourceGroups.CheckExistence(ResourceGroupName) && (Force.IsPresent || ShouldContinue(string.Format(Resources.CreateResourceGroupMessage, ResourceGroupName), Resources.CreateResourceGroupCaption)))
+                    if (!resourceManagementclient.ResourceGroups.CheckExistence(ResourceGroupName) && (Force.IsPresent || ShouldContinue(string.Format(Resources.CreateResourceGroupMessage, ResourceGroupName), Resources.CreateResourceGroupCaption)))
                     {
                         ResourceGroup parameters = new ResourceGroup("West US");
-                        client.ResourceGroups.CreateOrUpdate(ResourceGroupName, parameters);
+                        resourceManagementclient.ResourceGroups.CreateOrUpdate(ResourceGroupName, parameters);
                     }
-                    defaultResourceGroup = client.ResourceGroups.Get(ResourceGroupName);
-                    context.SetProperty(Resources.DefaultResourceGroupKey, defaultResourceGroup.Name);
 
+                    defaultResourceGroup = resourceManagementclient.ResourceGroups.Get(ResourceGroupName);
+                    ModifyContext((profile, client) => SetDefaultProperty(profile));
                     WriteObject(defaultResourceGroup);
                 }
             }
         }
+
+        private void SetDefaultProperty(IProfileOperations profile)
+        {
+            var context = profile.DefaultContext;
+            context.SetProperty(Resources.DefaultResourceGroupKey, ResourceGroupName);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`
`15`	`15`	`using Microsoft.Azure.Commands.Common.Authentication;`
`16`	`16`	`using Microsoft.Azure.Commands.Common.Authentication.Abstractions;`
	`17`	`+using Microsoft.Azure.Commands.Common.Authentication.ResourceManager;`
	`18`	`+using Microsoft.Azure.Commands.Profile.Common;`
`17`	`19`	`using Microsoft.Azure.Commands.Profile.Properties;`
`18`	`20`	`using Microsoft.Azure.Commands.ResourceManager.Common;`
`19`	`21`	`using Microsoft.Azure.Management.Internal.Resources;`
`@@ -28,7 +30,7 @@ namespace Microsoft.Azure.Commands.Profile.Default`
`28`	`30`	`[Cmdlet(VerbsCommon.Clear, "AzureRmDefault", DefaultParameterSetName = ResourceGroupParameterSet,`
`29`	`31`	`SupportsShouldProcess = true)]`
`30`	`32`	`[OutputType(typeof(bool))]`
`31`		`- public class ClearAzureRMDefaultCommand : AzureRMCmdlet`
	`33`	`+ public class ClearAzureRMDefaultCommand : AzureContextModificationCmdlet`
`32`	`34`	`{`
`33`	`35`	`private const string ResourceGroupParameterSet = "ResourceGroup";`
`34`	`36`
`@@ -47,21 +49,23 @@ public override void ExecuteCmdlet()`
`47`	`49`	`// If no parameters are specified, clear all defaults`
`48`	`50`	`if (!ResourceGroup)`
`49`	`51`	`{`
`50`		`- if (Force.IsPresent \|\| ShouldContinue(Resources.RemoveDefaultsMessage, Resources.RemoveDefaultsCaption))`
`51`		`- {`
`52`		`- if (context.IsPropertySet(Resources.DefaultResourceGroupKey))`
	`52`	`+ if (ShouldProcess(string.Format(Resources.DefaultResourceGroupTarget), Resources.DefaultResourceGroupRemovalWarning)) {`
	`53`	`+ if (Force.IsPresent \|\| ShouldContinue(Resources.RemoveDefaultsMessage, Resources.RemoveDefaultsCaption))`
`53`	`54`	`{`
`54`		`- context.ExtendedProperties.Remove(Resources.DefaultResourceGroupKey);`
`55`		`- if (PassThru.IsPresent)`
	`55`	`+ if (context.IsPropertySet(Resources.DefaultResourceGroupKey))`
`56`	`56`	`{`
`57`		`- WriteObject(true);`
	`57`	`+ ModifyContext((profile, client) => RemoveDefaultProperty(profile));`
	`58`	`+ if (PassThru.IsPresent)`
	`59`	`+ {`
	`60`	`+ WriteObject(true);`
	`61`	`+ }`
`58`	`62`	`}`
`59`		`- }`
`60`		`- else`
`61`		`- {`
`62`		`- if (PassThru.IsPresent)`
	`63`	`+ else`
`63`	`64`	`{`
`64`		`- WriteObject(false);`
	`65`	`+ if (PassThru.IsPresent)`
	`66`	`+ {`
	`67`	`+ WriteObject(false);`
	`68`	`+ }`
`65`	`69`	`}`
`66`	`70`	`}`
`67`	`71`	`}`
`@@ -74,7 +78,7 @@ public override void ExecuteCmdlet()`
`74`	`78`	`{`
`75`	`79`	`if (ShouldProcess(string.Format(Resources.DefaultResourceGroupTarget), Resources.DefaultResourceGroupRemovalWarning))`
`76`	`80`	`{`
`77`		`- context.ExtendedProperties.Remove(Resources.DefaultResourceGroupKey);`
	`81`	`+ ModifyContext((profile, client) => RemoveDefaultProperty(profile));`
`78`	`82`	`if (PassThru.IsPresent)`
`79`	`83`	`{`
`80`	`84`	`WriteObject(true);`
`@@ -90,5 +94,11 @@ public override void ExecuteCmdlet()`
`90`	`94`	`}`
`91`	`95`	`}`
`92`	`96`	`}`
	`97`	`+`
	`98`	`+ private void RemoveDefaultProperty(IProfileOperations profile)`
	`99`	`+ {`
	`100`	`+ var context = profile.DefaultContext;`
	`101`	`+ context.ExtendedProperties.Remove(Resources.DefaultResourceGroupKey);`
	`102`	`+ }`
`93`	`103`	`}`
`94`	`104`	`}`