Skip to content

[Packaging] Fix #22741: az upgrade: This command becomes non-blocking on Windows #26464

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
bebound merged 12 commits into from
Oct 18, 2023
Merged

[Packaging] Fix #22741: az upgrade: This command becomes non-blocking on Windows #26464

Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a7d5d28
Init
bebound May 10, 2023
5bbb874
Minor fix
bebound May 17, 2023
fd1c702
Update src/azure-cli/azure/cli/command_modules/util/custom.py
bebound May 19, 2023
14a80a5
Minor fix
bebound May 19, 2023
11f4647
Add instruction
bebound May 19, 2023
89f4f78
Minor fix
bebound May 19, 2023
b049e8b
Minor fix
bebound May 19, 2023
a65cb46
Minor fix
bebound May 19, 2023
527123a
Merge branch 'dev' into fix-upgrade
bebound Sep 13, 2023
b2509e6
Merge remote-tracking branch 'upstream/dev' into fix-upgrade
bebound Sep 28, 2023
c8bb0f3
Save MSI to ~\AppData\Local\Temp\azure-cli-msi
bebound Sep 28, 2023
ffcd51d
Remove pathlib
bebound Oct 16, 2023
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
20 changes: 8 additions & 12 deletions src/azure-cli/azure/cli/command_modules/util/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def upgrade_version(cmd, update_all=None, yes=None): # pylint: disable=too-many
logger.warning("Exit the container to pull latest image with 'docker pull mcr.microsoft.com/azure-cli' "
"or run 'pip install --upgrade azure-cli' in this container")
elif installer == 'MSI':
exit_code = _upgrade_on_windows()
_upgrade_on_windows()
else:
logger.warning(UPGRADE_MSG)
if exit_code:
Expand Down Expand Up @@ -188,25 +188,21 @@ def _upgrade_on_windows():
This also gives the user a chance to manually install the MSI in case of msiexec.exe failure.
"""
import platform
import subprocess
import sys

if platform.architecture()[0] == '32bit':
msi_url = 'https://aka.ms/installazurecliwindows'
else:
msi_url = 'https://aka.ms/installazurecliwindowsx64'
logger.warning("Updating Azure CLI with MSI from %s", msi_url)
tmp_dir, msi_path = _download_from_url(msi_url)
_, msi_path = _download_from_url(msi_url)

logger.warning("Installing MSI")
import subprocess
exit_code = subprocess.call(['msiexec.exe', '/i', msi_path])

if exit_code:
logger.warning("Installation Failed. You may manually install %s", msi_path)
else:
from azure.cli.core.util import rmtree_with_retry
logger.warning("Succeeded. Deleting %s", tmp_dir)
rmtree_with_retry(tmp_dir)
Copy link
Member

@jiasli jiasli Sep 18, 2023

Choose a reason for hiding this comment

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

I suggest we find a way to preserve this logic, otherwise the temporary MSI will not be deleted.

Copy link
Contributor Author

@bebound bebound Sep 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

The MSI is in the tempfile.mkdtemp() directory (C:\\Users\\xx\\AppData\\Local\\Temp\\tmp1s_cgvau), it appears that windows can delete it automatically.
Manage drive space with Storage Sense

Alternatively, we can save the MSI in .azure or Temp\azure-cli and add logic to clean MSI when run az command.

return exit_code
subprocess.Popen(['msiexec.exe', '/i', msi_path])
logger.warning("Installation started. Please complete the upgrade in the opened window.\nTo update extensions, "
"please run `az upgrade` again after completing the upgrade.")
sys.exit(0)


def _download_from_url(url):
Expand Down