Skip to content

[ACR] Fix: az acr login wrongly raise error #12282

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
yugangw-msft merged 2 commits into from
Feb 21, 2020
Merged

[ACR] Fix: az acr login wrongly raise error #12282

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b84eb4
[ACR] Fix: `az acr login` wrongly raise error
Wwwsylvia Feb 20, 2020
e32e703
[ACR] `az acr login`: Use logger.warning instead of sys.stderr
Wwwsylvia Feb 21, 2020
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
8 changes: 7 additions & 1 deletion src/azure-cli/azure/cli/command_modules/acr/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ def acr_login(cmd,
"--password", password,
login_server], stderr=PIPE)
_, stderr = p.communicate()
return_code = p.returncode

if stderr:
if b'error storing credentials' in stderr and b'stub received bad data' in stderr \
Expand All @@ -194,13 +195,18 @@ def acr_login(cmd,
p.wait()
else:
stderr_messages = stderr.decode()
# Dismiss the '--password-stdin' warning
if b'--password-stdin' in stderr:
errors = [err for err in stderr_messages.split('\n') if err and '--password-stdin' not in err]
# Will not raise CLIError if there is no error other than '--password-stdin'
if not errors:
return None
stderr_messages = '\n'.join(errors)
raise CLIError('docker: ' + stderr_messages)
logger.warning(stderr_messages)

# Raise error only if docker returns non-zero
if return_code != 0:
raise CLIError('Login failed.')

return None

Expand Down