Skip to content

Commit 8642715

Browse files
{RDBMS} Return default API version if available in _resolve_api_version function (#32271)
1 parent 63f27dd commit 8642715

File tree

31 files changed

+83215
-84684
lines changed

31 files changed

+83215
-84684
lines changed

src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,8 @@ def _resolve_api_version(client, provider_namespace, resource_type, parent_path)
306306
if t.resource_type.lower() == resource_type_str.lower()]
307307
if not rt:
308308
raise InvalidArgumentValueError('Resource type {} not found.'.format(resource_type_str))
309+
if len(rt) == 1 and rt[0].default_api_version not in (None, ''):
310+
return rt[0].default_api_version
309311
if len(rt) == 1 and rt[0].api_versions:
310312
npv = [v for v in rt[0].api_versions if 'preview' not in v.lower()]
311313
return npv[0] if npv else rt[0].api_versions[0]

src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_flexible_server_ssdv2_mgmt.yaml

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

src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_flexible_server_ssdv2_restore_mgmt.yaml

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

src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_flexible_server_vnet_mgmt_prepare_private_network_subnet.yaml

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

src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_flexible_server_vnet_mgmt_prepare_private_network_vname_and_subnetname.yaml

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

src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_flexible_server_vnet_mgmt_prepare_private_network_vnet.yaml

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

src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_flexible_server_vnet_mgmt_validator.yaml

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

src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_advanced_threat_protection_setting_mgmt.yaml

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

src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_auto_grow_replica_validator.yaml

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

src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/recordings/test_postgres_flexible_server_byok_mgmt.yaml

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

0 commit comments

Comments
 (0)