Added expression support

jianghaolu · May 11, 2016 · 30ed59c · 30ed59c
1 parent 075398c
commit 30ed59c
Show file tree

Hide file tree

Showing 10 changed files with 5,491 additions and 1,348 deletions.
diff --git a/...erators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Batch/Microsoft.Batch.json b/...erators/AzureResourceSchema/AzureResourceSchema.Tests/Expected/Batch/Microsoft.Batch.json
@@ -24,14 +24,28 @@
           "description": "The region in which the account is created."
         },
         "tags": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              }
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
           "description": "The user specified tags associated with the account."
         },
         "properties": {
-          "$ref": "#/definitions/AccountBaseProperties",
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AccountBaseProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
           "description": "The properties of the account."
         }
       },
@@ -48,7 +62,14 @@
       "type": "object",
       "properties": {
         "autoStorage": {
-          "$ref": "#/definitions/AutoStorageBaseProperties",
+          "oneOf": [
+            {
+              "$ref": "#/definitions/AutoStorageBaseProperties"
+            },
+            {
+              "$ref": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
           "description": "The properties related to auto storage account."
         }
       },