Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RDBMS] az postgres flexible-server geo-restore: add optional --restore-time parameter #30689

Merged
merged 1 commit into from
Jan 23, 2025
Merged

[RDBMS] az postgres flexible-server geo-restore: add optional --restore-time parameter #30689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/azure-cli/azure/cli/command_modules/rdbms/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,7 @@ def _flexible_server_params(command_group):
c.argument('public_access', options_list=['--public-access'], arg_type=get_enum_type(['Enabled', 'Disabled']),
help='Determines the public access. ')
elif command_group == 'postgres':
c.argument('restore_point_in_time', arg_type=restore_point_in_time_arg_type)
c.argument('geo_redundant_backup', default='Disabled', arg_type=geo_redundant_backup_arg_type)
c.argument('byok_key', arg_type=key_arg_type)
c.argument('byok_identity', arg_type=identity_arg_type)
Expand Down
6 changes: 4 additions & 2 deletions src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_custom_postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ def flexible_replica_create(cmd, client, resource_group_name, source_server, rep
def flexible_server_georestore(cmd, client, resource_group_name, server_name, source_server, location, zone=None,
vnet=None, vnet_address_prefix=None, subnet=None, subnet_address_prefix=None,
private_dns_zone_arguments=None, geo_redundant_backup=None, no_wait=False, yes=False,
byok_identity=None, byok_key=None, backup_byok_identity=None, backup_byok_key=None):
byok_identity=None, byok_key=None, backup_byok_identity=None, backup_byok_key=None, restore_point_in_time=None):
validate_resource_group(resource_group_name)

server_name = server_name.lower()
Expand All @@ -632,6 +632,8 @@ def flexible_server_georestore(cmd, client, resource_group_name, server_name, so
else:
source_server_id = source_server

restore_point_in_time = validate_and_format_restore_point_in_time(restore_point_in_time)

try:
id_parts = parse_resource_id(source_server_id)
validate_citus_cluster(cmd, id_parts['resource_group'], id_parts['name'])
Expand Down Expand Up @@ -659,7 +661,7 @@ def flexible_server_georestore(cmd, client, resource_group_name, server_name, so
storage = postgresql_flexibleservers.models.Storage(type=None)

parameters = postgresql_flexibleservers.models.Server(
point_in_time_utc=get_current_time(),
point_in_time_utc=restore_point_in_time,
location=location,
source_server_resource_id=source_server_id,
create_mode="GeoRestore",
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/command_modules/rdbms/validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ def validate_and_format_restore_point_in_time(restore_time):
return parser.parse(restore_time)
except:
raise ValidationError("The restore point in time value has incorrect date format. "
"Please use ISO format e.g., 2021-10-22T00:08:23+00:00.")
"Please use ISO format e.g., 2024-10-22T00:08:23+00:00.")


def is_citus_cluster(cmd, resource_group_name, server_name):
Expand Down
Loading