Skip to content

Commit e16d280

Browse files
yanzhuddnddq
authored andcommitted
{Compute} Use the static API version when checking resource existence (Azure#32963)
1 parent ba1ce63 commit e16d280

26 files changed

+50
-43
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3462,7 +3462,7 @@ interactions:
34623462
User-Agent:
34633463
- AZURECLI/2.84.0 azsdk-python-core/1.38.0 Python/3.12.10 (Windows-11-10.0.26200-SP0)
34643464
method: GET
3465-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_nw_packet_capture000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2025-07-01
3465+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_nw_packet_capture000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2023-11-01
34663466
response:
34673467
body:
34683468
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm1''

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3277,7 +3277,7 @@ interactions:
32773277
User-Agent:
32783278
- AZURECLI/2.71.0 azsdk-python-core/1.31.0 Python/3.10.11 (Windows-10-10.0.26100-SP0)
32793279
method: GET
3280-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_nw_vm000001/providers/Microsoft.Network/networkSecurityGroups/nsg1?api-version=2024-07-01
3280+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_nw_vm000001/providers/Microsoft.Network/networkSecurityGroups/nsg1?api-version=2023-11-01
32813281
response:
32823282
body:
32833283
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/nsg1''

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,7 @@ interactions:
15931593
User-Agent:
15941594
- AZURECLI/2.72.0 azsdk-python-core/1.31.0 Python/3.11.9 (Windows-10-10.0.26100-SP0)
15951595
method: GET
1596-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2024-07-01
1596+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2023-11-01
15971597
response:
15981598
body:
15991599
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm1''
@@ -9075,7 +9075,7 @@ interactions:
90759075
User-Agent:
90769076
- AZURECLI/2.72.0 azsdk-python-core/1.31.0 Python/3.11.9 (Windows-10-10.0.26100-SP0)
90779077
method: GET
9078-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm2?api-version=2024-07-01
9078+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm2?api-version=2023-11-01
90799079
response:
90809080
body:
90819081
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm2''

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1593,7 +1593,7 @@ interactions:
15931593
User-Agent:
15941594
- AZURECLI/2.72.0 azsdk-python-core/1.31.0 Python/3.11.9 (Windows-10-10.0.26100-SP0)
15951595
method: GET
1596-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2024-07-01
1596+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2023-11-01
15971597
response:
15981598
body:
15991599
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm1''

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,7 +1581,7 @@ interactions:
15811581
User-Agent:
15821582
- AZURECLI/2.72.0 azsdk-python-core/1.31.0 Python/3.12.1 (Linux-6.8.0-1026-azure-x86_64-with-glibc2.31)
15831583
method: GET
1584-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2024-07-01
1584+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2023-11-01
15851585
response:
15861586
body:
15871587
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm1''
@@ -9110,7 +9110,7 @@ interactions:
91109110
User-Agent:
91119111
- AZURECLI/2.72.0 azsdk-python-core/1.31.0 Python/3.12.1 (Linux-6.8.0-1026-azure-x86_64-with-glibc2.31)
91129112
method: GET
9113-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm2?api-version=2024-07-01
9113+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm2?api-version=2023-11-01
91149114
response:
91159115
body:
91169116
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm2''

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1697,7 +1697,7 @@ interactions:
16971697
User-Agent:
16981698
- AZURECLI/2.74.0 azsdk-python-core/1.31.0 Python/3.12.10 (Windows-11-10.0.26100-SP0)
16991699
method: GET
1700-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2024-10-01
1700+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm1?api-version=2023-11-01
17011701
response:
17021702
body:
17031703
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm1''
@@ -9402,7 +9402,7 @@ interactions:
94029402
User-Agent:
94039403
- AZURECLI/2.74.0 azsdk-python-core/1.31.0 Python/3.12.10 (Windows-11-10.0.26100-SP0)
94049404
method: GET
9405-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm2?api-version=2024-10-01
9405+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/connection_monitor_v2_test_000001/providers/Microsoft.Network/networkSecurityGroups/vm2?api-version=2023-11-01
94069406
response:
94079407
body:
94089408
string: '{"error":{"code":"ResourceNotFound","message":"The Resource ''Microsoft.Network/networkSecurityGroups/vm2''

src/azure-cli/azure/cli/command_modules/vm/_validators.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ def _validate_proximity_placement_group(cmd, namespace):
9090
parsed = parse_resource_id(namespace.proximity_placement_group)
9191
rg, name = parsed['resource_group'], parsed['name']
9292

93-
if not check_existence(cmd.cli_ctx, name, rg, 'Microsoft.Compute', 'proximityPlacementGroups'):
93+
if not check_existence(cmd.cli_ctx, name, rg, 'Microsoft.Compute',
94+
'proximityPlacementGroups', static_version='2024-07-01'):
9495
raise CLIError("Proximity Placement Group '{}' does not exist.".format(name))
9596

9697

@@ -692,7 +693,8 @@ def _validate_vm_create_storage_account(cmd, namespace):
692693
if namespace.storage_account:
693694
storage_id = parse_resource_id(namespace.storage_account)
694695
rg = storage_id.get('resource_group', namespace.resource_group_name)
695-
if check_existence(cmd.cli_ctx, storage_id['name'], rg, 'Microsoft.Storage', 'storageAccounts'):
696+
if check_existence(cmd.cli_ctx, storage_id['name'], rg, 'Microsoft.Storage',
697+
'storageAccounts', static_version='2024-01-01'):
696698
# 1 - existing storage account specified
697699
namespace.storage_account_type = 'existing'
698700
logger.debug("using specified existing storage account '%s'", storage_id['name'])
@@ -735,7 +737,8 @@ def _validate_vm_create_availability_set(cmd, namespace):
735737
name = as_id['name']
736738
rg = as_id.get('resource_group', namespace.resource_group_name)
737739

738-
if not check_existence(cmd.cli_ctx, name, rg, 'Microsoft.Compute', 'availabilitySets'):
740+
if not check_existence(cmd.cli_ctx, name, rg, 'Microsoft.Compute',
741+
'availabilitySets', static_version='2024-07-01'):
739742
raise CLIError("Availability set '{}' does not exist.".format(name))
740743

741744
namespace.availability_set = resource_id(
@@ -755,7 +758,8 @@ def _validate_vm_create_vmss(cmd, namespace):
755758
name = as_id['name']
756759
rg = as_id.get('resource_group', namespace.resource_group_name)
757760

758-
if not check_existence(cmd.cli_ctx, name, rg, 'Microsoft.Compute', 'virtualMachineScaleSets'):
761+
if not check_existence(cmd.cli_ctx, name, rg, 'Microsoft.Compute',
762+
'virtualMachineScaleSets', static_version='2025-04-01'):
759763
raise CLIError("virtual machine scale set '{}' does not exist.".format(name))
760764

761765
namespace.vmss = resource_id(
@@ -1035,7 +1039,8 @@ def _validate_vm_create_nsg(cmd, namespace):
10351039

10361040
if namespace.nsg:
10371041
if check_existence(cmd.cli_ctx, namespace.nsg, namespace.resource_group_name,
1038-
'Microsoft.Network', 'networkSecurityGroups'):
1042+
'Microsoft.Network', 'networkSecurityGroups',
1043+
static_version="2023-11-01"):
10391044
namespace.nsg_type = 'existing'
10401045
logger.debug("using specified NSG '%s'", namespace.nsg)
10411046
else:
@@ -1058,7 +1063,8 @@ def _validate_vmss_create_nsg(cmd, namespace):
10581063
def _validate_vm_vmss_create_public_ip(cmd, namespace):
10591064
if namespace.public_ip_address:
10601065
if check_existence(cmd.cli_ctx, namespace.public_ip_address, namespace.resource_group_name,
1061-
'Microsoft.Network', 'publicIPAddresses'):
1066+
'Microsoft.Network', 'publicIPAddresses',
1067+
static_version='2022-05-01'):
10621068
namespace.public_ip_address_type = 'existing'
10631069
logger.debug("using existing specified public IP '%s'", namespace.public_ip_address)
10641070
else:

src/azure-cli/azure/cli/command_modules/vm/_vm_utils.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@ def check_existence(cli_ctx, value, resource_group, provider_namespace, resource
9393
resource_name = id_parts['name']
9494
resource_type = id_parts.get('type', resource_type)
9595

96-
api_version = _resolve_api_version(cli_ctx, provider_namespace, resource_type, parent_path)
97-
if static_version: # only for vnet
96+
if static_version:
9897
api_version = static_version
98+
else:
99+
api_version = _resolve_api_version(cli_ctx, provider_namespace, resource_type, parent_path)
99100

100101
try:
101102
resource_client.get(rg, ns, parent_path, resource_type, resource_name, api_version)

src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_create_vm_with_shared_gallery_image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3916,7 +3916,7 @@ interactions:
39163916
User-Agent:
39173917
- AZURECLI/2.71.0 azsdk-python-core/1.31.0 Python/3.12.9 (Linux-6.8.0-1021-azure-x86_64-with-glibc2.36)
39183918
method: GET
3919-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/publicIPAddresses/pubip?api-version=2024-07-01
3919+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest.rg000001/providers/Microsoft.Network/publicIPAddresses/pubip?api-version=2022-05-01
39203920
response:
39213921
body:
39223922
string: '{"name":"pubip","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg000001/providers/Microsoft.Network/publicIPAddresses/pubip","etag":"W/\"80267895-4ce0-4ce9-a1f2-462176bfa265\"","location":"westus","properties":{"provisioningState":"Succeeded","resourceGuid":"67086f65-b393-436d-a5c4-09ff7129484e","ipAddress":"172.184.160.120","publicIPAddressVersion":"IPv4","publicIPAllocationMethod":"Static","idleTimeoutInMinutes":4,"ipTags":[{"ipTagType":"FirstPartyUsage","tag":"/NonProd"}],"ddosSettings":{"protectionMode":"VirtualNetworkInherited"}},"type":"Microsoft.Network/publicIPAddresses","sku":{"name":"Standard","tier":"Regional"}}'

src/azure-cli/azure/cli/command_modules/vm/tests/latest/recordings/test_image_version_create_for_diff_source.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3917,7 +3917,7 @@ interactions:
39173917
User-Agent:
39183918
- AZURECLI/2.71.0 azsdk-python-core/1.31.0 Python/3.12.9 (Linux-6.8.0-1021-azure-x86_64-with-glibc2.36)
39193919
method: GET
3920-
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_image_version_create_000001/providers/Microsoft.Network/publicIPAddresses/pubip?api-version=2024-07-01
3920+
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/cli_test_image_version_create_000001/providers/Microsoft.Network/publicIPAddresses/pubip?api-version=2022-05-01
39213921
response:
39223922
body:
39233923
string: '{"name":"pubip","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/cli_test_image_version_create_000001/providers/Microsoft.Network/publicIPAddresses/pubip","etag":"W/\"a70e8018-4560-4c6d-b92b-3fa945aab7b1\"","location":"westus","properties":{"provisioningState":"Succeeded","resourceGuid":"264ec368-bd59-4314-98a3-dc9fe55d0206","ipAddress":"20.66.96.64","publicIPAddressVersion":"IPv4","publicIPAllocationMethod":"Static","idleTimeoutInMinutes":4,"ipTags":[{"ipTagType":"FirstPartyUsage","tag":"/NonProd"}],"ddosSettings":{"protectionMode":"VirtualNetworkInherited"}},"type":"Microsoft.Network/publicIPAddresses","sku":{"name":"Standard","tier":"Regional"}}'

0 commit comments

Comments
 (0)