Skip to content

Commit 8ac693a

Browse files
mattboentoroMatthew Boentoro
andauthored
[RDBMS] BREAKING CHANGE: az postgres flexible-server create: Set the default value of parameter --create-default-database to Disabled (#31132)
* [RDBMS] az postgres flexible-server create: set the default value of parameter --create-default-database to Disabled * [RDBMS] az postgres flexible-server create: set the default value of parameter --create-default-database to Disabled * [RDBMS] az postgres flexible-server create: set the default value of parameter --create-default-database to Disabled * Run CI --------- Co-authored-by: Matthew Boentoro <mboentoro@microsoft.com>
1 parent dc9aedb commit 8ac693a

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ def _flexible_server_params(command_group):
330330
create_default_db_arg_type = CLIArgumentType(
331331
arg_type=get_enum_type(['Enabled', 'Disabled']),
332332
options_list=['--create-default-database', '-c'],
333-
help='Enable or disable the creation of default database flexibleserverdb. Default value is Enabled.'
333+
help='Enable or disable the creation of default database flexibleserverdb. Default value is Disabled.'
334334
)
335335

336336
cluster_option_arg_type = CLIArgumentType(
@@ -611,7 +611,7 @@ def _flexible_server_params(command_group):
611611
c.argument('iops', default=None, arg_type=iops_v2_arg_type)
612612
c.argument('throughput', default=None, arg_type=throughput_arg_type)
613613
c.argument('performance_tier', default=None, arg_type=performance_tier_arg_type)
614-
c.argument('create_default_db', default='Enabled', arg_type=create_default_db_arg_type)
614+
c.argument('create_default_db', default='Disabled', arg_type=create_default_db_arg_type)
615615
c.argument('create_cluster', default='Server', arg_type=cluster_option_arg_type)
616616
c.argument('cluster_size', default=None, arg_type=create_node_count_arg_type)
617617
elif command_group == 'mysql':

src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/test_rdbms_flexible_commands.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def __init__(self, engine_type, location, engine_parameter_name='database_engine
5353

5454
def create_resource(self, name, **kwargs):
5555
group = self._get_resource_group(**kwargs)
56-
template = 'az {} flexible-server create -l {} -g {} -n {} --public-access none'
56+
template = 'az {} flexible-server create -l {} -g {} -n {} --public-access none --create-default-database Enabled'
5757
execute(self.cli_ctx, template.format(self.engine_type,
5858
self.location,
5959
group, name))
@@ -145,7 +145,7 @@ def _test_flexible_server_mgmt(self, database_engine, resource_group):
145145

146146
self.cmd('{} flexible-server create -g {} -n {} --backup-retention {} --sku-name {} --tier {} \
147147
--storage-size {} -u {} --version {} --tags keys=3 --database-name {} --high-availability {} \
148-
--public-access None'.format(database_engine, resource_group, server_name, backup_retention,
148+
--public-access None --create-default-database Enabled'.format(database_engine, resource_group, server_name, backup_retention,
149149
sku_name, tier, storage_size, 'dbadmin', version, database_name, ha_value))
150150

151151
basic_info = self.cmd('{} flexible-server show -g {} -n {}'.format(database_engine, resource_group, server_name)).get_output_in_json()
@@ -680,15 +680,15 @@ def _test_flexible_server_byok_mgmt(self, resource_group, vault_name, backup_vau
680680

681681
def invalid_input_tests():
682682
# key or identity only
683-
self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {}'.format(
683+
self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {} --create-default-database Enabled'.format(
684684
resource_group,
685685
server_name,
686686
tier,
687687
sku_name,
688688
key['key']['kid']
689689
), expect_failure=True)
690690

691-
self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --identity {}'.format(
691+
self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --identity {} --create-default-database Enabled'.format(
692692
resource_group,
693693
server_name,
694694
tier,
@@ -697,7 +697,7 @@ def invalid_input_tests():
697697
), expect_failure=True)
698698

