Skip to content

[Containerapp] Fix #29711: az containerapp logs show: Fix JSON escaping by default or with --format json #29767

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
yanzhudd merged 2 commits into from
Aug 23, 2024
Merged

[Containerapp] Fix #29711: az containerapp logs show: Fix JSON escaping by default or with --format json #29767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de13b58
fix json
Aug 22, 2024
7325a53
rerun relative tests
Aug 22, 2024
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: 5 additions & 3 deletions src/azure-cli/azure/cli/command_modules/containerapp/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
# --------------------------------------------------------------------------------------------
# pylint: disable=line-too-long, consider-using-f-string, logging-format-interpolation, inconsistent-return-statements, broad-except, bare-except, too-many-statements, too-many-locals, too-many-boolean-expressions, too-many-branches, too-many-nested-blocks, pointless-statement, expression-not-assigned, unbalanced-tuple-unpacking, unsupported-assignment-operation
# pylint: disable=unused-argument, no-else-raise
import json
import threading
import sys
import time
Expand Down Expand Up @@ -3588,9 +3589,10 @@ def stream_containerapp_logs(cmd, resource_group_name, name, container=None, rev
for line in resp.iter_lines():
if line:
logger.info("received raw log line: %s", line)
# these .replaces are needed to display color/quotations properly
# for some reason the API returns garbled unicode special characters (may need to add more in the future)
print(line.decode("utf-8").replace("\\u0022", "\u0022").replace("\\u001B", "\u001B").replace("\\u002B", "\u002B").replace("\\u0027", "\u0027"))
if output_format == "json":
print(json.dumps(json.loads(line)))
else:
print(line.decode("utf-8"))


def stream_environment_logs(cmd, resource_group_name, name, follow=False, tail=None):
Expand Down
Loading