Skip to content

[RDBMS] Prevent Private DNS zone track2 migration breaking rdbms module #18062

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

Merged
evelyn-ys merged 8 commits into from
May 18, 2021
Merged

[RDBMS] Prevent Private DNS zone track2 migration breaking rdbms module #18062

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7938e7b
remove unnecessary writing operation for subnet
DaeunYim May 7, 2021
24f877d
network fixing
DaeunYim May 9, 2021
d446fa8
style fixed
DaeunYim May 9, 2021
447415b
change dns zone create to vnet group and validate thoroughly
DaeunYim May 9, 2021
2847ba9
pulled dev
DaeunYim May 13, 2021
5a0db17
private dns zone track2 migration fix
DaeunYim May 13, 2021
45d99b5
pulled dev
DaeunYim May 13, 2021
8188c45
typo fixed
DaeunYim May 13, 2021
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
Next Next commit
remove unnecessary writing operation for subnet
  • Loading branch information
@DaeunYim
DaeunYim committed May 7, 2021
commit 7938e7b47704e31e02c2464ed9cc224497a8328b
5 changes: 1 addition & 4 deletions src/azure-cli/azure/cli/command_modules/rdbms/flexible_server_virtual_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,14 @@ def _create_vnet_subnet_delegation(cmd, nw_client, resource_client, delegation_s
def _create_subnet_delegation(cmd, nw_client, resource_client, delegation_service_name, resource_group, vnet_name, subnet_name, location, server_name, subnet_address_pref):
Delegation, Subnet, ServiceEndpoint = cmd.get_models('Delegation', 'Subnet', 'ServiceEndpointPropertiesFormat', resource_type=ResourceType.MGMT_NETWORK)
delegation = Delegation(name=delegation_service_name, service_name=delegation_service_name)
service_endpoint = ServiceEndpoint(service='Microsoft.Storage')

# subnet exist
if not check_existence(resource_client, subnet_name, resource_group, 'Microsoft.Network', 'subnets', parent_name=vnet_name, parent_type='virtualNetworks'):
subnet_result = Subnet(
name=subnet_name,
location=location,
address_prefix=subnet_address_pref,
delegations=[delegation],
service_endpoints=[service_endpoint])
delegations=[delegation])

vnet = nw_client.virtual_networks.get(resource_group, vnet_name)
vnet_subnet_prefixes = [subnet.address_prefix for subnet in vnet.subnets]
Expand All @@ -164,7 +162,6 @@ def _create_subnet_delegation(cmd, nw_client, resource_client, delegation_servic
raise CLIError("Can not use subnet with existing delegations other than {}".format(
delegation_service_name))

subnet.service_endpoints = [service_endpoint]
subnet.delegations = [delegation]
subnet = nw_client.subnets.begin_create_or_update(resource_group, vnet_name, subnet_name, subnet).result()

Expand Down