[devcenter] Handle JSON error in "az devcenter dev environment show-l…

…ogs-by-operation" (Azure#7535) * Update project env type parameters * Fix environment def example and update style * Fix show logs * Fix spacing * Fix style error * Fix integraion tests * Fix gallery test * Fix gallery test * Fix gallery compute * Update
Greedygre · Apr 23, 2024 · a63d5ca · a63d5ca
1 parent 2a895ff
commit a63d5ca
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 60 deletions.
diff --git a/src/devcenter/HISTORY.rst b/src/devcenter/HISTORY.rst
@@ -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"

diff --git a/src/devcenter/azext_devcenter/action.py b/src/devcenter/azext_devcenter/action.py
@@ -8,7 +8,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 # pylint: disable=protected-access
-
+# pylint: disable=no-self-use
 
 import argparse
 from collections import defaultdict

diff --git a/src/devcenter/azext_devcenter/custom.py b/src/devcenter/azext_devcenter/custom.py
@@ -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
 
 

diff --git a/src/devcenter/azext_devcenter/tests/latest/recordings/test_attached_network_scenario.yaml b/src/devcenter/azext_devcenter/tests/latest/recordings/test_attached_network_scenario.yaml
@@ -905,7 +905,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.51.0 (AAZ) azsdk-python-core/1.24.0 Python/3.10.7 (Windows-10-10.0.22621-SP0)
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/virtualNetworks/cli000004/subnets/cli000005?api-version=2023-05-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/virtualNetworks/cli000004/subnets/cli000005?api-version=2023-09-01
   response:
     body:
       string: "{\r\n  \"name\": \"cli000005\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/virtualNetworks/cli000004/subnets/cli000005\"\
@@ -920,7 +920,7 @@ interactions:
       azure-asyncnotification:
       - Enabled
       azure-asyncoperation:
-      - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/canadacentral/operations/4cb6a702-4cc7-4e41-99e4-7635ad7857eb?api-version=2023-05-01
+      - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/canadacentral/operations/4cb6a702-4cc7-4e41-99e4-7635ad7857eb?api-version=2023-09-01
       cache-control:
       - no-cache
       content-length:
@@ -964,7 +964,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.51.0 (AAZ) azsdk-python-core/1.24.0 Python/3.10.7 (Windows-10-10.0.22621-SP0)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/canadacentral/operations/4cb6a702-4cc7-4e41-99e4-7635ad7857eb?api-version=2023-05-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/canadacentral/operations/4cb6a702-4cc7-4e41-99e4-7635ad7857eb?api-version=2023-09-01
   response:
     body:
       string: "{\r\n  \"status\": \"Succeeded\"\r\n}"
@@ -1010,7 +1010,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.51.0 (AAZ) azsdk-python-core/1.24.0 Python/3.10.7 (Windows-10-10.0.22621-SP0)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/virtualNetworks/cli000004/subnets/cli000005?api-version=2023-05-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/virtualNetworks/cli000004/subnets/cli000005?api-version=2023-09-01
   response:
     body:
       string: "{\r\n  \"name\": \"cli000005\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest000001/providers/Microsoft.Network/virtualNetworks/cli000004/subnets/cli000005\"\

diff --git a/src/devcenter/azext_devcenter/tests/latest/recordings/test_dev_box_dataplane_scenario.yaml b/src/devcenter/azext_devcenter/tests/latest/recordings/test_dev_box_dataplane_scenario.yaml
@@ -1251,7 +1251,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.51.0 (AAZ) azsdk-python-core/1.24.0 Python/3.10.7 (Windows-10-10.0.22621-SP0)
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli000002/providers/Microsoft.Network/virtualNetworks/cli000005/subnets/cli000006?api-version=2023-05-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli000002/providers/Microsoft.Network/virtualNetworks/cli000005/subnets/cli000006?api-version=2023-09-01
   response:
     body:
       string: "{\r\n  \"name\": \"cli000006\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli000002/providers/Microsoft.Network/virtualNetworks/cli000005/subnets/cli000006\"\
@@ -1266,7 +1266,7 @@ interactions:
       azure-asyncnotification:
       - Enabled
       azure-asyncoperation:
