Revert #9045 + Add TI Whitelist (#9271)

* TI whitelisting for firewall policy * running prettier * fixing description * removing extra property from the response * adding the new property in examples * retrigger the pr check * clean up * Revert "Rename Firewall Policy child resource RuleGroup to RuleCollectionGroup (#9045)" This reverts commit b49caab.
Azure · Apr 30, 2020 · 0199c74 · 0199c74
1 parent b49caab
commit 0199c74
Show file tree

Hide file tree

Showing 12 changed files with 286 additions and 230 deletions.
diff --git a/...work/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyGet.json b/...work/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyGet.json
@@ -19,9 +19,17 @@
         "properties": {
           "provisioningState": "Succeeded",
           "threatIntelMode": "Alert",
-          "ruleCollectionGroups": [
+          "threatIntelWhitelist": {
+            "ipAddresses": [
+              "20.3.4.5"
+            ],
+            "fqdns": [
+              "*.microsoft.com"
+            ]
+          },
+          "ruleGroups": [
             {
-              "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1"
+              "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1"
             }
           ],
           "firewalls": []

diff --git a/...nager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyListByResourceGroup.json b/...nager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyListByResourceGroup.json
@@ -20,9 +20,9 @@
             "properties": {
               "provisioningState": "Succeeded",
               "threatIntelMode": "Alert",
-              "ruleCollectionGroups": [
+              "ruleGroups": [
                 {
-                  "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1"
+                  "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1"
                 }
               ],
               "firewalls": []

diff --git a/...anager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyListBySubscription.json b/...anager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyListBySubscription.json
@@ -19,9 +19,9 @@
             "properties": {
               "provisioningState": "Succeeded",
               "threatIntelMode": "Alert",
-              "ruleCollectionGroups": [
+              "ruleGroups": [
                 {
-                  "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1"
+                  "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1"
                 }
               ],
               "firewalls": []

diff --git a/...work/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyPut.json b/...work/resource-manager/Microsoft.Network/stable/2020-04-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,12 +36,20 @@
         "properties": {
           "provisioningState": "Succeeded",
           "threatIntelMode": "Alert",
-          "ruleCollectionGroups": [
+          "threatIntelWhitelist": {
+            "ipAddresses": [
+              "20.3.4.5"
+            ],
+            "fqdns": [
+              "*.microsoft.com"
+            ]
+          },
+          "ruleGroups": [
             {
-              "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1"
+              "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup1"
             },
             {
-              "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup2"
+              "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup2"
             }
           ],
           "firewalls": []
@@ -53,12 +69,20 @@
         "properties": {
           "provisioningState": "Succeeded",
           "threatIntelMode": "Alert",
-          "ruleCollectionGroups": [
+          "threatIntelWhitelist": {
+            "ipAddresses": [
+              "20.3.4.5"
+            ],
+            "fqdns": [
+              "*.microsoft.com"
+            ]
+          },
+          "ruleGroups": [
             {
-              "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1"
+              "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1"
             },
             {
-              "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup2"
+              "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup2"
             }
           ],
           "firewalls": []

diff --git a/...ewallPolicyRuleCollectionGroupDelete.json → ...amples/FirewallPolicyRuleGroupDelete.json b/...ewallPolicyRuleCollectionGroupDelete.json → ...amples/FirewallPolicyRuleGroupDelete.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "ruleCollectionGroupName": "ruleCollectionGroup1",
+    "ruleGroupName": "ruleGroup1",
     "firewallPolicyName": "firewallPolicy",
     "resourceGroupName": "rg1",
     "api-version": "2020-04-01",

diff --git a/...FirewallPolicyRuleCollectionGroupGet.json → .../examples/FirewallPolicyRuleGroupGet.json b/...FirewallPolicyRuleCollectionGroupGet.json → .../examples/FirewallPolicyRuleGroupGet.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "ruleCollectionGroupName": "ruleCollectionGroup1",
+    "ruleGroupName": "ruleGroup1",
     "firewallPolicyName": "firewallPolicy",
     "resourceGroupName": "rg1",
     "api-version": "2020-04-01",
@@ -9,24 +9,24 @@
   "responses": {
     "200": {
       "body": {
-        "name": "ruleCollectionGroup1",
-        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1",
+        "name": "ruleGroup1",
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1",
         "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
         "properties": {
           "provisioningState": "Succeeded",
           "priority": 110,
-          "ruleCollections": [
+          "rules": [
             {
-              "ruleCollectionType": "FirewallPolicyFilterRuleCollection",
-              "name": "Example-Filter-Rule-Collection",
+              "ruleType": "FirewallPolicyFilterRule",
+              "name": "Example-Filter-Rule",
               "priority": 200,
               "action": {
                 "type": "Deny"
               },
-              "rules": [
+              "ruleConditions": [
                 {
-                  "ruleType": "NetworkRule",
-                  "name": "network-rule1",
+                  "ruleConditionType": "NetworkRuleCondition",
+                  "name": "network-condition1",
                   "sourceAddresses": [
                     "10.1.25.0/24"
                   ],

diff --git a/...irewallPolicyRuleCollectionGroupList.json → ...examples/FirewallPolicyRuleGroupList.json b/...irewallPolicyRuleCollectionGroupList.json → ...examples/FirewallPolicyRuleGroupList.json
@@ -10,25 +10,25 @@
       "body": {
         "value": [
           {
-            "name": "ruleCollectionGroup1",
-            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1",
+            "name": "ruleGroup1",
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1",
             "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
             "properties": {
               "provisioningState": "Succeeded",
               "priority": 110,
-              "ruleCollections": [
+              "rules": [
                 {
-                  "name": "Example-Filter-Rule-Collection",
-                  "ruleCollectionType": "FirewallPolicyFilterRuleCollection",
+                  "name": "Example-Filter-Rule",
+                  "ruleType": "FirewallPolicyFilterRule",
                   "priority": 120,
                   "action": {
                     "type": "Deny"
                   },
-                  "rules": [
+                  "ruleConditions": [
                     {
-                      "name": "network-rule-1",
-                      "ruleType": "NetworkRule",
-                      "description": "Network rule",
+                      "name": "network-condition-1",
+                      "ruleConditionType": "NetworkRuleCondition",
+                      "description": "Network rule condition",
                       "destinationAddresses": [
                         "*"
                       ],

diff --git a/...FirewallPolicyRuleCollectionGroupPut.json → .../examples/FirewallPolicyRuleGroupPut.json b/...FirewallPolicyRuleCollectionGroupPut.json → .../examples/FirewallPolicyRuleGroupPut.json
@@ -4,21 +4,21 @@
     "subscriptionId": "subid",
     "resourceGroupName": "rg1",
     "firewallPolicyName": "firewallPolicy",
-    "ruleCollectionGroupName": "ruleCollectionGroup1",
+    "ruleGroupName": "ruleGroup1",
     "parameters": {
       "properties": {
         "priority": 110,
-        "ruleCollections": [
+        "rules": [
           {
-            "ruleCollectionType": "FirewallPolicyFilterRuleCollection",
-            "name": "Example-Filter-Rule-Collection",
+            "ruleType": "FirewallPolicyFilterRule",
+            "name": "Example-Filter-Rule",
             "action": {
               "type": "Deny"
             },
-            "rules": [
+            "ruleConditions": [
               {
-                "ruleType": "NetworkRule",
-                "name": "network-rule1",
+                "ruleConditionType": "NetworkRuleCondition",
+                "name": "network-condition1",
                 "sourceAddresses": [
                   "10.1.25.0/24"
                 ],
@@ -41,23 +41,23 @@
   "responses": {
     "200": {
       "body": {
-        "name": "ruleCollectionGroup1",
-        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1",
+        "name": "ruleGroup1",
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1",
         "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
         "properties": {
           "provisioningState": "Succeeded",
           "priority": 110,
-          "ruleCollections": [
+          "rules": [
             {
-              "ruleCollectionType": "FirewallPolicyFilterRuleCollection",
-              "name": "Example-Filter-Rule-Collection",
+              "ruleType": "FirewallPolicyFilterRule",
+              "name": "Example-Filter-Rule",
               "action": {
                 "type": "Deny"
               },
-              "rules": [
+              "ruleConditions": [
                 {
-                  "ruleType": "NetworkRule",
-                  "name": "network-rule1",
+                  "ruleConditionType": "NetworkRuleCondition",
+                  "name": "network-condition1",
                   "sourceAddresses": [
                     "10.1.25.0/24"
                   ],
@@ -85,17 +85,17 @@
         "properties": {
           "provisioningState": "Succeeded",
           "priority": 110,
-          "ruleCollections": [
+          "rules": [
             {
-              "ruleCollectionType": "FirewallPolicyFilterRuleCollection",
-              "name": "Example-Filter-Rule-Collection",
+              "ruleType": "FirewallPolicyFilterRule",
+              "name": "Example-Filter-Rule",
               "action": {
                 "type": "Deny"
               },
-              "rules": [
+              "ruleConditions": [
                 {
-                  "ruleType": "NetworkRule",
-                  "name": "network-rule1",
+                  "ruleConditionType": "NetworkRuleCondition",
+                  "name": "network-condition1",
                   "sourceAddresses": [
                     "10.1.25.0/24"
                   ],

diff --git a/...cyRuleCollectionGroupWithIpGroupsGet.json → ...rewallPolicyRuleGroupWithIpGroupsGet.json b/...cyRuleCollectionGroupWithIpGroupsGet.json → ...rewallPolicyRuleGroupWithIpGroupsGet.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "ruleCollectionGroupName": "ruleGroup1",
+    "ruleGroupName": "ruleGroup1",
     "firewallPolicyName": "firewallPolicy",
     "resourceGroupName": "rg1",
     "api-version": "2020-04-01",
@@ -15,18 +15,18 @@
         "properties": {
           "provisioningState": "Succeeded",
           "priority": 110,
-          "ruleCollections": [
+          "rules": [
             {
-              "ruleCollectionType": "FirewallPolicyFilterRuleCollection",
-              "name": "Example-Filter-Rule-Collection",
+              "ruleType": "FirewallPolicyFilterRule",
+              "name": "Example-Filter-Rule",
               "priority": 200,
               "action": {
                 "type": "Deny"
               },
-              "rules": [
+              "ruleConditions": [
                 {
-                  "ruleType": "NetworkRule",
-                  "name": "network-rule1",
+                  "ruleConditionType": "NetworkRuleCondition",
+                  "name": "network-condition1",
                   "ipProtocols": [
                     "TCP"
                   ],

diff --git a/...yRuleCollectionGroupWithIpGroupsList.json → ...ewallPolicyRuleGroupWithIpGroupsList.json b/...yRuleCollectionGroupWithIpGroupsList.json → ...ewallPolicyRuleGroupWithIpGroupsList.json
@@ -10,25 +10,25 @@
       "body": {
         "value": [
           {
-            "name": "ruleCollectionGroup1",
-            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1",
+            "name": "ruleGroup1",
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1",
             "etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
             "properties": {
               "provisioningState": "Succeeded",
               "priority": 110,
-              "ruleCollections": [
+              "rules": [
                 {
-                  "name": "Example-Filter-Rule-Collection",
-                  "ruleCollectionType": "FirewallPolicyFilterRuleCollection",
+                  "name": "Example-Filter-Rule",
+                  "ruleType": "FirewallPolicyFilterRule",
                   "priority": 120,
                   "action": {
                     "type": "Deny"
                   },
-                  "rules": [
+                  "ruleConditions": [
                     {
-                      "name": "network-rule-1",
-                      "ruleType": "NetworkRule",
-                      "description": "Network rule",
+                      "name": "network-condition-1",
+                      "ruleConditionType": "NetworkRuleCondition",
+                      "description": "Network rule condition",
                       "sourceIpGroups": [
                         "/subscriptions/subid/providers/Microsoft.Network/resourceGroup/rg1/ipGroups/ipGroups1"
                       ],