Merge pull request #1155 from Azure/autogenerate

Merge Autogenerate
AzureSDKAutomation · Aug 28, 2020 · 85ebda1 · 85ebda1
2 parents 59f5f1a + 7d173f8
commit 85ebda1
Show file tree

Hide file tree

Showing 20 changed files with 6,672 additions and 458 deletions.
diff --git a/generator/resources.json b/generator/resources.json
@@ -18,6 +18,10 @@
   "Microsoft.AVS/privateClouds/hcxEnterpriseSites": [
     "2020-03-20"
   ],
+  "Microsoft.Aad/domainServices/ouContainer": [
+    "2017-06-01",
+    "2020-01-01"
+  ],
   "Microsoft.Addons/supportProviders/supportPlanTypes": [
     "2017-05-15",
     "2018-03-01"
@@ -685,10 +689,16 @@
     "2019-10-01-preview",
     "2020-05-01"
   ],
+  "Microsoft.Billing/billingAccounts/billingRoleAssignments": [
+    "2019-10-01-preview"
+  ],
   "Microsoft.Billing/billingAccounts/customers/policies": [
     "2019-10-01-preview",
     "2020-05-01"
   ],
+  "Microsoft.Billing/billingAccounts/departments/billingRoleAssignments": [
+    "2019-10-01-preview"
+  ],
   "Microsoft.Billing/billingAccounts/enrollmentAccounts/billingRoleAssignments": [
     "2019-10-01-preview"
   ],
@@ -1945,10 +1955,12 @@
     "2019-09-16"
   ],
   "Microsoft.HybridCompute/machines": [
-    "2019-12-12"
+    "2019-12-12",
+    "2020-07-30-preview"
   ],
   "Microsoft.HybridCompute/machines/extensions": [
-    "2019-12-12"
+    "2019-12-12",
+    "2020-07-30-preview"
   ],
   "Microsoft.HybridData/dataManagers": [
     "2016-06-01",
@@ -2180,7 +2192,8 @@
     "2020-04-01",
     "2020-05-01-preview",
     "2020-05-15-preview",
-    "2020-06-01"
+    "2020-06-01",
+    "2020-09-01-preview"
   ],
   "Microsoft.MachineLearningServices/workspaces/computes": [
     "2018-03-01-preview",
@@ -2194,11 +2207,15 @@
     "2020-04-01",
     "2020-05-01-preview",
     "2020-05-15-preview",
-    "2020-06-01"
+    "2020-06-01",
+    "2020-09-01-preview"
   ],
   "Microsoft.MachineLearningServices/workspaces/connections": [
     "2020-06-01"
   ],
+  "Microsoft.MachineLearningServices/workspaces/linkedServices": [
+    "2020-09-01-preview"
+  ],
   "Microsoft.MachineLearningServices/workspaces/linkedWorkspaces": [
     "2020-05-01-preview",
     "2020-05-15-preview"
@@ -2210,11 +2227,13 @@
     "2020-04-01",
     "2020-05-01-preview",
     "2020-05-15-preview",
-    "2020-06-01"
+    "2020-06-01",
+    "2020-09-01-preview"
   ],
   "Microsoft.MachineLearningServices/workspaces/services": [
     "2020-05-01-preview",
-    "2020-05-15-preview"
+    "2020-05-15-preview",
+    "2020-09-01-preview"
   ],
   "Microsoft.Maintenance/maintenanceConfigurations": [
     "2018-06-01-preview",
@@ -2361,7 +2380,11 @@
     "2019-08-01",
     "2019-10-01",
     "2019-11-01",
-    "2020-02-01"
+    "2020-02-01",
+    "2020-06-01"
+  ],
+  "Microsoft.NetApp/netAppAccounts/backupPolicies": [
+    "2020-06-01"
   ],
   "Microsoft.NetApp/netAppAccounts/capacityPools": [
     "2017-08-15",
@@ -2371,7 +2394,8 @@
     "2019-08-01",
     "2019-10-01",
     "2019-11-01",
-    "2020-02-01"
+    "2020-02-01",
+    "2020-06-01"
   ],
   "Microsoft.NetApp/netAppAccounts/capacityPools/volumes": [
     "2017-08-15",
@@ -2381,7 +2405,11 @@
     "2019-08-01",
     "2019-10-01",
     "2019-11-01",
-    "2020-02-01"
+    "2020-02-01",
+    "2020-06-01"
+  ],
+  "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/backups": [
+    "2020-06-01"
   ],
   "Microsoft.NetApp/netAppAccounts/capacityPools/volumes/snapshots": [
     "2017-08-15",
@@ -2391,7 +2419,11 @@
     "2019-08-01",
     "2019-10-01",
     "2019-11-01",
-    "2020-02-01"
+    "2020-02-01",
+    "2020-06-01"
+  ],
+  "Microsoft.NetApp/netAppAccounts/snapshotPolicies": [
+    "2020-06-01"
   ],
   "Microsoft.Network/ApplicationGatewayWebApplicationFirewallPolicies": [
     "2018-12-01",
@@ -3967,15 +3999,19 @@
     "2015-02-28",
     "2015-08-19",
     "2019-10-01-preview",
-    "2020-03-13"
+    "2020-03-13",
+    "2020-08-01",
+    "2020-08-01-preview"
   ],
   "Microsoft.Search/searchServices/privateEndpointConnections": [
     "2019-10-01-preview",
-    "2020-03-13"
+    "2020-03-13",
+    "2020-08-01",
+    "2020-08-01-preview"
   ],
   "Microsoft.Search/searchServices/sharedPrivateLinkResources": [
-    "2019-10-01-preview",
-    "2020-03-13"
+    "2020-08-01",
+    "2020-08-01-preview"
   ],
   "Microsoft.Security/advancedThreatProtectionSettings": [
     "2017-08-01-preview",

diff --git a/schemas/2017-06-01/Microsoft.AAD.json b/schemas/2017-06-01/Microsoft.AAD.json
@@ -36,6 +36,16 @@
           ],
           "description": "Properties of the Domain Service."
         },
+        "resources": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              {
+                "$ref": "#/definitions/domainServices_ouContainer_childResource"
+              }
+            ]
+          }
+        },
         "tags": {
           "oneOf": [
             {
@@ -65,6 +75,45 @@
         "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": {
@@ -181,6 +230,45 @@
       },
       "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/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)."
+          "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)."
         },
         "family": {
           "oneOf": [

diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json
@@ -12429,6 +12429,11 @@
           ],
           "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": [
             {
@@ -12440,6 +12445,11 @@
           ],
           "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,6 +1304,26 @@
       "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": {
@@ -2116,6 +2136,17 @@
             }
           ],
           "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."
@@ -2162,6 +2193,27 @@
       },
       "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": {
@@ -2309,6 +2361,17 @@
           ],
           "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": [
             {