Skip to content

{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
devfrom
release
Open

{Branch Management} Fix merge-base: Merge release 2.89.1 hotfixes back to dev#33869
Naga Nandyala (naga-nandyala) wants to merge 3 commits into
devfrom
release

Conversation

@naga-nandyala

Copy link
Copy Markdown
Contributor

Fix merge-base between release and dev

After the 2.89.1 hotfix train landed on release (PR #33861), the hotfix commits need to come back to dev so the two branches stay in sync and future scans/CI on dev don't drift.

Commits being merged back

# Commit PR Description
1 2e67654b4b #33860 / #33861 [Ssh] az ssh: Allow SSH certificate flow in Cloud Shell (code already in dev via #33860)
2 4af9e3aea1 #33861 {Release} Upgrade to Azure CLI 2.89.1
3 d3d81d5007 #33861 Merge pull request #33861 (hotfix merge commit)

Current state (before this PR)

upstream/release HEAD d3d81d5007
upstream/dev HEAD 716b3a30ac
merge-base 0ff7e508d6 (2.89.0)
Commits in release not in dev 3
Files changed 13

What this PR does

This PR exists to satisfy the azure-production-ruleset PR requirement. It will be merged locally using git merge --no-ff and pushed, creating a 2-parent merge commit that links release history into dev and advances the merge-base.

Note: the SSH _profile.py change is already present in dev (via #33860), so it contributes no net diff. The substantive incoming change is the 2.89.1 version bump/HISTORY entries.

How to merge

🛑 Do NOT use the GitHub UI merge button or GitHub CLI gh pr merge.

Follow the documented hotfix process:

  1. ✅ Create this PR
  2. ✅ Approve this PR in GitHub UI
  3. Merge locally:
    git checkout dev && git pull origin dev && git merge origin/release --no-ff -m "Merge release 2.89.1 hotfixes back to dev"
    
  4. Push: git push origin dev
  5. This PR will automatically be marked as Merged

Reference

Same process as PR #33305 and PR #33283.

Copilot AI lite review requested due to automatic review settings August 10, 2026 01:51
@yonzhan

Copy link
Copy Markdown
Collaborator

Thank you for your contribution! We will review the pull request and get back to you soon.

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

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.0 to 2.89.1 across packaging, requirements pins, and command/help index metadata.
  • Add 2.89.1 release notes entries to both azure-cli and azure-cli-core HISTORY 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.")
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants