Skip to content
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

update error msg if not supported #11915

Merged
merged 16 commits into from
Jun 9, 2020
Merged

update error msg if not supported #11915

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
82e37d3
update error msg if not supported
xiangyan99 Jun 9, 2020
2a87ae4
async
xiangyan99 Jun 9, 2020
5f2849d
update
xiangyan99 Jun 9, 2020
ae4f3bb
update
xiangyan99 Jun 9, 2020
555fdb2
update
xiangyan99 Jun 9, 2020
aed3fad
update
xiangyan99 Jun 9, 2020
d422a34
update
xiangyan99 Jun 9, 2020
ce8c7b3
update
xiangyan99 Jun 9, 2020
042a951
update
xiangyan99 Jun 9, 2020
380e98a
update
xiangyan99 Jun 9, 2020
3187e1c
update
xiangyan99 Jun 9, 2020
3eefd37
update
xiangyan99 Jun 9, 2020
bc2470e
disable linux suppport
xiangyan99 Jun 9, 2020
d6bb255
update
xiangyan99 Jun 9, 2020
0cedf2f
update
xiangyan99 Jun 9, 2020
93524f8
update
xiangyan99 Jun 9, 2020
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
2 changes: 2 additions & 0 deletions sdk/identity/azure-identity/azure/identity/_credentials/linux_vscode_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,7 @@ def get_credentials():
environment_name = _get_user_settings()
credentials = _get_refresh_token(VSCODE_CREDENTIALS_SECTION, environment_name)
return credentials
except NotImplementedError: # pylint:disable=try-except-raise
raise
except Exception: # pylint: disable=broad-except
return None
10 changes: 7 additions & 3 deletions sdk/identity/azure-identity/azure/identity/_credentials/vscode_credential.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,13 @@ def get_token(self, *scopes, **kwargs):
return token

if not self._refresh_token:
self._refresh_token = get_credentials()
if not self._refresh_token:
raise CredentialUnavailableError(message="No Azure user is logged in to Visual Studio Code.")
try:
self._refresh_token = get_credentials()
if not self._refresh_token:
raise CredentialUnavailableError(message="No Azure user is logged in to Visual Studio Code.")
except NotImplementedError: # pylint:disable=try-except-raise
raise CredentialUnavailableError(message="No supported")
xiangyan99 marked this conversation as resolved.
Show resolved Hide resolved


token = self._client.obtain_token_by_refresh_token(scopes, self._refresh_token, **kwargs)
return token
8 changes: 8 additions & 0 deletions sdk/identity/azure-identity/tests/test_vscode_credential.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,14 @@ def test_distro():
with pytest.raises(NotImplementedError):
credential = _get_refresh_token("test", "test")

with mock.patch("platform.uname",
return_value=('Linux', 'deb', '4.19.0-9-cloud-amd64',
'#1 SMP Debian 4.19.118-2 (2020-04-29)', 'x86_64', '')):
if sys.version_info[0] == 3 and sys.version_info[1] == 8:
with pytest.raises(CredentialUnavailableError):
credential = VSCodeCredential(_client=mock_client)
token = credential.get_token("scope")


@pytest.mark.skipif(not sys.platform.startswith("darwin"), reason="This test only runs on MacOS")
def test_mac_keychain_valid_value():
Expand Down