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

SDKAuto · SDKAuto · commit 388e1098c4e0 · 2021-11-18T08:58:33.000Z
Merge 5ec263377279512f549edca8a070f0d3cc32f423 into 4946dbb5b2893a77ce52d08e2a855056e1acd361
diff --git a/schemas/2014-04-01/Microsoft.Sql.json b/schemas/2014-04-01/Microsoft.Sql.json
@@ -36,9 +36,6 @@
           "type": "array",
           "items": {
             "oneOf": [
-              {
-                "$ref": "#/definitions/servers_connectionPolicies_childResource"
-              },
               {
                 "$ref": "#/definitions/servers_databases_childResource"
               },
@@ -48,6 +45,9 @@
               {
                 "$ref": "#/definitions/servers_communicationLinks_childResource"
               },
+              {
+                "$ref": "#/definitions/servers_connectionPolicies_childResource"
+              },
               {
                 "$ref": "#/definitions/servers_firewallRules_childResource"
               },
diff --git a/schemas/2021-02-01-preview/Microsoft.Sql.json b/schemas/2021-02-01-preview/Microsoft.Sql.json
@@ -1120,9 +1120,6 @@
           "type": "array",
           "items": {
             "oneOf": [
-              {
-                "$ref": "#/definitions/servers_databases_childResource"
-              },
               {
                 "$ref": "#/definitions/servers_outboundFirewallRules_childResource"
               },
@@ -1132,6 +1129,9 @@
               {
                 "$ref": "#/definitions/servers_auditingSettings_childResource"
               },
+              {
+                "$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
@@ -1205,13 +1205,16 @@
           "items": {
             "oneOf": [
               {
-                "$ref": "#/definitions/servers_extendedAuditingSettings_childResource"
+                "$ref": "#/definitions/servers_databases_childResource"
               },
               {
-                "$ref": "#/definitions/servers_auditingSettings_childResource"
+                "$ref": "#/definitions/servers_connectionPolicies_childResource"
               },
               {
-                "$ref": "#/definitions/servers_databases_childResource"
+                "$ref": "#/definitions/servers_extendedAuditingSettings_childResource"
+              },
+              {
+                "$ref": "#/definitions/servers_auditingSettings_childResource"
               },
               {
                 "$ref": "#/definitions/servers_elasticPools_childResource"
@@ -1240,9 +1243,6 @@
               {
                 "$ref": "#/definitions/servers_azureADOnlyAuthentications_childResource"
               },
-              {
-                "$ref": "#/definitions/servers_connectionPolicies_childResource"
-              },
               {
                 "$ref": "#/definitions/servers_devOpsAuditingSettings_childResource"
               },

Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,6 @@`
`36`	`36`	`"type": "array",`
`37`	`37`	`"items": {`
`38`	`38`	`"oneOf": [`
`39`		`- {`
`40`		`- "$ref": "#/definitions/servers_connectionPolicies_childResource"`
`41`		`- },`
`42`	`39`	`{`
`43`	`40`	`"$ref": "#/definitions/servers_databases_childResource"`
`44`	`41`	`},`
`@@ -48,6 +45,9 @@`
`48`	`45`	`{`
`49`	`46`	`"$ref": "#/definitions/servers_communicationLinks_childResource"`
`50`	`47`	`},`
	`48`	`+ {`
	`49`	`+ "$ref": "#/definitions/servers_connectionPolicies_childResource"`
	`50`	`+ },`
`51`	`51`	`{`
`52`	`52`	`"$ref": "#/definitions/servers_firewallRules_childResource"`
`53`	`53`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1120,9 +1120,6 @@`
`1120`	`1120`	`"type": "array",`
`1121`	`1121`	`"items": {`
`1122`	`1122`	`"oneOf": [`
`1123`		`- {`
`1124`		`- "$ref": "#/definitions/servers_databases_childResource"`
`1125`		`- },`
`1126`	`1123`	`{`
`1127`	`1124`	`"$ref": "#/definitions/servers_outboundFirewallRules_childResource"`
`1128`	`1125`	`},`
`@@ -1132,6 +1129,9 @@`
`1132`	`1129`	`{`
`1133`	`1130`	`"$ref": "#/definitions/servers_auditingSettings_childResource"`
`1134`	`1131`	`},`
	`1132`	`+ {`
	`1133`	`+ "$ref": "#/definitions/servers_databases_childResource"`
	`1134`	`+ },`
`1135`	`1135`	`{`
`1136`	`1136`	`"$ref": "#/definitions/servers_elasticPools_childResource"`
`1137`	`1137`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1205,13 +1205,16 @@`
`1205`	`1205`	`"items": {`
`1206`	`1206`	`"oneOf": [`
`1207`	`1207`	`{`
`1208`		`- "$ref": "#/definitions/servers_extendedAuditingSettings_childResource"`
	`1208`	`+ "$ref": "#/definitions/servers_databases_childResource"`
`1209`	`1209`	`},`
`1210`	`1210`	`{`
`1211`		`- "$ref": "#/definitions/servers_auditingSettings_childResource"`
	`1211`	`+ "$ref": "#/definitions/servers_connectionPolicies_childResource"`
`1212`	`1212`	`},`
`1213`	`1213`	`{`
`1214`		`- "$ref": "#/definitions/servers_databases_childResource"`
	`1214`	`+ "$ref": "#/definitions/servers_extendedAuditingSettings_childResource"`
	`1215`	`+ },`
	`1216`	`+ {`
	`1217`	`+ "$ref": "#/definitions/servers_auditingSettings_childResource"`
`1215`	`1218`	`},`
`1216`	`1219`	`{`
`1217`	`1220`	`"$ref": "#/definitions/servers_elasticPools_childResource"`
`@@ -1240,9 +1243,6 @@`
`1240`	`1243`	`{`
`1241`	`1244`	`"$ref": "#/definitions/servers_azureADOnlyAuthentications_childResource"`
`1242`	`1245`	`},`
`1243`		`- {`
`1244`		`- "$ref": "#/definitions/servers_connectionPolicies_childResource"`
`1245`		`- },`
`1246`	`1246`	`{`
`1247`	`1247`	`"$ref": "#/definitions/servers_devOpsAuditingSettings_childResource"`
`1248`	`1248`	`},`