699699
# geo-redundant server with data encryption needs backup_key and backup_identity
700-
self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {} --identity {} --geo-redundant-backup Enabled'.format(
700+
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(
701701
resource_group,
702702
server_name,
703703
tier,
@@ -711,7 +711,7 @@ def main_tests(geo_redundant_backup):
711711
backup_key_id_flags = '--backup-key {} --backup-identity {}'.format(backup_key['key']['kid'], backup_identity['id']) if geo_redundant_backup else ''
712712
primary_server_name = server_with_geo_name if geo_redundant_backup else server_name
713713
# create primary flexible server with data encryption
714-
self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --key {} --identity {} {} --location {} --geo-redundant-backup {}'.format(
714+
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(
715715
resource_group,
716716
primary_server_name,
717717
tier,
@@ -828,7 +828,7 @@ def main_tests(geo_redundant_backup):
828828
main_tests(True)
829829

830830
# try to update key and identity in a server without data encryption
831-
self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --location {}'.format(
831+
self.cmd('postgres flexible-server create -g {} -n {} --public-access none --tier {} --sku-name {} --location {} --create-default-database Enabled'.format(
832832
resource_group,
833833
server_2_name,
834834
tier,
@@ -1332,7 +1332,7 @@ def _test_flexible_server_replica_mgmt(self, database_engine, resource_group, vn
13321332
replica_vnet_check = [[]] * 2
13331333

13341334
# create a server
1335-
self.cmd('{} flexible-server create -g {} --name {} -l {} --storage-size {} {} --tier GeneralPurpose --sku-name Standard_D2s_v3 --yes'
1335+
self.cmd('{} flexible-server create -g {} --name {} -l {} --storage-size {} {} --tier GeneralPurpose --sku-name Standard_D2s_v3 --yes --create-default-database Enabled'
13361336
.format(database_engine, resource_group, master_server, location, 256, master_vnet_args))
13371337
result = self.cmd('{} flexible-server show -g {} --name {} '
13381338
.format(database_engine, resource_group, master_server),
@@ -2173,7 +2173,7 @@ def _test_flexible_server_upgrade_mgmt(self, database_engine, resource_group, pu
21732173
new_version = '16'
21742174
location = self.postgres_location
21752175

2176-
create_command = '{} flexible-server create -g {} -n {} --tier GeneralPurpose --sku-name {} --location {} --version {} --yes'.format(
2176+
create_command = '{} flexible-server create -g {} -n {} --tier GeneralPurpose --sku-name {} --location {} --version {} --yes --create-default-database Enabled'.format(
21772177
database_engine, resource_group, server_name, "Standard_D2s_v3", location, current_version)
21782178
if public_access:
21792179
create_command += ' --public-access none'
@@ -2283,7 +2283,7 @@ def _test_identity_aad_admin_mgmt(self, database_engine, resource_group, passwor
22832283
replica = [self.create_random_name(SERVER_NAME_PREFIX, SERVER_NAME_MAX_LENGTH) for _ in range(2)]
22842284

22852285
# create server
2286-
self.cmd('{} flexible-server create --location {} -g {} -n {} --public-access none --tier {} --sku-name {} {}'
2286+
self.cmd('{} flexible-server create --location {} -g {} -n {} --public-access none --tier {} --sku-name {} {} --create-default-database Enabled'
22872287
.format(database_engine, location, resource_group, server, 'GeneralPurpose', 'Standard_D2s_v3', auth_args))
22882288

22892289
# create 3 identities
@@ -2455,7 +2455,7 @@ def _test_identity_microsoft_entra_admin_mgmt(self, database_engine, resource_gr
24552455
replica = [self.create_random_name(SERVER_NAME_PREFIX, SERVER_NAME_MAX_LENGTH) for _ in range(2)]
24562456

24572457
# create server
2458-
self.cmd('{} flexible-server create --location {} -g {} -n {} --public-access none --tier {} --sku-name {} {}'
2458+
self.cmd('{} flexible-server create --location {} -g {} -n {} --public-access none --tier {} --sku-name {} {} --create-default-database Enabled'
24592459
.format(database_engine, location, resource_group, server, 'GeneralPurpose', 'Standard_D2s_v3', auth_args))
24602460

24612461
# create 3 identities

0 commit comments

Comments
 (0)