{Branch Management} Fix merge-base: Merge release 2.89.1 hotfixes back to dev - #33869
Open
Naga Nandyala (naga-nandyala) wants to merge 3 commits into
Open
{Branch Management} Fix merge-base: Merge release 2.89.1 hotfixes back to dev#33869Naga Nandyala (naga-nandyala) wants to merge 3 commits into
Naga Nandyala (naga-nandyala) wants to merge 3 commits into
Conversation
{Hotfix} Upgrade to Azure CLI 2.89.1
Collaborator
|
Thank you for your contribution! We will review the pull request and get back to you soon. |
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Copilot started reviewing on behalf of
Naga Nandyala (naga-nandyala)
August 10, 2026 01:51
View session
Contributor
There was a problem hiding this comment.
Pull request overview
This PR merges the release branch’s 2.89.1 hotfix train back into dev to re-align branch history (merge-base) and keep dev in sync for future CI/scans.
Changes:
- Bump Azure CLI and azure-cli-core version references from
2.89.0to2.89.1across packaging, requirements pins, and command/help index metadata. - Add 2.89.1 release notes entries to both
azure-cliandazure-cli-coreHISTORY files. - Update VM SSH
get_msal_token()behavior to allow Cloud Shell SSH certificate flow (while keeping managed identity unsupported) and adjust/extend related unit tests.
Reviewed changes
Copilot reviewed 13 out of 13 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/azure-cli/setup.py | Bumps CLI package version to 2.89.1 (and keeps setup validation aligned). |
| src/azure-cli/requirements.py3.windows.txt | Pins azure-cli / azure-cli-core to 2.89.1 for Windows. |
| src/azure-cli/requirements.py3.Linux.txt | Pins azure-cli / azure-cli-core to 2.89.1 for Linux. |
| src/azure-cli/requirements.py3.Darwin.txt | Pins azure-cli / azure-cli-core to 2.89.1 for macOS. |
| src/azure-cli/HISTORY.rst | Adds 2.89.1 release notes entry (Core). |
| src/azure-cli/azure/cli/main.py | Updates CLI runtime __version__ to 2.89.1. |
| src/azure-cli-core/setup.py | Bumps core package version to 2.89.1. |
| src/azure-cli-core/HISTORY.rst | Adds 2.89.1 release notes entry. |
| src/azure-cli-core/azure/cli/core/tests/test_profile.py | Updates tests to reflect Cloud Shell SSH-cert support and new MI-only error text. |
| src/azure-cli-core/azure/cli/core/helpIndex.latest.json | Updates help index version metadata to 2.89.1. |
| src/azure-cli-core/azure/cli/core/commandIndex.latest.json | Updates command index version metadata to 2.89.1. |
| src/azure-cli-core/azure/cli/core/_profile.py | Allows Cloud Shell SSH certificate flow in get_msal_token(); keeps MI blocked. |
| src/azure-cli-core/azure/cli/core/init.py | Updates core __version__ to 2.89.1. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
444
to
+447
| account = self.get_subscription() | ||
| managed_identity_type, _ = Profile._parse_managed_identity_account(account) | ||
| if managed_identity_type or (in_cloud_console() and account[_USER_ENTITY].get(_CLOUD_SHELL_ID)): | ||
| raise AuthenticationError("VM SSH currently doesn't support managed identity or Cloud Shell.") | ||
| if managed_identity_type: | ||
| raise AuthenticationError("VM SSH currently doesn't support managed identity.") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix merge-base between
releaseanddevAfter the 2.89.1 hotfix train landed on
release(PR #33861), the hotfix commits need to come back todevso the two branches stay in sync and future scans/CI ondevdon't drift.Commits being merged back
2e67654b4baz ssh: Allow SSH certificate flow in Cloud Shell (code already indevvia #33860)4af9e3aea1d3d81d5007Current state (before this PR)
d3d81d5007716b3a30ac0ff7e508d6(2.89.0)What this PR does
This PR exists to satisfy the
azure-production-rulesetPR requirement. It will be merged locally usinggit merge --no-ffand pushed, creating a 2-parent merge commit that linksreleasehistory intodevand advances the merge-base.How to merge
🛑 Do NOT use the GitHub UI merge button or GitHub CLI
gh pr merge.Follow the documented hotfix process:
git push origin devReference
Same process as PR #33305 and PR #33283.