Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
ee1192c
add to ignore
nasc17 Feb 24, 2025
d9d34d4
Merge pull request #5 from nasc17/nasc/gitUpdates
nasc17 Feb 24, 2025
6c0e048
Merge branch 'Azure:dev' into dev2
nasc17 Mar 4, 2025
6370088
Fix bug when updating cmk geo
nasc17 Mar 4, 2025
7f19801
Revert "add to ignore"
nasc17 Mar 4, 2025
4857a1a
Merge branch 'Azure:dev' into dev2
nasc17 Mar 7, 2025
50e8d48
Merge branch 'dev2' of https://github.com/nasc17/azure-cli into dev2
nasc17 Mar 7, 2025
3b1d20b
Updates to not create password if pasword is disabled
nasc17 Mar 10, 2025
c0c36b5
Revert "Updates to not create password if pasword is disabled"
nasc17 Mar 11, 2025
2e0117c
Merge branch 'Azure:dev' into dev2
nasc17 Mar 11, 2025
e6dbe6a
Merge branch 'Azure:dev' into dev2
nasc17 Mar 11, 2025
b54254b
Merge branch 'Azure:dev' into dev2
nasc17 Mar 19, 2025
647ab9f
Merge branch 'Azure:dev' into dev2
nasc17 Mar 21, 2025
881bf8b
Merge branch 'Azure:dev' into dev2
nasc17 Mar 24, 2025
f7943d8
Merge branch 'Azure:dev' into dev2
nasc17 Mar 24, 2025
5b654d3
Merge branch 'Azure:dev' into dev2
nasc17 Mar 24, 2025
88e0438
Merge branch 'Azure:dev' into dev2
nasc17 Apr 1, 2025
3db45d3
Merge branch 'Azure:dev' into dev2
nasc17 Apr 24, 2025
00bf86a
Merge branch 'Azure:dev' into dev2
nasc17 Apr 25, 2025
6a1b57d
Merge branch 'Azure:dev' into dev2
nasc17 Apr 28, 2025
de7b4c9
Merge branch 'Azure:dev' into dev2
nasc17 Apr 30, 2025
0389be8
Merge branch 'Azure:dev' into dev2
nasc17 May 23, 2025
b870885
[RDBMS] az postgres flexible-server replica create: Enable replica op…
Jun 24, 2025
a32c9a2
address style issue
Jun 24, 2025
b123966
fix test
Jun 25, 2025
cabdb07
Merge branch 'Azure:dev' into dev2
nasc17 Jun 26, 2025
5c1151c
Merge branch 'Azure:dev' into dev2
nasc17 Jul 18, 2025
d6ab539
Merge remote-tracking branch 'mattforked/mattboentoro/cof-replica-ena…
nasc17 Jul 18, 2025
7ce26c4
Merge branch 'dev' of https://github.com/mattboentoro/azure-cli into …
Jul 21, 2025
25988da
Merge remote-tracking branch 'mattforked/mattboentoro/cof-replica-ena…
nasc17 Jul 21, 2025
7a4a347
test fix
nasc17 Jul 22, 2025
76534e9
Merge pull request #3 from mattboentoro/nasc/byokTestAttempt718
mattboentoro Jul 22, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from azure.cli.core.util import CLIError, sdk_no_wait, user_confirmation
from azure.core.exceptions import HttpResponseError, ResourceNotFoundError
from azure.mgmt.core.tools import resource_id, is_valid_resource_id, parse_resource_id
from azure.cli.core.azclierror import BadRequestError, FileOperationError, MutuallyExclusiveArgumentError, RequiredArgumentMissingError, ArgumentUsageError, InvalidArgumentValueError
from azure.cli.core.azclierror import BadRequestError, FileOperationError, MutuallyExclusiveArgumentError, RequiredArgumentMissingError, ArgumentUsageError, InvalidArgumentValueError, ValidationError
from azure.mgmt import postgresqlflexibleservers as postgresql_flexibleservers
from ._client_factory import cf_postgres_flexible_firewall_rules, get_postgresql_flexible_management_client, \
cf_postgres_flexible_db, cf_postgres_check_resource_availability, cf_postgres_flexible_servers, \
Expand All @@ -43,7 +43,7 @@
from .validators import pg_arguments_validator, validate_server_name, validate_and_format_restore_point_in_time, \
validate_postgres_replica, validate_georestore_network, pg_byok_validator, validate_migration_runtime_server, \
validate_resource_group, check_resource_group, validate_citus_cluster, cluster_byok_validator, validate_backup_name, \
validate_virtual_endpoint_name_availability, validate_database_name, compare_sku_names
validate_virtual_endpoint_name_availability, validate_database_name, compare_sku_names, is_citus_cluster

logger = get_logger(__name__)
DEFAULT_DB_NAME = 'flexibleserverdb'
Expand Down Expand Up @@ -597,7 +597,6 @@ def flexible_replica_create(cmd, client, resource_group_name, source_server, rep
source_server_id = source_server

source_server_id_parts = parse_resource_id(source_server_id)
validate_citus_cluster(cmd, source_server_id_parts['resource_group'], source_server_id_parts['name'])
try:
source_server_object = client.get(source_server_id_parts['resource_group'], source_server_id_parts['name'])
except Exception as e:
Expand Down Expand Up @@ -712,7 +711,8 @@ def flexible_server_georestore(cmd, client, resource_group_name, server_name, so
logging_name='PostgreSQL', command_group='postgres', server_client=client, location=location)

validate_server_name(db_context, server_name, 'Microsoft.DBforPostgreSQL/flexibleServers')
validate_georestore_network(source_server_object, None, vnet, subnet, 'postgres')
if source_server_object.network.delegated_subnet_resource_id is not None:
validate_georestore_network(source_server_object, None, vnet, subnet, 'postgres')

pg_byok_validator(byok_identity, byok_key, backup_byok_identity, backup_byok_key, geo_redundant_backup)

Expand Down Expand Up @@ -822,7 +822,12 @@ def flexible_server_revivedropped(cmd, client, resource_group_name, server_name,

def flexible_replica_promote(cmd, client, resource_group_name, server_name, promote_mode='standalone', promote_option='planned'):
validate_resource_group(resource_group_name)
validate_citus_cluster(cmd, resource_group_name, server_name)
if is_citus_cluster(cmd, resource_group_name, server_name):
# some settings validation
if promote_mode.lower() == 'standalone':
raise ValidationError("Standalone replica promotion on elastic cluster isn't currently supported. Please use 'switchover' instead.")
if promote_option.lower() == 'planned':
raise ValidationError("Planned replica promotion on elastic cluster isn't currently supported. Please use 'forced' instead.")

try:
server_object = client.get(resource_group_name, server_name)
Expand Down
Loading
Loading