Skip to content

. #170

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 9 commits into from
Oct 23, 2015
Merged

. #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e82498b
[#105517922] Update Select-AzureRmSubscription to pass in subscriptio…
Oct 21, 2015
c5c79e2
Fixed failing tests
Oct 21, 2015
ec0eae5
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
Oct 22, 2015
3f2656b
Addressing review comments
Oct 22, 2015
3f92c7e
[#106171538] Changed Tenant to TenantId in cmdletst
Oct 22, 2015
bd1cfc2
Merge pull request #1151 from hovsepm/dev
Oct 22, 2015
572f0ba
Merge branch 'dev' of github.com:Azure/azure-powershell into TenantId
Oct 22, 2015
bc64d6b
Fixed build breaks
Oct 22, 2015
7e29780
Merge pull request #1155 from hovsepm/TenantId
Oct 23, 2015
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
6 changes: 4 additions & 2 deletions src/ResourceManager/Profile/Commands.Profile.Test/ContextCmdletTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
using System;
using Microsoft.Azure.Commands.Profile.Models;
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
using System.Management.Automation;

namespace Microsoft.Azure.Commands.ResourceManager.Profile.Test
{
Expand Down Expand Up @@ -58,7 +59,7 @@ public void GetAzureContext()
var context = (PSAzureContext) commandRuntimeMock.OutputPipeline[0];
Assert.Equal("test", context.Subscription.SubscriptionName);
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void SelectAzureContextWithNoSubscriptionAndTenant()
Expand All @@ -76,7 +77,8 @@ public void SelectAzureContextWithNoSubscriptionAndTenant()
// Verify
Assert.True(commandRuntimeMock.OutputPipeline.Count == 1);
var context = (PSAzureContext)commandRuntimeMock.OutputPipeline[0];
Assert.Equal("72f988bf-86f1-41af-91ab-2d7cd011db47", context.Tenant.TenantId);
// TenantId is not sufficient to change the context.
Assert.NotEqual("72f988bf-86f1-41af-91ab-2d7cd011db47", context.Tenant.TenantId);
}

[Fact]
Expand Down
10 changes: 5 additions & 5 deletions src/ResourceManager/Profile/Commands.Profile.Test/LoginCmdletTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void LoginWithSubscriptionAndTenant()
// Setup
cmdlt.CommandRuntime = commandRuntimeMock;
cmdlt.SubscriptionId = "2c224e7e-3ef5-431d-a57b-e71f4662e3a6";
cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
cmdlt.TenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47";

// Act
cmdlt.InvokeBeginProcessing();
Expand All @@ -69,7 +69,7 @@ public void LoginWithInvalidSubscriptionAndTenantThrowsCloudException()
// Setup
cmdlt.CommandRuntime = commandRuntimeMock;
cmdlt.SubscriptionId = "2c224e7e-3ef5-431d-a57b-e71f4662e3a5";
cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
cmdlt.TenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47";

// Act
cmdlt.InvokeBeginProcessing();
Expand Down Expand Up @@ -119,7 +119,7 @@ public void LoginWithNoSubscriptionAndTenant()
var cmdlt = new AddAzureRMAccountCommand();
// Setup
cmdlt.CommandRuntime = commandRuntimeMock;
cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
cmdlt.TenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47";

// Act
cmdlt.InvokeBeginProcessing();
Expand All @@ -137,7 +137,7 @@ public void LoginWithSubscriptionname()
var cmdlt = new AddAzureRMAccountCommand();
// Setup
cmdlt.CommandRuntime = commandRuntimeMock;
cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
cmdlt.TenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47";
cmdlt.SubscriptionName = "Node CLI Test";

// Act
Expand All @@ -156,7 +156,7 @@ public void LoginWithBothSubscriptionIdAndNameThrowsCloudException()
var cmdlt = new AddAzureRMAccountCommand();
// Setup
cmdlt.CommandRuntime = commandRuntimeMock;
cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
cmdlt.TenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47";
cmdlt.SubscriptionName = "Node CLI Test";
cmdlt.SubscriptionId = "2c224e7e-3ef5-431d-a57b-e71f4662e3a6";

Expand Down
256 changes: 224 additions & 32 deletions ...crosoft.Azure.Commands.Profile.Test.SubscriptionCmdletTests/PipingWithRmContextWorks.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions src/ResourceManager/Profile/Commands.Profile.Test/SubscriptionCmdletTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ function Test-PipingWithContext
$name = $firstSubscription.SubscriptionName
$nameContext = Get-AzureRmSubscription -SubscriptionName $name | Set-AzureRmContext
$idContext = Get-AzureRmSubscription -SubscriptionId $id | Set-AzureRmContext
$contextByName = Set-AzureRmContext -SubscriptionName $name
Assert-True { $nameContext -ne $null }
Assert-True { $nameContext.Subscription -ne $null }
Assert-True { $nameContext.Subscription.SubscriptionId -ne $null }
Expand All @@ -62,6 +63,11 @@ function Test-PipingWithContext
Assert-True { $idContext.Subscription.SubscriptionName -ne $null }
Assert-AreEqual $idContext.Subscription.SubscriptionId $nameContext.Subscription.SubscriptionId
Assert-AreEqual $idContext.Subscription.SubscriptionName $nameContext.Subscription.SubscriptionName
Assert-True { $contextByName -ne $null }
Assert-True { $contextByName.Subscription -ne $null }
Assert-True { $contextByName.Subscription.SubscriptionId -ne $null }
Assert-True { $contextByName.Subscription.SubscriptionName -ne $null }
Assert-AreEqual $contextByName.Subscription.SubscriptionName $nameContext.Subscription.SubscriptionName
}

function Test-SetAzureRmContextEndToEnd
Expand Down
6 changes: 3 additions & 3 deletions src/ResourceManager/Profile/Commands.Profile.Test/TenantCmdletTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void GetTenantWithTenantParameter()
var cmdlt = new GetAzureRMTenantCommand();
// Setup
cmdlt.CommandRuntime = commandRuntimeMock;
cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47";
cmdlt.TenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47";

// Act
Login("2c224e7e-3ef5-431d-a57b-e71f4662e3a6", null);
Expand All @@ -69,7 +69,7 @@ public void GetTenantWithDomainParameter()
var cmdlt = new GetAzureRMTenantCommand();
// Setup
cmdlt.CommandRuntime = commandRuntimeMock;
cmdlt.Tenant = "microsoft.com";
cmdlt.TenantId = "microsoft.com";

// Act
Login("2c224e7e-3ef5-431d-a57b-e71f4662e3a6", null);
Expand Down Expand Up @@ -107,7 +107,7 @@ private void Login(string subscriptionId, string tenantId)
// Setup
cmdlt.CommandRuntime = commandRuntimeMock;
cmdlt.SubscriptionId = subscriptionId;
cmdlt.Tenant = tenantId;
cmdlt.TenantId = tenantId;

// Act
cmdlt.InvokeBeginProcessing();
Expand Down
9 changes: 5 additions & 4 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 @@ -48,8 +48,9 @@ public class AddAzureRMAccountCommand : AzureRMCmdlet , IModuleAssemblyInitializ
[Parameter(ParameterSetName = "User", Mandatory = false, HelpMessage = "Optional tenant name or ID")]
[Parameter(ParameterSetName = "ServicePrincipal", Mandatory = true, HelpMessage = "TenantId name or ID")]
[Parameter(ParameterSetName = "AccessToken", Mandatory = false, HelpMessage = "TenantId name or ID")]
[Alias("Tenant")]
[ValidateNotNullOrEmpty]
public string Tenant { get; set; }
public string TenantId { get; set; }

[Parameter(ParameterSetName = "AccessToken", Mandatory = true, HelpMessage = "AccessToken")]
[ValidateNotNullOrEmpty]
Expand Down Expand Up @@ -126,9 +127,9 @@ protected override void ProcessRecord()
password = Credential.Password;
}

