Skip to content

Commit 7ff0a80

Browse files
{ARM} Pick up new azure-mgmt-resource packages (#31684)
1 parent 8c65f4a commit 7ff0a80

67 files changed

Lines changed: 16525 additions & 15851 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/azure-cli-core/azure/cli/core/profiles/_shared.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ class ResourceType(Enum): # pylint: disable=too-few-public-methods
5858
MGMT_RESOURCE_POLICY = ('azure.mgmt.resource.policy', 'PolicyClient')
5959
MGMT_RESOURCE_RESOURCES = ('azure.mgmt.resource.resources', 'ResourceManagementClient')
6060
MGMT_RESOURCE_SUBSCRIPTIONS = ('azure.mgmt.resource.subscriptions', 'SubscriptionClient')
61+
MGMT_RESOURCE_DEPLOYMENTS = ('azure.mgmt.resource.deployments', 'DeploymentsMgmtClient')
6162
MGMT_RESOURCE_DEPLOYMENTSCRIPTS = ('azure.mgmt.resource.deploymentscripts', 'DeploymentScriptsClient')
6263
MGMT_RESOURCE_TEMPLATESPECS = ('azure.mgmt.resource.templatespecs', 'TemplateSpecsClient')
6364
MGMT_RESOURCE_DEPLOYMENTSTACKS = ('azure.mgmt.resource.deploymentstacks', 'DeploymentStacksClient')
@@ -179,9 +180,10 @@ def default_api_version(self):
179180
}),
180181
ResourceType.MGMT_RESOURCE_RESOURCES: '2024-11-01',
181182
ResourceType.MGMT_RESOURCE_SUBSCRIPTIONS: '2022-12-01',
182-
ResourceType.MGMT_RESOURCE_DEPLOYMENTSCRIPTS: '2020-10-01',
183-
ResourceType.MGMT_RESOURCE_TEMPLATESPECS: '2021-05-01',
184-
ResourceType.MGMT_RESOURCE_DEPLOYMENTSTACKS: '2024-03-01',
183+
ResourceType.MGMT_RESOURCE_DEPLOYMENTS: None,
184+
ResourceType.MGMT_RESOURCE_DEPLOYMENTSCRIPTS: None,
185+
ResourceType.MGMT_RESOURCE_TEMPLATESPECS: None,
186+
ResourceType.MGMT_RESOURCE_DEPLOYMENTSTACKS: None,
185187
ResourceType.MGMT_RESOURCE_PRIVATELINKS: '2020-05-01',
186188
ResourceType.MGMT_RESOURCE_MANAGEDAPPLICATIONS: '2019-07-01',
187189
ResourceType.MGMT_NETWORK_DNS: '2018-05-01',

src/azure-cli/azure/cli/command_modules/acr/tests/latest/recordings/test_acr_abac_task.yaml

Lines changed: 12 additions & 12 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/acr/tests/latest/recordings/test_acr_taskrun.yaml

Lines changed: 7 additions & 7 deletions
Large diffs are not rendered by default.

src/azure-cli/azure/cli/command_modules/appservice/appservice_environment.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
from azure.mgmt.privatedns import PrivateDnsManagementClient
1010

1111
# Models
12-
from azure.mgmt.resource.resources.models import (DeploymentProperties, Deployment, SubResource)
12+
from azure.mgmt.resource.deployments.models import (DeploymentProperties, Deployment)
13+
from azure.mgmt.resource.resources.models import SubResource
1314
from azure.mgmt.privatedns.models import (PrivateZone, VirtualNetworkLink, RecordSet, ARecord)
1415

1516
# Utils

