diff --git a/src/devcenter/HISTORY.rst b/src/devcenter/HISTORY.rst index 7aaa3f15021..ceee452deee 100644 --- a/src/devcenter/HISTORY.rst +++ b/src/devcenter/HISTORY.rst @@ -2,6 +2,11 @@ Release History =============== +6.2.1 +++++++ +* Fix environment data plane command examples +* Fix 'az devcenter dev environment show-logs-by-operation' output format + 6.2.0 ++++++ * Update data plane API to v2024-10-01-preview diff --git a/src/devcenter/azext_devcenter/_help.py b/src/devcenter/azext_devcenter/_help.py index 7e9f67f6329..eb16aec3a28 100644 --- a/src/devcenter/azext_devcenter/_help.py +++ b/src/devcenter/azext_devcenter/_help.py @@ -561,7 +561,6 @@ text: |- az devcenter dev environment show --dev-center-name "ContosoDevCenter" \ --name "mydevenv" --project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" - examples: - name: Get using endpoint text: |- az devcenter dev environment show --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \ @@ -814,7 +813,6 @@ text: |- az devcenter dev environment list-operation --dev-center-name "ContosoDevCenter" \ --name "mydevenv" --project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" - examples: - name: List using endpoint text: |- az devcenter dev environment list-operation --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \ @@ -832,7 +830,6 @@ az devcenter dev environment show-operation --dev-center-name "ContosoDevCenter" \ --name "mydevenv" --project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" --operation-id \ "f5dbdfab-fa0e-4831-8d13-25359aa5e680" - examples: - name: Get using endpoint text: |- az devcenter dev environment show-operation --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \ @@ -850,7 +847,6 @@ az devcenter dev environment show-logs-by-operation --dev-center-name "ContosoDevCenter" \ --name "mydevenv" --project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" --operation-id \ "f5dbdfab-fa0e-4831-8d13-25359aa5e680" - examples: - name: Get using endpoint text: |- az devcenter dev environment show-logs-by-operation --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \ @@ -868,7 +864,6 @@ az devcenter dev environment show-action --dev-center-name "ContosoDevCenter" \ --name "mydevenv" --project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" --action-name \ "myEnv-Delete" - examples: - name: Get using endpoint text: |- az devcenter dev environment show-action --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \ @@ -885,7 +880,6 @@ text: |- az devcenter dev environment list-action --dev-center-name "ContosoDevCenter" \ --name "mydevenv" --project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" - examples: - name: List using endpoint text: |- az devcenter dev environment list-action --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \ @@ -903,7 +897,6 @@ az devcenter dev environment delay-action --dev-center-name "ContosoDevCenter" \ --name "mydevenv" --project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" --action-name \ "myEnv-Delete" --delay-time "04:30" - examples: - name: Delay using endpoint text: |- az devcenter dev environment delay-action --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \ @@ -921,7 +914,6 @@ az devcenter dev environment skip-action --dev-center-name "ContosoDevCenter" \ --name "mydevenv" --project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" --action-name \ "myEnv-Delete" - examples: - name: Skip using endpoint text: |- az devcenter dev environment skip-action --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \ @@ -938,7 +930,6 @@ text: |- az devcenter dev environment show-outputs --dev-center-name "ContosoDevCenter" \ --name "mydevenv" --project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" - examples: - name: Get using endpoint text: |- az devcenter dev environment show-outputs --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \ @@ -955,7 +946,6 @@ text: |- az devcenter dev environment update-expiration-date --dev-center-name "ContosoDevCenter" \ --name "mydevenv" --project-name "DevProject" --user-id "00000000-0000-0000-0000-000000000000" --expiration "2026-11-30T22:35:00+00:00" - examples: - name: Get using endpoint text: |- az devcenter dev environment update-expiration-date --endpoint "https://8a40af38-3b4c-4672-a6a4-5e964b1870ed-contosodevcenter.centralus.devcenter.azure.com/" \ diff --git a/src/devcenter/azext_devcenter/custom.py b/src/devcenter/azext_devcenter/custom.py index 5c72ab69b83..347931493b8 100644 --- a/src/devcenter/azext_devcenter/custom.py +++ b/src/devcenter/azext_devcenter/custom.py @@ -6,7 +6,6 @@ # pylint: disable=too-many-lines from datetime import datetime -import json from azure.cli.core.aaz import register_callback, has_value from azure.cli.core.azclierror import ResourceNotFoundError from .utils import get_project_arg, get_earliest_time, get_delayed_time, get_dataplane_endpoint @@ -1621,13 +1620,7 @@ def devcenter_environment_show_logs_by_operation( "environment_name": environment_name }) - for log in logs: - if log: - try: - logs_string = json.loads(log) - print(json.dumps(logs_string, indent=2)) - except json.JSONDecodeError: - print(log) + print(logs) def devcenter_environment_show_action( diff --git a/src/devcenter/setup.py b/src/devcenter/setup.py index 9af77fff45b..3360c0cf89b 100644 --- a/src/devcenter/setup.py +++ b/src/devcenter/setup.py @@ -10,7 +10,7 @@ from setuptools import setup, find_packages # HISTORY.rst entry. -VERSION = '6.2.0' +VERSION = '6.2.1' try: from azext_devcenter.manual.version import VERSION except ImportError: