- Moved "virtualMachines_extensions" and "virtualMachineScaleSets_ext…

…ensions" out Microsoft.Compute.Extenions - Added more tests - Added more properties in Schema since it was generated last time
Azure · Oct 3, 2018 · f405451 · f405451
1 parent 7b25f95
commit f405451
Show file tree

Hide file tree

Showing 7 changed files with 1,347 additions and 508 deletions.
diff --git a/schemas/2014-04-01-preview/deploymentTemplate.json b/schemas/2014-04-01-preview/deploymentTemplate.json
@@ -718,9 +718,11 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/images" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/availabilitySets" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/virtualMachines" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/virtualMachineScaleSets" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/virtualMachines_extensions" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/virtualMachineScaleSets_extensions" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/virtualMachineScaleSets" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/disks" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/snapshots" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/resourceDefinitions/virtualMachines_extensions" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/resourceDefinitions/virtualMachineScaleSets_extensions" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-07-01-privatepreview/Microsoft.IoTCentral.json#/resourceDefinitions/IoTApps" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-09-01/Microsoft.IoTCentral.json#/resourceDefinitions/IoTApps" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Maps.json#/resourceDefinitions/accounts" },

diff --git a/schemas/2015-01-01/deploymentTemplate.json b/schemas/2015-01-01/deploymentTemplate.json
@@ -729,8 +729,10 @@
                   { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/availabilitySets" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/virtualMachines" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/virtualMachineScaleSets" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/virtualMachines_extensions" },
-                  { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/virtualMachineScaleSets_extensions" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/disks" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.json#/resourceDefinitions/snapshots" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/resourceDefinitions/virtualMachines_extensions" },
+                  { "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/resourceDefinitions/virtualMachineScaleSets_extensions" },
                   { "$ref": "https://schema.management.azure.com/schemas/2017-07-01-privatepreview/Microsoft.IoTCentral.json#/resourceDefinitions/IoTApps" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-09-01/Microsoft.IoTCentral.json#/resourceDefinitions/IoTApps" },
                   { "$ref": "https://schema.management.azure.com/schemas/2018-05-01/Microsoft.Maps.json#/resourceDefinitions/accounts" },

diff --git a/schemas/2018-06-01/Microsoft.Compute.Extensions.json b/schemas/2018-06-01/Microsoft.Compute.Extensions.json
@@ -3,7 +3,299 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "title": "Microsoft.Compute.Extensions",
   "description": "Microsoft Compute Extensions Resource Types",
-  "resourceDefinitions": {},
+  "resourceDefinitions": {
+    "virtualMachines_extensions": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Compute/virtualMachines/extensions"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2018-06-01"
+          ]
+        },
+        "location": {
+          "type": "string",
+          "description": "Resource location"
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Resource tags"
+        },
+        "properties": {
+          "anyOf": [
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/genericExtension"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/iaaSDiagnostics"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/iaaSAntimalware"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/customScriptExtension"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/customScriptForLinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/linuxDiagnostic"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/vmAccessForLinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/bgInfo"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/vmAccessAgent"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/dscExtension"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/acronisBackupLinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/acronisBackup"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/linuxChefClient"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/chefClient"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/datadogLinuxAgent"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/datadogWindowsAgent"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/dockerExtension"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/dynatraceLinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/dynatraceWindows"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/eset"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/hpeSecurityApplicationDefender"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/puppetAgent"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/site24x7LinuxServerExtn"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/site24x7WindowsServerExtn"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/site24x7ApmInsightExtn"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/trendMicroDSALinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/trendMicroDSA"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/bmcCtmAgentLinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/bmcCtmAgentWindows"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/OSPatchingForLinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/VMSnapshot"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/VMSnapshotLinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/customScript"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/networkWatcherAgentWindows"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/networkWatcherAgentLinux"
+            }
+          ]
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "apiVersion",
+        "location",
+        "properties"
+      ],
+      "description": "Microsoft.Compute/virtualMachines/extensions"
+    },
+    "virtualMachineScaleSets_extensions": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Compute/virtualMachineScaleSets/extensions"
+          ]
+        },
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2018-06-01"
+          ]
+        },
+        "properties": {
+          "anyOf": [
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/genericExtension"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/iaaSDiagnostics"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/iaaSAntimalware"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/customScriptExtension"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/customScriptForLinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/linuxDiagnostic"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/vmAccessForLinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/bgInfo"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/vmAccessAgent"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/dscExtension"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/acronisBackupLinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/acronisBackup"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/linuxChefClient"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/chefClient"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/datadogLinuxAgent"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/datadogWindowsAgent"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/dockerExtension"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/dynatraceLinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/dynatraceWindows"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/eset"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/hpeSecurityApplicationDefender"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/puppetAgent"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/site24x7LinuxServerExtn"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/site24x7WindowsServerExtn"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/site24x7ApmInsightExtn"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/trendMicroDSALinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/trendMicroDSA"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/bmcCtmAgentLinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/bmcCtmAgentWindows"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/OSPatchingForLinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/VMSnapshot"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/VMSnapshotLinux"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/customScript"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/networkWatcherAgentWindows"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2018-06-01/Microsoft.Compute.Extensions.json#/definitions/networkWatcherAgentLinux"
+            }
+          ]
+        }
+      },
+      "required": [
+        "name",
+        "type",
+        "apiVersion",
+        "properties"
+      ],
+      "description": "Microsoft.Compute/virtualMachineScaleSets/extensions"
+    }
+  },
   "definitions": {
     "genericExtension": {
       "type": "object",