From 245ec28a3f4b0704696e320206b95fabffb12330 Mon Sep 17 00:00:00 2001 From: "samankal@microsoft.com" Date: Wed, 6 May 2020 08:57:06 -0700 Subject: [PATCH 1/7] Rename Firewall Policy child resource RuleGroup to RuleCollectionGroup --- .../examples/FirewallPolicyGet.json | 14 +- .../FirewallPolicyListByResourceGroup.json | 6 +- .../FirewallPolicyListBySubscription.json | 6 +- .../examples/FirewallPolicyPut.json | 40 +- ...ewallPolicyRuleCollectionGroupDelete.json} | 4 +- ...FirewallPolicyRuleCollectionGroupGet.json} | 20 +- ...irewallPolicyRuleCollectionGroupList.json} | 20 +- ...FirewallPolicyRuleCollectionGroupPut.json} | 44 +- ...cyRuleCollectionGroupWithIpGroupsGet.json} | 16 +- ...yRuleCollectionGroupWithIpGroupsList.json} | 20 +- ...cyRuleCollectionGroupWithIpGroupsPut.json} | 44 +- .../stable/2020-05-01/firewallPolicy.json | 395 +++++++----------- 12 files changed, 242 insertions(+), 387 deletions(-) rename specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/{FirewallPolicyRuleGroupDelete.json => FirewallPolicyRuleCollectionGroupDelete.json} (80%) rename specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/{FirewallPolicyRuleGroupGet.json => FirewallPolicyRuleCollectionGroupGet.json} (68%) rename specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/{FirewallPolicyRuleGroupList.json => FirewallPolicyRuleCollectionGroupList.json} (70%) rename specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/{FirewallPolicyRuleGroupPut.json => FirewallPolicyRuleCollectionGroupPut.json} (70%) rename specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/{FirewallPolicyRuleGroupWithIpGroupsGet.json => FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json} (79%) rename specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/{FirewallPolicyRuleGroupWithIpGroupsList.json => FirewallPolicyRuleCollectionGroupWithIpGroupsList.json} (72%) rename specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/{FirewallPolicyRuleGroupWithIpGroupsPut.json => FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json} (74%) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json index 16e9142108d9..e699433c05d7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json @@ -19,17 +19,9 @@ "properties": { "provisioningState": "Succeeded", "threatIntelMode": "Alert", - "threatIntelWhitelist": { - "ipAddresses": [ - "20.3.4.5" - ], - "fqdns": [ - "*.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": [] @@ -37,4 +29,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json index 51621a041c49..acf320ae12f1 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json @@ -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": [] @@ -32,4 +32,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json index 6d312447394f..c75b47fcc518 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json @@ -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": [] @@ -31,4 +31,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json index 7dc9b4b3325a..267930d4eb06 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json @@ -10,15 +10,7 @@ }, "location": "West US", "properties": { - "threatIntelMode": "Alert", - "threatIntelWhitelist": { - "ipAddresses": [ - "20.3.4.5" - ], - "fqdns": [ - "*.microsoft.com" - ] - } + "threatIntelMode": "Alert" } } }, @@ -36,20 +28,12 @@ "properties": { "provisioningState": "Succeeded", "threatIntelMode": "Alert", - "threatIntelWhitelist": { - "ipAddresses": [ - "20.3.4.5" - ], - "fqdns": [ - "*.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": [] @@ -69,20 +53,12 @@ "properties": { "provisioningState": "Succeeded", "threatIntelMode": "Alert", - "threatIntelWhitelist": { - "ipAddresses": [ - "20.3.4.5" - ], - "fqdns": [ - "*.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": [] @@ -90,4 +66,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupDelete.json similarity index 80% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupDelete.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupDelete.json index 5231bd3e42a5..4346ce16f6f1 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupDelete.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupDelete.json @@ -1,6 +1,6 @@ { "parameters": { - "ruleGroupName": "ruleGroup1", + "ruleCollectionGroupName": "ruleCollectionGroup1", "firewallPolicyName": "firewallPolicy", "resourceGroupName": "rg1", "api-version": "2020-05-01", @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupGet.json similarity index 68% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupGet.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupGet.json index 42bbf9945b1d..499f4a44a721 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupGet.json @@ -1,6 +1,6 @@ { "parameters": { - "ruleGroupName": "ruleGroup1", + "ruleCollectionGroupName": "ruleCollectionGroup1", "firewallPolicyName": "firewallPolicy", "resourceGroupName": "rg1", "api-version": "2020-05-01", @@ -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" ], @@ -47,4 +47,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupList.json similarity index 70% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupList.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupList.json index ba5f116e9196..601c4e75de88 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupList.json @@ -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": [ "*" ], @@ -51,4 +51,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupPut.json similarity index 70% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupPut.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupPut.json index d3a22b304ba4..b84057074454 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupPut.json @@ -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" ], @@ -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" ], @@ -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" ], @@ -116,4 +116,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupWithIpGroupsGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json similarity index 79% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupWithIpGroupsGet.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json index ab5263f8da0e..1e424c8ffc64 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupWithIpGroupsGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json @@ -1,6 +1,6 @@ { "parameters": { - "ruleGroupName": "ruleGroup1", + "ruleCollectionGroupName": "ruleGroup1", "firewallPolicyName": "firewallPolicy", "resourceGroupName": "rg1", "api-version": "2020-05-01", @@ -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" ], @@ -47,4 +47,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupWithIpGroupsList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json similarity index 72% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupWithIpGroupsList.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json index a11c8e1ddb04..251ffc7295c5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupWithIpGroupsList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json @@ -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" ], @@ -51,4 +51,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupWithIpGroupsPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json similarity index 74% rename from specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupWithIpGroupsPut.json rename to specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json index 245f4b5ea87f..2ae9286589cd 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleGroupWithIpGroupsPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json @@ -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" ], @@ -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" ], @@ -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" ], @@ -116,4 +116,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json index 02db63cb6fe4..92d6bc819133 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json @@ -298,13 +298,13 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleGroups/{ruleGroupName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleCollectionGroups/{ruleCollectionGroupName}": { "delete": { "tags": [ - "FirewallPolicyRuleGroups" + "FirewallPolicyRuleCollectionGroups" ], - "operationId": "FirewallPolicyRuleGroups_Delete", - "description": "Deletes the specified FirewallPolicyRuleGroup.", + "operationId": "FirewallPolicyRuleCollectionGroups_Delete", + "description": "Deletes the specified FirewallPolicyRuleCollectionGroup.", "parameters": [ { "name": "resourceGroupName", @@ -321,11 +321,11 @@ "description": "The name of the Firewall Policy." }, { - "name": "ruleGroupName", + "name": "ruleCollectionGroupName", "in": "path", "required": true, "type": "string", - "description": "The name of the FirewallPolicyRuleGroup." + "description": "The name of the FirewallPolicyRuleCollectionGroup." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -352,8 +352,8 @@ } }, "x-ms-examples": { - "Delete FirewallPolicyRuleGroup": { - "$ref": "./examples/FirewallPolicyRuleGroupDelete.json" + "Delete FirewallPolicyRuleCollectionGroup": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupDelete.json" } }, "x-ms-long-running-operation": true, @@ -363,10 +363,10 @@ }, "get": { "tags": [ - "FirewallPolicyRuleGroups" + "FirewallPolicyRuleCollectionGroups" ], - "operationId": "FirewallPolicyRuleGroups_Get", - "description": "Gets the specified FirewallPolicyRuleGroup.", + "operationId": "FirewallPolicyRuleCollectionGroups_Get", + "description": "Gets the specified FirewallPolicyRuleCollectionGroup.", "parameters": [ { "name": "resourceGroupName", @@ -383,11 +383,11 @@ "description": "The name of the Firewall Policy." }, { - "name": "ruleGroupName", + "name": "ruleCollectionGroupName", "in": "path", "required": true, "type": "string", - "description": "The name of the FirewallPolicyRuleGroup." + "description": "The name of the FirewallPolicyRuleCollectionGroup." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -398,9 +398,9 @@ ], "responses": { "200": { - "description": "Request successful. The operation returns a FirewallPolicyRuleGroup resource.", + "description": "Request successful. The operation returns a FirewallPolicyRuleCollectionGroup resource.", "schema": { - "$ref": "#/definitions/FirewallPolicyRuleGroup" + "$ref": "#/definitions/FirewallPolicyRuleCollectionGroup" } }, "default": { @@ -411,20 +411,20 @@ } }, "x-ms-examples": { - "Get FirewallPolicyRuleGroup": { - "$ref": "./examples/FirewallPolicyRuleGroupGet.json" + "Get FirewallPolicyRuleCollectionGroup": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupGet.json" }, - "Get FirewallPolicyRuleGroup With IpGroups": { - "$ref": "./examples/FirewallPolicyRuleGroupWithIpGroupsGet.json" + "Get FirewallPolicyRuleCollectionGroup With IpGroups": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json" } } }, "put": { "tags": [ - "FirewallPolicyRuleGroups" + "FirewallPolicyRuleCollectionGroups" ], - "operationId": "FirewallPolicyRuleGroups_CreateOrUpdate", - "description": "Creates or updates the specified FirewallPolicyRuleGroup.", + "operationId": "FirewallPolicyRuleCollectionGroups_CreateOrUpdate", + "description": "Creates or updates the specified FirewallPolicyRuleCollectionGroup.", "parameters": [ { "name": "resourceGroupName", @@ -441,20 +441,20 @@ "description": "The name of the Firewall Policy." }, { - "name": "ruleGroupName", + "name": "ruleCollectionGroupName", "in": "path", "required": true, "type": "string", - "description": "The name of the FirewallPolicyRuleGroup." + "description": "The name of the FirewallPolicyRuleCollectionGroup." }, { "name": "parameters", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/FirewallPolicyRuleGroup" + "$ref": "#/definitions/FirewallPolicyRuleCollectionGroup" }, - "description": "Parameters supplied to the create or update FirewallPolicyRuleGroup operation." + "description": "Parameters supplied to the create or update FirewallPolicyRuleCollectionGroup operation." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" @@ -465,15 +465,15 @@ ], "responses": { "201": { - "description": "Request received successfully. The operation returns the resulting FirewallPolicyRuleGroup resource.", + "description": "Request received successfully. The operation returns the resulting FirewallPolicyRuleCollectionGroup resource.", "schema": { - "$ref": "#/definitions/FirewallPolicyRuleGroup" + "$ref": "#/definitions/FirewallPolicyRuleCollectionGroup" } }, "200": { - "description": "Request successful. The operation returns the resulting FirewallPolicyRuleGroup resource.", + "description": "Request successful. The operation returns the resulting FirewallPolicyRuleCollectionGroup resource.", "schema": { - "$ref": "#/definitions/FirewallPolicyRuleGroup" + "$ref": "#/definitions/FirewallPolicyRuleCollectionGroup" } }, "default": { @@ -484,11 +484,11 @@ } }, "x-ms-examples": { - "Create FirewallPolicyRuleGroup": { - "$ref": "./examples/FirewallPolicyRuleGroupPut.json" + "Create FirewallPolicyRuleCollectionGroup": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupPut.json" }, - "Create FirewallPolicyRuleGroup With IpGroups": { - "$ref": "./examples/FirewallPolicyRuleGroupWithIpGroupsPut.json" + "Create FirewallPolicyRuleCollectionGroup With IpGroups": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json" } }, "x-ms-long-running-operation": true, @@ -497,13 +497,13 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleGroups": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/firewallPolicies/{firewallPolicyName}/ruleCollectionGroups": { "get": { "tags": [ - "FirewallPolicyRuleGroups" + "FirewallPolicyRuleCollectionGroups" ], - "operationId": "FirewallPolicyRuleGroups_List", - "description": "Lists all FirewallPolicyRuleGroups in a FirewallPolicy resource.", + "operationId": "FirewallPolicyRuleCollectionGroups_List", + "description": "Lists all FirewallPolicyRuleCollectionGroups in a FirewallPolicy resource.", "parameters": [ { "name": "resourceGroupName", @@ -528,9 +528,9 @@ ], "responses": { "200": { - "description": "Success. The operation returns a list of FirewallPolicyRuleGroup resources.", + "description": "Success. The operation returns a list of FirewallPolicyRuleCollectionGroup resources.", "schema": { - "$ref": "#/definitions/FirewallPolicyRuleGroupListResult" + "$ref": "#/definitions/FirewallPolicyRuleCollectionGroupListResult" } }, "default": { @@ -541,11 +541,11 @@ } }, "x-ms-examples": { - "List all FirewallPolicyRuleGroups for a given FirewallPolicy": { - "$ref": "./examples/FirewallPolicyRuleGroupList.json" + "List all FirewallPolicyRuleCollectionGroups for a given FirewallPolicy": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupList.json" }, - "List all FirewallPolicyRuleGroups with IpGroups for a given FirewallPolicy": { - "$ref": "./examples/FirewallPolicyRuleGroupWithIpGroupsList.json" + "List all FirewallPolicyRuleCollectionGroups with IpGroups for a given FirewallPolicy": { + "$ref": "./examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json" } }, "x-ms-pageable": { @@ -566,10 +566,6 @@ "type": "string", "readOnly": true, "description": "A unique read-only string that changes whenever the resource is updated." - }, - "identity": { - "$ref": "./network.json#/definitions/ManagedServiceIdentity", - "description": "The identity of the firewall policy." } }, "allOf": [ @@ -581,10 +577,10 @@ }, "FirewallPolicyPropertiesFormat": { "properties": { - "ruleGroups": { + "ruleCollectionGroups": { "type": "array", "readOnly": true, - "description": "List of references to FirewallPolicyRuleGroups.", + "description": "List of references to FirewallPolicyRuleCollectionGroups.", "items": { "$ref": "./network.json#/definitions/SubResource" } @@ -619,97 +615,19 @@ "description": "The operation mode for Threat Intelligence.", "$ref": "./azureFirewall.json#/definitions/AzureFirewallThreatIntelMode" }, - "threatIntelWhitelist": { - "description": "ThreatIntel Whitelist for Firewall Policy.", - "$ref": "#/definitions/FirewallPolicyThreatIntelWhitelist" - }, "intrusionSystemMode": { "description": "The operation mode for Intrusion system.", "$ref": "#/definitions/FirewallPolicyIntrusionSystemMode" - }, - "transportSecurity": { - "description": "TLS Configuration definition.", - "$ref": "#/definitions/FirewallPolicyTransportSecurity" } }, "description": "Firewall Policy definition." }, - "FirewallPolicyTransportSecurity": { - "properties": { - "certificateAuthority": { - "$ref": "#/definitions/FirewallPolicyCertificateAuthority", - "description": "The CA used for intermediate CA generation." - }, - "excludedDomains": { - "type": "array", - "items": { - "type": "string" - }, - "description": "List of domains which are excluded from TLS termination." - }, - "trustedRootCertificates": { - "type": "array", - "items": { - "$ref": "#/definitions/FirewallPolicyTrustedRootCertificate", - "description": "A list of certificates which are to be trusted by the firewall." - }, - "description": "Certificates which are to be trusted by the firewall." - } - }, - "description": "Configuration needed to perform TLS termination & initiation." - }, - "FirewallPolicyTrustedRootCertificate": { - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/FirewallPolicyTrustedRootCertificatePropertiesFormat", - "description": "Properties of the trusted root authorities." - }, - "name": { - "type": "string", - "description": "Name of the trusted root certificate that is unique within a firewall policy." - } - }, - "description": "Trusted Root certificates of a firewall policy." - }, - "FirewallPolicyTrustedRootCertificatePropertiesFormat": { - "properties": { - "keyVaultSecretId": { - "type": "string", - "description": "Secret Id of (base-64 encoded unencrypted pfx) the public certificate data stored in KeyVault." - } - }, - "description": "Trusted Root certificates properties for tls." - }, - "FirewallPolicyCertificateAuthority": { - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/FirewallPolicyCertificateAuthorityPropertiesFormat", - "description": "Properties of the certificate authority." - }, - "name": { - "type": "string", - "description": "Name of the CA certificate." - } - }, - "description": "Trusted Root certificates properties for tls." - }, - "FirewallPolicyCertificateAuthorityPropertiesFormat": { - "properties": { - "keyVaultSecretId": { - "type": "string", - "description": "Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in KeyVault." - } - }, - "description": "Trusted Root certificates properties for tls." - }, - "FirewallPolicyRuleGroup": { + "FirewallPolicyRuleCollectionGroup": { "properties": { "properties": { "x-ms-client-flatten": true, - "$ref": "#/definitions/FirewallPolicyRuleGroupProperties", - "description": "The properties of the firewall policy rule group." + "$ref": "#/definitions/FirewallPolicyRuleCollectionGroupProperties", + "description": "The properties of the firewall policy rule collection group." }, "name": { "type": "string", @@ -731,9 +649,9 @@ "$ref": "./network.json#/definitions/SubResource" } ], - "description": "Rule Group resource." + "description": "Rule Collection Group resource." }, - "FirewallPolicyRuleGroupProperties": { + "FirewallPolicyRuleCollectionGroupProperties": { "properties": { "priority": { "type": "integer", @@ -742,45 +660,45 @@ "exclusiveMaximum": false, "minimum": 100, "exclusiveMinimum": false, - "description": "Priority of the Firewall Policy Rule Group resource." + "description": "Priority of the Firewall Policy Rule Collection Group resource." }, - "rules": { + "ruleCollections": { "type": "array", "items": { - "$ref": "#/definitions/FirewallPolicyRule" + "$ref": "#/definitions/FirewallPolicyRuleCollection" }, - "description": "Group of Firewall Policy rules." + "description": "Group of Firewall Policy rule collections." }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", - "description": "The provisioning state of the firewall policy rule group resource." + "description": "The provisioning state of the firewall policy rule collection group resource." } }, - "description": "Properties of the rule group." + "description": "Properties of the rule collection group." }, - "FirewallPolicyRule": { - "description": "Properties of the rule.", - "discriminator": "ruleType", + "FirewallPolicyRuleCollection": { + "description": "Properties of the rule collection.", + "discriminator": "ruleCollectionType", "required": [ - "ruleType" + "ruleCollectionType" ], "properties": { - "ruleType": { + "ruleCollectionType": { "type": "string", - "description": "The type of the rule.", + "description": "The type of the rule collection.", "enum": [ - "FirewallPolicyNatRule", - "FirewallPolicyFilterRule" + "FirewallPolicyNatRuleCollection", + "FirewallPolicyFilterRuleCollection" ], "x-ms-enum": { - "name": "FirewallPolicyRuleType", + "name": "FirewallPolicyRuleCollectionType", "modelAsString": true } }, "name": { "type": "string", - "description": "The name of the rule." + "description": "The name of the rule collection." }, "priority": { "type": "integer", @@ -789,94 +707,94 @@ "exclusiveMaximum": false, "minimum": 100, "exclusiveMinimum": false, - "description": "Priority of the Firewall Policy Rule resource." + "description": "Priority of the Firewall Policy Rule Collection resource." } } }, - "FirewallPolicyNatRule": { + "FirewallPolicyNatRuleCollection": { "properties": { "action": { - "$ref": "#/definitions/FirewallPolicyNatRuleAction", - "description": "The action type of a Nat rule." + "$ref": "#/definitions/FirewallPolicyNatRuleCollectionAction", + "description": "The action type of a Nat rule collection." }, "translatedAddress": { "type": "string", - "description": "The translated address for this NAT rule." + "description": "The translated address for this NAT rule collection." }, "translatedPort": { "type": "string", - "description": "The translated port for this NAT rule." + "description": "The translated port for this NAT rule collection." }, - "ruleCondition": { - "$ref": "#/definitions/FirewallPolicyRuleCondition", - "description": "The match conditions for incoming traffic." + "rule": { + "$ref": "#/definitions/FirewallPolicyRule", + "description": "The match rule for incoming traffic." } }, "allOf": [ { - "$ref": "#/definitions/FirewallPolicyRule" + "$ref": "#/definitions/FirewallPolicyRuleCollection" } ], - "x-ms-discriminator-value": "FirewallPolicyNatRule", - "description": "Firewall Policy NAT Rule." + "x-ms-discriminator-value": "FirewallPolicyNatRuleCollection", + "description": "Firewall Policy NAT Rule Collection." }, - "FirewallPolicyFilterRule": { + "FirewallPolicyFilterRuleCollection": { "properties": { "action": { - "$ref": "#/definitions/FirewallPolicyFilterRuleAction", - "description": "The action type of a Filter rule." + "$ref": "#/definitions/FirewallPolicyFilterRuleCollectionAction", + "description": "The action type of a Filter rule collection." }, - "ruleConditions": { + "rules": { "type": "array", "items": { - "$ref": "#/definitions/FirewallPolicyRuleCondition" + "$ref": "#/definitions/FirewallPolicyRule" }, - "description": "Collection of rule conditions used by a rule." + "description": "List of rules included in a rule collection." } }, "allOf": [ { - "$ref": "#/definitions/FirewallPolicyRule" + "$ref": "#/definitions/FirewallPolicyRuleCollection" } ], - "x-ms-discriminator-value": "FirewallPolicyFilterRule", - "description": "Firewall Policy Filter Rule." + "x-ms-discriminator-value": "FirewallPolicyFilterRuleCollection", + "description": "Firewall Policy Filter Rule Collection." }, - "FirewallPolicyRuleCondition": { + "FirewallPolicyRule": { "description": "Properties of a rule.", - "discriminator": "ruleConditionType", + "discriminator": "ruleType", "required": [ - "ruleConditionType" + "ruleType" ], "properties": { "name": { "type": "string", - "description": "Name of the rule condition." + "description": "Name of the rule." }, "description": { "type": "string", - "description": "Description of the rule condition." + "description": "Description of the rule." }, - "ruleConditionType": { + "ruleType": { "type": "string", - "description": "Rule Condition Type.", + "description": "Rule Type.", "enum": [ - "ApplicationRuleCondition", - "NetworkRuleCondition", - "NatRuleCondition" + "ApplicationRule", + "NetworkRule", + "NatRule" ], "x-ms-enum": { - "name": "FirewallPolicyRuleConditionType", + "name": "FirewallPolicyRuleType", "modelAsString": true } } } }, - "ApplicationRuleCondition": { - "x-ms-discriminator-value": "ApplicationRuleCondition", + "ApplicationRule": { + "x-ms-discriminator-value": "ApplicationRule", "allOf": [ { - "$ref": "#/definitions/FirewallPolicyRuleCondition" + "$ref": "#/definitions/FirewallPolicyRule" } ], "properties": { @@ -897,27 +815,20 @@ "protocols": { "type": "array", "items": { - "$ref": "#/definitions/FirewallPolicyRuleConditionApplicationProtocol" + "$ref": "#/definitions/FirewallPolicyRuleApplicationProtocol" }, "description": "Array of Application Protocols." }, - "targetUrls": { - "type": "array", - "description": "List of Urls for this rule condition.", - "items": { - "type": "string" - } - }, "targetFqdns": { "type": "array", - "description": "List of FQDNs for this rule condition.", + "description": "List of FQDNs for this rule.", "items": { "type": "string" } }, "fqdnTags": { "type": "array", - "description": "List of FQDN Tags for this rule condition.", + "description": "List of FQDN Tags for this rule.", "items": { "type": "string" } @@ -930,23 +841,23 @@ } } }, - "description": "Rule condition of type application." + "description": "Rule of type application." }, - "NatRuleCondition": { - "description": "Rule condition of type nat.", - "x-ms-discriminator-value": "NatRuleCondition", + "NatRule": { + "description": "Rule of type nat.", + "x-ms-discriminator-value": "NatRule", "allOf": [ { - "$ref": "#/definitions/FirewallPolicyRuleCondition" + "$ref": "#/definitions/FirewallPolicyRule" } ], "properties": { "ipProtocols": { "type": "array", "items": { - "$ref": "#/definitions/FirewallPolicyRuleConditionNetworkProtocol" + "$ref": "#/definitions/FirewallPolicyRuleNetworkProtocol" }, - "description": "Array of FirewallPolicyRuleConditionNetworkProtocols." + "description": "Array of FirewallPolicyRuleNetworkProtocols." }, "sourceAddresses": { "type": "array", @@ -975,28 +886,24 @@ "items": { "type": "string" } - }, - "terminateTLS": { - "type": "boolean", - "description": "Terminate TLS connections for this rule." } } }, - "NetworkRuleCondition": { - "description": "Rule condition of type network.", - "x-ms-discriminator-value": "NetworkRuleCondition", + "NetworkRule": { + "description": "Rule of type network.", + "x-ms-discriminator-value": "NetworkRule", "allOf": [ { - "$ref": "#/definitions/FirewallPolicyRuleCondition" + "$ref": "#/definitions/FirewallPolicyRule" } ], "properties": { "ipProtocols": { "type": "array", "items": { - "$ref": "#/definitions/FirewallPolicyRuleConditionNetworkProtocol" + "$ref": "#/definitions/FirewallPolicyRuleNetworkProtocol" }, - "description": "Array of FirewallPolicyRuleConditionNetworkProtocols." + "description": "Array of FirewallPolicyRuleNetworkProtocols." }, "sourceAddresses": { "type": "array", @@ -1035,11 +942,11 @@ } } }, - "FirewallPolicyRuleConditionApplicationProtocol": { + "FirewallPolicyRuleApplicationProtocol": { "properties": { "protocolType": { "description": "Protocol type.", - "$ref": "#/definitions/FirewallPolicyRuleConditionApplicationProtocolType" + "$ref": "#/definitions/FirewallPolicyRuleApplicationProtocolType" }, "port": { "type": "integer", @@ -1053,39 +960,39 @@ }, "description": "Properties of the application rule protocol." }, - "FirewallPolicyRuleConditionApplicationProtocolType": { + "FirewallPolicyRuleApplicationProtocolType": { "type": "string", - "description": "The application protocol type of a Rule condition.", + "description": "The application protocol type of a Rule.", "enum": [ "Http", "Https" ], "x-ms-enum": { - "name": "FirewallPolicyRuleConditionApplicationProtocolType", + "name": "FirewallPolicyRuleApplicationProtocolType", "modelAsString": true } }, - "FirewallPolicyNatRuleActionType": { + "FirewallPolicyNatRuleCollectionActionType": { "type": "string", "description": "The action type of a rule.", "enum": [ "DNAT" ], "x-ms-enum": { - "name": "FirewallPolicyNatRuleActionType", + "name": "FirewallPolicyNatRuleCollectionActionType", "modelAsString": true } }, - "FirewallPolicyNatRuleAction": { + "FirewallPolicyNatRuleCollectionAction": { "properties": { "type": { "description": "The type of action.", - "$ref": "#/definitions/FirewallPolicyNatRuleActionType" + "$ref": "#/definitions/FirewallPolicyNatRuleCollectionActionType" } }, - "description": "Properties of the FirewallPolicyNatRuleAction." + "description": "Properties of the FirewallPolicyNatRuleCollectionAction." }, - "FirewallPolicyFilterRuleActionType": { + "FirewallPolicyFilterRuleCollectionActionType": { "type": "string", "description": "The action type of a rule.", "enum": [ @@ -1093,22 +1000,22 @@ "Deny" ], "x-ms-enum": { - "name": "FirewallPolicyFilterRuleActionType", + "name": "FirewallPolicyFilterRuleCollectionActionType", "modelAsString": true } }, - "FirewallPolicyFilterRuleAction": { + "FirewallPolicyFilterRuleCollectionAction": { "properties": { "type": { "description": "The type of action.", - "$ref": "#/definitions/FirewallPolicyFilterRuleActionType" + "$ref": "#/definitions/FirewallPolicyFilterRuleCollectionActionType" } }, - "description": "Properties of the FirewallPolicyFilterRuleAction." + "description": "Properties of the FirewallPolicyFilterRuleCollectionAction." }, - "FirewallPolicyRuleConditionNetworkProtocol": { + "FirewallPolicyRuleNetworkProtocol": { "type": "string", - "description": "The Network protocol of a Rule condition.", + "description": "The Network protocol of a Rule.", "enum": [ "TCP", "UDP", @@ -1116,7 +1023,7 @@ "ICMP" ], "x-ms-enum": { - "name": "FirewallPolicyRuleConditionNetworkProtocol", + "name": "FirewallPolicyRuleNetworkProtocol", "modelAsString": true } }, @@ -1136,21 +1043,21 @@ }, "description": "Response for ListFirewallPolicies API service call." }, - "FirewallPolicyRuleGroupListResult": { + "FirewallPolicyRuleCollectionGroupListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/FirewallPolicyRuleGroup" + "$ref": "#/definitions/FirewallPolicyRuleCollectionGroup" }, - "description": "List of FirewallPolicyRuleGroups in a FirewallPolicy." + "description": "List of FirewallPolicyRuleCollectionGroups in a FirewallPolicy." }, "nextLink": { "type": "string", "description": "URL to get the next set of results." } }, - "description": "Response for ListFirewallPolicyRuleGroups API service call." + "description": "Response for ListFirewallPolicyRuleCollectionGroups API service call." }, "FirewallPolicyIntrusionSystemMode": { "type": "string", @@ -1163,26 +1070,6 @@ "name": "FirewallPolicyIntrusionSystemMode", "modelAsString": true } - }, - "FirewallPolicyThreatIntelWhitelist": { - "description": "ThreatIntel Whitelist for Firewall Policy.", - "x-ms-discriminator-value": "FirewallPolicyThreatIntelWhitelist", - "properties": { - "ipAddresses": { - "type": "array", - "description": "List of IP addresses for the ThreatIntel Whitelist.", - "items": { - "type": "string" - } - }, - "fqdns": { - "type": "array", - "description": "List of FQDNs for the ThreatIntel Whitelist.", - "items": { - "type": "string" - } - } - } } } -} +} \ No newline at end of file From 5c099cd236650a5710c1d558c5fef22e63099ee6 Mon Sep 17 00:00:00 2001 From: "samankal@microsoft.com" Date: Wed, 6 May 2020 09:00:32 -0700 Subject: [PATCH 2/7] rebase with ti whitelist --- .../2020-05-01/examples/FirewallPolicyGet.json | 8 ++++++++ .../2020-05-01/examples/FirewallPolicyPut.json | 18 +++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json index e699433c05d7..7292a1b8a167 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json @@ -19,6 +19,14 @@ "properties": { "provisioningState": "Succeeded", "threatIntelMode": "Alert", + "threatIntelWhitelist": { + "ipAddresses": [ + "20.3.4.5" + ], + "fqdns": [ + "*.microsoft.com" + ] + }, "ruleCollectionGroups": [ { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json index 267930d4eb06..554f87a7b1a5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json @@ -10,7 +10,15 @@ }, "location": "West US", "properties": { - "threatIntelMode": "Alert" + "threatIntelMode": "Alert", + "threatIntelWhitelist": { + "ipAddresses": [ + "20.3.4.5" + ], + "fqdns": [ + "*.microsoft.com" + ] + }, } } }, @@ -28,6 +36,14 @@ "properties": { "provisioningState": "Succeeded", "threatIntelMode": "Alert", + "threatIntelWhitelist": { + "ipAddresses": [ + "20.3.4.5" + ], + "fqdns": [ + "*.microsoft.com" + ] + }, "ruleCollectionGroups": [ { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1" From 6517e89306b6255d750c59754f8f8f9517a6b723 Mon Sep 17 00:00:00 2001 From: "samankal@microsoft.com" Date: Wed, 6 May 2020 09:01:38 -0700 Subject: [PATCH 3/7] rebase with ti whitelist --- .../stable/2020-05-01/examples/FirewallPolicyPut.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json index 554f87a7b1a5..b9e3dd69138f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json @@ -69,6 +69,14 @@ "properties": { "provisioningState": "Succeeded", "threatIntelMode": "Alert", + "threatIntelWhitelist": { + "ipAddresses": [ + "20.3.4.5" + ], + "fqdns": [ + "*.microsoft.com" + ] + }, "ruleCollectionGroups": [ { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1" From d2f63c432d4f1c7d7a69b37abf4a229f4714dcb7 Mon Sep 17 00:00:00 2001 From: "samankal@microsoft.com" Date: Wed, 6 May 2020 09:07:51 -0700 Subject: [PATCH 4/7] rebase with ti whitelist --- .../stable/2020-05-01/firewallPolicy.json | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json index 92d6bc819133..54ffd24296f6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json @@ -566,6 +566,10 @@ "type": "string", "readOnly": true, "description": "A unique read-only string that changes whenever the resource is updated." + }, + "identity": { + "$ref": "./network.json#/definitions/ManagedServiceIdentity", + "description": "The identity of the firewall policy." } }, "allOf": [ @@ -615,13 +619,91 @@ "description": "The operation mode for Threat Intelligence.", "$ref": "./azureFirewall.json#/definitions/AzureFirewallThreatIntelMode" }, + "threatIntelWhitelist": { + "description": "ThreatIntel Whitelist for Firewall Policy.", + "$ref": "#/definitions/FirewallPolicyThreatIntelWhitelist" + }, "intrusionSystemMode": { "description": "The operation mode for Intrusion system.", "$ref": "#/definitions/FirewallPolicyIntrusionSystemMode" + }, + "transportSecurity": { + "description": "TLS Configuration definition.", + "$ref": "#/definitions/FirewallPolicyTransportSecurity" } }, "description": "Firewall Policy definition." }, + "FirewallPolicyTransportSecurity": { + "properties": { + "certificateAuthority": { + "$ref": "#/definitions/FirewallPolicyCertificateAuthority", + "description": "The CA used for intermediate CA generation." + }, + "excludedDomains": { + "type": "array", + "items": { + "type": "string" + }, + "description": "List of domains which are excluded from TLS termination." + }, + "trustedRootCertificates": { + "type": "array", + "items": { + "$ref": "#/definitions/FirewallPolicyTrustedRootCertificate", + "description": "A list of certificates which are to be trusted by the firewall." + }, + "description": "Certificates which are to be trusted by the firewall." + } + }, + "description": "Configuration needed to perform TLS termination & initiation." + }, + "FirewallPolicyTrustedRootCertificate": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/FirewallPolicyTrustedRootCertificatePropertiesFormat", + "description": "Properties of the trusted root authorities." + }, + "name": { + "type": "string", + "description": "Name of the trusted root certificate that is unique within a firewall policy." + } + }, + "description": "Trusted Root certificates of a firewall policy." + }, + "FirewallPolicyTrustedRootCertificatePropertiesFormat": { + "properties": { + "keyVaultSecretId": { + "type": "string", + "description": "Secret Id of (base-64 encoded unencrypted pfx) the public certificate data stored in KeyVault." + } + }, + "description": "Trusted Root certificates properties for tls." + }, + "FirewallPolicyCertificateAuthority": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/FirewallPolicyCertificateAuthorityPropertiesFormat", + "description": "Properties of the certificate authority." + }, + "name": { + "type": "string", + "description": "Name of the CA certificate." + } + }, + "description": "Trusted Root certificates properties for tls." + }, + "FirewallPolicyCertificateAuthorityPropertiesFormat": { + "properties": { + "keyVaultSecretId": { + "type": "string", + "description": "Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in KeyVault." + } + }, + "description": "Trusted Root certificates properties for tls." + }, "FirewallPolicyRuleCollectionGroup": { "properties": { "properties": { @@ -819,6 +901,13 @@ }, "description": "Array of Application Protocols." }, + "targetUrls": { + "type": "array", + "description": "List of Urls for this rule condition.", + "items": { + "type": "string" + } + }, "targetFqdns": { "type": "array", "description": "List of FQDNs for this rule.", @@ -886,6 +975,10 @@ "items": { "type": "string" } + }, + "terminateTLS": { + "type": "boolean", + "description": "Terminate TLS connections for this rule." } } }, @@ -1070,6 +1163,26 @@ "name": "FirewallPolicyIntrusionSystemMode", "modelAsString": true } + }, + "FirewallPolicyThreatIntelWhitelist": { + "description": "ThreatIntel Whitelist for Firewall Policy.", + "x-ms-discriminator-value": "FirewallPolicyThreatIntelWhitelist", + "properties": { + "ipAddresses": { + "type": "array", + "description": "List of IP addresses for the ThreatIntel Whitelist.", + "items": { + "type": "string" + } + }, + "fqdns": { + "type": "array", + "description": "List of FQDNs for the ThreatIntel Whitelist.", + "items": { + "type": "string" + } + } + } } } } \ No newline at end of file From 1bf1a4ebde28194766280c991a17c3cad93176ec Mon Sep 17 00:00:00 2001 From: "samankal@microsoft.com" Date: Wed, 6 May 2020 09:32:00 -0700 Subject: [PATCH 5/7] prettier run --- .../stable/2020-05-01/examples/FirewallPolicyGet.json | 2 +- .../examples/FirewallPolicyListByResourceGroup.json | 2 +- .../2020-05-01/examples/FirewallPolicyListBySubscription.json | 2 +- .../stable/2020-05-01/examples/FirewallPolicyPut.json | 4 ++-- .../examples/FirewallPolicyRuleCollectionGroupDelete.json | 2 +- .../examples/FirewallPolicyRuleCollectionGroupGet.json | 2 +- .../examples/FirewallPolicyRuleCollectionGroupList.json | 2 +- .../examples/FirewallPolicyRuleCollectionGroupPut.json | 2 +- .../FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json | 2 +- .../FirewallPolicyRuleCollectionGroupWithIpGroupsList.json | 2 +- .../FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json | 2 +- .../Microsoft.Network/stable/2020-05-01/firewallPolicy.json | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json index 7292a1b8a167..39574b82d72e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json @@ -37,4 +37,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json index acf320ae12f1..136500048b04 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json @@ -32,4 +32,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json index c75b47fcc518..81c51ad23948 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json @@ -31,4 +31,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json index b9e3dd69138f..3a123506ab5b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json @@ -18,7 +18,7 @@ "fqdns": [ "*.microsoft.com" ] - }, + } } } }, @@ -90,4 +90,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupDelete.json index 4346ce16f6f1..87663c53603b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupDelete.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupDelete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupGet.json index 499f4a44a721..8f1118730047 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupGet.json @@ -47,4 +47,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupList.json index 601c4e75de88..4947622e4f88 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupList.json @@ -51,4 +51,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupPut.json index b84057074454..1d458ceb2a22 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupPut.json @@ -116,4 +116,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json index 1e424c8ffc64..f46a42fb45c5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json @@ -47,4 +47,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json index 251ffc7295c5..a57ae20aa2b0 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json @@ -51,4 +51,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json index 2ae9286589cd..0e7ea965c4df 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json @@ -116,4 +116,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json index 54ffd24296f6..44602e37ad1f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json @@ -1185,4 +1185,4 @@ } } } -} \ No newline at end of file +} From a7f269b717a9d6f6724eeac416c8705c6c190c61 Mon Sep 17 00:00:00 2001 From: "samankal@microsoft.com" Date: Thu, 7 May 2020 10:16:06 -0700 Subject: [PATCH 6/7] making nat rule into a collection --- .../stable/2020-05-01/firewallPolicy.json | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json index 44602e37ad1f..53da71061d9f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json @@ -799,19 +799,13 @@ "$ref": "#/definitions/FirewallPolicyNatRuleCollectionAction", "description": "The action type of a Nat rule collection." }, - "translatedAddress": { - "type": "string", - "description": "The translated address for this NAT rule collection." - }, - "translatedPort": { - "type": "string", - "description": "The translated port for this NAT rule collection." + "rules": { + "type": "array", + "items": { + "$ref": "#/definitions/FirewallPolicyRule" + }, + "description": "List of rules included in a rule collection." }, - "rule": { - "$ref": "#/definitions/FirewallPolicyRule", - "description": "The match rule for incoming traffic." - } - }, "allOf": [ { "$ref": "#/definitions/FirewallPolicyRuleCollection" @@ -969,6 +963,14 @@ "type": "string" } }, + "translatedAddress": { + "type": "string", + "description": "The translated address for this NAT rule." + }, + "translatedPort": { + "type": "string", + "description": "The translated port for this NAT rule." + }, "sourceIpGroups": { "type": "array", "description": "List of source IpGroups for this rule.", From b8f2bd93f571098bde0174e12e3331fa4434b33f Mon Sep 17 00:00:00 2001 From: "samankal@microsoft.com" Date: Thu, 7 May 2020 11:08:56 -0700 Subject: [PATCH 7/7] prettier run --- .../Microsoft.Network/stable/2020-05-01/firewallPolicy.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json index 53da71061d9f..efb1458e19e8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json @@ -805,7 +805,8 @@ "$ref": "#/definitions/FirewallPolicyRule" }, "description": "List of rules included in a rule collection." - }, + } + }, "allOf": [ { "$ref": "#/definitions/FirewallPolicyRuleCollection"