Skip to content

Commit 5b8d84a

Browse files
cormacpaynecormacpayne
committed
Resolve code review feedback
1 parent e56ce3a commit 5b8d84a

File tree

1 file changed

+65
-33
lines changed

1 file changed

+65
-33
lines changed

‎src/ResourceManager/Profile/Commands.Profile/Account/AddAzureRmAccount.cs

Lines changed: 65 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace Microsoft.Azure.Commands.Profile
2929
/// <summary>
3030
/// Cmdlet to log into an environment and download the subscriptions
3131
/// </summary>
32-
[Cmdlet("Add", "AzureRmAccount", DefaultParameterSetName = "User", SupportsShouldProcess=true)]
32+
[Cmdlet("Add", "AzureRmAccount", DefaultParameterSetName = "UserWithSubscriptionId", SupportsShouldProcess=true)]
3333
[Alias("Login-AzureRmAccount")]
3434
[OutputType(typeof(PSAzureProfile))]
3535
public class AddAzureRMAccountCommand : AzureRMCmdlet, IModuleAssemblyInitializer
@@ -53,59 +53,91 @@ public class AddAzureRMAccountCommand : AzureRMCmdlet, IModuleAssemblyInitialize
5353
public string EnvironmentName { get; set; }
5454

5555

56-
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionId, Mandatory = false, HelpMessage = "Optional credential", Position = 0)]
57-
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionName, Mandatory = false, HelpMessage = "Optional credential", Position = 0)]
58-
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionId, Mandatory = true, HelpMessage = "Credential")]
59-
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionName, Mandatory = true, HelpMessage = "Credential")]
56+
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionId,
57+
Mandatory = false, HelpMessage = "Optional credential", Position = 0)]
58+
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionName,
59+
Mandatory = false, HelpMessage = "Optional credential", Position = 0)]
60+
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionId,
61+
Mandatory = true, HelpMessage = "Credential")]
62+
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionName,
63+
Mandatory = true, HelpMessage = "Credential")]
6064
public PSCredential Credential { get; set; }
6165

62-
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId, Mandatory = true, HelpMessage = "Certificate Hash (Thumbprint)")]
63-
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName, Mandatory = true, HelpMessage = "Certificate Hash (Thumbprint)")]
66+
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId,
67+
Mandatory = true, HelpMessage = "Certificate Hash (Thumbprint)")]
68+
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName,
69+
Mandatory = true, HelpMessage = "Certificate Hash (Thumbprint)")]
6470
public string CertificateThumbprint { get; set; }
6571

66-
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId, Mandatory = true, HelpMessage = "SPN")]
67-
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName, Mandatory = true, HelpMessage = "SPN")]
72+
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId,
73+
Mandatory = true, HelpMessage = "SPN")]
74+
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName,
75+
Mandatory = true, HelpMessage = "SPN")]
6876
public string ApplicationId { get; set; }
6977

70-
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionId, Mandatory = true)]
71-
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionName, Mandatory = true)]
72-
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId, Mandatory = true)]
73-
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName, Mandatory = true)]
78+
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionId,
79+
Mandatory = true)]
80+
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionName,
81+
Mandatory = true)]
82+
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId,
83+
Mandatory = true)]
84+
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName,
85+
Mandatory = true)]
7486
public SwitchParameter ServicePrincipal { get; set; }
7587