if (!string.IsNullOrEmpty(Tenant))
if (!string.IsNullOrEmpty(TenantId))
{
azureAccount.SetProperty(AzureAccount.Property.Tenants, new[] { Tenant });
azureAccount.SetProperty(AzureAccount.Property.Tenants, new[] { TenantId });
}

if( AzureRmProfileProvider.Instance.Profile == null)
Expand All @@ -138,7 +139,7 @@ protected override void ProcessRecord()

var profileClient = new RMProfileClient(AzureRmProfileProvider.Instance.Profile);

WriteObject((PSAzureProfile)profileClient.Login(azureAccount, Environment, Tenant, SubscriptionId,
WriteObject((PSAzureProfile)profileClient.Login(azureAccount, Environment, TenantId, SubscriptionId,
SubscriptionName, password));
}

Expand Down
60 changes: 42 additions & 18 deletions src/ResourceManager/Profile/Commands.Profile/Context/SetAzureRMContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,38 +17,36 @@
using Microsoft.Azure.Commands.Profile.Models;
using Microsoft.Azure.Commands.ResourceManager.Common;
using Microsoft.WindowsAzure.Commands.Common;
using Microsoft.Azure.Commands.Profile.Properties;

namespace Microsoft.Azure.Commands.Profile
{
/// <summary>
/// Cmdlet to change current Azure context.
/// </summary>
[Cmdlet(VerbsCommon.Set, "AzureRmContext", DefaultParameterSetName =TenantIdAndSubscriptionIdParameterSet)]
[Cmdlet(VerbsCommon.Set, "AzureRmContext", DefaultParameterSetName = SubscriptionNameParameterSet)]
[Alias("Select-AzureRmSubscription")]
[OutputType(typeof(PSAzureContext))]
public class SetAzureRMContextCommand : AzureRMCmdlet
{
private const string TenantIdParameterSet = "TenantId";
private const string SubscriptionIdParameterSet = "Subscription";
private const string TenantIdAndSubscriptionIdParameterSet = "TenantIdAndSubscriptionId";
private const string SubscriptionNameParameterSet = "SubscriptionName";
private const string SubscriptionIdParameterSet = "SubscriptionId";
private const string ContextParameterSet = "Context";

[Parameter(ParameterSetName = TenantIdParameterSet, Mandatory = false, HelpMessage = "TenantId name or ID", ValueFromPipelineByPropertyName=true)]
[Parameter(ParameterSetName = TenantIdAndSubscriptionIdParameterSet, Mandatory = false, HelpMessage = "TenantId name or ID", ValueFromPipelineByPropertyName=true)]
[Parameter(ParameterSetName = SubscriptionNameParameterSet, Mandatory = false, HelpMessage = "TenantId name or ID", ValueFromPipelineByPropertyName = true)]
[Parameter(ParameterSetName = SubscriptionIdParameterSet, Mandatory = false, HelpMessage = "TenantId name or ID", ValueFromPipelineByPropertyName = true)]
[ValidateNotNullOrEmpty]
public string TenantId { get; set; }

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

[Parameter(ParameterSetName = SubscriptionIdParameterSet, Mandatory = true, HelpMessage = "Subscription", ValueFromPipelineByPropertyName = true)]
[ValidateNotNullOrEmpty]
public string SubscriptionId { get; set; }

[Parameter(ParameterSetName = SubscriptionIdParameterSet, Mandatory = false, HelpMessage = "Subscription Name", ValueFromPipelineByPropertyName=true)]
[Parameter(ParameterSetName = TenantIdAndSubscriptionIdParameterSet, Mandatory = false, HelpMessage = "Subscription Name", ValueFromPipelineByPropertyName=true)]
[Parameter(ParameterSetName = SubscriptionNameParameterSet, Mandatory = true, HelpMessage = "Subscription Name", ValueFromPipelineByPropertyName = true)]
[ValidateNotNullOrEmpty]
public string SubscriptionName{ get; set; }
[Parameter(ParameterSetName = ContextParameterSet, Mandatory = true, HelpMessage = "Context", ValueFromPipeline=true)]
public string SubscriptionName { get; set; }

[Parameter(ParameterSetName = ContextParameterSet, Mandatory = true, HelpMessage = "Context", ValueFromPipeline = true)]
public PSAzureContext Context { get; set; }

protected override void ProcessRecord()
Expand All @@ -58,14 +56,40 @@ protected override void ProcessRecord()
AzureRmProfileProvider.Instance.Profile.SetContextWithCache(new AzureContext(Context.Subscription, Context.Account,
Context.Environment, Context.Tenant));
}
else
else if (ParameterSetName == SubscriptionNameParameterSet)
{
var profileClient = new RMProfileClient(AzureRmProfileProvider.Instance.Profile);
profileClient.SetCurrentContext(SubscriptionId, TenantId);
if (!string.IsNullOrWhiteSpace(SubscriptionName))
AzureSubscription subscription = null;
string tenantId = AzureRmProfileProvider.Instance.Profile.Context.Tenant.Id.ToString();

if (string.IsNullOrWhiteSpace(TenantId))
{
WriteVerbose(
string.Format(
Resources.CurrentTenantInUse,
tenantId));
}
else
{
AzureRmProfileProvider.Instance.Profile.Context.Subscription.Name = SubscriptionName;
tenantId = TenantId;
}

if (!profileClient.TryGetSubscriptionByName(
tenantId,
SubscriptionName,
out subscription))
{
throw new ItemNotFoundException(
string.Format(Resources.SubscriptionNameNotFoundError, SubscriptionName));
}

profileClient.SetCurrentContext(subscription.Id.ToString(), tenantId, verifySubscription: false);
AzureRmProfileProvider.Instance.Profile.Context.Subscription.Name = SubscriptionName;
}
else if (ParameterSetName == SubscriptionIdParameterSet)
{
var profileClient = new RMProfileClient(AzureRmProfileProvider.Instance.Profile);
profileClient.SetCurrentContext(SubscriptionId, TenantId);
}
WriteObject((PSAzureContext)AzureRmProfileProvider.Instance.Profile.Context);
}
Expand Down
Loading