Merge pull request #3690 from cormacpayne/fix-get-context

Fix error when calling Get-AzureRmContext with no context

Author: markcowl

src/ResourceManager/Profile/Commands.Profile.Test/ContextCmdletTests.cs

@@ -71,6 +71,38 @@ public void GetAzureContext()
             Assert.Equal("test", context.Subscription.SubscriptionName);
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void GetAzureContextNoLogin()
+        {
+            var cmdlt = new GetAzureRMContextCommand();
+
+            // Setup
+            cmdlt.CommandRuntime = commandRuntimeMock;
+            var profile = AzureRmProfileProvider.Instance.Profile;
+            AzureRmProfileProvider.Instance.Profile = new AzureRMProfile();
+
+            try
+            {
+                // Act
+                cmdlt.InvokeBeginProcessing();
+                cmdlt.ExecuteCmdlet();
+                cmdlt.InvokeEndProcessing();
+            }
+            finally
+            {
+                AzureRmProfileProvider.Instance.Profile = profile;
+            }
+
+            // Verify
+            Assert.True(commandRuntimeMock.OutputPipeline.Count == 1);
+            var context = (PSAzureContext)commandRuntimeMock.OutputPipeline[0];
+            Assert.Null(context);
+            Assert.True(commandRuntimeMock.ErrorStream.Count == 1);
+            var error = commandRuntimeMock.ErrorStream[0];
+            Assert.Equal("Run Login-AzureRmAccount to login.", error.Exception.Message);
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SelectAzureContextWithNoSubscriptionAndTenant()

src/ResourceManager/Profile/Commands.Profile/Context/GetAzureRMContext.cs

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Profile.Models;
 using Microsoft.Azure.Commands.ResourceManager.Common;
 using Microsoft.WindowsAzure.Commands.Common;
@@ -26,9 +27,34 @@ namespace Microsoft.Azure.Commands.Profile
     [OutputType(typeof(PSAzureContext))]
     public class GetAzureRMContextCommand : AzureRMCmdlet
     {
+        /// <summary>
+        /// Gets the current default context.
+        /// </summary>
+        protected override AzureContext DefaultContext
+        {
+            get
+            {
+                if (DefaultProfile == null || DefaultProfile.Context == null)
+                {
+                    return null;
+                }
+
+                return DefaultProfile.Context;
+            }
+        }
+
         public override void ExecuteCmdlet()
         {
-            WriteObject((PSAzureContext)AzureRmProfileProvider.Instance.Profile.Context);
+            var context = (PSAzureContext)DefaultContext;
+            if (context == null)
+            {
+                WriteError(new ErrorRecord(
+                        new PSInvalidOperationException("Run Login-AzureRmAccount to login."),
+                        string.Empty,
+                        ErrorCategory.AuthenticationError,
+                        null));
+            }
+            WriteObject(context);
         }
     }
 }