Skip to content

huangpf PR: dev <- Azure:dev #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 12, 2016
Merged

huangpf PR: dev <- Azure:dev #630

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e56ce3a
Add position to Credential parameter, change parameter sets to includ…
cormacpayne Sep 30, 2016
5b8d84a
Resolve code review feedback
cormacpayne Oct 11, 2016
7c63206
Merge pull request #3042 from cormacpayne/fix-parameters
markcowl Oct 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 79 additions & 41 deletions src/ResourceManager/Profile/Commands.Profile/Account/AddAzureRmAccount.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,19 @@ namespace Microsoft.Azure.Commands.Profile
/// <summary>
/// Cmdlet to log into an environment and download the subscriptions
/// </summary>
[Cmdlet("Add", "AzureRmAccount", DefaultParameterSetName = "User", SupportsShouldProcess=true)]
[Cmdlet("Add", "AzureRmAccount", DefaultParameterSetName = "UserWithSubscriptionId", SupportsShouldProcess=true)]
[Alias("Login-AzureRmAccount")]
[OutputType(typeof(PSAzureProfile))]
public class AddAzureRMAccountCommand : AzureRMCmdlet, IModuleAssemblyInitializer
{
private const string UserParameterSet = "User";
private const string ServicePrincipalParameterSet = "ServicePrincipal";
private const string ServicePrincipalCertificateParameterSet = "ServicePrincipalCertificate";
private const string AccessTokenParameterSet = "AccessToken";
private const string SubscriptionNameParameterSet = "SubscriptionName";
private const string SubscriptionIdParameterSet = "SubscriptionId";
private const string UserParameterSetWithSubscriptionId = "UserWithSubscriptionId";
private const string UserParameterSetWithSubscriptionName = "UserWithSubscriptionName";
private const string ServicePrincipalParameterSetWithSubscriptionId = "ServicePrincipalWithSubscriptionId";
private const string ServicePrincipalParameterSetWithSubscriptionName = "ServicePrincipalWithSubscriptionName";
private const string ServicePrincipalCertificateParameterSetWithSubscriptionId = "ServicePrincipalCertificateWithSubscriptionId";
private const string ServicePrincipalCertificateParameterSetWithSubscriptionName = "ServicePrincipalCertificateWithSubscriptionName";
private const string AccessTokenParameterSetWithSubscriptionId = "AccessTokenWithSubscriptionId";
private const string AccessTokenParameterSetWithSubscriptionName = "AccessTokenWithSubscriptionName";

[Parameter(Mandatory = false, HelpMessage = "Environment containing the account to log into")]
[ValidateNotNullOrEmpty]
Expand All @@ -50,56 +52,92 @@ public class AddAzureRMAccountCommand : AzureRMCmdlet, IModuleAssemblyInitialize

public string EnvironmentName { get; set; }


[Parameter(ParameterSetName = UserParameterSet, Mandatory = false, HelpMessage = "Optional credential")]
[Parameter(ParameterSetName = ServicePrincipalParameterSet, Mandatory = true, HelpMessage = "Credential")]
[Parameter(ParameterSetName = SubscriptionIdParameterSet, Mandatory = false, HelpMessage = "Optional credential")]
[Parameter(ParameterSetName = SubscriptionNameParameterSet, Mandatory = false, HelpMessage = "Optional credential")]

[Parameter(ParameterSetName = UserParameterSetWithSubscriptionId,
Mandatory = false, HelpMessage = "Optional credential", Position = 0)]
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionName,
Mandatory = false, HelpMessage = "Optional credential", Position = 0)]
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionId,
Mandatory = true, HelpMessage = "Credential")]
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionName,
Mandatory = true, HelpMessage = "Credential")]
public PSCredential Credential { get; set; }

[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet, Mandatory = true, HelpMessage = "Certificate Hash (Thumbprint)")]
[Parameter(ParameterSetName = SubscriptionIdParameterSet, Mandatory = false, HelpMessage = "Certificate Hash (Thumbprint)")]
[Parameter(ParameterSetName = SubscriptionNameParameterSet, Mandatory = false, HelpMessage = "Certificate Hash (Thumbprint)")]
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId,
Mandatory = true, HelpMessage = "Certificate Hash (Thumbprint)")]
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName,
Mandatory = true, HelpMessage = "Certificate Hash (Thumbprint)")]
public string CertificateThumbprint { get; set; }

[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet, Mandatory = true, HelpMessage = "SPN")]
[Parameter(ParameterSetName = SubscriptionIdParameterSet, Mandatory = false, HelpMessage = "SPN")]
[Parameter(ParameterSetName = SubscriptionNameParameterSet, Mandatory = false, HelpMessage = "SPN")]

[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId,
Mandatory = true, HelpMessage = "SPN")]
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName,
Mandatory = true, HelpMessage = "SPN")]
public string ApplicationId { get; set; }

[Parameter(ParameterSetName = ServicePrincipalParameterSet, Mandatory = true)]
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet, Mandatory = true)]
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionId,
Mandatory = true)]
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionName,
Mandatory = true)]
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId,
Mandatory = true)]
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName,
Mandatory = true)]
public SwitchParameter ServicePrincipal { get; set; }

