rebase with TI white list

Azure · Apr 29, 2020 · 8d11e41 · 8d11e41
2 parents 4bc590e + 130fea7
commit 8d11e41
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 1 deletion.
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,6 +19,14 @@
         "properties": {
           "provisioningState": "Succeeded",
           "threatIntelMode": "Alert",
+          "threatIntelWhitelist": {
+            "ipAddresses": [
+              "20.3.4.5"
+            ],
+            "fqdns": [
+              "*.microsoft.com"
+            ]
+          },
           "ruleGroups": [
             {
               "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1"

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,6 +36,14 @@
         "properties": {
           "provisioningState": "Succeeded",
           "threatIntelMode": "Alert",
+          "threatIntelWhitelist": {
+            "ipAddresses": [
+              "20.3.4.5"
+            ],
+            "fqdns": [
+              "*.microsoft.com"
+            ]
+          },
           "ruleGroups": [
             {
               "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup1"
@@ -53,6 +69,14 @@
         "properties": {
           "provisioningState": "Succeeded",
           "threatIntelMode": "Alert",
+          "threatIntelWhitelist": {
+            "ipAddresses": [
+              "20.3.4.5"
+            ],
+            "fqdns": [
+              "*.microsoft.com"
+            ]
+          },
           "ruleGroups": [
             {
               "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1"

diff --git a/...fication/network/resource-manager/Microsoft.Network/stable/2020-04-01/firewallPolicy.json b/...fication/network/resource-manager/Microsoft.Network/stable/2020-04-01/firewallPolicy.json
@@ -615,6 +615,10 @@
           "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"
@@ -1070,6 +1074,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"
+          }
+        }
+      }
     }
   }
 }