Skip to content

Fix show logs #16

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
am-lim merged 3 commits into from
Apr 19, 2024
Merged

Fix show logs #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbf79c2
Fix show logs
am-lim Apr 19, 2024
1d4aa9e
Fix spacing
am-lim Apr 19, 2024
d2afbcf
Fix style error
am-lim Apr 19, 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
4 changes: 4 additions & 0 deletions src/devcenter/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

Release History
===============
5.0.1
++++++
* Fix bug in "az devcenter dev environment show-logs-by-operation" if logs is not in JSON format

5.0.0
++++++
* Require roles and identity type parameters in "az decenter admin project-environment-type create"
Expand Down
2 changes: 1 addition & 1 deletion src/devcenter/azext_devcenter/action.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# regenerated.
# --------------------------------------------------------------------------
# pylint: disable=protected-access

# pylint: disable=no-self-use

import argparse
from collections import defaultdict
Expand Down
8 changes: 6 additions & 2 deletions src/devcenter/azext_devcenter/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,8 +1205,12 @@ def devcenter_environment_operation_show_logs_by_operation(
)
logs_array = []
for log in logs:
logs_string = json.loads(log)
logs_array.append(logs_string)
if log:
try:
logs_string = json.loads(log)
logs_array.append(logs_string)
except json.JSONDecodeError:
logs_array.append(log)
return logs_array


Expand Down
2 changes: 1 addition & 1 deletion src/devcenter/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from setuptools import setup, find_packages

# HISTORY.rst entry.
VERSION = '5.0.0'
VERSION = '5.0.1'
try:
from azext_devcenter.manual.version import VERSION
except ImportError:
Expand Down