-      - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/canadacentral/operations/086b9cb5-da19-4d52-8a98-f014ced21f0d?api-version=2023-05-01
+      - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/canadacentral/operations/086b9cb5-da19-4d52-8a98-f014ced21f0d?api-version=2023-09-01
       cache-control:
       - no-cache
       content-length:
@@ -1310,7 +1310,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.51.0 (AAZ) azsdk-python-core/1.24.0 Python/3.10.7 (Windows-10-10.0.22621-SP0)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/canadacentral/operations/086b9cb5-da19-4d52-8a98-f014ced21f0d?api-version=2023-05-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/canadacentral/operations/086b9cb5-da19-4d52-8a98-f014ced21f0d?api-version=2023-09-01
   response:
     body:
       string: "{\r\n  \"status\": \"Succeeded\"\r\n}"
@@ -1356,7 +1356,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.51.0 (AAZ) azsdk-python-core/1.24.0 Python/3.10.7 (Windows-10-10.0.22621-SP0)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli000002/providers/Microsoft.Network/virtualNetworks/cli000005/subnets/cli000006?api-version=2023-05-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli000002/providers/Microsoft.Network/virtualNetworks/cli000005/subnets/cli000006?api-version=2023-09-01
   response:
     body:
       string: "{\r\n  \"name\": \"cli000006\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli000002/providers/Microsoft.Network/virtualNetworks/cli000005/subnets/cli000006\"\

diff --git a/...enter/azext_devcenter/tests/latest/recordings/test_dev_box_repair_dataplane_scenario.yaml b/...enter/azext_devcenter/tests/latest/recordings/test_dev_box_repair_dataplane_scenario.yaml
@@ -1343,7 +1343,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.51.0 (AAZ) azsdk-python-core/1.24.0 Python/3.10.7 (Windows-10-10.0.22621-SP0)
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli000002/providers/Microsoft.Network/virtualNetworks/cli000005/subnets/cli000006?api-version=2023-05-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli000002/providers/Microsoft.Network/virtualNetworks/cli000005/subnets/cli000006?api-version=2023-09-01
   response:
     body:
       string: "{\r\n  \"name\": \"cli000006\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli000002/providers/Microsoft.Network/virtualNetworks/cli000005/subnets/cli000006\"\
@@ -1358,7 +1358,7 @@ interactions:
       azure-asyncnotification:
       - Enabled
       azure-asyncoperation:
-      - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/canadacentral/operations/a5d93084-1bf5-4b62-b055-2abf89cd6080?api-version=2023-05-01
+      - https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/canadacentral/operations/a5d93084-1bf5-4b62-b055-2abf89cd6080?api-version=2023-09-01
       cache-control:
       - no-cache
       content-length:
@@ -1402,7 +1402,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.51.0 (AAZ) azsdk-python-core/1.24.0 Python/3.10.7 (Windows-10-10.0.22621-SP0)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/canadacentral/operations/a5d93084-1bf5-4b62-b055-2abf89cd6080?api-version=2023-05-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/canadacentral/operations/a5d93084-1bf5-4b62-b055-2abf89cd6080?api-version=2023-09-01
   response:
     body:
       string: "{\r\n  \"status\": \"Succeeded\"\r\n}"
@@ -1448,7 +1448,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.51.0 (AAZ) azsdk-python-core/1.24.0 Python/3.10.7 (Windows-10-10.0.22621-SP0)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli000002/providers/Microsoft.Network/virtualNetworks/cli000005/subnets/cli000006?api-version=2023-05-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli000002/providers/Microsoft.Network/virtualNetworks/cli000005/subnets/cli000006?api-version=2023-09-01
   response:
     body:
       string: "{\r\n  \"name\": \"cli000006\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli000002/providers/Microsoft.Network/virtualNetworks/cli000005/subnets/cli000006\"\