Merge remote-tracking branch 'origin/main' into autogenerate

Autogenerator Pipeline · Autogenerator Pipeline · commit bd64aca8e0a3 · 2021-09-17T08:01:08.000Z
diff --git a/generator/autogenlist.ts b/generator/autogenlist.ts
@@ -101,11 +101,6 @@ const disabledProviders: AutoGenConfig[] = [
         namespace: 'Microsoft.EdgeOrderPartner',
         disabledForAutogen: true,
     },
-    {
-        basePath: 'extendedlocation/resource-manager',
-        namespace: 'Microsoft.ExtendedLocation',
-        disabledForAutogen: true,
-    },
     {
         basePath: 'fluidrelay/resource-manager',
         namespace: 'Microsoft.FluidRelay',
diff --git a/schemas/2021-02-01-preview/Microsoft.Sql.json b/schemas/2021-02-01-preview/Microsoft.Sql.json
@@ -1384,6 +1384,9 @@
           "type": "array",
           "items": {
             "oneOf": [
+              {
+                "$ref": "#/definitions/servers_databases_transparentDataEncryption_childResource"
+              },
               {
                 "$ref": "#/definitions/servers_databases_backupShortTermRetentionPolicies_childResource"
               },
@@ -1414,9 +1417,6 @@
               {
                 "$ref": "#/definitions/servers_databases_syncGroups_childResource"
               },
-              {
-                "$ref": "#/definitions/servers_databases_transparentDataEncryption_childResource"
-              },
               {
                 "$ref": "#/definitions/servers_databases_workloadGroups_childResource"
               }
diff --git a/schemas/2021-07-01-preview/Microsoft.DocumentDB.json b/schemas/2021-07-01-preview/Microsoft.DocumentDB.json
@@ -2777,7 +2777,8 @@
         }
       },
       "required": [
-        "id"
+        "id",
+        "viewDefinition"
       ],
       "description": "Cosmos DB Cassandra view resource object"
     },

Original file line number	Diff line number	Diff line change
`@@ -1384,6 +1384,9 @@`
`1384`	`1384`	`"type": "array",`
`1385`	`1385`	`"items": {`
`1386`	`1386`	`"oneOf": [`
	`1387`	`+ {`
	`1388`	`+ "$ref": "#/definitions/servers_databases_transparentDataEncryption_childResource"`
	`1389`	`+ },`
`1387`	`1390`	`{`
`1388`	`1391`	`"$ref": "#/definitions/servers_databases_backupShortTermRetentionPolicies_childResource"`
`1389`	`1392`	`},`
`@@ -1414,9 +1417,6 @@`
`1414`	`1417`	`{`
`1415`	`1418`	`"$ref": "#/definitions/servers_databases_syncGroups_childResource"`
`1416`	`1419`	`},`
`1417`		`- {`
`1418`		`- "$ref": "#/definitions/servers_databases_transparentDataEncryption_childResource"`
`1419`		`- },`
`1420`	`1420`	`{`
`1421`	`1421`	`"$ref": "#/definitions/servers_databases_workloadGroups_childResource"`
`1422`	`1422`	`}`