Skip to content

Rename networkAcls to NetworkRuleSet. #1494

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

Merged
jhendrixMSFT merged 2 commits into from
Aug 22, 2017
Merged

Rename networkAcls to NetworkRuleSet. #1494

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
120b18d
Rename networkAcls to NetworkRuleSet.
JasonYang-MSFT Jul 31, 2017
b06ad23
Fixed description for dimensions
JasonYang-MSFT Aug 1, 2017
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
29 changes: 16 additions & 13 deletions specification/storage/resource-manager/Microsoft.Storage/2017-06-01/storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@
"description": "Unit could be Bytes or Count."
},
"dimensions": {
"description": "Dimensions.",
"description": "Dimensions of blobs, including blob type and access tier.",
"type" : "array",
"items": {
"$ref" : "#/definitions/Dimension"
Expand All @@ -666,7 +666,7 @@
}
},
"Dimension": {
"description": "Dimensions.",
"description": "Dimension of blobs, possiblly be blob type or access tier.",
"properties": {
"name" : {
"type" : "string",
Expand Down Expand Up @@ -883,7 +883,7 @@
"modelAsString": false
},
"default": "Allow",
"description": "The action of virtual network ACL rule."
"description": "The action of virtual network rule."
},
"state": {
"type": "string",
Expand All @@ -898,7 +898,7 @@
"name": "State",
"modelAsString": false
},
"description": "Gets the state of virtual network ACL rule."
"description": "Gets the state of virtual network rule."
}
},
"required": [ "id" ],
Expand Down Expand Up @@ -929,7 +929,7 @@
],
"description": "IP rule with specific IP or IP range in CIDR format."
},
"StorageNetworkAcls": {
"NetworkRuleSet": {
"properties": {
"bypass": {
"type": "string",
Expand All @@ -953,7 +953,7 @@
"description": "Virtual Network rule.",
"$ref": "#/definitions/VirtualNetworkRule"
},
"description": "Sets the virtual network ACL rules"
"description": "Sets the virtual network rules"
},
"ipRules": {
"type": "array",
Expand All @@ -980,7 +980,7 @@
"required": [
"defaultAction"
],
"description": "Network ACL"
"description": "Network rule set"
},
"StorageAccountPropertiesCreateParameters": {
"properties": {
Expand All @@ -993,8 +993,9 @@
"description": "Provides the encryption settings on the account. If left unspecified the account encryption settings will remain the same. The default setting is unencrypted."
},
"networkAcls": {
"$ref": "#/definitions/StorageNetworkAcls",
"description": "Network ACL"
"$ref": "#/definitions/NetworkRuleSet",
"x-ms-client-name": "NetworkRuleSet",
"description": "Network rule set"
},
"accessTier": {
"type": "string",
Expand Down Expand Up @@ -1221,8 +1222,9 @@
"description": "Allows https traffic only to storage service if sets to true."
},
"networkAcls": {
"$ref": "#/definitions/StorageNetworkAcls",
"description": "Network ACL",
"$ref": "#/definitions/NetworkRuleSet",
"x-ms-client-name": "NetworkRuleSet",
"description": "Network rule set",
"readOnly": true
}
},
Expand Down Expand Up @@ -1360,8 +1362,9 @@
"description": "Allows https traffic only to storage service if sets to true."
},
"networkAcls": {
"description": "Network ACL",
"$ref": "#/definitions/StorageNetworkAcls"
"description": "Network rule set",
"x-ms-client-name": "NetworkRuleSet",
"$ref": "#/definitions/NetworkRuleSet"
}
},
"description": "The parameters used when updating a storage account."
Expand Down