Skip to content

{SSH} Update the comment for acquiring certificate #8911

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

Open
jiasli wants to merge 1 commit into
base: main
Choose a base branch
from
Open

{SSH} Update the comment for acquiring certificate #8911

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/ssh/azext_ssh/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,14 @@ def _get_and_write_certificate(cmd, public_key_file, cert_file, ssh_client_folde
profile = Profile(cli_ctx=cmd.cli_ctx)

t0 = time.time()
# We currently are using the presence of get_msal_token to detect if we are running on an older azure cli client
# TODO: Remove when adal has been deprecated for a while
# Azure CLI 2.76 brought back get_msal_token as the official interface for getting certificate:
# https://github.com/Azure/azure-cli/pull/31082
if hasattr(profile, "get_msal_token"):
# we used to use the username from the token but now we throw it away
_, certificate = profile.get_msal_token(scopes, data)
else:
# Azure CLI 2.76 dropped `data` from get_token: https://github.com/Azure/azure-cli/pull/31723
# TODO: Remove when Azure CLI <= 2.75 has been deprecated for a while
credential, _, _ = profile.get_login_credentials(subscription_id=profile.get_subscription()["id"])
certificatedata = credential.get_token(*scopes, data=data)
certificate = certificatedata.token
Expand Down
Loading