Skip to content

Fix Get-AzureRmSubscription issue in CloudShell #7493

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
maddieclayton merged 3 commits into from
Oct 12, 2018
Merged

Fix Get-AzureRmSubscription issue in CloudShell #7493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f51118
fix tenant issue
Oct 8, 2018
9731d54
Update Az.Profile.psd1
Oct 11, 2018
28d2e83
update changelog
Oct 11, 2018
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
1 change: 1 addition & 0 deletions src/ResourceManager/Profile/Commands.Profile/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Additional information about change #1
-->
## Current Release
* Fix issue with Get-AzureRmSubscription in CloudShell

## Version 5.6.0
* Minor changes to the storage common code
Expand Down
20 changes: 18 additions & 2 deletions src/ResourceManager/Profile/Commands.Profile/Subscription/GetAzureRMSubscription.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,24 @@ public override void ExecuteCmdlet()
{
try
{
var subscriptions = _client.ListSubscriptions(tenant);
WriteObject(subscriptions.Select((s) => new PSAzureSubscription(s)), enumerateCollection: true);
if (DefaultContext.Account.Type.Equals("ManagedService"))
Copy link
Member

@markcowl markcowl Oct 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please file an issue to add some automation for this - we have the infrastructure to mock managed service tests, and we should have some regression protection for thsi scenario.

Please make sure you have tested this in CloudShell. LMK if you need some help in doign this.

{
if (tenant == null)
{
tenant = DefaultContext.Tenant.Id;
}

if (tenant.Equals(DefaultContext.Tenant.Id))
{
var subscriptions = _client.ListSubscriptions(tenant);
WriteObject(subscriptions.Select((s) => new PSAzureSubscription(s)), enumerateCollection: true);
}
}
else
{
var subscriptions = _client.ListSubscriptions(tenant);
WriteObject(subscriptions.Select((s) => new PSAzureSubscription(s)), enumerateCollection: true);
}
}
catch (AadAuthenticationException exception)
{
Expand Down