Update from master

Azure · Aug 29, 2020 · d80a292 · d80a292
1 parent 85ebda1
commit d80a292
Show file tree

Hide file tree

Showing 20 changed files with 446 additions and 6,624 deletions.
diff --git a/schemas/2017-06-01/Microsoft.AAD.json b/schemas/2017-06-01/Microsoft.AAD.json
@@ -36,16 +36,6 @@
           ],
           "description": "Properties of the Domain Service."
         },
-        "resources": {
-          "type": "array",
-          "items": {
-            "oneOf": [
-              {
-                "$ref": "#/definitions/domainServices_ouContainer_childResource"
-              }
-            ]
-          }
-        },
         "tags": {
           "oneOf": [
             {
@@ -75,45 +65,6 @@
         "type"
       ],
       "description": "Microsoft.AAD/domainServices"
-    },
-    "domainServices_ouContainer": {
-      "type": "object",
-      "properties": {
-        "accountName": {
-          "type": "string",
-          "description": "The account name"
-        },
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2017-06-01"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the OuContainer."
-        },
-        "password": {
-          "type": "string",
-          "description": "The account password"
-        },
-        "spn": {
-          "type": "string",
-          "description": "The account spn"
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "Microsoft.Aad/domainServices/ouContainer"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "type"
-      ],
-      "description": "Microsoft.Aad/domainServices/ouContainer"
     }
   },
   "definitions": {
@@ -230,45 +181,6 @@
       },
       "description": "Properties of the Domain Service."
     },
-    "domainServices_ouContainer_childResource": {
-      "type": "object",
-      "properties": {
-        "accountName": {
-          "type": "string",
-          "description": "The account name"
-        },
-        "apiVersion": {
-          "type": "string",
-          "enum": [
-            "2017-06-01"
-          ]
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the OuContainer."
-        },
-        "password": {
-          "type": "string",
-          "description": "The account password"
-        },
-        "spn": {
-          "type": "string",
-          "description": "The account spn"
-        },
-        "type": {
-          "type": "string",
-          "enum": [
-            "ouContainer"
-          ]
-        }
-      },
-      "required": [
-        "apiVersion",
-        "name",
-        "type"
-      ],
-      "description": "Microsoft.Aad/domainServices/ouContainer"
-    },
     "LdapsSettings": {
       "type": "object",
       "properties": {

diff --git a/schemas/2017-12-01-preview/Microsoft.DBforPostgreSQL.json b/schemas/2017-12-01-preview/Microsoft.DBforPostgreSQL.json
@@ -275,7 +275,7 @@
           "oneOf": [
             {
               "type": "string",
-              "pattern": "^.*/Default$"
+              "pattern": "^.*/default$"
             },
             {
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -892,7 +892,7 @@
         "name": {
           "type": "string",
           "enum": [
-            "Default"
+            "default"
           ],
           "description": "The name of the threat detection policy."
         },

diff --git a/schemas/2018-03-01/Microsoft.Cache.json b/schemas/2018-03-01/Microsoft.Cache.json
@@ -587,7 +587,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The size of the Redis cache to deploy. Valid values: for C (Basic/Standard) family (0, 1, 2, 3, 4, 5, 6), for P (Premium) family (1, 2, 3, 4, 5)."
+          "description": "The size of the Redis cache to deploy. Valid values: for C (Basic/Standard) family (0, 1, 2, 3, 4, 5, 6), for P (Premium) family (1, 2, 3, 4)."
         },
         "family": {
           "oneOf": [

diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json
@@ -12429,11 +12429,6 @@
           ],
           "description": "Unmatched properties from the message are deserialized this collection"
         },
-        "enableReliableLogging": {
-          "type": "object",
-          "properties": {},
-          "description": "Specifies whether to enable reliable logging. Type: boolean (or Expression with resultType boolean)."
-        },
         "linkedServiceName": {
           "oneOf": [
             {
@@ -12445,11 +12440,6 @@
           ],
           "description": "Linked service reference type."
         },
-        "logLevel": {
-          "type": "object",
-          "properties": {},
-          "description": "Gets or sets the log level, support: Info, Warning. Type: string (or Expression with resultType string)."
-        },
         "path": {
           "type": "object",
           "properties": {},

diff --git a/schemas/2019-01-01-preview/Microsoft.SecurityInsights.json b/schemas/2019-01-01-preview/Microsoft.SecurityInsights.json
@@ -1304,26 +1304,6 @@
       "properties": {},
       "description": "EntityAnalytics property bag."
     },
-    "EventGroupingSettings": {
-      "type": "object",
-      "properties": {
-        "aggregationKind": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "SingleAlert",
-                "AlertPerResult"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ]
-        }
-      },
-      "description": "Event grouping settings property bag."
-    },
     "EyesOn": {
       "type": "object",
       "properties": {
@@ -2136,17 +2116,6 @@
             }
           ],
           "description": "SharePoint data type connection."
-        },
-        "teams": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/OfficeDataConnectorDataTypesTeams"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Teams data type connection."
         }
       },
       "description": "The available data types for office data connector."
@@ -2193,27 +2162,6 @@
       },
       "description": "SharePoint data type connection."
     },
-    "OfficeDataConnectorDataTypesTeams": {
-      "type": "object",
-      "properties": {
-        "state": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "Enabled",
-                "Disabled"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Describe whether this data type connection is enabled or not."
-        }
-      },
-      "description": "Teams data type connection."
-    },
     "OfficeDataConnectorProperties": {
       "type": "object",
       "properties": {
@@ -2361,17 +2309,6 @@
           ],
           "description": "Determines whether this alert rule is enabled or disabled."
         },
-        "eventGroupingSettings": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/EventGroupingSettings"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Event grouping settings property bag."
-        },
         "incidentConfiguration": {
           "oneOf": [
             {

diff --git a/schemas/2019-05-01-preview/Microsoft.AppPlatform.json b/schemas/2019-05-01-preview/Microsoft.AppPlatform.json
@@ -684,18 +684,13 @@
           ],
           "description": "Required Memory size in GB, basic tier should be in range (1, 2), standard tier should be in range (1, 8)"
         },
-        "netCoreMainEntryPath": {
-          "type": "string",
-          "description": "The path to the .NET executable relative to zip root"
-        },
         "runtimeVersion": {
           "oneOf": [
             {
               "type": "string",
               "enum": [
                 "Java_8",
-                "Java_11",
-                "NetCore_31"
+                "Java_11"
               ]
             },
             {
@@ -1186,7 +1181,6 @@
               "type": "string",
               "enum": [
                 "Jar",
-                "NetCoreZip",
                 "Source"
               ]
             },

diff --git a/schemas/2019-07-01/Microsoft.Cache.json b/schemas/2019-07-01/Microsoft.Cache.json
@@ -598,7 +598,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "The size of the Redis cache to deploy. Valid values: for C (Basic/Standard) family (0, 1, 2, 3, 4, 5, 6), for P (Premium) family (1, 2, 3, 4, 5)."
+          "description": "The size of the Redis cache to deploy. Valid values: for C (Basic/Standard) family (0, 1, 2, 3, 4, 5, 6), for P (Premium) family (1, 2, 3, 4)."
         },
         "family": {
           "oneOf": [