Merge pull request #613 from shurd/updateLocationProperty

Update Cosmos DB schema to reflect new Location property

Author: Tiano2017

schemas/2015-04-08/Microsoft.DocumentDB.json

@@ -277,6 +277,17 @@
             }
           ],
           "description": "The failover priority of the region. A failover priority of 0 indicates a write region. The maximum value for a failover priority = (total number of regions - 1). Failover priority values must be unique for each of the regions in which the database account exists."
+        },
+        "isZoneRedundant": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Flag to indicate whether or not this region is an AvailabilityZone region"
         }
       },
       "description": "A region in which the Azure Cosmos DB database account is deployed."
@@ -287,6 +298,17 @@
         "id": {
           "type": "string",
           "description": "Resource ID of a subnet, for example: /subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}."
+        },
+        "ignoreMissingVNetServiceEndpoint": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#/definitions/expression"
+            }
+          ],
+          "description": "Create firewall rule before the virtual network has vnet service endpoint enabled"
         }
       },
       "description": "Virtual Network ACL Rule object"

tests/2015-04-08/Microsoft.DocumentDB.tests.json

@@ -87,6 +87,53 @@
         }
       }
     },
+    {
+      "name": "databaseAccounts - resource with zone redundant location",
+      "definition": "https://schema.management.azure.com/schemas/2015-04-08/Microsoft.DocumentDB.json#/resourceDefinitions/databaseAccounts",
+      "json": {
+        "type": "Microsoft.DocumentDB/databaseAccounts",
+        "apiVersion": "2015-04-08",
+        "name": "test",
+        "location": "West Us",
+        "properties": {
+            "locations": [
+                    {
+                        "locationName": "West Us",
+                        "failoverPriority": 0,
+                        "isZoneRedundant": true
+                    }
+            ],
+            "databaseAccountOfferType": "Standard"
+        }
+      }
+    },
+    {
+      "name": "databaseAccounts - resource with VNET",
+      "definition": "https://schema.management.azure.com/schemas/2015-04-08/Microsoft.DocumentDB.json#/resourceDefinitions/databaseAccounts",
+      "json": {
+        "type": "Microsoft.DocumentDB/databaseAccounts",
+        "apiVersion": "2015-04-08",
+        "name": "test",
+        "location": "West Us",
+        "properties": {
+            "locations": [
+                    {
+                        "locationName": "West Us",
+                        "failoverPriority": 0,
+                        "isZoneRedundant": true
+                    }
+            ],
+            "virtualNetworkRules": [
+              {
+                  "id": "/subscriptions/subId/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1",
+                  "ignoreMissingVNetServiceEndpoint": false
+              }
+            ],
+            "isVirtualNetworkFilterEnabled": true,
+            "databaseAccountOfferType": "Standard"
+        }
+      }
+    },
     {
       "name": "databaseAccounts - resource without properties property",
       "expectedErrors": [