76-
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionId, Mandatory = false, HelpMessage = "Optional tenant name or ID")]
77-
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionName, Mandatory = false, HelpMessage = "Optional tenant name or ID")]
78-
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionId, Mandatory = true, HelpMessage = "Tenant name or ID")]
79-
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionName, Mandatory = true, HelpMessage = "Tenant name or ID")]
80-
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionId, Mandatory = false, HelpMessage = "Tenant name or ID")]
81-
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionName, Mandatory = false, HelpMessage = "Tenant name or ID")]
82-
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId, Mandatory = true, HelpMessage = "Tenant name or ID")]
83-
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName, Mandatory = true, HelpMessage = "Tenant name or ID")]
88+
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionId,
89+
Mandatory = false, HelpMessage = "Optional tenant name or ID")]
90+
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionName,
91+
Mandatory = false, HelpMessage = "Optional tenant name or ID")]
92+
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionId,
93+
Mandatory = true, HelpMessage = "Tenant name or ID")]
94+
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionName,
95+
Mandatory = true, HelpMessage = "Tenant name or ID")]
96+
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionId,
97+
Mandatory = false, HelpMessage = "Tenant name or ID")]
98+
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionName,
99+
Mandatory = false, HelpMessage = "Tenant name or ID")]
100+
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId,
101+
Mandatory = true, HelpMessage = "Tenant name or ID")]
102+
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName,
103+
Mandatory = true, HelpMessage = "Tenant name or ID")]
84104
[Alias("Domain")]
85105
[ValidateNotNullOrEmpty]
86106
public string TenantId { get; set; }
87107

88-
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionId, Mandatory = true, HelpMessage = "AccessToken")]
89-
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionName, Mandatory = true, HelpMessage = "AccessToken")]
108+
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionId,
109+
Mandatory = true, HelpMessage = "AccessToken")]
110+
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionName,
111+
Mandatory = true, HelpMessage = "AccessToken")]
90112
[ValidateNotNullOrEmpty]
91113
public string AccessToken { get; set; }
92114

93-
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionId, Mandatory = true, HelpMessage = "Account Id for access token")]
94-
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionName, Mandatory = true, HelpMessage = "Account Id for access token")]
115+
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionId,
116+
Mandatory = true, HelpMessage = "Account Id for access token")]
117+
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionName,
118+
Mandatory = true, HelpMessage = "Account Id for access token")]
95119
[ValidateNotNullOrEmpty]
96120
public string AccountId { get; set; }
97121

98-
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionId, Mandatory = false, HelpMessage = "Subscription ID", ValueFromPipeline = true)]
99-
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionId, Mandatory = false, HelpMessage = "Subscription ID", ValueFromPipeline = true)]
100-
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId, Mandatory = false, HelpMessage = "Subscription ID", ValueFromPipeline = true)]
101-
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionId, Mandatory = false, HelpMessage = "Subscription ID", ValueFromPipeline = true)]
122+
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionId,
123+
Mandatory = false, HelpMessage = "Subscription ID", ValueFromPipeline = true)]
124+
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionId,
125+
Mandatory = false, HelpMessage = "Subscription ID", ValueFromPipeline = true)]
126+
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId,
127+
Mandatory = false, HelpMessage = "Subscription ID", ValueFromPipeline = true)]
128+
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionId,
129+
Mandatory = false, HelpMessage = "Subscription ID", ValueFromPipeline = true)]
102130
[ValidateNotNullOrEmpty]
103131
public string SubscriptionId { get; set; }
104132

105-
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionName, Mandatory = true, HelpMessage = "Subscription Name", ValueFromPipeline = true)]
106-
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionName, Mandatory = true, HelpMessage = "Subscription Name", ValueFromPipeline = true)]
107-
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName, Mandatory = true, HelpMessage = "Subscription Name", ValueFromPipeline = true)]
108-
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionName, Mandatory = true, HelpMessage = "Subscription Name", ValueFromPipeline = true)]
133+
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionName,
134+
Mandatory = true, HelpMessage = "Subscription Name", ValueFromPipeline = true)]
135+
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionName,
136+
Mandatory = true, HelpMessage = "Subscription Name", ValueFromPipeline = true)]
137+
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName,
138+
Mandatory = true, HelpMessage = "Subscription Name", ValueFromPipeline = true)]
139+
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionName,
140+
Mandatory = true, HelpMessage = "Subscription Name", ValueFromPipeline = true)]
109141
[ValidateNotNullOrEmpty]
110142
public string SubscriptionName { get; set; }
111143

0 commit comments

Comments
 (0)