Rename Firewall Policy child resource RuleGroup to RuleCollectionGroup (#9045)

gimotwanMSFT · web-flow · commit b49caabeacec · 2020-04-22T10:47:06.000+08:00
* Rename firewall policy sub resources

s/RuleGroup/RuleCollectionGroup
s/Rule/RuleCollection
s/RuleCondition/Rule

This was based on customer feedback - the feature is currently in preview.

* rename files

* Update examples with new names for the subresource and children

* Fix model validation error

* Update examples
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyGet.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/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-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/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-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/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyPut.json
@@ -28,12 +28,12 @@
         "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"
             },
             {
-              "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": []
@@ -53,12 +53,12 @@
         "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"
             },
             {
-              "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/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupDelete.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "ruleGroupName": "ruleGroup1",
+    "ruleCollectionGroupName": "ruleCollectionGroup1",
     "firewallPolicyName": "firewallPolicy",
     "resourceGroupName": "rg1",
     "api-version": "2020-04-01",
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupGet.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "ruleGroupName": "ruleGroup1",
+    "ruleCollectionGroupName": "ruleCollectionGroup1",
     "firewallPolicyName": "firewallPolicy",
     "resourceGroupName": "rg1",
     "api-version": "2020-04-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/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-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": [
                         "*"
                       ],
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-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"
                   ],
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsGet.json
@@ -1,6 +1,6 @@
 {
   "parameters": {
-    "ruleGroupName": "ruleGroup1",
+    "ruleCollectionGroupName": "ruleGroup1",
     "firewallPolicyName": "firewallPolicy",
     "resourceGroupName": "rg1",
     "api-version": "2020-04-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/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsList.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-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"
                       ],
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/examples/FirewallPolicyRuleCollectionGroupWithIpGroupsPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-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"
                   ],
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-04-01/firewallPolicy.json

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@`
`19`	`19`	`"properties": {`
`20`	`20`	`"provisioningState": "Succeeded",`
`21`	`21`	`"threatIntelMode": "Alert",`
`22`		`- "ruleGroups": [`
	`22`	`+ "ruleCollectionGroups": [`
`23`	`23`	`{`
`24`		`- "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1"`
	`24`	`+ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1"`
`25`	`25`	`}`
`26`	`26`	`],`
`27`	`27`	`"firewalls": []`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@`
`20`	`20`	`"properties": {`
`21`	`21`	`"provisioningState": "Succeeded",`
`22`	`22`	`"threatIntelMode": "Alert",`
`23`		`- "ruleGroups": [`
	`23`	`+ "ruleCollectionGroups": [`
`24`	`24`	`{`
`25`		`- "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1"`
	`25`	`+ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1"`
`26`	`26`	`}`
`27`	`27`	`],`
`28`	`28`	`"firewalls": []`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,12 @@`
`28`	`28`	`"properties": {`
`29`	`29`	`"provisioningState": "Succeeded",`
`30`	`30`	`"threatIntelMode": "Alert",`
`31`		`- "ruleGroups": [`
	`31`	`+ "ruleCollectionGroups": [`
`32`	`32`	`{`
`33`		`- "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup1"`
	`33`	`+ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1"`
`34`	`34`	`},`
`35`	`35`	`{`
`36`		`- "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup2"`
	`36`	`+ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup2"`
`37`	`37`	`}`
`38`	`38`	`],`
`39`	`39`	`"firewalls": []`
`@@ -53,12 +53,12 @@`
`53`	`53`	`"properties": {`
`54`	`54`	`"provisioningState": "Succeeded",`
`55`	`55`	`"threatIntelMode": "Alert",`
`56`		`- "ruleGroups": [`
	`56`	`+ "ruleCollectionGroups": [`
`57`	`57`	`{`
`58`		`- "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1"`
	`58`	`+ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup1"`
`59`	`59`	`},`
`60`	`60`	`{`
`61`		`- "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup2"`
	`61`	`+ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleCollectionGroups/ruleCollectionGroup2"`
`62`	`62`	`}`
`63`	`63`	`],`
`64`	`64`	`"firewalls": []`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"parameters": {`
`3`		`- "ruleGroupName": "ruleGroup1",`
	`3`	`+ "ruleCollectionGroupName": "ruleCollectionGroup1",`
`4`	`4`	`"firewallPolicyName": "firewallPolicy",`
`5`	`5`	`"resourceGroupName": "rg1",`
`6`	`6`	`"api-version": "2020-04-01",`