From 8927e92ea6d6cef7fd5e1b64d636a3b588d5c346 Mon Sep 17 00:00:00 2001 From: Matthew Boentoro Date: Thu, 1 May 2025 21:24:39 -0700 Subject: [PATCH 1/2] {RDBMS} az postgres flexible-server create: Remove the breaking change from validators and breaking_change file --- .../azure/cli/command_modules/rdbms/_breaking_change.py | 3 --- src/azure-cli/azure/cli/command_modules/rdbms/validators.py | 5 ----- 2 files changed, 8 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/_breaking_change.py b/src/azure-cli/azure/cli/command_modules/rdbms/_breaking_change.py index 656c81a5bf4..0bea61a0734 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/_breaking_change.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/_breaking_change.py @@ -10,9 +10,6 @@ register_logic_breaking_change('postgres flexible-server create', 'Update default value of "--sku-name"', detail='The default value will be changed from "Standard_D2s_v3" to a ' 'supported sku based on regional capabilities.') -register_default_value_breaking_change('postgres flexible-server create', '--version', '16', '17') -register_default_value_breaking_change('postgres flexible-server create', '--create-default-database', 'Enabled', - 'Disabled') register_argument_deprecate('postgres flexible-server create', '--active-directory-auth', '--microsoft-entra-auth') register_argument_deprecate('postgres flexible-server update', '--active-directory-auth', '--microsoft-entra-auth') register_command_group_deprecate('postgres flexible-server ad-admin', redirect='microsoft-entra-admin') diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/validators.py b/src/azure-cli/azure/cli/command_modules/rdbms/validators.py index efee756a851..66d13b47f29 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/validators.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/validators.py @@ -520,11 +520,6 @@ def _pg_version_validator(version, versions, is_create): "We recommend selecting PostgreSQL 13 or a later version for " "all future operations.") - if is_create: - # Warning for upcoming breaking change to default value of pg version - logger.warning("The default value for the PostgreSQL server major version " - "will be updating to 17 in the near future.") - def _pg_high_availability_validator(high_availability, standby_availability_zone, zone, tier, single_az, instance): if instance: From fee4c0002d2ac40edb24a01b55465ed453e1ea9a Mon Sep 17 00:00:00 2001 From: Matthew Boentoro Date: Thu, 1 May 2025 23:07:11 -0700 Subject: [PATCH 2/2] remove unused param --- .../azure/cli/command_modules/rdbms/_breaking_change.py | 2 +- src/azure-cli/azure/cli/command_modules/rdbms/validators.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/_breaking_change.py b/src/azure-cli/azure/cli/command_modules/rdbms/_breaking_change.py index 0bea61a0734..539a242c5ae 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/_breaking_change.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/_breaking_change.py @@ -3,7 +3,7 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from azure.cli.core.breaking_change import register_command_group_deprecate, register_default_value_breaking_change, \ +from azure.cli.core.breaking_change import register_command_group_deprecate, \ register_argument_deprecate, register_other_breaking_change, register_logic_breaking_change diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/validators.py b/src/azure-cli/azure/cli/command_modules/rdbms/validators.py index 66d13b47f29..b591f2cd35f 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/validators.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/validators.py @@ -350,7 +350,7 @@ def pg_arguments_validator(db_context, location, tier, sku_name, storage_gb, ser _pg_storage_validator(storage_gb, sku_info, tier, storage_type, iops, throughput, instance) _pg_sku_name_validator(sku_name, sku_info, tier, instance) _pg_high_availability_validator(high_availability, standby_availability_zone, zone, tier, single_az, instance) - _pg_version_validator(version, list_location_capability_info['server_versions'], is_create) + _pg_version_validator(version, list_location_capability_info['server_versions']) pg_byok_validator(byok_identity, byok_key, backup_byok_identity, backup_byok_key, geo_redundant_backup, instance) is_microsoft_entra_auth = bool(active_directory_auth is not None and active_directory_auth.lower() == 'enabled') \ or bool(microsoft_entra_auth is not None and microsoft_entra_auth.lower() == 'enabled') @@ -510,7 +510,7 @@ def _pg_storage_performance_tier_validator(performance_tier, sku_info, tier=None ' Allowed values : {}'.format(storage_size, performance_tiers)) -def _pg_version_validator(version, versions, is_create): +def _pg_version_validator(version, versions): if version: if version not in versions: raise CLIError('Incorrect value for --version. Allowed values : {}'.format(sorted(versions)))