[Parameter(ParameterSetName = UserParameterSet, Mandatory = false, HelpMessage = "Optional tenant name or ID")]
[Parameter(ParameterSetName = ServicePrincipalParameterSet, Mandatory = true, HelpMessage = "TenantId name or ID")]
[Parameter(ParameterSetName = AccessTokenParameterSet, Mandatory = false, HelpMessage = "TenantId name or ID")]
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSet, Mandatory = true, HelpMessage = "TenantId name or ID")]
[Parameter(ParameterSetName = SubscriptionIdParameterSet, Mandatory = false, HelpMessage = "TenantId name or ID")]
[Parameter(ParameterSetName = SubscriptionNameParameterSet, Mandatory = false, HelpMessage = "TenantId name or ID")]

[Parameter(ParameterSetName = UserParameterSetWithSubscriptionId,
Mandatory = false, HelpMessage = "Optional tenant name or ID")]
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionName,
Mandatory = false, HelpMessage = "Optional tenant name or ID")]
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionId,
Mandatory = true, HelpMessage = "Tenant name or ID")]
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionName,
Mandatory = true, HelpMessage = "Tenant name or ID")]
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionId,
Mandatory = false, HelpMessage = "Tenant name or ID")]
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionName,
Mandatory = false, HelpMessage = "Tenant name or ID")]
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId,
Mandatory = true, HelpMessage = "Tenant name or ID")]
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName,
Mandatory = true, HelpMessage = "Tenant name or ID")]
[Alias("Domain")]
[ValidateNotNullOrEmpty]
public string TenantId { get; set; }

[Parameter(ParameterSetName = AccessTokenParameterSet, Mandatory = true, HelpMessage = "AccessToken")]
[Parameter(ParameterSetName = SubscriptionIdParameterSet, Mandatory = false, HelpMessage = "AccessToken")]
[Parameter(ParameterSetName = SubscriptionNameParameterSet, Mandatory = false, HelpMessage = "AccessToken")]

[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionId,
Mandatory = true, HelpMessage = "AccessToken")]
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionName,
Mandatory = true, HelpMessage = "AccessToken")]
[ValidateNotNullOrEmpty]
public string AccessToken { get; set; }

[Parameter(ParameterSetName = AccessTokenParameterSet, Mandatory = true, HelpMessage = "Account Id for access token")]
[Parameter(ParameterSetName = SubscriptionIdParameterSet, Mandatory = false, HelpMessage = "Account Id for access token")]
[Parameter(ParameterSetName = SubscriptionNameParameterSet, Mandatory = false, HelpMessage = "Account Id for access token")]

[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionId,
Mandatory = true, HelpMessage = "Account Id for access token")]
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionName,
Mandatory = true, HelpMessage = "Account Id for access token")]
[ValidateNotNullOrEmpty]
public string AccountId { get; set; }

[Parameter(ParameterSetName = SubscriptionIdParameterSet, Mandatory = false, HelpMessage = "Subscription", ValueFromPipelineByPropertyName = true)]
[Parameter(ParameterSetName = ServicePrincipalParameterSet, Mandatory = false, HelpMessage = "Subscription", ValueFromPipelineByPropertyName = true)]

[Parameter(ParameterSetName = UserParameterSetWithSubscriptionId,
Mandatory = false, HelpMessage = "Subscription ID", ValueFromPipeline = true)]
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionId,
Mandatory = false, HelpMessage = "Subscription ID", ValueFromPipeline = true)]
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionId,
Mandatory = false, HelpMessage = "Subscription ID", ValueFromPipeline = true)]
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionId,
Mandatory = false, HelpMessage = "Subscription ID", ValueFromPipeline = true)]
[ValidateNotNullOrEmpty]
public string SubscriptionId { get; set; }

[Parameter(ParameterSetName = SubscriptionNameParameterSet, Mandatory = false, HelpMessage = "Subscription Name", ValueFromPipelineByPropertyName = true)]
[Parameter(ParameterSetName = ServicePrincipalParameterSet, Mandatory = false, HelpMessage = "Subscription Name", ValueFromPipelineByPropertyName = true)]
[Parameter(ParameterSetName = UserParameterSetWithSubscriptionName,
Mandatory = true, HelpMessage = "Subscription Name", ValueFromPipeline = true)]
[Parameter(ParameterSetName = ServicePrincipalParameterSetWithSubscriptionName,
Mandatory = true, HelpMessage = "Subscription Name", ValueFromPipeline = true)]
[Parameter(ParameterSetName = ServicePrincipalCertificateParameterSetWithSubscriptionName,
Mandatory = true, HelpMessage = "Subscription Name", ValueFromPipeline = true)]
[Parameter(ParameterSetName = AccessTokenParameterSetWithSubscriptionName,
Mandatory = true, HelpMessage = "Subscription Name", ValueFromPipeline = true)]
[ValidateNotNullOrEmpty]
public string SubscriptionName { get; set; }

Expand Down