From 70ce3c200c208cd12a8a806395a92cac02a5fa40 Mon Sep 17 00:00:00 2001 From: Matthew Boentoro Date: Tue, 25 Mar 2025 22:06:23 -0700 Subject: [PATCH 1/4] [RDBMS] az postgres flexible-server create: set the default value of parameter --create-default-database to Disabled --- src/azure-cli/azure/cli/command_modules/rdbms/_params.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/_params.py b/src/azure-cli/azure/cli/command_modules/rdbms/_params.py index 4b9bcead324..01e1d39804d 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/_params.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/_params.py @@ -330,7 +330,7 @@ def _flexible_server_params(command_group): create_default_db_arg_type = CLIArgumentType( arg_type=get_enum_type(['Enabled', 'Disabled']), options_list=['--create-default-database', '-c'], - help='Enable or disable the creation of default database flexibleserverdb. Default value is Enabled.' + help='Enable or disable the creation of default database flexibleserverdb. Default value is Disabled.' ) cluster_option_arg_type = CLIArgumentType( @@ -600,7 +600,7 @@ def _flexible_server_params(command_group): c.argument('iops', default=None, arg_type=iops_v2_arg_type) c.argument('throughput', default=None, arg_type=throughput_arg_type) c.argument('performance_tier', default=None, arg_type=performance_tier_arg_type) - c.argument('create_default_db', default='Enabled', arg_type=create_default_db_arg_type) + c.argument('create_default_db', default='Disabled', arg_type=create_default_db_arg_type) c.argument('create_cluster', default='Server', arg_type=cluster_option_arg_type) c.argument('cluster_size', default=None, arg_type=create_node_count_arg_type) elif command_group == 'mysql': From c016513b0bc7516537e40196f44d26ec5081bf38 Mon Sep 17 00:00:00 2001 From: Matthew Boentoro Date: Tue, 25 Mar 2025 22:06:23 -0700 Subject: [PATCH 2/4] [RDBMS] az postgres flexible-server create: set the default value of parameter --create-default-database to Disabled --- .../cli/command_modules/rdbms/_params.py | 4 ++-- .../latest/test_rdbms_flexible_commands.py | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/_params.py b/src/azure-cli/azure/cli/command_modules/rdbms/_params.py index 3bb01f6ec9a..6c499e15a32 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/_params.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/_params.py @@ -330,7 +330,7 @@ def _flexible_server_params(command_group): create_default_db_arg_type = CLIArgumentType( arg_type=get_enum_type(['Enabled', 'Disabled']), options_list=['--create-default-database', '-c'], - help='Enable or disable the creation of default database flexibleserverdb. Default value is Enabled.' + help='Enable or disable the creation of default database flexibleserverdb. Default value is Disabled.' ) cluster_option_arg_type = CLIArgumentType( @@ -611,7 +611,7 @@ def _flexible_server_params(command_group): c.argument('iops', default=None, arg_type=iops_v2_arg_type) c.argument('throughput', default=None, arg_type=throughput_arg_type) c.argument('performance_tier', default=None, arg_type=performance_tier_arg_type) - c.argument('create_default_db', default='Enabled', arg_type=create_default_db_arg_type) + c.argument('create_default_db', default='Disabled', arg_type=create_default_db_arg_type) c.argument('create_cluster', default='Server', arg_type=cluster_option_arg_type) c.argument('cluster_size', default=None, arg_type=create_node_count_arg_type) elif command_group == 'mysql': diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/test_rdbms_flexible_commands.py b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/test_rdbms_flexible_commands.py index 6d9eb9be57a..d3c4da46e97 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/test_rdbms_flexible_commands.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/test_rdbms_flexible_commands.py @@ -53,7 +53,7 @@ def __init__(self, engine_type, location, engine_parameter_name='database_engine def create_resource(self, name, **kwargs): group = self._get_resource_group(**kwargs) - template = 'az {} flexible-server create -l {} -g {} -n {} --public-access none' + template = 'az {} flexible-server create -l {} -g {} -n {} --public-access none --create-default-database Enabled' execute(self.cli_ctx, template.format(self.engine_type, self.location, group, name)) @@ -145,7 +145,7 @@ def _test_flexible_server_mgmt(self, database_engine, resource_group): self.cmd('{} flexible-server create -g {} -n {} --backup-retention {} --sku-name {} --tier {} \ --storage-size {} -u {} --version {} --tags keys=3 --database-name {} --high-availability {} \ - --public-access None'.format(database_engine, resource_group, server_name, backup_retention, + --public-access None --create-default-database Enabled'.format(database_engine, resource_group, server_name, backup_retention, sku_name, tier, storage_size, 'dbadmin', version, database_name, ha_value)) basic_info = self.cmd('{} flexible-server show -g {} -n {}'.format(database_engine, resource_group, server_name)).get_output_in_json() @@ -680,7 +680,7 @@ def _test_flexible_server_byok_mgmt(self, resource_group, vault_name, backup_vau def invalid_input_tests(): # key or identity only - self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {}'.format( + self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {} --create-default-database Enabled'.format( resource_group, server_name, tier, @@ -688,7 +688,7 @@ def invalid_input_tests(): key['key']['kid'] ), expect_failure=True) - self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --identity {}'.format( + self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --identity {} --create-default-database Enabled'.format( resource_group, server_name, tier, @@ -697,7 +697,7 @@ def invalid_input_tests(): ), expect_failure=True) # geo-redundant server with data encryption needs backup_key and backup_identity - self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {} --identity {} --geo-redundant-backup Enabled'.format( + self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {} --identity {} --geo-redundant-backup Enabled --create-default-database Enabled'.format( resource_group, server_name, tier, @@ -711,7 +711,7 @@ def main_tests(geo_redundant_backup): backup_key_id_flags = '--backup-key {} --backup-identity {}'.format(backup_key['key']['kid'], backup_identity['id']) if geo_redundant_backup else '' primary_server_name = server_with_geo_name if geo_redundant_backup else server_name # create primary flexible server with data encryption - self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {} --identity {} {} --location {} --geo-redundant-backup {}'.format( + self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {} --identity {} {} --location {} --geo-redundant-backup {} --create-default-database Enabled'.format( resource_group, primary_server_name, tier, @@ -828,7 +828,7 @@ def main_tests(geo_redundant_backup): main_tests(True) # try to update key and identity in a server without data encryption - self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --location {}'.format( + self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --location {} --create-default-database Enabled'.format( resource_group, server_2_name, tier, @@ -1332,7 +1332,7 @@ def _test_flexible_server_replica_mgmt(self, database_engine, resource_group, vn replica_vnet_check = [[]] * 2 # create a server - self.cmd('{} flexible-server create -g {} --name {} -l {} --storage-size {} {} --tier GeneralPurpose --sku-name Standard_D2s_v3 --yes' + self.cmd('{} flexible-server create -g {} --name {} -l {} --storage-size {} {} --tier GeneralPurpose --sku-name Standard_D2s_v3 --yes --create-default-database Enabled' .format(database_engine, resource_group, master_server, location, 256, master_vnet_args)) result = self.cmd('{} flexible-server show -g {} --name {} ' .format(database_engine, resource_group, master_server), @@ -2173,7 +2173,7 @@ def _test_flexible_server_upgrade_mgmt(self, database_engine, resource_group, pu new_version = '16' location = self.postgres_location - create_command = '{} flexible-server create -g {} -n {} --tier GeneralPurpose --sku-name {} --location {} --version {} --yes'.format( + create_command = '{} flexible-server create -g {} -n {} --tier GeneralPurpose --sku-name {} --location {} --version {} --yes --create-default-database Enabled'.format( database_engine, resource_group, server_name, "Standard_D2s_v3", location, current_version) if public_access: create_command += ' --public-access none' @@ -2283,7 +2283,7 @@ def _test_identity_aad_admin_mgmt(self, database_engine, resource_group, passwor replica = [self.create_random_name(SERVER_NAME_PREFIX, SERVER_NAME_MAX_LENGTH) for _ in range(2)] # create server - self.cmd('{} flexible-server create --location {} -g {} -n {} --public-access none --tier {} --sku-name {} {}' + self.cmd('{} flexible-server create --location {} -g {} -n {} --public-access none --tier {} --sku-name {} {} --create-default-database Enabled' .format(database_engine, location, resource_group, server, 'GeneralPurpose', 'Standard_D2s_v3', auth_args)) # create 3 identities @@ -2455,7 +2455,7 @@ def _test_identity_microsoft_entra_admin_mgmt(self, database_engine, resource_gr replica = [self.create_random_name(SERVER_NAME_PREFIX, SERVER_NAME_MAX_LENGTH) for _ in range(2)] # create server - self.cmd('{} flexible-server create --location {} -g {} -n {} --public-access none --tier {} --sku-name {} {}' + self.cmd('{} flexible-server create --location {} -g {} -n {} --public-access none --tier {} --sku-name {} {} --create-default-database Enabled' .format(database_engine, location, resource_group, server, 'GeneralPurpose', 'Standard_D2s_v3', auth_args)) # create 3 identities From 1f642d86e1f4ed91ef50b3683109c300ff87c78c Mon Sep 17 00:00:00 2001 From: Matthew Boentoro Date: Tue, 25 Mar 2025 22:06:23 -0700 Subject: [PATCH 3/4] [RDBMS] az postgres flexible-server create: set the default value of parameter --create-default-database to Disabled --- .../cli/command_modules/rdbms/_params.py | 4 ++-- .../latest/test_rdbms_flexible_commands.py | 22 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/_params.py b/src/azure-cli/azure/cli/command_modules/rdbms/_params.py index 3bb01f6ec9a..6c499e15a32 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/_params.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/_params.py @@ -330,7 +330,7 @@ def _flexible_server_params(command_group): create_default_db_arg_type = CLIArgumentType( arg_type=get_enum_type(['Enabled', 'Disabled']), options_list=['--create-default-database', '-c'], - help='Enable or disable the creation of default database flexibleserverdb. Default value is Enabled.' + help='Enable or disable the creation of default database flexibleserverdb. Default value is Disabled.' ) cluster_option_arg_type = CLIArgumentType( @@ -611,7 +611,7 @@ def _flexible_server_params(command_group): c.argument('iops', default=None, arg_type=iops_v2_arg_type) c.argument('throughput', default=None, arg_type=throughput_arg_type) c.argument('performance_tier', default=None, arg_type=performance_tier_arg_type) - c.argument('create_default_db', default='Enabled', arg_type=create_default_db_arg_type) + c.argument('create_default_db', default='Disabled', arg_type=create_default_db_arg_type) c.argument('create_cluster', default='Server', arg_type=cluster_option_arg_type) c.argument('cluster_size', default=None, arg_type=create_node_count_arg_type) elif command_group == 'mysql': diff --git a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/test_rdbms_flexible_commands.py b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/test_rdbms_flexible_commands.py index 6d9eb9be57a..d3c4da46e97 100644 --- a/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/test_rdbms_flexible_commands.py +++ b/src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/test_rdbms_flexible_commands.py @@ -53,7 +53,7 @@ def __init__(self, engine_type, location, engine_parameter_name='database_engine def create_resource(self, name, **kwargs): group = self._get_resource_group(**kwargs) - template = 'az {} flexible-server create -l {} -g {} -n {} --public-access none' + template = 'az {} flexible-server create -l {} -g {} -n {} --public-access none --create-default-database Enabled' execute(self.cli_ctx, template.format(self.engine_type, self.location, group, name)) @@ -145,7 +145,7 @@ def _test_flexible_server_mgmt(self, database_engine, resource_group): self.cmd('{} flexible-server create -g {} -n {} --backup-retention {} --sku-name {} --tier {} \ --storage-size {} -u {} --version {} --tags keys=3 --database-name {} --high-availability {} \ - --public-access None'.format(database_engine, resource_group, server_name, backup_retention, + --public-access None --create-default-database Enabled'.format(database_engine, resource_group, server_name, backup_retention, sku_name, tier, storage_size, 'dbadmin', version, database_name, ha_value)) basic_info = self.cmd('{} flexible-server show -g {} -n {}'.format(database_engine, resource_group, server_name)).get_output_in_json() @@ -680,7 +680,7 @@ def _test_flexible_server_byok_mgmt(self, resource_group, vault_name, backup_vau def invalid_input_tests(): # key or identity only - self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {}'.format( + self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {} --create-default-database Enabled'.format( resource_group, server_name, tier, @@ -688,7 +688,7 @@ def invalid_input_tests(): key['key']['kid'] ), expect_failure=True) - self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --identity {}'.format( + self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --identity {} --create-default-database Enabled'.format( resource_group, server_name, tier, @@ -697,7 +697,7 @@ def invalid_input_tests(): ), expect_failure=True) # geo-redundant server with data encryption needs backup_key and backup_identity - self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {} --identity {} --geo-redundant-backup Enabled'.format( + self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {} --identity {} --geo-redundant-backup Enabled --create-default-database Enabled'.format( resource_group, server_name, tier, @@ -711,7 +711,7 @@ def main_tests(geo_redundant_backup): backup_key_id_flags = '--backup-key {} --backup-identity {}'.format(backup_key['key']['kid'], backup_identity['id']) if geo_redundant_backup else '' primary_server_name = server_with_geo_name if geo_redundant_backup else server_name # create primary flexible server with data encryption - self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {} --identity {} {} --location {} --geo-redundant-backup {}'.format( + self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {} --identity {} {} --location {} --geo-redundant-backup {} --create-default-database Enabled'.format( resource_group, primary_server_name, tier, @@ -828,7 +828,7 @@ def main_tests(geo_redundant_backup): main_tests(True) # try to update key and identity in a server without data encryption - self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --location {}'.format( + self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --location {} --create-default-database Enabled'.format( resource_group, server_2_name, tier, @@ -1332,7 +1332,7 @@ def _test_flexible_server_replica_mgmt(self, database_engine, resource_group, vn replica_vnet_check = [[]] * 2 # create a server - self.cmd('{} flexible-server create -g {} --name {} -l {} --storage-size {} {} --tier GeneralPurpose --sku-name Standard_D2s_v3 --yes' + self.cmd('{} flexible-server create -g {} --name {} -l {} --storage-size {} {} --tier GeneralPurpose --sku-name Standard_D2s_v3 --yes --create-default-database Enabled' .format(database_engine, resource_group, master_server, location, 256, master_vnet_args)) result = self.cmd('{} flexible-server show -g {} --name {} ' .format(database_engine, resource_group, master_server), @@ -2173,7 +2173,7 @@ def _test_flexible_server_upgrade_mgmt(self, database_engine, resource_group, pu new_version = '16' location = self.postgres_location - create_command = '{} flexible-server create -g {} -n {} --tier GeneralPurpose --sku-name {} --location {} --version {} --yes'.format( + create_command = '{} flexible-server create -g {} -n {} --tier GeneralPurpose --sku-name {} --location {} --version {} --yes --create-default-database Enabled'.format( database_engine, resource_group, server_name, "Standard_D2s_v3", location, current_version) if public_access: create_command += ' --public-access none' @@ -2283,7 +2283,7 @@ def _test_identity_aad_admin_mgmt(self, database_engine, resource_group, passwor replica = [self.create_random_name(SERVER_NAME_PREFIX, SERVER_NAME_MAX_LENGTH) for _ in range(2)] # create server - self.cmd('{} flexible-server create --location {} -g {} -n {} --public-access none --tier {} --sku-name {} {}' + self.cmd('{} flexible-server create --location {} -g {} -n {} --public-access none --tier {} --sku-name {} {} --create-default-database Enabled' .format(database_engine, location, resource_group, server, 'GeneralPurpose', 'Standard_D2s_v3', auth_args)) # create 3 identities @@ -2455,7 +2455,7 @@ def _test_identity_microsoft_entra_admin_mgmt(self, database_engine, resource_gr replica = [self.create_random_name(SERVER_NAME_PREFIX, SERVER_NAME_MAX_LENGTH) for _ in range(2)] # create server - self.cmd('{} flexible-server create --location {} -g {} -n {} --public-access none --tier {} --sku-name {} {}' + self.cmd('{} flexible-server create --location {} -g {} -n {} --public-access none --tier {} --sku-name {} {} --create-default-database Enabled' .format(database_engine, location, resource_group, server, 'GeneralPurpose', 'Standard_D2s_v3', auth_args)) # create 3 identities From 4c1c0967d93e069e5f3add882af601b6c0ba1837 Mon Sep 17 00:00:00 2001 From: Matthew Boentoro Date: Wed, 26 Mar 2025 08:26:53 -0700 Subject: [PATCH 4/4] Run CI