Skip to content

[ARM] Fix #17379: bicep auto install results in invalid json output from deployment #17380

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
zhoxing-ms merged 2 commits into from
Mar 26, 2021
Merged

[ARM] Fix #17379: bicep auto install results in invalid json output from deployment #17380

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2939af8
Send bicep auto install messages to logger
Mar 20, 2021
04615ec
Fix blank line contains whitespace
Mar 21, 2021
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
21 changes: 14 additions & 7 deletions src/azure-cli/azure/cli/command_modules/resource/_bicep.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def run_bicep_command(args, auto_install=True, check_upgrade=True):

if not installed:
if auto_install:
ensure_bicep_installation()
ensure_bicep_installation(stdout=False)
else:
raise FileOperationError('Bicep CLI not found. Install it now by running "az bicep install".')
elif check_upgrade:
Expand All @@ -49,7 +49,7 @@ def run_bicep_command(args, auto_install=True, check_upgrade=True):
return _run_command(installation_path, args)


def ensure_bicep_installation(release_tag=None):
def ensure_bicep_installation(release_tag=None, stdout=True):
system = platform.system()
installation_path = _get_bicep_installation_path(system)

Expand All @@ -68,18 +68,25 @@ def ensure_bicep_installation(release_tag=None):

try:
release_tag = release_tag if release_tag else get_bicep_latest_release_tag()
if release_tag:
print(f"Installing Bicep CLI {release_tag}...")
else:
print("Installing Bicep CLI...")
if stdout:
if release_tag:
print(f"Installing Bicep CLI {release_tag}...")
else:
print("Installing Bicep CLI...")

request = urlopen(_get_bicep_download_url(system, release_tag))
with open(installation_path, "wb") as f:
f.write(request.read())

os.chmod(installation_path, os.stat(installation_path).st_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)

print(f'Successfully installed Bicep CLI to "{installation_path}".')
if stdout:
print(f'Successfully installed Bicep CLI to "{installation_path}".')
else:
_logger.info(
'Successfully installed Bicep CLI to %s',
installation_path,
)
except IOError as err:
raise ClientRequestError(f"Error while attempting to download Bicep CLI: {err}")

Expand Down