Add switch parameter to opt out of context population

Author: cormacpayne

src/ResourceManager/Profile/Commands.Profile/Account/ConnectAzureRmAccount.cs

@@ -51,42 +51,42 @@ public class ConnectAzureRmAccountCommand : AzureContextModificationCmdlet, IMod
         [ValidateNotNullOrEmpty]
         public string Environment { get; set; }
 
-        
-        [Parameter(ParameterSetName = UserParameterSet, 
+
+        [Parameter(ParameterSetName = UserParameterSet,
                     Mandatory = false, HelpMessage = "Optional credential", Position = 0)]
-        [Parameter(ParameterSetName = ServicePrincipalParameterSet, 
+        [Parameter(ParameterSetName = ServicePrincipalParameterSet,
                     Mandatory = true, HelpMessage = "Credential")]
         public PSCredential Credential { get; set; }
 
-        [Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet, 
+        [Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet,
                     Mandatory = true, HelpMessage = "Certificate Hash (Thumbprint)")]
         public string CertificateThumbprint { get; set; }
-        
-        [Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet, 
+
+        [Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet,
                     Mandatory = true, HelpMessage = "SPN")]
         public string ApplicationId { get; set; }
 
-        [Parameter(ParameterSetName = ServicePrincipalParameterSet, 
+        [Parameter(ParameterSetName = ServicePrincipalParameterSet,
                     Mandatory = true)]
-        [Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet, 
+        [Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet,
                     Mandatory = true)]
         public SwitchParameter ServicePrincipal { get; set; }
-        
-        [Parameter(ParameterSetName = UserParameterSet, 
+
+        [Parameter(ParameterSetName = UserParameterSet,
                     Mandatory = false, HelpMessage = "Optional tenant name or ID")]
-        [Parameter(ParameterSetName = ServicePrincipalParameterSet, 
+        [Parameter(ParameterSetName = ServicePrincipalParameterSet,
                     Mandatory = true, HelpMessage = "Tenant name or ID")]
-        [Parameter(ParameterSetName = AccessTokenParameterSet, 
+        [Parameter(ParameterSetName = AccessTokenParameterSet,
                     Mandatory = false, HelpMessage = "Tenant name or ID")]
-        [Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet, 
+        [Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet,
                     Mandatory = true, HelpMessage = "Tenant name or ID")]
         [Parameter(ParameterSetName = ManagedServiceParameterSet,
                     Mandatory = false, HelpMessage = "Optional tenant name or ID")]
         [Alias("Domain")]
         [ValidateNotNullOrEmpty]
         public string TenantId { get; set; }
-        
-        [Parameter(ParameterSetName = AccessTokenParameterSet, 
+
+        [Parameter(ParameterSetName = AccessTokenParameterSet,
                     Mandatory = true, HelpMessage = "AccessToken for Azure Resource Manager")]
         [ValidateNotNullOrEmpty]
         public string AccessToken { get; set; }
@@ -100,8 +100,8 @@ public class ConnectAzureRmAccountCommand : AzureContextModificationCmdlet, IMod
                    Mandatory = false, HelpMessage = "AccessToken for KeyVault Service")]
         [ValidateNotNullOrEmpty]
         public string KeyVaultAccessToken { get; set; }
-        
-        [Parameter(ParameterSetName = AccessTokenParameterSet, 
+
+        [Parameter(ParameterSetName = AccessTokenParameterSet,
                     Mandatory = true, HelpMessage = "Account Id for access token")]
         [Parameter(ParameterSetName = ManagedServiceParameterSet,
                     Mandatory = false, HelpMessage = "Account Id for managed service. Can be a managed service resource Id, or the associated client id. To use the SyatemAssigned identity, leave this field blank.")]
@@ -147,6 +147,9 @@ public class ConnectAzureRmAccountCommand : AzureContextModificationCmdlet, IMod
                     Mandatory = false, HelpMessage = "Skip validation for access token")]
         public SwitchParameter SkipValidation { get; set; }
 
+        [Parameter(Mandatory = false, HelpMessage = "Skips context population if no contexts are found.")]
+        public SwitchParameter SkipContextPopulation { get; set; }
+
         [Parameter(Mandatory = false, HelpMessage = "Overwrite the existing context with the same name, if any.")]
         public SwitchParameter Force { get; set; }
 
@@ -213,8 +216,8 @@ public override void ExecuteCmdlet()
                     builder.Port = ManagedServicePort;
                     builder.Path = "/oauth2/token";
 
-                    string msiSecret = this.IsBound(nameof(ManagedServiceSecret)) 
-                        ? ManagedServiceSecret.ConvertToString() 
+                    string msiSecret = this.IsBound(nameof(ManagedServiceSecret))
+                        ? ManagedServiceSecret.ConvertToString()
                         : System.Environment.GetEnvironmentVariable(MSISecretVariable);
 
                     string suppliedUri = this.IsBound(nameof(ManagedServiceHostName))
@@ -225,7 +228,7 @@ public override void ExecuteCmdlet()
                     {
                         azureAccount.SetProperty(AzureAccount.Property.MSILoginSecret, msiSecret);
                     }
-                       
+
                     if (!string.IsNullOrWhiteSpace(suppliedUri))
                     {
                         azureAccount.SetProperty(AzureAccount.Property.MSILoginUri, suppliedUri);
@@ -254,7 +257,7 @@ public override void ExecuteCmdlet()
             {
                 azureAccount.Id = ApplicationId;
             }
-             
+
             if (!string.IsNullOrWhiteSpace(CertificateThumbprint))
             {
                 azureAccount.SetThumbprint(CertificateThumbprint);
@@ -283,7 +286,8 @@ public override void ExecuteCmdlet()
                         password,
                         SkipValidation,
                         (s) => WriteWarning(s),
-                        name));
+                        name,
+                        !this.SkipContextPopulation.IsPresent));
                });
             }
         }
@@ -329,7 +333,7 @@ public void OnImport()
 #if DEBUG
                 }
 #endif
-                
+
                 bool autoSaveEnabled = AzureSession.Instance.ARMContextSaveMode == ContextSaveMode.CurrentUser;
                 var autosaveVariable = System.Environment.GetEnvironmentVariable(AzureProfileConstants.AzureAutosaveVariable);
                 bool localAutosave;

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

@@ -109,7 +109,8 @@ public AzureRmProfile Login(
             SecureString password,
             bool skipValidation,
             Action<string> promptAction,
-            string name = null)
+            string name = null,
+            bool shouldPopulateContextList = true)
         {
             IAzureSubscription newSubscription = null;
             IAzureTenant newTenant = null;
@@ -226,7 +227,7 @@ public AzureRmProfile Login(
                 }
             }
 
-            var shouldPopulateContextList = _profile.DefaultContext?.Account == null;
+            shouldPopulateContextList &= _profile.DefaultContext?.Account == null;
             if (newSubscription == null)
             {
                 if (subscriptionId != null)
@@ -264,7 +265,7 @@ public AzureRmProfile Login(
             if (shouldPopulateContextList)
             {
                 var defaultContext = _profile.DefaultContext;
-                var subscriptions = ListSubscriptions(tenantId);
+                var subscriptions = ListSubscriptions(tenantId).Take(25);
                 foreach (var subscription in subscriptions)
                 {
                     IAzureTenant tempTenant = new AzureTenant()