Fix up some broken tests

Author: anthony-c-martin

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

@@ -5,6 +5,7 @@
 
 import re
 import json
+from azure.core.exceptions import HttpResponseError
 
 _management_group_pattern = (
     r"^\/?providers\/Microsoft.Management\/managementGroups\/(?P<management_group_id>[\w\d_\.\(\)-]+)"
@@ -87,7 +88,10 @@ def _build_preflight_error_message(preflight_error):
 
 
 def _build_http_response_error_message(http_error):
-    error_txt = http_error.response.internal_response.text
+    if not isinstance(http_error, HttpResponseError):
+        raise TypeError("http_error must be an instance of HttpResponseError")
+
+    error_txt = http_error.response.text()
 
     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/commands.py

@@ -158,13 +158,13 @@ def load_command_table(self, _):
     )
 
     resource_deployment_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.resource.resources.operations#DeploymentsOperations.{}',
+        operations_tmpl='azure.mgmt.resource.deployments.operations#DeploymentsOperations.{}',
         client_factory=cf_deployments,
         resource_type=ResourceType.MGMT_RESOURCE_DEPLOYMENTS
     )
 
     resource_deployment_operation_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.resource.resources.operations#DeploymentOperationsOperations.{}',
+        operations_tmpl='azure.mgmt.resource.deployments.operations#DeploymentOperationsOperations.{}',
         client_factory=cf_deployment_operations,
         resource_type=ResourceType.MGMT_RESOURCE_DEPLOYMENTS
     )

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

@@ -729,7 +729,7 @@ def _deploy_arm_template_at_management_group(cmd,
     deployment = ScopedDeployment(properties=deployment_properties, location=deployment_location)
     try:
         validation_poller = mgmt_client.begin_validate_at_management_group_scope(management_group_id,
-                                                                                    deployment_name, deployment)
+                                                                                 deployment_name, deployment)
     except HttpResponseError as err:
         err_message = _build_http_response_error_message(err)
         raise_subdivision_deployment_error(err_message, err.error.code if err.error else None)
@@ -809,7 +809,7 @@ def _deploy_arm_template_at_tenant_scope(cmd,
     deployment = ScopedDeployment(properties=deployment_properties, location=deployment_location)
     try:
         validation_poller = mgmt_client.begin_validate_at_tenant_scope(deployment_name=deployment_name,
-                                                                        parameters=deployment)
+                                                                       parameters=deployment)
     except HttpResponseError as err:
         err_message = _build_http_response_error_message(err)
         raise_subdivision_deployment_error(err_message, err.error.code if err.error else None)

src/azure-cli/azure/cli/command_modules/resource/tests/latest/management_group_level_parameters.json

@@ -1,9 +1,5 @@
 {
   "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
   "contentVersion": "1.0.0.0",
-  "parameters": {
-    "nestedsubId": {
-      "value": "0b1f6471-1bf0-4dda-aec3-cb9272f09590"
-    }
-  }
+  "parameters": {}
 }

src/azure-cli/azure/cli/command_modules/resource/tests/latest/management_group_level_template.json

@@ -5,7 +5,7 @@
     "targetMG": {
       "type": "string"
     },
