Skip to content

Commit 5cc6e80

Browse files
authored
{RDBMS} Revert - Add MigrationRuntimeResourceId to properties of creating migration request in CLI (#28804)
* Revert "[RDBMS] Add MigrationRuntimeResourceId to properties of creating migration request in CLI (#28695)" This reverts commit 0f5e68d. * Trigger Build * keep comma fix
1 parent 1de2edf commit 5cc6e80

File tree

3 files changed

+6
-47
lines changed

3 files changed

+6
-47
lines changed

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -586,30 +586,6 @@
586586
text: >
587587
az postgres flexible-server migration create --subscription xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx --resource-group testGroup --name testserver \
588588
--migration-name testmigration --properties "migrationConfig.json"
589-
- name: >
590-
Start a private endpoint enabled migration workflow on the target server identified by the parameters. The configurations of the migration should be specified in the migrationConfig.json file.
591-
Pass in MigrationRuntimeResourceId to define the migration runtime server that is responsible for migrating data between source and target server. Sample migrationConfig.json will look like this: \n
592-
{
593-
"properties": {
594-
"SourceDBServerResourceId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/test-single-rg/providers/Microsoft.DBforPostgreSQL/servers/pg-single-1",
595-
"MigrationRuntimeResourceId": "/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/resourceGroups/testGroup/providers/Microsoft.DBforPostgreSQL/flexibleServers/testsourcemigration",
596-
"SecretParameters": {
597-
"AdminCredentials": {
598-
"SourceServerPassword": "password",
599-
"TargetServerPassword": "password"
600-
},
601-
"SourceServerUserName": "testuser@pg-single-1",
602-
"TargetServerUserName": "fspguser"
603-
},
604-
"dBsToMigrate": [
605-
"postgres"
606-
],
607-
"OverwriteDbsInTarget": "true"
608-
}
609-
}
610-
text: >
611-
az postgres flexible-server migration create --subscription xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx --resource-group testGroup --name testserver --migration-name testmigration
612-
--properties "migrationConfig.json"
613589
"""
614590

615591
helps['postgres flexible-server migration list'] = """

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
from .flexible_server_custom_common import create_firewall_rule
3434
from .flexible_server_virtual_network import prepare_private_network, prepare_private_dns_zone, prepare_public_network
3535
from .validators import pg_arguments_validator, validate_server_name, validate_and_format_restore_point_in_time, \
36-
validate_postgres_replica, validate_georestore_network, pg_byok_validator, validate_migration_runtime_server
36+
validate_postgres_replica, validate_georestore_network, pg_byok_validator
3737

3838
logger = get_logger(__name__)
3939
DEFAULT_DB_NAME = 'flexibleserverdb'
@@ -1117,7 +1117,7 @@ def migration_create_func(cmd, client, resource_group_name, server_name, propert
11171117
# Use default migration_option as 'ValidateAndMigrate'
11181118
migration_option = "ValidateAndMigrate"
11191119

1120-
return _create_migration(cmd, logging_name, client, subscription_id, resource_group_name, server_name, migration_name,
1120+
return _create_migration(logging_name, client, subscription_id, resource_group_name, server_name, migration_name,
11211121
migration_mode, migration_option, migration_parameters, tags, location)
11221122

11231123

@@ -1394,14 +1394,11 @@ def _get_pg_replica_zone(availabilityZones, sourceServerZone, replicaZone):
13941394
return pg_replica_zone
13951395

13961396

1397-
def _create_migration(cmd, logging_name, client, subscription_id, resource_group_name, target_db_server_name,
1397+
def _create_migration(logging_name, client, subscription_id, resource_group_name, target_db_server_name,
13981398
migration_name, migration_mode, migration_option, parameters, tags, location):
1399-
parameter_keys = list(parameters.keys())
1400-
migrationInstanceResourceId = get_case_insensitive_key_value("MigrationRuntimeResourceId", parameter_keys, parameters)
1401-
if migrationInstanceResourceId is not None:
1402-
validate_migration_runtime_server(cmd, migrationInstanceResourceId, resource_group_name, target_db_server_name)
1403-
14041399
logger.warning('Creating %s Migration for server \'%s\' in group \'%s\' and subscription \'%s\'...', logging_name, target_db_server_name, resource_group_name, subscription_id)
1400+
1401+
parameter_keys = list(parameters.keys())
14051402
secret_parameter_dictionary = get_case_insensitive_key_value("SecretParameters", parameter_keys, parameters)
14061403
secret_parameter_keys = list(secret_parameter_dictionary.keys())
14071404
admin_credentials_dictionary = get_case_insensitive_key_value("AdminCredentials", secret_parameter_keys, secret_parameter_dictionary)
@@ -1427,8 +1424,7 @@ def _create_migration(cmd, logging_name, client, subscription_id, resource_group
14271424
overwrite_dbs_in_target=get_enum_value_true_false(get_case_insensitive_key_value("OverwriteDbsInTarget", parameter_keys, parameters), "OverwriteDbsInTarget"),
14281425
source_type=source_type,
14291426
migration_option=migration_option,
1430-
ssl_mode=ssl_mode,
1431-
migration_instance_resource_id=migrationInstanceResourceId)
1427+
ssl_mode=ssl_mode)
14321428

14331429
return client.create(subscription_id, resource_group_name, target_db_server_name, migration_name, migration_parameters)
14341430

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -627,19 +627,6 @@ def validate_server_name(db_context, server_name, type_):
627627
raise ValidationError(result.message)
628628

629629

630-
def validate_migration_runtime_server(cmd, migrationInstanceResourceId, target_resource_group_name, target_server_name):
631-
id_comps = parse_resource_id(migrationInstanceResourceId)
632-
runtime_server_resource_resource_type = id_comps['resource_type'].lower()
633-
if "flexibleservers" != runtime_server_resource_resource_type:
634-
raise ValidationError("Migration Runtime Resource ID provided should be Flexible server.")
635-
636-
server_operations_client = cf_postgres_flexible_servers(cmd.cli_ctx, '_')
637-
target_server = server_operations_client.get(target_resource_group_name, target_server_name)
638-
if target_server.id.lower() == migrationInstanceResourceId.lower():
639-
raise ValidationError("Migration Runtime server is same as Target Flexible server. "
640-
"Please change the values accordingly.")
641-
642-
643630
def validate_private_dns_zone(db_context, server_name, private_dns_zone, private_dns_zone_suffix):
644631
cmd = db_context.cmd
645632
if db_context.command_group == 'postgres':

0 commit comments

Comments
 (0)