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

taogems · web-flow · commit b39d3318a9cb · 2021-04-16T14:21:04.000+08:00
* Add optional param - private DNS zone to server API

* Follow comment to resolve go sdk issue.
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreate.json
@@ -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
@@ -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
@@ -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
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreatePointInTimeRestore.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerCreatePointInTimeRestore.json
@@ -32,6 +32,7 @@
           "publicNetworkAccess": "Enabled",
           "haEnabled": "Disabled",
           "delegatedSubnetArguments": {},
+          "privateDnsZoneArguments": {},
           "storageProfile": {
             "storageMB": 524288,
             "backupRetentionDays": 7
@@ -63,6 +64,7 @@
           "publicNetworkAccess": "Enabled",
           "haEnabled": "Disabled",
           "delegatedSubnetArguments": {},
+          "privateDnsZoneArguments": {},
           "storageProfile": {
             "storageMB": 524288,
             "backupRetentionDays": 7
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGetWithVnet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerGetWithVnet.json
@@ -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
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdate.json
@@ -39,6 +39,7 @@
             "backupRetentionDays": 20
           },
           "delegatedSubnetArguments": {},
+          "privateDnsZoneArguments": {},
           "haEnabled": "Disabled",
           "availabilityZone": "1"
         },
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdateWithCustomerMaintenanceWindow.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/examples/ServerUpdateWithCustomerMaintenanceWindow.json
@@ -36,6 +36,7 @@
             "backupRetentionDays": 20
           },
           "delegatedSubnetArguments": {},
+          "privateDnsZoneArguments": {},
           "haEnabled": "Disabled",
           "availabilityZone": "1",
           "maintenanceWindow": {
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-preview/postgresql.json
@@ -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.",
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreate.json
@@ -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
@@ -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
@@ -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
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreatePointInTimeRestore.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerCreatePointInTimeRestore.json
@@ -32,6 +32,7 @@
           "publicNetworkAccess": "Enabled",
           "haEnabled": "Disabled",
           "delegatedSubnetArguments": {},
+          "privateDnsZoneArguments": {},
           "storageProfile": {
             "storageMB": 524288,
             "backupRetentionDays": 7
@@ -63,6 +64,7 @@
           "publicNetworkAccess": "Enabled",
           "haEnabled": "Disabled",
           "delegatedSubnetArguments": {},
+          "privateDnsZoneArguments": {},
           "storageProfile": {
             "storageMB": 524288,
             "backupRetentionDays": 7
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGetWithVnet.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerGetWithVnet.json
@@ -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
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdate.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdate.json
@@ -39,6 +39,7 @@
             "backupRetentionDays": 20
           },
           "delegatedSubnetArguments": {},
+          "privateDnsZoneArguments": {},
           "haEnabled": "Disabled",
           "availabilityZone": "1"
         },
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/examples/ServerUpdateWithCustomerMaintenanceWindow.json
@@ -36,6 +36,7 @@
             "backupRetentionDays": 20
           },
           "delegatedSubnetArguments": {},
+          "privateDnsZoneArguments": {},
           "haEnabled": "Disabled",
           "availabilityZone": "1",
           "maintenanceWindow": {
diff --git a/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json b/specification/postgresql/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-02-14-privatepreview/postgresql.json
@@ -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.",
diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupCreate.json
@@ -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",
diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupGet.json
@@ -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,
diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupList.json
@@ -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"
               ],
@@ -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": [
diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/examples/ServerGroupListByResourceGroup.json
@@ -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": [
@@ -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": [
diff --git a/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json b/specification/postgresqlhsc/resource-manager/Microsoft.DBforPostgreSQL/preview/2020-10-05-privatepreview/postgresqlhsc.json
@@ -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.",
diff --git a/specification/postgresqlhsc/resource-manager/readme.go.md b/specification/postgresqlhsc/resource-manager/readme.go.md
@@ -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)
 ```