src/azure-cli/azure/cli/command_modules/network/tests/latest/recordings/test_private_endpoint_connection_app_configuration.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ interactions:
2929
User-Agent:
3030
- AZURECLI/2.64.0 azsdk-python-core/1.28.0 Python/3.12.6 (Windows-11-10.0.22631-SP0)
3131
method: POST
32-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/validate?api-version=2024-11-01
32+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/validate?api-version=2025-04-01
3333
response:
3434
body:
3535
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Resources/deployments/appconfiguration_configurationstores_template","name":"appconfiguration_configurationstores_template","type":"Microsoft.Resources/deployments","properties":{"templateHash":"7483349641174567162","parameters":{"target_resource_name":{"type":"String","value":"clitestappconfig"}},"mode":"Incremental","provisioningState":"Succeeded","timestamp":"0001-01-01T00:00:00Z","duration":"PT0S","correlationId":"bf3d66fd-2e5b-487c-befd-4e98ed72f0d3","providers":[{"namespace":"Microsoft.AppConfiguration","resourceTypes":[{"resourceType":"configurationStores","locations":["westus"]}]}],"dependencies":[],"validatedResources":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.AppConfiguration/configurationStores/clitestappconfig"}]}}'
@@ -91,13 +91,13 @@ interactions:
9191
User-Agent:
9292
- AZURECLI/2.64.0 azsdk-python-core/1.28.0 Python/3.12.6 (Windows-11-10.0.22631-SP0)
9393
method: PUT
94-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2024-11-01
94+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2025-04-01
9595
response:
9696
body:
9797
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Resources/deployments/appconfiguration_configurationstores_template","name":"appconfiguration_configurationstores_template","type":"Microsoft.Resources/deployments","properties":{"templateHash":"7483349641174567162","parameters":{"target_resource_name":{"type":"String","value":"clitestappconfig"}},"mode":"Incremental","provisioningState":"Accepted","timestamp":"2024-09-14T12:49:41.569886Z","duration":"PT0.0001261S","correlationId":"24935512-1314-4086-810d-7331a5065251","providers":[{"namespace":"Microsoft.AppConfiguration","resourceTypes":[{"resourceType":"configurationStores","locations":["westus"]}]}],"dependencies":[]}}'
9898
headers:
9999
azure-asyncoperation:
100-
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/appconfiguration_configurationstores_template/operationStatuses/08584752887065525322?api-version=2024-11-01
100+
- https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/appconfiguration_configurationstores_template/operationStatuses/08584752887065525322?api-version=2025-04-01
101101
cache-control:
102102
- no-cache
103103
content-length:
@@ -143,7 +143,7 @@ interactions:
143143
User-Agent:
144144
- AZURECLI/2.64.0 azsdk-python-core/1.28.0 Python/3.12.6 (Windows-11-10.0.22631-SP0)
145145
method: GET
146-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08584752887065525322?api-version=2024-11-01
146+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08584752887065525322?api-version=2025-04-01
147147
response:
148148
body:
149149
string: '{"status":"Running"}'
@@ -189,7 +189,7 @@ interactions:
189189
User-Agent:
190190
- AZURECLI/2.64.0 azsdk-python-core/1.28.0 Python/3.12.6 (Windows-11-10.0.22631-SP0)
191191
method: GET
192-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08584752887065525322?api-version=2024-11-01
192+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08584752887065525322?api-version=2025-04-01
193193
response:
194194
body:
195195
string: '{"status":"Running"}'
@@ -235,7 +235,7 @@ interactions:
235235
User-Agent:
236236
- AZURECLI/2.64.0 azsdk-python-core/1.28.0 Python/3.12.6 (Windows-11-10.0.22631-SP0)
237237
method: GET
238-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08584752887065525322?api-version=2024-11-01
238+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment/operationStatuses/08584752887065525322?api-version=2025-04-01
239239
response:
240240
body:
241241
string: '{"status":"Succeeded"}'
@@ -281,7 +281,7 @@ interactions:
281281
User-Agent:
282282
- AZURECLI/2.64.0 azsdk-python-core/1.28.0 Python/3.12.6 (Windows-11-10.0.22631-SP0)
283283
method: GET
284-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2024-11-01
284+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Resources/deployments/mock-deployment?api-version=2025-04-01
285285
response:
286286
body:
287287
string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Resources/deployments/appconfiguration_configurationstores_template","name":"appconfiguration_configurationstores_template","type":"Microsoft.Resources/deployments","properties":{"templateHash":"7483349641174567162","parameters":{"target_resource_name":{"type":"String","value":"clitestappconfig"}},"mode":"Incremental","provisioningState":"Succeeded","timestamp":"2024-09-14T12:50:21.5770069Z","duration":"PT40.007247S","correlationId":"24935512-1314-4086-810d-7331a5065251","providers":[{"namespace":"Microsoft.AppConfiguration","resourceTypes":[{"resourceType":"configurationStores","locations":["westus"]}]}],"dependencies":[],"outputResources":[{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.AppConfiguration/configurationStores/clitestappconfig"}]}}'

0 commit comments

Comments
 (0)