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

Add optional param - private DNS zone to server API #13716

Merged
merged 2 commits into from
Apr 16, 2021
Merged

Add optional param - private DNS zone to server API #13716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecbb7d5
Add optional param - private DNS zone to server API
taogems Mar 30, 2021
b39acba
Follow comment to resolve go sdk issue.
taogems Apr 16, 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
9 changes: 9 additions & 0 deletions ...e-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
"delegatedSubnetArguments": {
"subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet"
},
"privateDnsZoneArguments": {
"privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone"
},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
Expand Down Expand Up @@ -48,6 +51,9 @@
"delegatedSubnetArguments": {
"subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet"
},
"privateDnsZoneArguments": {
"privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone"
},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
Expand Down Expand Up @@ -88,6 +94,9 @@
"delegatedSubnetArguments": {
"subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet"
},
"privateDnsZoneArguments": {
"privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone"
},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
Expand Down
2 changes: 2 additions & 0 deletions ...t.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreatePointInTimeRestore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"publicNetworkAccess": "Enabled",
"haEnabled": "Disabled",
"delegatedSubnetArguments": {},
"privateDnsZoneArguments": {},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
Expand Down Expand Up @@ -63,6 +64,7 @@
"publicNetworkAccess": "Enabled",
"haEnabled": "Disabled",
"delegatedSubnetArguments": {},
"privateDnsZoneArguments": {},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
Expand Down
3 changes: 3 additions & 0 deletions ...ager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGetWithVnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
"delegatedSubnetArguments": {
"subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet"
},
"privateDnsZoneArguments": {
"privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone"
},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
Expand Down
1 change: 1 addition & 0 deletions ...e-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"backupRetentionDays": 20
},
"delegatedSubnetArguments": {},
"privateDnsZoneArguments": {},
"haEnabled": "Disabled",
"availabilityZone": "1"
},
Expand Down
1 change: 1 addition & 0 deletions ...greSQL/preview/2020-02-14-preview/examples/ServerUpdateWithCustomerMaintenanceWindow.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"backupRetentionDays": 20
},
"delegatedSubnetArguments": {},
"privateDnsZoneArguments": {},
"haEnabled": "Disabled",
"availabilityZone": "1",
"maintenanceWindow": {
Expand Down
8 changes: 8 additions & 0 deletions ...sql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/postgresql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1305,6 +1305,14 @@
}
}
},
"privateDnsZoneArguments": {
"properties": {
"privateDnsZoneArmResourceId": {
"type": "string",
"description": "private dns zone arm resource id."
}
}
},
"createMode": {
"type": "string",
"description": "The mode to create a new PostgreSQL server.",
Expand Down
9 changes: 9 additions & 0 deletions ...er/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
"delegatedSubnetArguments": {
"subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet"
},
"privateDnsZoneArguments": {
"privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone"
},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
Expand Down Expand Up @@ -48,6 +51,9 @@
"delegatedSubnetArguments": {
"subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet"
},
"privateDnsZoneArguments": {
"privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone"
},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
Expand Down Expand Up @@ -88,6 +94,9 @@
"delegatedSubnetArguments": {
"subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet"
},
"privateDnsZoneArguments": {
"privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone"
},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
Expand Down
2 changes: 2 additions & 0 deletions ...PostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreatePointInTimeRestore.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"publicNetworkAccess": "Enabled",
"haEnabled": "Disabled",
"delegatedSubnetArguments": {},
"privateDnsZoneArguments": {},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
Expand Down Expand Up @@ -63,6 +64,7 @@
"publicNetworkAccess": "Enabled",
"haEnabled": "Disabled",
"delegatedSubnetArguments": {},
"privateDnsZoneArguments": {},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
Expand Down
3 changes: 3 additions & 0 deletions ...crosoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGetWithVnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
"delegatedSubnetArguments": {
"subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet"
},
"privateDnsZoneArguments": {
"privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone"
},
"storageProfile": {
"storageMB": 524288,
"backupRetentionDays": 7
Expand Down
1 change: 1 addition & 0 deletions ...er/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"backupRetentionDays": 20
},
"delegatedSubnetArguments": {},
"privateDnsZoneArguments": {},
"haEnabled": "Disabled",
"availabilityZone": "1"
},
Expand Down
1 change: 1 addition & 0 deletions ...preview/2020-02-14-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"backupRetentionDays": 20
},
"delegatedSubnetArguments": {},
"privateDnsZoneArguments": {},
"haEnabled": "Disabled",
"availabilityZone": "1",
"maintenanceWindow": {
Expand Down
8 changes: 8 additions & 0 deletions ...ource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1583,6 +1583,14 @@
}
}
},
"privateDnsZoneArguments": {
"properties": {
"privateDnsZoneArmResourceId": {
"type": "string",
"description": "private dns zone arm resource id."
}
}
},
"createMode": {
"type": "string",
"description": "The mode to create a new PostgreSQL server.",
Expand Down
3 changes: 3 additions & 0 deletions ...crosoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"delegatedSubnetArguments": {
"subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet"
},
"privateDnsZoneArguments": {
"privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone"
},
"enableMx": true,
"enableZfs": false,
"postgresqlVersion": "12",
Expand Down
3 changes: 3 additions & 0 deletions .../Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
"delegatedSubnetArguments": {
"subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet"
},
"privateDnsZoneArguments": {
"privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone"
},
"maintenanceWindow": {
"dayOfWeek": 0,
"startHour": 0,
Expand Down
6 changes: 6 additions & 0 deletions ...Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
"delegatedSubnetArguments": {
"subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet"
},
"privateDnsZoneArguments": {
"privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone"
},
"readReplicas": [
"/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/TestGroup/providers/Microsoft.DBforPostgreSQL/serverGroupsv2/hsctestsg2"
],
Expand Down Expand Up @@ -185,6 +188,9 @@
"delegatedSubnetArguments": {
"subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet"
},
"privateDnsZoneArguments": {
"privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone"
},
"readReplicas": null,
"sourceServerGroup": null,
"serverRoleGroups": [
Expand Down
6 changes: 6 additions & 0 deletions ...PostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
"delegatedSubnetArguments": {
"subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet"
},
"privateDnsZoneArguments": {
"privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone"
},
"readReplicas": null,
"sourceServerGroup": null,
"serverRoleGroups": [
Expand Down Expand Up @@ -184,6 +187,9 @@
"delegatedSubnetArguments": {
"subnetArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/test-vnet-subnet"
},
"privateDnsZoneArguments": {
"privateDnsZoneArmResourceId": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.Network/privateDnsZones/test-private-dns-zone"
},
"readReplicas": null,
"sourceServerGroup": null,
"serverRoleGroups": [
Expand Down
9 changes: 9 additions & 0 deletions ...ce-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,6 +1657,15 @@
}
}
},
"privateDnsZoneArguments": {
"description": "The private dns zone arguments for a server group.",
"properties": {
"privateDnsZoneArmResourceId": {
"type": "string",
"description": "private dns zone arm resource id."
}
}
},
"readReplicas": {
"type": "array",
"description": "The array of read replica server groups.",
Expand Down
2 changes: 1 addition & 1 deletion specification/postgresqlhsc/resource-manager/readme.go.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ These settings apply only when `--tag=package-2020-10-05-privatepreview --go` is
Please also specify `--go-sdk-folder=<path to the root directory of your azure-sdk-for-go clone>`.

``` yaml $(tag) == 'package-2020-10-05-privatepreview' && $(go)
output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-10-05-privatepreview/$(namespace)
output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2020-10-05-preview/$(namespace)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this changed? there is no api version with this name...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did we modify serverGroupsv2 apis? Are we going to introduce private dns for HSC?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know specifically what is causing it but this change is making WebScout scans to fail for 2020-10-05 private preview api version

```