Merge pull request #190 from stankovski/dev

Fixed issue with account being wiped out by Select-AzureSubscription

Author: stankovski

src/Common/Commands.Common.Test/Common/ProfileCmdltsTests.cs

@@ -517,6 +517,50 @@ public void SelectAzureSubscriptionByNameUpdatesProfile()
             Assert.Equal(azureSubscription2.Id, cmdlt.Profile.Context.Subscription.Id);
         }
 
+        [Fact]
+        public void SelectAzureSubscriptionByNameWithoutAccountPreservesTheAccount()
+        {
+            SetupDefaultProfile();
+            SelectAzureSubscriptionCommand cmdlt = new SelectAzureSubscriptionCommand();
+
+            // Setup
+            cmdlt.CommandRuntime = commandRuntimeMock;
+            cmdlt.SetParameterSet("SelectSubscriptionByNameParameterSet");
+            cmdlt.SubscriptionName = azureSubscription2.Name;
+
+            // Act
+            cmdlt.InvokeBeginProcessing();
+            cmdlt.ExecuteCmdlet();
+            cmdlt.InvokeEndProcessing();
+
+            // Verify
+            Assert.NotNull(cmdlt.Profile.Context.Subscription);
+            Assert.Equal(azureSubscription2.Account, cmdlt.Profile.Context.Subscription.Account);
+            Assert.Equal(azureSubscription2.Id, cmdlt.Profile.Context.Subscription.Id);
+        }
+
+        [Fact]
+        public void SelectAzureSubscriptionByIdWithoutAccountPreservesTheAccount()
+        {
+            SetupDefaultProfile();
+            SelectAzureSubscriptionCommand cmdlt = new SelectAzureSubscriptionCommand();
+
+            // Setup
+            cmdlt.CommandRuntime = commandRuntimeMock;
+            cmdlt.SetParameterSet("SelectSubscriptionByIdParameterSet");
+            cmdlt.SubscriptionId = azureSubscription2.Id.ToString();
+
+            // Act
+            cmdlt.InvokeBeginProcessing();
+            cmdlt.ExecuteCmdlet();
+            cmdlt.InvokeEndProcessing();
+
+            // Verify
+            Assert.NotNull(cmdlt.Profile.Context.Subscription);
+            Assert.Equal(azureSubscription2.Account, cmdlt.Profile.Context.Subscription.Account);
+            Assert.Equal(azureSubscription2.Id, cmdlt.Profile.Context.Subscription.Id);
+        }
+
         [Fact]
         public void SelectAzureSubscriptionWithoutPassthroughDoesNotPrint()
         {

src/Common/Commands.Profile/Subscription/SelectAzureSubscription.cs

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------------
 
 using System;
+using System.Linq;
 using System.Management.Automation;
 using Microsoft.WindowsAzure.Commands.Common;
 using Microsoft.Azure.Common.Authentication.Models;
@@ -94,20 +95,20 @@ public override void ExecuteCmdlet()
             switch (ParameterSetName)
             {
                 case SelectSubscriptionByNameParameterSet:
-                    azureSubscription = ProfileClient.SetSubscriptionAsDefault(SubscriptionName, Account);
+                    azureSubscription = ProfileClient.SetSubscriptionAsDefault(SubscriptionName, GetAccount());
                     break;
 
                 case SelectSubscriptionByIdParameterSet:
-                    azureSubscription = ProfileClient.SetSubscriptionAsDefault(SubscriptionIdAsGuid(), Account);
+                    azureSubscription = ProfileClient.SetSubscriptionAsDefault(SubscriptionIdAsGuid(), GetAccount());
                     break;
 
                 case SelectDefaultSubscriptionByNameParameterSet:
-                    azureSubscription = ProfileClient.SetSubscriptionAsDefault(SubscriptionName, Account);
+                    azureSubscription = ProfileClient.SetSubscriptionAsDefault(SubscriptionName, GetAccount());
                     WriteWarning("Current and Default parameters have been deprecated. Select-AzureSubscription will always update the Default Subscription.");
                     break;
 
                 case SelectDefaultSubscriptionByIdParameterSet:
-                    azureSubscription = ProfileClient.SetSubscriptionAsDefault(SubscriptionIdAsGuid(), Account);
+                    azureSubscription = ProfileClient.SetSubscriptionAsDefault(SubscriptionIdAsGuid(), GetAccount());
                     WriteWarning("Current and Default parameters have been deprecated. Select-AzureSubscription will always update the Default Subscription.");
                     break;
 
@@ -126,6 +127,31 @@ public override void ExecuteCmdlet()
             }
         }
 
+        /// <summary>
+        /// Returns Account specified in the parameter or current account of the subscription
+        /// </summary>
+        /// <returns></returns>
+        private string GetAccount()
+        {
+            if (!string.IsNullOrEmpty(Account))
+            {
+                return Account;
+            }
+
+            AzureSubscription subscription = ProfileClient.Profile.Subscriptions.Values
+                .FirstOrDefault(s => s.Name.Equals(SubscriptionName, StringComparison.InvariantCultureIgnoreCase) ||
+                                     s.Id.ToString().Equals(SubscriptionId, StringComparison.InvariantCultureIgnoreCase));
+
+            if (subscription != null)
+            {
+                return subscription.Account;
+            }
+            else
+            {
+                return null;
+            }
+        }
+
         private Guid SubscriptionIdAsGuid()
         {
             Guid subscriptionIdGuid;