Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add VNet related properties to CosmosDB #2817

Merged
merged 5 commits into from
Apr 12, 2018
Merged

Add VNet related properties to CosmosDB #2817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e63c53
Test
sharathchandrap Apr 4, 2018
ef35b21
Support for VNet
sharathchandrap Apr 4, 2018
f4de45b
Undo Test
sharathchandrap Apr 4, 2018
aba21b1
Merge branch 'master' into vnet
sharathchandrap Apr 10, 2018
6e943a9
Fix boolean
sharathchandrap Apr 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions ...fication/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2015-04-08/cosmos-db.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,6 +1446,10 @@
"description": "Cosmos DB Firewall Support: This value specifies the set of IP addresses or IP address ranges in CIDR form to be included as the allowed list of client IPs for a given database account. IP addresses/ranges must be comma separated and must not contain any spaces.",
"$ref": "#/definitions/IPRangeFilter"
},
"isVirtualNetworkFilterEnabled": {
"description": "Flag to indicate whether to enable/disable Virtual Network ACL rules.",
"type": "boolean"
},
"enableAutomaticFailover": {
"description": "Enables automatic failover of the write region in the rare event that the region is unavailable due to an outage. Automatic failover will result in a new write region for the account and is chosen based on the failover priorities configured for the account.",
"type": "boolean"
Expand Down Expand Up @@ -1484,6 +1488,13 @@
"items": {
"$ref": "#/definitions/FailoverPolicy"
}
},
"virtualNetworkRules": {
"type": "array",
"description": "List of Virtual Network ACL rules configured for the Cosmos DB account.",
"items": {
"$ref": "#/definitions/VirtualNetworkRule"
}
}
}
},
Expand Down Expand Up @@ -1522,6 +1533,10 @@
"description": "Cosmos DB Firewall Support: This value specifies the set of IP addresses or IP address ranges in CIDR form to be included as the allowed list of client IPs for a given database account. IP addresses/ranges must be comma separated and must not contain any spaces.",
"$ref": "#/definitions/IPRangeFilter"
},
"isVirtualNetworkFilterEnabled": {
"description": "Flag to indicate whether to enable/disable Virtual Network ACL rules.",
"type": "boolean"
},
"enableAutomaticFailover": {
"description": "Enables automatic failover of the write region in the rare event that the region is unavailable due to an outage. Automatic failover will result in a new write region for the account and is chosen based on the failover priorities configured for the account.",
"type": "boolean"
Expand All @@ -1532,6 +1547,13 @@
"items": {
"$ref": "#/definitions/Capability"
}
},
"virtualNetworkRules": {
"type": "array",
"description": "List of Virtual Network ACL rules configured for the Cosmos DB account.",
"items": {
"$ref": "#/definitions/VirtualNetworkRule"
}
}
},
"required": [
Expand Down Expand Up @@ -1705,6 +1727,16 @@
"type": "string",
"description": "Cosmos DB Firewall Support: This value specifies the set of IP addresses or IP address ranges in CIDR form to be included as the allowed list of client IPs for a given database account. IP addresses/ranges must be comma separated and must not contain any spaces."
},
"VirtualNetworkRule": {
"type": "object",
"description": "Virtual Network ACL Rule object",
"properties": {
"id":{
"type": "string",
"description": "Resource ID of a subnet, for example: /subscriptions/{subscriptionId}/resourceGroups/{groupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}."
}
}
},
"Operation": {
"description": "REST API operation",
"type": "object",
Expand Down
12 changes: 12 additions & 0 deletions ...ger/Microsoft.DocumentDB/stable/2015-04-08/examples/CosmosDBDatabaseAccountCreateMax.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
"properties": {
"databaseAccountOfferType": "Standard",
"ipRangeFilter": "10.10.10.10",
"isVirtualNetworkFilterEnabled": true,
"virtualNetworkRules": [
{
"id": "/subscriptions/subId/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1"
}
],
"locations": [
{
"failoverPriority": 0,
Expand Down Expand Up @@ -41,6 +47,7 @@
"properties": {
"provisioningState": "Initializing",
"ipRangeFilter": "10.10.10.10",
"isVirtualNetworkFilterEnabled": true,
"databaseAccountOfferType": "Standard",
"consistencyPolicy": {
"defaultConsistencyLevel": "BoundedStaleness",
Expand Down Expand Up @@ -80,6 +87,11 @@
"locationName": "East US",
"failoverPriority": 1
}
],
"virtualNetworkRules": [
{
"id": "/subscriptions/subId/resourceGroups/rg/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1"
}
]
}
}
Expand Down
2 changes: 2 additions & 0 deletions ...e-manager/Microsoft.DocumentDB/stable/2015-04-08/examples/CosmosDBDatabaseAccountGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"provisioningState": "Succeeded",
"documentEndpoint": "https://ddb1.documents.azure.com:443/",
"ipRangeFilter": "",
"isVirtualNetworkFilterEnabled": false,
"virtualNetworkRules": [],
"databaseAccountOfferType": "Standard",
"consistencyPolicy": {
"defaultConsistencyLevel": "Session",
Expand Down