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

Rename Firewall Policy child resource RuleGroup to RuleCollectionGroup #9356

Merged
merged 7 commits into from
May 27, 2020
Merged

Rename Firewall Policy child resource RuleGroup to RuleCollectionGroup #9356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
245ec28
Rename Firewall Policy child resource RuleGroup to RuleCollectionGroup
saisujithreddym May 6, 2020
5c099cd
rebase with ti whitelist
saisujithreddym May 6, 2020
6517e89
rebase with ti whitelist
saisujithreddym May 6, 2020
d2f63c4
rebase with ti whitelist
saisujithreddym May 6, 2020
1bf1a4e
prettier run
saisujithreddym May 6, 2020
a7f269b
making nat rule into a collection
saisujithreddym May 7, 2020
b8f2bd9
prettier run
saisujithreddym May 7, 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
4 changes: 2 additions & 2 deletions ...work/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
"*.microsoft.com"
]
},
"ruleGroups": [
"ruleCollectionGroups": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1"
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1"
}
],
"firewalls": []
Expand Down
4 changes: 2 additions & 2 deletions ...nager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
"properties": {
"provisioningState": "Succeeded",
"threatIntelMode": "Alert",
"ruleGroups": [
"ruleCollectionGroups": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1"
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1"
}
],
"firewalls": []
Expand Down
4 changes: 2 additions & 2 deletions ...anager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"properties": {
"provisioningState": "Succeeded",
"threatIntelMode": "Alert",
"ruleGroups": [
"ruleCollectionGroups": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1"
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1"
}
],
"firewalls": []
Expand Down
12 changes: 6 additions & 6 deletions ...work/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
"*.microsoft.com"
]
},
"ruleGroups": [
"ruleCollectionGroups": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup1"
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1"
},
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup2"
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup2"
}
],
"firewalls": []
Expand Down Expand Up @@ -77,12 +77,12 @@
"*.microsoft.com"
]
},
"ruleGroups": [
"ruleCollectionGroups": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1"
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1"
},
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup2"
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup2"
}
],
"firewalls": []
Expand Down
2 changes: 1 addition & 1 deletion ...amples/FirewallPolicyRuleGroupDelete.json → ...ewallPolicyRuleCollectionGroupDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"ruleGroupName": "ruleGroup1",
"ruleCollectionGroupName": "ruleCollectionGroup1",
"firewallPolicyName": "firewallPolicy",
"resourceGroupName": "rg1",
"api-version": "2020-05-01",
Expand Down
18 changes: 9 additions & 9 deletions .../examples/FirewallPolicyRuleGroupGet.json → ...FirewallPolicyRuleCollectionGroupGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"ruleGroupName": "ruleGroup1",
"ruleCollectionGroupName": "ruleCollectionGroup1",
"firewallPolicyName": "firewallPolicy",
"resourceGroupName": "rg1",
"api-version": "2020-05-01",
Expand All @@ -9,24 +9,24 @@
"responses": {
"200": {
"body": {
"name": "ruleGroup1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1",
"name": "ruleCollectionGroup1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1",
"etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
"properties": {
"provisioningState": "Succeeded",
"priority": 110,
"rules": [
"ruleCollections": [
{
"ruleType": "FirewallPolicyFilterRule",
"name": "Example-Filter-Rule",
"ruleCollectionType": "FirewallPolicyFilterRuleCollection",
"name": "Example-Filter-Rule-Collection",
"priority": 200,
"action": {
"type": "Deny"
},
"ruleConditions": [
"rules": [
{
"ruleConditionType": "NetworkRuleCondition",
"name": "network-condition1",
"ruleType": "NetworkRule",
"name": "network-rule1",
"sourceAddresses": [
"10.1.25.0/24"
],
Expand Down
18 changes: 9 additions & 9 deletions ...examples/FirewallPolicyRuleGroupList.json → ...irewallPolicyRuleCollectionGroupList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@
"body": {
"value": [
{
"name": "ruleGroup1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1",
"name": "ruleCollectionGroup1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1",
"etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
"properties": {
"provisioningState": "Succeeded",
"priority": 110,
"rules": [
"ruleCollections": [
{
"name": "Example-Filter-Rule",
"ruleType": "FirewallPolicyFilterRule",
"name": "Example-Filter-Rule-Collection",
"ruleCollectionType": "FirewallPolicyFilterRuleCollection",
"priority": 120,
"action": {
"type": "Deny"
},
"ruleConditions": [
"rules": [
{
"name": "network-condition-1",
"ruleConditionType": "NetworkRuleCondition",
"description": "Network rule condition",
"name": "network-rule-1",
"ruleType": "NetworkRule",
"description": "Network rule",
"destinationAddresses": [
"*"
],
Expand Down
42 changes: 21 additions & 21 deletions .../examples/FirewallPolicyRuleGroupPut.json → ...FirewallPolicyRuleCollectionGroupPut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"firewallPolicyName": "firewallPolicy",
"ruleGroupName": "ruleGroup1",
"ruleCollectionGroupName": "ruleCollectionGroup1",
"parameters": {
"properties": {
"priority": 110,
"rules": [
"ruleCollections": [
{
"ruleType": "FirewallPolicyFilterRule",
"name": "Example-Filter-Rule",
"ruleCollectionType": "FirewallPolicyFilterRuleCollection",
"name": "Example-Filter-Rule-Collection",
"action": {
"type": "Deny"
},
"ruleConditions": [
"rules": [
{
"ruleConditionType": "NetworkRuleCondition",
"name": "network-condition1",
"ruleType": "NetworkRule",
"name": "network-rule1",
"sourceAddresses": [
"10.1.25.0/24"
],
Expand All @@ -41,23 +41,23 @@
"responses": {
"200": {
"body": {
"name": "ruleGroup1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1",
"name": "ruleCollectionGroup1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"priority": 110,
"rules": [
"ruleCollections": [
{
"ruleType": "FirewallPolicyFilterRule",
"name": "Example-Filter-Rule",
"ruleCollectionType": "FirewallPolicyFilterRuleCollection",
"name": "Example-Filter-Rule-Collection",
"action": {
"type": "Deny"
},
"ruleConditions": [
"rules": [
{
"ruleConditionType": "NetworkRuleCondition",
"name": "network-condition1",
"ruleType": "NetworkRule",
"name": "network-rule1",
"sourceAddresses": [
"10.1.25.0/24"
],
Expand Down Expand Up @@ -85,17 +85,17 @@
"properties": {
"provisioningState": "Succeeded",
"priority": 110,
"rules": [
"ruleCollections": [
{
"ruleType": "FirewallPolicyFilterRule",
"name": "Example-Filter-Rule",
"ruleCollectionType": "FirewallPolicyFilterRuleCollection",
"name": "Example-Filter-Rule-Collection",
"action": {
"type": "Deny"
},
"ruleConditions": [
"rules": [
{
"ruleConditionType": "NetworkRuleCondition",
"name": "network-condition1",
"ruleType": "NetworkRule",
"name": "network-rule1",
"sourceAddresses": [
"10.1.25.0/24"
],
Expand Down
14 changes: 7 additions & 7 deletions ...rewallPolicyRuleGroupWithIpGroupsGet.json → ...cyRuleCollectionGroupWithIpGroupsGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parameters": {
"ruleGroupName": "ruleGroup1",
"ruleCollectionGroupName": "ruleGroup1",
"firewallPolicyName": "firewallPolicy",
"resourceGroupName": "rg1",
"api-version": "2020-05-01",
Expand All @@ -15,18 +15,18 @@
"properties": {
"provisioningState": "Succeeded",
"priority": 110,
"rules": [
"ruleCollections": [
{
"ruleType": "FirewallPolicyFilterRule",
"name": "Example-Filter-Rule",
"ruleCollectionType": "FirewallPolicyFilterRuleCollection",
"name": "Example-Filter-Rule-Collection",
"priority": 200,
"action": {
"type": "Deny"
},
"ruleConditions": [
"rules": [
{
"ruleConditionType": "NetworkRuleCondition",
"name": "network-condition1",
"ruleType": "NetworkRule",
"name": "network-rule1",
"ipProtocols": [
"TCP"
],
Expand Down
18 changes: 9 additions & 9 deletions ...ewallPolicyRuleGroupWithIpGroupsList.json → ...yRuleCollectionGroupWithIpGroupsList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@
"body": {
"value": [
{
"name": "ruleGroup1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1",
"name": "ruleCollectionGroup1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1",
"etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
"properties": {
"provisioningState": "Succeeded",
"priority": 110,
"rules": [
"ruleCollections": [
{
"name": "Example-Filter-Rule",
"ruleType": "FirewallPolicyFilterRule",
"name": "Example-Filter-Rule-Collection",
"ruleCollectionType": "FirewallPolicyFilterRuleCollection",
"priority": 120,
"action": {
"type": "Deny"
},
"ruleConditions": [
"rules": [
{
"name": "network-condition-1",
"ruleConditionType": "NetworkRuleCondition",
"description": "Network rule condition",
"name": "network-rule-1",
"ruleType": "NetworkRule",
"description": "Network rule",
"sourceIpGroups": [
"/subscriptions/subid/providers/Microsoft.Network/resourceGroup/rg1/ipGroups/ipGroups1"
],
Expand Down
42 changes: 21 additions & 21 deletions ...rewallPolicyRuleGroupWithIpGroupsPut.json → ...cyRuleCollectionGroupWithIpGroupsPut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"firewallPolicyName": "firewallPolicy",
"ruleGroupName": "ruleGroup1",
"ruleCollectionGroupName": "ruleCollectionGroup1",
"parameters": {
"properties": {
"priority": 110,
"rules": [
"ruleCollections": [
{
"ruleType": "FirewallPolicyFilterRule",
"name": "Example-Filter-Rule",
"ruleCollectionType": "FirewallPolicyFilterRuleCollection",
"name": "Example-Filter-Rule-Collection",
"action": {
"type": "Deny"
},
"ruleConditions": [
"rules": [
{
"ruleConditionType": "NetworkRuleCondition",
"name": "network-condition1",
"ruleType": "NetworkRule",
"name": "network-1",
"ipProtocols": [
"TCP"
],
Expand All @@ -41,23 +41,23 @@
"responses": {
"200": {
"body": {
"name": "ruleGroup1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1",
"name": "ruleCollectionGroup1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"provisioningState": "Succeeded",
"priority": 110,
"rules": [
"ruleCollections": [
{
"ruleType": "FirewallPolicyFilterRule",
"name": "Example-Filter-Rule",
"ruleCollectionType": "FirewallPolicyFilterRuleCollection",
"name": "Example-Filter-Rule-Collection",
"action": {
"type": "Deny"
},
"ruleConditions": [
"rules": [
{
"ruleConditionType": "NetworkRuleCondition",
"name": "network-condition1",
"ruleType": "NetworkRule",
"name": "network-1",
"ipProtocols": [
"TCP"
],
Expand Down Expand Up @@ -85,17 +85,17 @@
"properties": {
"provisioningState": "Succeeded",
"priority": 110,
"rules": [
"ruleCollections": [
{
"ruleType": "FirewallPolicyFilterRule",
"name": "Example-Filter-Rule",
"ruleCollectionType": "FirewallPolicyFilterRuleCollection",
"name": "Example-Filter-Rule-Collection",
"action": {
"type": "Deny"
},
"ruleConditions": [
"rules": [
{
"ruleConditionType": "NetworkRuleCondition",
"name": "network-condition1",
"ruleType": "NetworkRule",
"name": "network-1",
"ipProtocols": [
"TCP"
],
Expand Down
Loading