From eee85a3d973045c283f30be7f520c74a08ae6576 Mon Sep 17 00:00:00 2001 From: RakeshMohan-MSFT <49954584+RakeshMohanMSFT@users.noreply.github.com> Date: Fri, 24 Jun 2022 18:07:25 +0530 Subject: [PATCH 1/3] {rdbms} | None is compared as 'None' Fixes https://github.com/Azure/azure-cli/issues/22968 --- src/azure-cli/azure/cli/command_modules/rdbms/validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b27089d84d7..75ff4d360d8 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/validators.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/validators.py @@ -212,7 +212,7 @@ def _mysql_auto_grow_validator(auto_grow, replication_role, high_availability, i replication_role = instance.replication_role if replication_role is None else replication_role high_availability = instance.high_availability.mode if high_availability is None else high_availability # if replica, cannot be disabled - if replication_role != 'None' and auto_grow.lower() == 'disabled': + if replication_role != None and auto_grow.lower() == 'disabled': raise ValidationError("Auto grow feature for replica server cannot be disabled.") # if ha, cannot be disabled if high_availability in ['Enabled', 'ZoneRedundant'] and auto_grow.lower() == 'disabled': From bcdf6ccc8c63f62c3f62a44a5e8c3273ddee6966 Mon Sep 17 00:00:00 2001 From: RakeshMohan-MSFT <49954584+RakeshMohanMSFT@users.noreply.github.com> Date: Mon, 27 Jun 2022 10:49:05 +0530 Subject: [PATCH 2/3] {rdbms} | updated condition state of comparing none updated condition state of comparing none --- src/azure-cli/azure/cli/command_modules/rdbms/validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 75ff4d360d8..d079b5bd117 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/validators.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/validators.py @@ -212,7 +212,7 @@ def _mysql_auto_grow_validator(auto_grow, replication_role, high_availability, i replication_role = instance.replication_role if replication_role is None else replication_role high_availability = instance.high_availability.mode if high_availability is None else high_availability # if replica, cannot be disabled - if replication_role != None and auto_grow.lower() == 'disabled': + if replication_role is not None and auto_grow.lower() == 'disabled': raise ValidationError("Auto grow feature for replica server cannot be disabled.") # if ha, cannot be disabled if high_availability in ['Enabled', 'ZoneRedundant'] and auto_grow.lower() == 'disabled': From b384e8fbfe0d5c7d4461433456d001b996568b61 Mon Sep 17 00:00:00 2001 From: RakeshMohan-MSFT <49954584+RakeshMohanMSFT@users.noreply.github.com> Date: Thu, 30 Jun 2022 14:27:14 +0530 Subject: [PATCH 3/3] Update src/azure-cli/azure/cli/command_modules/rdbms/validators.py Committing suggestion Co-authored-by: Daeun Yim <69321306+DaeunYim@users.noreply.github.com> --- src/azure-cli/azure/cli/command_modules/rdbms/validators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d079b5bd117..ce1ae8f9ffd 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/validators.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/validators.py @@ -212,7 +212,7 @@ def _mysql_auto_grow_validator(auto_grow, replication_role, high_availability, i replication_role = instance.replication_role if replication_role is None else replication_role high_availability = instance.high_availability.mode if high_availability is None else high_availability # if replica, cannot be disabled - if replication_role is not None and auto_grow.lower() == 'disabled': + if replication_role not in ('None', None) and auto_grow.lower() == 'disabled': raise ValidationError("Auto grow feature for replica server cannot be disabled.") # if ha, cannot be disabled if high_availability in ['Enabled', 'ZoneRedundant'] and auto_grow.lower() == 'disabled':