Update from master

AzureSDKAutomation · Aug 28, 2020 · a3ca4da · a3ca4da
1 parent 59f5f1a
commit a3ca4da
Show file tree

Hide file tree

Showing 4 changed files with 537 additions and 1 deletion.
diff --git a/schemas/2015-01-01/deploymentTemplate.json b/schemas/2015-01-01/deploymentTemplate.json
@@ -890,7 +890,6 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_firewallRules" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_virtualNetworkRules" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_securityAlertPolicies" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforMySQL.json#/resourceDefinitions/servers_Administrators" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_configurations" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-12-01/Microsoft.DBforPostgreSQL.json#/resourceDefinitions/servers_databases" },

diff --git a/schemas/2019-03-18-preview/Microsoft.HybridCompute.json b/schemas/2019-03-18-preview/Microsoft.HybridCompute.json
@@ -0,0 +1,118 @@
+{
+  "id": "https://schema.management.azure.com/schemas/2019-03-18-preview/Microsoft.HybridCompute.json#",
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Microsoft.HybridCompute",
+  "description": "Microsoft HybridCompute Resource Types",
+  "resourceDefinitions": {
+    "machines": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2019-03-18-preview"
+          ]
+        },
+        "identity": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/Identity"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the hybrid machine."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/MachineProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Describes the properties of a hybrid machine."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.HybridCompute/machines"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "location",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.HybridCompute/machines"
+    }
+  },
+  "definitions": {
+    "Identity": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "description": "The identity type."
+        }
+      }
+    },
+    "MachineProperties": {
+      "type": "object",
+      "properties": {
+        "clientPublicKey": {
+          "type": "string",
+          "description": "Public Key that the client provides to be used during initial resource onboarding"
+        },
+        "osProfile": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/OSProfile"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Specifies the operating system settings for the hybrid machine."
+        },
+        "physicalLocation": {
+          "type": "string",
+          "description": "Resource's Physical Location"
+        }
+      },
+      "description": "Describes the properties of a hybrid machine."
+    },
+    "OSProfile": {
+      "type": "object",
+      "properties": {},
+      "description": "Specifies the operating system settings for the hybrid machine."
+    }
+  }
+}