From 7e91222afa2f43c53bfd5d16344a04c262843bba Mon Sep 17 00:00:00 2001 From: Beisi Zhou Date: Mon, 20 Jul 2020 15:33:58 +0800 Subject: [PATCH 1/2] Add a constant for more flexibility in setting the default value of MaxContentPopulation. --- .../Accounts/Account/ConnectAzureRmAccount.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs b/src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs index 2d2fdd56bca5..a1a399bdbee0 100644 --- a/src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs +++ b/src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs @@ -48,6 +48,7 @@ public class ConnectAzureRmAccountCommand : AzureContextModificationCmdlet, IMod public const string MSIEndpointVariable = "MSI_ENDPOINT"; public const string MSISecretVariable = "MSI_SECRET"; public const int DefaultMaxContextPopulation = 25; + public const string DefaultMaxContextPopulationString = "25"; private IAzureEnvironment _environment = AzureEnvironment.PublicEnvironments[EnvironmentName.AzureCloud]; @@ -158,13 +159,13 @@ public class ConnectAzureRmAccountCommand : AzureContextModificationCmdlet, IMod [Parameter(Mandatory = false, HelpMessage = "Skips context population if no contexts are found.")] public SwitchParameter SkipContextPopulation { get; set; } - [Parameter(ParameterSetName = UserParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is 25. To populate all subscriptions to contexts, set to -1.")] - [Parameter(ParameterSetName = UserWithCredentialParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is 25. To populate all subscriptions to contexts, set to -1.")] - [Parameter(ParameterSetName = ServicePrincipalParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is 25. To populate all subscriptions to contexts, set to -1.")] - [Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is 25. To populate all subscriptions to contexts, set to -1.")] - [Parameter(ParameterSetName = AccessTokenParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is 25. To populate all subscriptions to contexts, set to -1.")] - [Parameter(ParameterSetName = ManagedServiceParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is 25. To populate all subscriptions to contexts, set to -1.")] - [PSDefaultValue(Value = DefaultMaxContextPopulation)] + [Parameter(ParameterSetName = UserParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is "+ DefaultMaxContextPopulationString + ". To populate all subscriptions to contexts, set to -1.")] + [Parameter(ParameterSetName = UserWithCredentialParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is " + DefaultMaxContextPopulationString + ". To populate all subscriptions to contexts, set to -1.")] + [Parameter(ParameterSetName = ServicePrincipalParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is " + DefaultMaxContextPopulationString + ". To populate all subscriptions to contexts, set to -1.")] + [Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is " + DefaultMaxContextPopulationString + ". To populate all subscriptions to contexts, set to -1.")] + [Parameter(ParameterSetName = AccessTokenParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is " + DefaultMaxContextPopulationString + ". To populate all subscriptions to contexts, set to -1.")] + [Parameter(ParameterSetName = ManagedServiceParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is " + DefaultMaxContextPopulationString + ". To populate all subscriptions to contexts, set to -1.")] + [PSDefaultValue(Help= DefaultMaxContextPopulationString, Value = DefaultMaxContextPopulation)] [ValidateRange(-1,int.MaxValue)] public int MaxContextPopulation { get; set; } = DefaultMaxContextPopulation; From cb2f051b719cb5b19b9b2f49dbf004e2ea3135ca Mon Sep 17 00:00:00 2001 From: Yunchi Wang <54880216+wyunchi-ms@users.noreply.github.com> Date: Mon, 20 Jul 2020 17:04:38 +0800 Subject: [PATCH 2/2] Update ConnectAzureRmAccount.cs --- src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs b/src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs index a1a399bdbee0..d01f76d50010 100644 --- a/src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs +++ b/src/Accounts/Accounts/Account/ConnectAzureRmAccount.cs @@ -165,7 +165,7 @@ public class ConnectAzureRmAccountCommand : AzureContextModificationCmdlet, IMod [Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is " + DefaultMaxContextPopulationString + ". To populate all subscriptions to contexts, set to -1.")] [Parameter(ParameterSetName = AccessTokenParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is " + DefaultMaxContextPopulationString + ". To populate all subscriptions to contexts, set to -1.")] [Parameter(ParameterSetName = ManagedServiceParameterSet, Mandatory = false, HelpMessage = "Max subscription number to populate contexts after login. Default is " + DefaultMaxContextPopulationString + ". To populate all subscriptions to contexts, set to -1.")] - [PSDefaultValue(Help= DefaultMaxContextPopulationString, Value = DefaultMaxContextPopulation)] + [PSDefaultValue(Help = DefaultMaxContextPopulationString, Value = DefaultMaxContextPopulation)] [ValidateRange(-1,int.MaxValue)] public int MaxContextPopulation { get; set; } = DefaultMaxContextPopulation;