Merge pull request #6003 from cormacpayne/context-default

Enable context autosave by default

Author: markcowl

src/Common/Commands.Common.Authentication/AzureSessionInitializer.cs

@@ -97,6 +97,17 @@ static ContextAutosaveSettings InitializeSessionSettings(IDataStore store, strin
                     result.Mode = settings.Mode;
                     result.ContextFile = settings.ContextFile ?? result.ContextFile;
                 }
+                else
+                {
+                    string directoryPath = Path.GetDirectoryName(profileDirectory);
+                    if (!store.DirectoryExists(directoryPath))
+                    {
+                        store.CreateDirectory(directoryPath);
+                    }
+                    string autoSavePath = Path.Combine(profileDirectory, settingsFile);
+                    store.WriteFile(autoSavePath, JsonConvert.SerializeObject(result));
+                    result.Mode = ContextSaveMode.CurrentUser;
+                }
             }
             catch
             {
@@ -191,7 +202,7 @@ public override System.Diagnostics.TraceLevel AuthenticationLegacyTraceLevel
                 }
                 set
                 {
-                    
+
                 }
             }
 

src/ResourceManager/Common/Commands.Common.Authentication.ResourceManager/AzureRmProfile.cs

@@ -40,7 +40,7 @@ public class AzureRmProfile : IAzureContextContainer, IProfileOperations
         public IDictionary<string, IAzureContext> Contexts { get; set; } = new ConcurrentDictionary<string, IAzureContext>(StringComparer.CurrentCultureIgnoreCase);
 
         /// <summary>
-        /// Gets the path of the profile file. 
+        /// Gets the path of the profile file.
         /// </summary>
         [JsonIgnore]
         [XmlIgnore]
@@ -271,7 +271,7 @@ public void Save(IFileProvider provider, bool serializeCache = true)
                     writer.Write(contents);
                     writer.Flush();
 
-                    // When writing to a stream, ensure that the file is truncated 
+                    // When writing to a stream, ensure that the file is truncated
                     // so that previous data is overwritten
                     provider.Stream.SetLength(provider.Stream.Position);
                 }
@@ -386,20 +386,9 @@ public bool TryGetContextName(IAzureContext context, out string name)
             if (context != null)
             {
 
-                if ((context.Account != null && !string.IsNullOrWhiteSpace(context.Account.Id)) || context.Subscription != null)
+                if (context.Subscription != null)
                 {
-                    List<string> components = new List<string>();
-                    if (context.Account != null && !string.IsNullOrWhiteSpace(context.Account.Id))
-                    {
-                        components.Add(context.Account.Id);
-                    }
-
-                    if (context.Subscription != null)
-                    {
-                        components.Add(context.Subscription.GetId().ToString());
-                    }
-
-                    name = string.Format("[{0}]", string.Join(", ", components));
+                    name = string.Format("{0} - {1}", context.Subscription.Name, context.Subscription.Id);
                     result = true;
                 }
                 else

src/ResourceManager/Profile/ChangeLog.md

@@ -19,6 +19,8 @@
 -->
 ## Current Release
 * Set minimum dependency of module to PowerShell 5.0
+* Enable context autosave by default
+* Create a context for each subscription when running `Connect-AzureRmAccount` with no previous context
 * Add USGovernmentOperationalInsightsEndpoint and USGovernmentOperationalInsightsEndpointResourceId properties to Azure environment for US Gov.
 
 ## Version 4.6.0

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

@@ -96,12 +96,7 @@ public void GetAzureContextNoLogin()
             }
 
             // Verify
-            Assert.True(commandRuntimeMock.OutputPipeline.Count == 1);
-            var context = (PSAzureContext)commandRuntimeMock.OutputPipeline[0];
-            Assert.True(context == null || context.Account == null || context.Account.Id == null);
-            Assert.True(commandRuntimeMock.ErrorStream.Count == 1);
-            var error = commandRuntimeMock.ErrorStream[0];
-            Assert.Equal("Run Connect-AzureRmAccount to login.", error.Exception.Message);
+            Assert.True(commandRuntimeMock.OutputPipeline.Count == 0);
         }
 
         [Fact]
