Rename Firewall Policy child resource RuleGroup to RuleCollectionGroup (

Azure#9356) * Rename Firewall Policy child resource RuleGroup to RuleCollectionGroup * rebase with ti whitelist * rebase with ti whitelist * rebase with ti whitelist * prettier run * making nat rule into a collection * prettier run
mmyyrroonn · Jun 4, 2020 · 54361bc · 54361bc
1 parent feb8b87
commit 54361bc
Show file tree

Hide file tree

Showing 12 changed files with 238 additions and 235 deletions.
diff --git a/...work/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json b/...work/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json
@@ -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": [],

diff --git a/...nager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json b/...nager/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": [],

diff --git a/...anager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json b/...anager/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": [],

diff --git a/...work/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json b/...work/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json
@@ -51,12 +51,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": [],
@@ -91,12 +91,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": [],

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

diff --git a/.../examples/FirewallPolicyRuleGroupGet.json → ...FirewallPolicyRuleCollectionGroupGet.json b/.../examples/FirewallPolicyRuleGroupGet.json → ...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"
                   ],

diff --git a/...examples/FirewallPolicyRuleGroupList.json → ...irewallPolicyRuleCollectionGroupList.json b/...examples/FirewallPolicyRuleGroupList.json → ...irewallPolicyRuleCollectionGroupList.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": [
                         "*"
                       ],

diff --git a/.../examples/FirewallPolicyRuleGroupPut.json → ...FirewallPolicyRuleCollectionGroupPut.json b/.../examples/FirewallPolicyRuleGroupPut.json → ...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"
                   ],

diff --git a/...rewallPolicyRuleGroupWithIpGroupsGet.json → ...cyRuleCollectionGroupWithIpGroupsGet.json b/...rewallPolicyRuleGroupWithIpGroupsGet.json → ...cyRuleCollectionGroupWithIpGroupsGet.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"
                   ],

diff --git a/...ewallPolicyRuleGroupWithIpGroupsList.json → ...yRuleCollectionGroupWithIpGroupsList.json b/...ewallPolicyRuleGroupWithIpGroupsList.json → ...yRuleCollectionGroupWithIpGroupsList.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"
                       ],

diff --git a/...rewallPolicyRuleGroupWithIpGroupsPut.json → ...cyRuleCollectionGroupWithIpGroupsPut.json b/...rewallPolicyRuleGroupWithIpGroupsPut.json → ...cyRuleCollectionGroupWithIpGroupsPut.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"
                   ],