CodeGen from PR 17562 in Azure/azure-rest-api-specs

Merge 610373fb19fa4def960f519332214bc76136b550 into 219b2b3dea0233e3cb43f72d2764c0e4e4d8fcd3
AzureSDKAutomation · Jan 31, 2022 · b8f8cf8 · b8f8cf8
1 parent 4942b3b
commit b8f8cf8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/schemas/2020-11-01-preview/Microsoft.Sql.json b/schemas/2020-11-01-preview/Microsoft.Sql.json
@@ -1126,9 +1126,6 @@
               {
                 "$ref": "#/definitions/servers_auditingSettings_childResource"
               },
-              {
-                "$ref": "#/definitions/servers_elasticPools_childResource"
-              },
               {
                 "$ref": "#/definitions/servers_encryptionProtector_childResource"
               },
@@ -1173,6 +1170,9 @@
               },
               {
                 "$ref": "#/definitions/servers_databases_childResource"
+              },
+              {
+                "$ref": "#/definitions/servers_elasticPools_childResource"
               }
             ]
           }

diff --git a/schemas/2021-05-01-preview/Microsoft.Sql.json b/schemas/2021-05-01-preview/Microsoft.Sql.json
@@ -198,6 +198,9 @@
               {
                 "$ref": "#/definitions/managedInstances_distributedAvailabilityGroups_childResource"
               },
+              {
+                "$ref": "#/definitions/managedInstances_serverTrustCertificates_childResource"
+              },
               {
                 "$ref": "#/definitions/managedInstances_databases_childResource"
               },
@@ -222,9 +225,6 @@
               {
                 "$ref": "#/definitions/managedInstances_securityAlertPolicies_childResource"
               },
-              {
-                "$ref": "#/definitions/managedInstances_serverTrustCertificates_childResource"
-              },
               {
                 "$ref": "#/definitions/managedInstances_sqlAgent_childResource"
               }

diff --git a/schemas/2021-08-01-preview/Microsoft.Sql.json b/schemas/2021-08-01-preview/Microsoft.Sql.json
@@ -1204,6 +1204,12 @@
           "type": "array",
           "items": {
             "oneOf": [
+              {
+                "$ref": "#/definitions/servers_elasticPools_childResource"
+              },
+              {
+                "$ref": "#/definitions/servers_ipv6FirewallRules_childResource"
+              },
               {
                 "$ref": "#/definitions/servers_extendedAuditingSettings_childResource"
               },
@@ -1213,9 +1219,6 @@
               {
                 "$ref": "#/definitions/servers_databases_childResource"
               },
-              {
-                "$ref": "#/definitions/servers_elasticPools_childResource"
-              },
               {
                 "$ref": "#/definitions/servers_encryptionProtector_childResource"
               },
@@ -1225,9 +1228,6 @@
               {
                 "$ref": "#/definitions/servers_firewallRules_childResource"
               },
-              {
-                "$ref": "#/definitions/servers_ipv6FirewallRules_childResource"
-              },
               {
                 "$ref": "#/definitions/servers_jobAgents_childResource"
               },
@@ -3728,7 +3728,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The number of secondary replicas associated with the database that are used to provide high availability."
+          "description": "The number of secondary replicas associated with the database that are used to provide high availability. Not applicable to a Hyperscale database within an elastic pool."
         },
         "isLedgerOn": {
           "oneOf": [
@@ -3811,7 +3811,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The state of read-only routing. If enabled, connections that have application intent set to readonly in their connection string may be routed to a readonly secondary replica in the same region."
+          "description": "The state of read-only routing. If enabled, connections that have application intent set to readonly in their connection string may be routed to a readonly secondary replica in the same region. Not applicable to a Hyperscale database within an elastic pool."
         },
         "recoverableDatabaseId": {
           "type": "string",