-    "nestedsubId": {
+    "nestedSubId": {
       "type": "string"
     },
     "nestedRG": {
@@ -72,7 +72,7 @@
               "type": "Microsoft.Resources/resourceGroups",
               "name": "[parameters('nestedRG')]",
               "apiVersion": "2018-05-01",
-              "location": "East US 2 EUAP",
+              "location": "West US",
               "properties": {
 
               }

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

@@ -29,7 +29,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Fri, 20 Jun 2025 17:06:53 GMT
+      - Mon, 23 Jun 2025 13:15:30 GMT
       expires:
       - '-1'
       pragma:
@@ -43,7 +43,7 @@ interactions:
       x-ms-failure-cause:
       - gateway
       x-msedge-ref:
-      - 'Ref A: C5AAD8346AC3473F8EB606DB451C8611 Ref B: BN1AA2051013017 Ref C: 2025-06-20T17:06:53Z'
+      - 'Ref A: D628529BCDDC460DBCA3C04ECB6F7AD2 Ref B: BN1AA2051013025 Ref C: 2025-06-23T13:15:30Z'
     status:
       code: 404
       message: Not Found
@@ -77,7 +77,7 @@ interactions:
       content-type:
       - application/json; charset=utf-8
       date:
-      - Fri, 20 Jun 2025 17:06:53 GMT
+      - Mon, 23 Jun 2025 13:15:30 GMT
       expires:
       - '-1'
       pragma:
@@ -91,7 +91,7 @@ interactions:
       x-ms-failure-cause:
       - gateway
       x-msedge-ref:
-      - 'Ref A: 6A76C2457EE249B7A68B2430D3718FE8 Ref B: BN1AA2051013029 Ref C: 2025-06-20T17:06:53Z'
+      - 'Ref A: E5F1C1BA263C4F7A9FCEF58E7E8CA626 Ref B: BN1AA2051015045 Ref C: 2025-06-23T13:15:30Z'
     status:
       code: 404
       message: Not Found
@@ -121,20 +121,21 @@ interactions:
     body:
       string: "{\r\n  \"location\": \"westus\",\r\n  \"tags\": {},\r\n  \"properties\":
         {\r\n    \"description\": \"AzCLI test root template spec\"\r\n  },\r\n  \"systemData\":
-        {\r\n    \"createdBy\": \"test@example.com\",\r\n    \"createdByType\": \"User\",\r\n
-        \   \"createdAt\": \"2025-06-20T17:06:54.7552142Z\",\r\n    \"lastModifiedBy\":
-        \"test@example.com\",\r\n    \"lastModifiedByType\": \"User\",\r\n    \"lastModifiedAt\":
-        \"2025-06-20T17:06:54.7552142Z\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002\",\r\n
+        {\r\n    \"createdBy\": \"anthony.ct.martin@gmail.com\",\r\n    \"createdByType\":
+        \"User\",\r\n    \"createdAt\": \"2025-06-23T13:15:32.0669075Z\",\r\n    \"lastModifiedBy\":
+        \"anthony.ct.martin@gmail.com\",\r\n    \"lastModifiedByType\": \"User\",\r\n
+        \   \"lastModifiedAt\": \"2025-06-23T13:15:32.0669075Z\"\r\n  },\r\n  \"id\":
+        \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002\",\r\n
         \ \"type\": \"Microsoft.Resources/templateSpecs\",\r\n  \"name\": \"cli-test-create-template-spec000002\"\r\n}"
     headers:
       cache-control:
       - no-cache
       content-length:
-      - '682'
+      - '704'
       content-type:
       - application/json; charset=utf-8
       date:
-      - Fri, 20 Jun 2025 17:06:54 GMT
+      - Mon, 23 Jun 2025 13:15:31 GMT
       expires:
       - '-1'
       pragma:
@@ -146,13 +147,13 @@ interactions:
       x-content-type-options:
       - nosniff
       x-ms-operation-identifier:
-      - tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47,objectId=83cb6ceb-42ff-4c0f-9239-2afb8f90086a/eastus/a3bfaa15-2469-4028-b54a-14da233fc8a3
+      - tenantId=3f371d31-f8f9-4ac4-9950-b5c4ff5bbb3d,objectId=880dfe77-3cbb-4d27-b0cf-0052ba153f33/eastus/0b785bcc-fe0a-42d4-9a86-254835f0020b
       x-ms-ratelimit-remaining-subscription-global-writes:
-      - '11999'
+      - '2999'
       x-ms-ratelimit-remaining-subscription-writes:
-      - '799'
+      - '199'
       x-msedge-ref:
-      - 'Ref A: 79FE0763406B4D1AA91B4A29CEEA0371 Ref B: BN1AA2051015021 Ref C: 2025-06-20T17:06:54Z'
+      - 'Ref A: 6C0BF96198A846D5A472521BF3B7239C Ref B: BN1AA2051012037 Ref C: 2025-06-23T13:15:30Z'
     status:
       code: 201
       message: Created
@@ -371,21 +372,22 @@ interactions:
         ''))]\"\r\n      },\r\n      \"resources\": [],\r\n      \"outputs\": {\r\n
         \       \"name\": {\r\n          \"type\": \"string\",\r\n          \"value\":
         \"[toLower(variables('name'))]\"\r\n        }\r\n      }\r\n    }\r\n  },\r\n
-        \ \"systemData\": {\r\n    \"createdBy\": \"test@example.com\",\r\n    \"createdByType\":
-        \"User\",\r\n    \"createdAt\": \"2025-06-20T17:06:57.1197197Z\",\r\n    \"lastModifiedBy\":
-        \"test@example.com\",\r\n    \"lastModifiedByType\": \"User\",\r\n    \"lastModifiedAt\":
-        \"2025-06-20T17:06:57.1197197Z\"\r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002/versions/1.0\",\r\n
+        \ \"systemData\": {\r\n    \"createdBy\": \"anthony.ct.martin@gmail.com\",\r\n
+        \   \"createdByType\": \"User\",\r\n    \"createdAt\": \"2025-06-23T13:15:33.2532932Z\",\r\n
+        \   \"lastModifiedBy\": \"anthony.ct.martin@gmail.com\",\r\n    \"lastModifiedByType\":
+        \"User\",\r\n    \"lastModifiedAt\": \"2025-06-23T13:15:33.2532932Z\"\r\n
+        \ },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002/versions/1.0\",\r\n
         \ \"type\": \"Microsoft.Resources/templateSpecs/versions\",\r\n  \"name\":
         \"1.0\"\r\n}"
     headers:
       cache-control:
       - no-cache
       content-length:
-      - '10056'
+      - '10078'
       content-type:
       - application/json; charset=utf-8
       date:
-      - Fri, 20 Jun 2025 17:06:56 GMT
+      - Mon, 23 Jun 2025 13:15:33 GMT
       expires:
       - '-1'
       pragma:
@@ -397,14 +399,64 @@ interactions:
       x-content-type-options:
       - nosniff
       x-ms-operation-identifier:
-      - tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47,objectId=83cb6ceb-42ff-4c0f-9239-2afb8f90086a/eastus/94a3503d-fbd2-441e-b76c-dd35bfc406d7
+      - tenantId=3f371d31-f8f9-4ac4-9950-b5c4ff5bbb3d,objectId=880dfe77-3cbb-4d27-b0cf-0052ba153f33/eastus/e7e0bd1d-b671-45d5-9409-b0ce7d67e5f9
       x-ms-ratelimit-remaining-subscription-global-writes:
-      - '11999'
+      - '2999'
       x-ms-ratelimit-remaining-subscription-writes:
-      - '799'
+      - '199'
       x-msedge-ref:
-      - 'Ref A: 2B9305DE0EC84A7AA9A74C3F08241824 Ref B: BN1AA2051014051 Ref C: 2025-06-20T17:06:55Z'
+      - 'Ref A: A5508F236D894B0C90522549D0A6B294 Ref B: BN1AA2051012019 Ref C: 2025-06-23T13:15:32Z'
     status:
       code: 201
       message: Created
+- request:
+    body: null
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip, deflate
+      CommandName:
+      - ts delete
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+      ParameterSetName:
+      - --template-spec --yes
+      User-Agent:
+      - AZURECLI/2.74.0 azsdk-python-core/1.31.0 Python/3.12.1 (Linux-6.8.0-1027-azure-x86_64-with-glibc2.31)
+    method: DELETE
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_template_specs000001/providers/Microsoft.Resources/templateSpecs/cli-test-create-template-spec000002?api-version=2022-02-01
+  response:
+    body:
+      string: ''
+    headers:
+      cache-control:
+      - no-cache
+      content-length:
+      - '0'
+      date:
+      - Mon, 23 Jun 2025 13:15:35 GMT
+      expires:
+      - '-1'
+      pragma:
+      - no-cache
+      strict-transport-security:
+      - max-age=31536000; includeSubDomains
+      x-cache:
+      - CONFIG_NOCACHE
+      x-content-type-options:
+      - nosniff
+      x-ms-operation-identifier:
+      - tenantId=3f371d31-f8f9-4ac4-9950-b5c4ff5bbb3d,objectId=880dfe77-3cbb-4d27-b0cf-0052ba153f33/eastus/d3f421bc-9563-4502-9beb-7ad2c70df903
+      x-ms-ratelimit-remaining-subscription-deletes:
+      - '199'
+      x-ms-ratelimit-remaining-subscription-global-deletes:
+      - '2999'
+      x-msedge-ref:
+      - 'Ref A: CA08CBD56C914612B258CC796EBA419E Ref B: BN1AA2051015019 Ref C: 2025-06-23T13:15:33Z'
+    status:
+      code: 200
+      message: OK
 version: 1