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

[Microsoft.Storage] Adding support for ResourceAccessRules #10868

Merged
merged 2 commits into from
Sep 23, 2020
Merged

[Microsoft.Storage] Adding support for ResourceAccessRules #10868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
518d604
[Microsoft.Storage] Adding support for ResourceAccessRules
prpandey3004 Sep 21, 2020
9bb89e6
PrettierCheck failure
prpandey3004 Sep 21, 2020
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
8 changes: 7 additions & 1 deletion ...er/Microsoft.Storage/preview/2020-08-01-preview/examples/StorageAccountGetProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@
"bypass": "AzureServices",
"defaultAction": "Allow",
"ipRules": [],
"virtualNetworkRules": []
"virtualNetworkRules": [],
"resourceAccessRules": [
{
"tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
"resourceId": "/subscriptions/a7e99807-abbf-4642-bdec-2c809a96a8bc/resourceGroups/res9407/providers/Microsoft.Synapse/workspaces/testworkspace"
blueww marked this conversation as resolved.
Show resolved Hide resolved
}
]
},
"primaryEndpoints": {
"web": "https://sto8596.web.core.windows.net/",
Expand Down
3 changes: 2 additions & 1 deletion ...ft.Storage/preview/2020-08-01-preview/examples/StorageAccountGetPropertiesCMKEnabled.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"bypass": "AzureServices",
"defaultAction": "Allow",
"ipRules": [],
"virtualNetworkRules": []
"virtualNetworkRules": [],
"resourceAccessRules": []
},
"primaryEndpoints": {
"web": "https://sto8596.web.core.windows.net/",
Expand Down
6 changes: 6 additions & 0 deletions ...rce-manager/Microsoft.Storage/preview/2020-08-01-preview/examples/StorageAccountList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,12 @@
"isHnsEnabled": true,
"creationTime": "2017-06-01T02:42:41.7633306Z",
"networkAcls": {
"resourceAccessRules": [
{
"tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
"resourceId": "/subscriptions/a7e99807-abbf-4642-bdec-2c809a96a8bc/resourceGroups/res9407/providers/Microsoft.Synapse/workspaces/testworkspace"
priyapansrp marked this conversation as resolved.
Show resolved Hide resolved
}
],
"bypass": "AzureServices",
"defaultAction": "Allow",
"ipRules": [],
Expand Down
12 changes: 12 additions & 0 deletions ...e-manager/Microsoft.Storage/preview/2020-08-01-preview/examples/StorageAccountUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
"allowBlobPublicAccess": false,
"minimumTlsVersion": "TLS1_2",
"networkAcls": {
"resourceAccessRules": [
{
"tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
"resourceId": "/subscriptions/a7e99807-abbf-4642-bdec-2c809a96a8bc/resourceGroups/res9407/providers/Microsoft.Synapse/workspaces/testworkspace"
priyapansrp marked this conversation as resolved.
Show resolved Hide resolved
}
],
"defaultAction": "Allow"
},
"routingPreference": {
Expand Down Expand Up @@ -46,6 +52,12 @@
"minimumTlsVersion": "TLS1_2",
"creationTime": "2017-06-01T02:42:41.7633306Z",
"networkAcls": {
"resourceAccessRules": [
{
"tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
"resourceId": "/subscriptions/a7e99807-abbf-4642-bdec-2c809a96a8bc/resourceGroups/res9407/providers/Microsoft.Synapse/workspaces/testworkspace"
priyapansrp marked this conversation as resolved.
Show resolved Hide resolved
}
],
"bypass": "AzureServices",
"defaultAction": "Allow",
"ipRules": [],
Expand Down
20 changes: 20 additions & 0 deletions ...cation/storage/resource-manager/Microsoft.Storage/preview/2020-08-01-preview/storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1979,6 +1979,19 @@
],
"description": "The encryption settings on the storage account."
},
"ResourceAccessRule": {
"properties": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add action property similar with VirtualNetworkRule and IPRule?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's not part of the spec.

"tenantId": {
"type": "string",
"description": "Tenant Id"
},
"resourceId": {
"type": "string",
"description": "Resource Id"
}
},
"description": "Resource Access Rule."
},
"VirtualNetworkRule": {
"properties": {
"id": {
Expand Down Expand Up @@ -2062,6 +2075,13 @@
"default": "AzureServices",
"description": "Specifies whether traffic is bypassed for Logging/Metrics/AzureServices. Possible values are any combination of Logging|Metrics|AzureServices (For example, \"Logging, Metrics\"), or None to bypass none of those traffics."
},
"resourceAccessRules": {
"type": "array",
"items": {
"description": "Resource Access Rules.",
"$ref": "#/definitions/ResourceAccessRule"
}
},
"virtualNetworkRules": {
"type": "array",
"items": {
Expand Down