WIP commit

Author: jeskew

src/azure-cli/azure/cli/command_modules/resource/_formatters.py

@@ -85,16 +85,16 @@ def format_what_if_operation_result(what_if_operation_result, enable_color=True)
     _format_resource_changes_stats(builder,
                                    what_if_operation_result.changes,
                                    definite_changes=True)
-    _format_resource_changes(builder,
-                             what_if_operation_result.potential_changes,
-                             definite_changes=False)
-    _format_resource_changes_stats(builder,
-                                   what_if_operation_result.potential_changes,
-                                   definite_changes=False)
-    _format_diagnostics(builder,
-                        what_if_operation_result.changes,
-                        what_if_operation_result.potential_changes,
-                        what_if_operation_result.diagnostics)
+    # _format_resource_changes(builder,
+    #                          what_if_operation_result.potential_changes,
+    #                          definite_changes=False)
+    # _format_resource_changes_stats(builder,
+    #                                what_if_operation_result.potential_changes,
+    #                                definite_changes=False)
+    # _format_diagnostics(builder,
+    #                     what_if_operation_result.changes,
+    #                     what_if_operation_result.potential_changes,
+    #                     what_if_operation_result.diagnostics)
     return builder.build()
 
 

src/azure-cli/azure/cli/command_modules/resource/_utils.py

@@ -87,7 +87,10 @@ def _build_preflight_error_message(preflight_error):
 
 
 def _build_http_response_error_message(http_error):
-    error_txt = http_error.response.internal_response.text
+    try:
+        error_txt = http_error.response.internal_response.text
+    except AttributeError:
+        return ''
 
     error_info = json.loads(error_txt)['error']
     error_details = error_info.pop('details') if 'details' in error_info else []

src/azure-cli/azure/cli/command_modules/resource/tests/latest/recordings/test_aaz_resource_id_arg_fmt.yaml

@@ -14,7 +14,7 @@ interactions:
       - AZURECLI/2.45.0 azsdk-python-azure-mgmt-resource/22.0.0 Python/3.10.9 (Linux-5.15.0-1031-azure-x86_64-with-glibc2.31)
         VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_220_0
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test_resource_id_arg_fmt000001?api-version=2022-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test_resource_id_arg_fmt000001?api-version=2024-11-01
   response:
     body:
       string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_resource_id_arg_fmt000001","name":"test_resource_id_arg_fmt000001","type":"Microsoft.Resources/resourceGroups","location":"eastus2","tags":{"product":"azurecli","cause":"automation","date":"2023-02-07T11:12:46Z"},"properties":{"provisioningState":"Succeeded"}}'
@@ -55,7 +55,7 @@ interactions:
       - AZURECLI/2.45.0 azsdk-python-azure-mgmt-resource/22.0.0 Python/3.10.9 (Linux-5.15.0-1031-azure-x86_64-with-glibc2.31)
         VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_220_0
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test_resource_id_arg_fmt000001?api-version=2022-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test_resource_id_arg_fmt000001?api-version=2024-11-01
   response:
     body:
       string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_resource_id_arg_fmt000001","name":"test_resource_id_arg_fmt000001","type":"Microsoft.Resources/resourceGroups","location":"eastus2","tags":{"product":"azurecli","cause":"automation","date":"2023-02-07T11:12:46Z"},"properties":{"provisioningState":"Succeeded"}}'
@@ -96,7 +96,7 @@ interactions:
       - AZURECLI/2.45.0 azsdk-python-azure-mgmt-resource/22.0.0 Python/3.10.9 (Linux-5.15.0-1031-azure-x86_64-with-glibc2.31)
         VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_220_0
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test_resource_id_arg_fmt000001?api-version=2022-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test_resource_id_arg_fmt000001?api-version=2024-11-01
   response:
     body:
       string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_resource_id_arg_fmt000001","name":"test_resource_id_arg_fmt000001","type":"Microsoft.Resources/resourceGroups","location":"eastus2","tags":{"product":"azurecli","cause":"automation","date":"2023-02-07T11:12:46Z"},"properties":{"provisioningState":"Succeeded"}}'
@@ -137,7 +137,7 @@ interactions:
       - AZURECLI/2.45.0 azsdk-python-azure-mgmt-resource/22.0.0 Python/3.10.9 (Linux-5.15.0-1031-azure-x86_64-with-glibc2.31)
         VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_220_0
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test_resource_id_arg_fmt000001?api-version=2022-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test_resource_id_arg_fmt000001?api-version=2024-11-01
   response:
     body:
       string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_resource_id_arg_fmt000001","name":"test_resource_id_arg_fmt000001","type":"Microsoft.Resources/resourceGroups","location":"eastus2","tags":{"product":"azurecli","cause":"automation","date":"2023-02-07T11:12:46Z"},"properties":{"provisioningState":"Succeeded"}}'

src/azure-cli/azure/cli/command_modules/resource/tests/latest/recordings/test_aaz_resource_location_arg_fmt.yaml

@@ -13,7 +13,7 @@ interactions:
       User-Agent:
       - AZURECLI/2.60.0 azsdk-python-core/1.28.0 Python/3.10.12 (Linux-5.15.146.1-microsoft-standard-WSL2-x86_64-with-glibc2.35)
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test_resource_location_arg_fmt000001?api-version=2022-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test_resource_location_arg_fmt000001?api-version=2024-11-01
   response:
     body:
       string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_resource_location_arg_fmt000001","name":"test_resource_location_arg_fmt000001","type":"Microsoft.Resources/resourceGroups","location":"eastus2","tags":{"product":"azurecli","cause":"automation","test":"test_aaz_resource_location_arg_fmt","date":"2024-05-07T16:44:11Z","module":"resource"},"properties":{"provisioningState":"Succeeded"}}'

src/azure-cli/azure/cli/command_modules/resource/tests/latest/recordings/test_aaz_subscription_id_arg_format.yaml

@@ -16,7 +16,7 @@ interactions:
       - AZURECLI/2.45.0 azsdk-python-azure-mgmt-resource/22.0.0 Python/3.10.9 (Linux-5.15.0-1031-azure-x86_64-with-glibc2.31)
         VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_220_0
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test_subscription_id_arg_format000001?api-version=2022-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/test_subscription_id_arg_format000001?api-version=2024-11-01
   response:
     body:
       string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_subscription_id_arg_format000001","name":"test_subscription_id_arg_format000001","type":"Microsoft.Resources/resourceGroups","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2023-02-07T11:12:53Z"},"properties":{"provisioningState":"Succeeded"}}'

src/azure-cli/azure/cli/command_modules/resource/tests/latest/recordings/test_cannotdelete_resource_lock.yaml

@@ -16,7 +16,7 @@ interactions:
       - AZURECLI/2.45.0 azsdk-python-azure-mgmt-resource/22.0.0 Python/3.10.9 (Linux-5.15.0-1031-azure-x86_64-with-glibc2.31)
         VSTS_7b238909-6802-4b65-b90d-184bca47f458_build_220_0
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_cannotdelete_resource_lock000001?api-version=2022-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_cannotdelete_resource_lock000001?api-version=2024-11-01
   response:
     body:
       string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_cannotdelete_resource_lock000001","name":"cli_test_cannotdelete_resource_lock000001","type":"Microsoft.Resources/resourceGroups","location":"westus","tags":{"product":"azurecli","cause":"automation","date":"2023-02-07T11:12:56Z"},"properties":{"provisioningState":"Succeeded"}}'