Skip to content

[fixes #103937270] Add -SubscriptionName to Get-AzureRMSubscription #971

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 2 commits into from
Sep 24, 2015
Merged

[fixes #103937270] Add -SubscriptionName to Get-AzureRMSubscription #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81bab9e
[fixes #103937270] Add -SubscriptionName to Get-AzureRMSubscription
jianghaolu Sep 23, 2015
443c1f9
Clean up ARM EnvironmentSetupHelper
jianghaolu Sep 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
13 changes: 13 additions & 0 deletions src/ResourceManager/Common/Commands.ResourceManager.Common/RMProfileClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,19 @@ public bool TryGetSubscription(string tenantId, string subscriptionId, out Azure
tenantId, subscriptionId, out subscription, out tenant);
}

public bool TryGetSubscriptionByName(string tenantId, string subscriptionName, out AzureSubscription subscription)
{
if (string.IsNullOrWhiteSpace(tenantId))
{
throw new ArgumentNullException("Please provide a valid tenant Id.");
}

IEnumerable<AzureSubscription> subscriptionList = ListSubscriptions(tenantId);
subscription = subscriptionList.FirstOrDefault(s => s.Name.Equals(subscriptionName, StringComparison.OrdinalIgnoreCase));

return subscription != null;
}

public AzureEnvironment AddOrSetEnvironment(AzureEnvironment environment)
{
if (environment == null)
Expand Down
63 changes: 19 additions & 44 deletions ...rceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,7 @@ public EnvironmentSetupHelper()
System.Net.ServicePointManager.ServerCertificateValidationCallback += (se, cert, chain, sslerror) => true;

// Set RunningMocked
if (HttpMockServer.GetCurrentMode() == HttpRecorderMode.Playback)
{
TestMockSupport.RunningMocked = true;
}
else
{
TestMockSupport.RunningMocked = false;
}
TestMockSupport.RunningMocked = HttpMockServer.GetCurrentMode() == HttpRecorderMode.Playback;
}

/// <summary>
Expand Down Expand Up @@ -103,32 +96,29 @@ public void SetupEnvironment(AzureModule mode)

private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
{
TestEnvironment rdfeEnvironment = new RDFETestEnvironmentFactory().GetTestEnvironment();
TestEnvironment csmEnvironment = new CSMTestEnvironmentFactory().GetTestEnvironment();
TestEnvironment currentEnvironment = (mode == AzureModule.AzureResourceManager ? csmEnvironment : rdfeEnvironment);
TestEnvironment currentEnvironment = null;
if (mode == AzureModule.AzureResourceManager)
{
currentEnvironment = new CSMTestEnvironmentFactory().GetTestEnvironment();
}
else
{
currentEnvironment = new RDFETestEnvironmentFactory().GetTestEnvironment();
}

if (currentEnvironment.UserName == null)
{
currentEnvironment.UserName = "[email protected]";
}

SetAuthenticationFactory(mode, rdfeEnvironment, csmEnvironment);
SetAuthenticationFactory(mode, currentEnvironment);

AzureEnvironment environment = new AzureEnvironment { Name = testEnvironmentName };

Debug.Assert(currentEnvironment != null);
environment.Endpoints[AzureEnvironment.Endpoint.ActiveDirectory] = currentEnvironment.Endpoints.AADAuthUri.AbsoluteUri;
environment.Endpoints[AzureEnvironment.Endpoint.Gallery] = currentEnvironment.Endpoints.GalleryUri.AbsoluteUri;

if (csmEnvironment != null)
{
environment.Endpoints[AzureEnvironment.Endpoint.ResourceManager] = csmEnvironment.BaseUri.AbsoluteUri;
}

if (rdfeEnvironment != null)
{
environment.Endpoints[AzureEnvironment.Endpoint.ServiceManagement] = rdfeEnvironment.BaseUri.AbsoluteUri;
}
environment.Endpoints[AzureEnvironment.Endpoint.ServiceManagement] = currentEnvironment.BaseUri.AbsoluteUri;

if (!ProfileClient.Profile.Environments.ContainsKey(testEnvironmentName))
{
Expand Down Expand Up @@ -169,44 +159,29 @@ private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
}
}

private void SetAuthenticationFactory(AzureModule mode, TestEnvironment rdfeEnvironment, TestEnvironment csmEnvironment)
private void SetAuthenticationFactory(AzureModule mode, TestEnvironment environment)
{
string jwtToken = null;
X509Certificate2 certificate = null;
TestEnvironment currentEnvironment = (mode == AzureModule.AzureResourceManager ? csmEnvironment : rdfeEnvironment);

if (mode == AzureModule.AzureServiceManagement)
if (environment.Credentials is TokenCloudCredentials)
{
if (rdfeEnvironment.Credentials is TokenCloudCredentials)
{
jwtToken = ((TokenCloudCredentials)rdfeEnvironment.Credentials).Token;
}
if (rdfeEnvironment.Credentials is CertificateCloudCredentials)
{
certificate = ((CertificateCloudCredentials)rdfeEnvironment.Credentials).ManagementCertificate;
}
jwtToken = ((TokenCloudCredentials)environment.Credentials).Token;
}
else
if (environment.Credentials is CertificateCloudCredentials)
{
if (csmEnvironment.Credentials is TokenCloudCredentials)
{
jwtToken = ((TokenCloudCredentials)csmEnvironment.Credentials).Token;
}
if (csmEnvironment.Credentials is CertificateCloudCredentials)
{
certificate = ((CertificateCloudCredentials)csmEnvironment.Credentials).ManagementCertificate;
}
certificate = ((CertificateCloudCredentials)environment.Credentials).ManagementCertificate;
}


if (jwtToken != null)
{
AzureSession.AuthenticationFactory = new MockTokenAuthenticationFactory(currentEnvironment.UserName,
AzureSession.AuthenticationFactory = new MockTokenAuthenticationFactory(environment.UserName,
jwtToken);
}
else if (certificate != null)
{
AzureSession.AuthenticationFactory = new MockCertificateAuthenticationFactory(currentEnvironment.UserName,
AzureSession.AuthenticationFactory = new MockCertificateAuthenticationFactory(environment.UserName,
certificate);
}
}
Expand Down
Loading