Skip to content

Commit 7520f21

Browse files
author
Meha Kaushik
committed
Replace IpRangeFilter by IpRules
1 parent 88e1237 commit 7520f21

File tree

8 files changed

+62
-21
lines changed

8 files changed

+62
-21
lines changed

‎specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-05-04/cosmos-db.json‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5094,9 +5094,9 @@
50945094
"readOnly": true,
50955095
"$ref": "#/definitions/DatabaseAccountOfferType"
50965096
},
5097-
"ipRangeFilter": {
5098-
"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.",
5099-
"$ref": "#/definitions/IPRangeFilter"
5097+
"ipRules": {
5098+
"description": "List of IpRules.",
5099+
"$ref": "#/definitions/IPRules"
51005100
},
51015101
"isVirtualNetworkFilterEnabled": {
51025102
"description": "Flag to indicate whether to enable/disable Virtual Network ACL rules.",
@@ -5213,9 +5213,9 @@
52135213
"description": "The offer type for the database",
52145214
"$ref": "#/definitions/DatabaseAccountOfferType"
52155215
},
5216-
"ipRangeFilter": {
5217-
"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.",
5218-
"$ref": "#/definitions/IPRangeFilter"
5216+
"ipRules": {
5217+
"description": "List of IpRules.",
5218+
"$ref": "#/definitions/IPRules"
52195219
},
52205220
"isVirtualNetworkFilterEnabled": {
52215221
"description": "Flag to indicate whether to enable/disable Virtual Network ACL rules.",
@@ -5320,9 +5320,9 @@
53205320
"$ref": "#/definitions/Location"
53215321
}
53225322
},
5323-
"ipRangeFilter": {
5324-
"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.",
5325-
"$ref": "#/definitions/IPRangeFilter"
5323+
"ipRules": {
5324+
"description": "List of IpRules.",
5325+
"$ref": "#/definitions/IPRules"
53265326
},
53275327
"isVirtualNetworkFilterEnabled": {
53285328
"description": "Flag to indicate whether to enable/disable Virtual Network ACL rules.",
@@ -6718,9 +6718,16 @@
67186718
"readOnly": true,
67196719
"description": "The status of the Cosmos DB account at the time the operation was called. The status can be one of following. 'Creating' – the Cosmos DB account is being created. When an account is in Creating state, only properties that are specified as input for the Create Cosmos DB account operation are returned. 'Succeeded' – the Cosmos DB account is active for use. 'Updating' – the Cosmos DB account is being updated. 'Deleting' – the Cosmos DB account is being deleted. 'Failed' – the Cosmos DB account failed creation. 'DeletionFailed' – the Cosmos DB account deletion failed."
67206720
},
6721-
"IPRangeFilter": {
6721+
"IPRules": {
6722+
"type": "array",
6723+
"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.",
6724+
"items": {
6725+
"$ref": "#/definitions/IpAddressOrRange"
6726+
}
6727+
},
6728+
"IpAddressOrRange": {
67226729
"type": "string",
6723-
"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."
6730+
"description": "A single IPv4 address or a single IPv4 address range in CIDR format. Provided IPs must be well-formatted and cannot be contained in one of the following ranges: 10.0.0.0/8, 100.64.0.0/10, 172.16.0.0/12, 192.168.0.0/16, since these are not enforceable by the IP address filter. Example of valid inputs: “23.40.210.245” or “23.40.210.0/8”."
67246731
},
67256732
"VirtualNetworkRule": {
67266733
"type": "object",

‎specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-05-04/examples/CosmosDBDatabaseAccountCreateMax.json‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@
1010
"kind": "GlobalDocumentDB",
1111
"properties": {
1212
"databaseAccountOfferType": "Standard",
13-
"ipRangeFilter": "10.10.10.10",
13+
"ipRules": [
14+
{
15+
"ipAddressOrRange": "23.43.230.120"
16+
},
17+
{
18+
"ipAddressOrRange": "110.12.240.0/12"
19+
}
20+
],
1421
"isVirtualNetworkFilterEnabled": true,
1522
"virtualNetworkRules": [
1623
{
@@ -51,7 +58,6 @@
5158
"tags": {},
5259
"properties": {
5360
"provisioningState": "Initializing",
54-
"ipRangeFilter": "10.10.10.10",
5561
"isVirtualNetworkFilterEnabled": true,
5662
"databaseAccountOfferType": "Standard",
5763
"disableKeyBasedMetadataWriteAccess": false,
@@ -119,7 +125,15 @@
119125
}
120126
],
121127
"keyVaultKeyUri": "https://myKeyVault.vault.azure.net",
122-
"enableFreeTier": false
128+
"enableFreeTier": false,
129+
"ipRules": [
130+
{
131+
"ipAddressOrRange": "23.43.230.120"
132+
},
133+
{
134+
"ipAddressOrRange": "110.12.240.0/12"
135+
}
136+
]
123137
}
124138
}
125139
}

‎specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-05-04/examples/CosmosDBDatabaseAccountCreateMin.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"tags": {},
3030
"properties": {
3131
"provisioningState": "Initializing",
32-
"ipRangeFilter": "",
32+
"ipRules": [],
3333
"databaseAccountOfferType": "Standard",
3434
"disableKeyBasedMetadataWriteAccess": false,
3535
"consistencyPolicy": {

‎specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-05-04/examples/CosmosDBDatabaseAccountGet.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"properties": {
1818
"provisioningState": "Succeeded",
1919
"documentEndpoint": "https://ddb1.documents.azure.com:443/",
20-
"ipRangeFilter": "",
20+
"ipRules": [],
2121
"isVirtualNetworkFilterEnabled": false,
2222
"virtualNetworkRules": [],
2323
"databaseAccountOfferType": "Standard",

‎specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-05-04/examples/CosmosDBDatabaseAccountList.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"properties": {
1818
"provisioningState": "Succeeded",
1919
"documentEndpoint": "https://ddb1.documents.azure.com:443/",
20-
"ipRangeFilter": "",
20+
"ipRules": [],
2121
"databaseAccountOfferType": "Standard",
2222
"disableKeyBasedMetadataWriteAccess": false,
2323
"consistencyPolicy": {

‎specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-05-04/examples/CosmosDBDatabaseAccountListByResourceGroup.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"properties": {
1919
"provisioningState": "Succeeded",
2020
"documentEndpoint": "https://ddb1.documents.azure.com:443/",
21-
"ipRangeFilter": "",
21+
"ipRangeFilter": [],
2222
"databaseAccountOfferType": "Standard",
2323
"disableKeyBasedMetadataWriteAccess": false,
2424
"consistencyPolicy": {

‎specification/cosmos-db/resource-manager/Microsoft.DocumentDB/stable/2020-05-04/examples/CosmosDBDatabaseAccountPatch.json‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
"dept": "finance"
1111
},
1212
"properties": {
13-
"ipRangeFilter": "10.10.10.10",
13+
"ipRules": [
14+
{
15+
"ipAddressOrRange": "10.10.10.10"
16+
}
17+
],
1418
"isVirtualNetworkFilterEnabled": true,
1519
"virtualNetworkRules": [
1620
{
@@ -42,7 +46,11 @@
4246
"provisioningState": "Succeeded",
4347
"documentEndpoint": "https://ddb1.documents.azure.com:443/",
4448
"databaseAccountOfferType": "Standard",
45-
"ipRangeFilter": "10.10.10.10",
49+
"ipRules": [
50+
{
51+
"ipAddressOrRange": "10.10.10.10"
52+
}
53+
],
4654
"isVirtualNetworkFilterEnabled": true,
4755
"disableKeyBasedMetadataWriteAccess": false,
4856
"consistencyPolicy": {

‎specification/cosmos-db/resource-manager/readme.md‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,19 @@ These are the global settings for the Cosmos-DB API.
2727
``` yaml
2828
title: CosmosDBManagementClient
2929
openapi-type: arm
30-
tag: package-2020-03
30+
tag: package-2020-05
31+
```
32+
33+
### Tag: package-2020-05
34+
35+
These settings apply only when `--tag=package-2020-05` is specified on the command line.
36+
37+
``` yaml $(tag) == 'package-2020-05'
38+
input-file:
39+
- Microsoft.DocumentDB/stable/2020-05-04/cosmos-db.json
40+
- Microsoft.DocumentDB/stable/2020-05-04/notebook.json
41+
- Microsoft.DocumentDB/preview/2019-08-01-preview/privateLinkResources.json
42+
- Microsoft.DocumentDB/preview/2019-08-01-preview/privateEndpointConnection.json
3143
```
3244

3345
### Tag: package-2020-03

0 commit comments

Comments
 (0)