Add Firewall Policy sku tier (#10929)

* Add firewall policy premium feature properties * CR * add examples * Add transportSecurity examples * remove redundant class * fix examples * Add firewall policy sku tier * fix validation
Azure · Oct 7, 2020 · 474fdda · 474fdda
1 parent cae6296
commit 474fdda
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 64 deletions.
diff --git a/...work/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyGet.json b/...work/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyGet.json
@@ -40,6 +40,9 @@
             "enableProxy": true,
             "requireProxyForNetworkRules": false
           },
+          "sku": {
+            "tier": "Premium"
+          },
           "intrusionDetection": {
             "mode": "Alert",
             "configuration": {

diff --git a/...nager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyListByResourceGroup.json b/...nager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyListByResourceGroup.json
@@ -33,38 +33,8 @@
                 "enableProxy": true,
                 "requireProxyForNetworkRules": false
               },
-              "intrusionDetection": {
-                "mode": "Alert",
-                "configuration": {
-                  "signatureOverrides": [
-                    {
-                      "id": "2525004",
-                      "mode": "Deny"
-                    }
-                  ],
-                  "bypassTrafficSettings": [
-                    {
-                      "name": "bypassRule1",
-                      "description": "Rule 1",
-                      "protocol": "TCP",
-                      "sourceAddresses": [
-                        "1.2.3.4"
-                      ],
-                      "destinationAddresses": [
-                        "5.6.7.8"
-                      ],
-                      "destinationPorts": [
-                        "*"
-                      ]
-                    }
-                  ]
-                }
-              },
-              "transportSecurity": {
-                "certificateAuthority": {
-                  "name": "clientcert",
-                  "keyVaultSecretId": "https://kv/secret"
-                }
+              "sku": {
+                "tier": "Standard"
               }
             }
           }

diff --git a/...anager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyListBySubscription.json b/...anager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyListBySubscription.json
@@ -32,38 +32,8 @@
                 "enableProxy": true,
                 "requireProxyForNetworkRules": false
               },
-              "intrusionDetection": {
-                "mode": "Alert",
-                "configuration": {
-                  "signatureOverrides": [
-                    {
-                      "id": "2525004",
-                      "mode": "Deny"
-                    }
-                  ],
-                  "bypassTrafficSettings": [
-                    {
-                      "name": "bypassRule1",
-                      "description": "Rule 1",
-                      "protocol": "TCP",
-                      "sourceAddresses": [
-                        "1.2.3.4"
-                      ],
-                      "destinationAddresses": [
-                        "5.6.7.8"
-                      ],
-                      "destinationPorts": [
-                        "*"
-                      ]
-                    }
-                  ]
-                }
-              },
-              "transportSecurity": {
-                "certificateAuthority": {
-                  "name": "clientcert",
-                  "keyVaultSecretId": "https://kv/secret"
-                }
+              "sku": {
+                "tier": "Standard"
               }
             }
           }

diff --git a/...work/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyPut.json b/...work/resource-manager/Microsoft.Network/stable/2020-07-01/examples/FirewallPolicyPut.json
@@ -26,6 +26,9 @@
           "enableProxy": true,
           "requireProxyForNetworkRules": false
         },
+        "sku": {
+          "tier": "Premium"
+        },
         "intrusionDetection": {
           "mode": "Alert",
           "configuration": {
@@ -100,6 +103,9 @@
             "enableProxy": true,
             "requireProxyForNetworkRules": false
           },
+          "sku": {
+            "tier": "Premium"
+          },
           "intrusionDetection": {
             "mode": "Alert",
             "configuration": {
@@ -173,6 +179,9 @@
             "enableProxy": true,
             "requireProxyForNetworkRules": false
           },
+          "sku": {
+            "tier": "Premium"
+          },
           "intrusionDetection": {
             "mode": "Alert",
             "configuration": {

diff --git a/...fication/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json b/...fication/network/resource-manager/Microsoft.Network/stable/2020-07-01/firewallPolicy.json
@@ -640,6 +640,10 @@
         "transportSecurity": {
           "description": "TLS Configuration definition.",
           "$ref": "#/definitions/FirewallPolicyTransportSecurity"
+        },
+        "sku": {
+          "description": "The Firewall Policy SKU.",
+          "$ref": "#/definitions/FirewallPolicySku"
         }
       },
       "description": "Firewall Policy definition."
@@ -1294,6 +1298,23 @@
         }
       },
       "description": "Trusted Root certificates properties for tls."
+    },
+    "FirewallPolicySku": {
+      "properties": {
+        "tier": {
+          "type": "string",
+          "description": "Tier of Firewall Policy.",
+          "enum": [
+            "Standard",
+            "Premium"
+          ],
+          "x-ms-enum": {
+            "name": "FirewallPolicySkuTier",
+            "modelAsString": true
+          }
+        }
+      },
+      "description": "SKU of Firewall policy."
     }
   }
 }