Skip to content

[core] maintain the logical subscription name on log-in with msi #7744

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
williexu merged 4 commits into from
Nov 12, 2018
Merged

[core] maintain the logical subscription name on log-in with msi #7744

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19b6252
keep subscription name
yugangw-msft Nov 2, 2018
2fa9cd4
update history
yugangw-msft Nov 2, 2018
0e1bd12
adjust test
yugangw-msft Nov 2, 2018
ce92024
update field name
yugangw-msft Nov 2, 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
Prev Previous commit
update field name
  • Loading branch information
@yugangw-msft
yugangw-msft committed Nov 7, 2018
commit ce9202496c8255cbb6e577ccd0d94097a62f3f34
2 changes: 1 addition & 1 deletion src/azure-cli-core/azure/cli/core/_profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

_SYSTEM_ASSIGNED_IDENTITY = 'systemAssignedIdentity'
_USER_ASSIGNED_IDENTITY = 'userAssignedIdentity'
_ASSIGNED_IDENTITY_INFO = 'assignedIdentityId'
_ASSIGNED_IDENTITY_INFO = 'assignedIdentityInfo'


def load_subscriptions(cli_ctx, all_clouds=False, refresh=False):
Expand Down
8 changes: 4 additions & 4 deletions src/azure-cli-core/azure/cli/core/tests/test_profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,7 @@ def __init__(self, *args, **kwargs):
s = subscriptions[0]
self.assertEqual(s['user']['name'], 'systemAssignedIdentity')
self.assertEqual(s['user']['type'], 'servicePrincipal')
self.assertEqual(s['user']['assignedIdentityId'], 'MSI')
self.assertEqual(s['user']['assignedIdentityInfo'], 'MSI')
self.assertEqual(s['name'], self.display_name1)
self.assertEqual(s['id'], self.id1.split('/')[-1])
self.assertEqual(s['tenantId'], '54826b22-38d6-4fb2-bad9-b7b93a3e9c5a')
Expand Down Expand Up @@ -906,7 +906,7 @@ def __init__(self, *args, **kwargs):
self.assertEqual(s['user']['name'], 'userAssignedIdentity')
self.assertEqual(s['user']['type'], 'servicePrincipal')
self.assertEqual(s['name'], self.display_name1)
self.assertEqual(s['user']['assignedIdentityId'], 'MSIClient-{}'.format(test_client_id))
self.assertEqual(s['user']['assignedIdentityInfo'], 'MSIClient-{}'.format(test_client_id))
self.assertEqual(s['id'], self.id1.split('/')[-1])
self.assertEqual(s['tenantId'], '54826b22-38d6-4fb2-bad9-b7b93a3e9c5a')

Expand Down Expand Up @@ -956,7 +956,7 @@ def set_token(self):
subscriptions = profile.find_subscriptions_in_vm_with_msi(identity_id=test_object_id)

# assert
self.assertEqual(subscriptions[0]['user']['assignedIdentityId'], 'MSIObject-{}'.format(test_object_id))
self.assertEqual(subscriptions[0]['user']['assignedIdentityInfo'], 'MSIObject-{}'.format(test_object_id))

@mock.patch('requests.get', autospec=True)
@mock.patch('azure.cli.core.profiles._shared.get_client_class', autospec=True)
Expand Down Expand Up @@ -989,7 +989,7 @@ def __init__(self, *args, **kwargs):
subscriptions = profile.find_subscriptions_in_vm_with_msi(identity_id=test_res_id)

# assert
self.assertEqual(subscriptions[0]['user']['assignedIdentityId'], 'MSIResource-{}'.format(test_res_id))
self.assertEqual(subscriptions[0]['user']['assignedIdentityInfo'], 'MSIResource-{}'.format(test_res_id))

@mock.patch('adal.AuthenticationContext.acquire_token_with_username_password', autospec=True)
@mock.patch('adal.AuthenticationContext.acquire_token', autospec=True)
Expand Down