@@ -131,9 +126,7 @@ public void ListAzureContextNoLogin()
 
             // Verify
             Assert.Equal(0, commandRuntimeMock.OutputPipeline.Count);
-            Assert.True(commandRuntimeMock.ErrorStream.Count == 1);
-            var error = commandRuntimeMock.ErrorStream[0];
-            Assert.Equal("Run Connect-AzureRmAccount to login.", error.Exception.Message);
+            Assert.True(commandRuntimeMock.ErrorStream.Count == 0);
         }
 
 

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

@@ -83,7 +83,7 @@ public void DataCollectionSettingPreventsFileWrite()
                 Assert.Equal(typeof(AuthenticationStoreTokenCache), session.TokenCache.GetType());
                 Assert.NotNull(AzureRmProfileProvider.Instance);
                 Assert.Equal(typeof(ResourceManagerProfileProvider), AzureRmProfileProvider.Instance.GetType());
-                store.Verify(f => f.WriteFile(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
+                store.Verify(f => f.WriteFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
             }
             finally
             {

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

@@ -25,7 +25,7 @@
 namespace Microsoft.Azure.Commands.Profile
 {
     /// <summary>
-    /// Cmdlet to get current context. 
+    /// Cmdlet to get current context.
     /// </summary>
     [Cmdlet(VerbsCommon.Get, "AzureRmContext", DefaultParameterSetName = GetSingleParameterSet)]
     [OutputType(typeof(PSAzureContext))]
@@ -53,13 +53,10 @@ protected override IAzureContext DefaultContext
 
         public override void ExecuteCmdlet()
         {
+            // If no context is found, return
             if (DefaultContext == null)
             {
-                WriteError(new ErrorRecord(
-                        new PSInvalidOperationException(Resources.RunLoginCmdlet),
-                        string.Empty,
-                        ErrorCategory.AuthenticationError,
-                        null));
+                return;
             }
 
             if (ListAvailable.IsPresent)
@@ -102,6 +99,15 @@ void WriteContext(IAzureContext azureContext, string name)
                 context.Name = name;
             }
 
+            // Don't write the default (empty) context to the output stream
+            if (context.Account == null &&
+                context.Environment == null &&
+                context.Subscription == null &&
+                context.Tenant == null)
+            {
+                return;
+            }
+
             WriteObject(context);
         }
 

src/ResourceManager/Profile/Commands.Profile/Models/RMProfileClient.cs

@@ -140,7 +140,6 @@ public AzureRmProfile Login(
                     Id = tenantId
                 };
             }
-
             else
             {
                 // (tenant and subscription are present) OR
@@ -227,6 +226,7 @@ public AzureRmProfile Login(
                 }
             }
 
+            bool shouldPopulateContextList = _profile.DefaultContext?.Account == null;
             if (newSubscription == null)
             {
                 if (subscriptionId != null)
@@ -261,6 +261,29 @@ public AzureRmProfile Login(
             }
 
             _profile.DefaultContext.TokenCache = _cache;
+            var defaultContext = _profile.DefaultContext;
+            if (shouldPopulateContextList)
+            {
+                var subscriptions = ListSubscriptions(tenantId);
+                foreach (var subscription in subscriptions)
+                {
+                    var tempContext = new AzureContext(subscription, account, environment, newTenant);
+                    string tempName = null;
+                    if (!_profile.TryGetContextName(tempContext, out tempName))
+                    {
+                        WriteWarningMessage(string.Format("Unable to get context name for subscription with id '{0}'.", subscription.Id));
+                        continue;
+                    }
+
+                    if (!_profile.TrySetContext(tempName, tempContext))
+                    {
+                        WriteWarningMessage(string.Format("Cannot create a context for subscription with id '{0}'.", subscription.Id));
+                    }
+                }
+
+                _profile.TrySetDefaultContext(defaultContext);
+                _profile.TryRemoveContext("Default");
+            }
 
             return _profile.ToProfile();
         }