From 8f03757b33411eade0606ba9aca4f11b808fccc5 Mon Sep 17 00:00:00 2001 From: Venkata Krishnan Date: Mon, 1 Apr 2019 14:20:23 -0700 Subject: [PATCH 01/10] Top-level WAF --- .../stable/2019-08-01/webapplicationfirewall.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-08-01/webapplicationfirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-08-01/webapplicationfirewall.json index 00a41f894af9..cc2a4ff96d9d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-08-01/webapplicationfirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-08-01/webapplicationfirewall.json @@ -298,6 +298,10 @@ "$ref": "#/definitions/WebApplicationFirewallCustomRule" } }, + "managedRules": { + "description": "Describes the managedRules structure", + "$ref": "#/definitions/ManagedRulesDefinition" + }, "applicationGateways": { "readOnly": true, "type": "array", From 2da01875768013004298531220a2c2ea60da3b59 Mon Sep 17 00:00:00 2001 From: Venkata Krishnan Date: Thu, 3 Oct 2019 20:37:57 -0700 Subject: [PATCH 02/10] Changing the reference to subresource Update specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json fixing review comments Co-Authored-By: Anton Evseev Update specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json fixing review comments Co-Authored-By: Anton Evseev support for per listener/per-site firewall policy fixing the deleted extra space --- .../stable/2019-09-01/applicationGateway.json | 8 ++++++++ .../2019-09-01/webapplicationfirewall.json | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/applicationGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/applicationGateway.json index bd4f1b6cecc5..3af406c783f8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/applicationGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/applicationGateway.json @@ -1454,6 +1454,10 @@ "$ref": "#/definitions/ApplicationGatewayCustomError" }, "description": "Custom error configurations of the HTTP listener." + }, + "firewallPolicy": { + "$ref": "./network.json#/definitions/SubResource", + "description": "Reference to the FirewallPolicy resource." } }, "description": "Properties of HTTP listener of an application gateway." @@ -1513,6 +1517,10 @@ "provisioningState": { "$ref": "./network.json#/definitions/ProvisioningState", "description": "The provisioning state of the path rule resource." + }, + "firewallPolicy": { + "$ref": "./network.json#/definitions/SubResource", + "description": "Reference to the FirewallPolicy resource." } }, "description": "Properties of path rule of an application gateway." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json index dc0e39b1be57..9ade7a07f159 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json @@ -306,6 +306,22 @@ }, "description": "A collection of references to application gateways." }, + "httpListeners": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "./applicationGateway.json#/definitions/SubResource" + }, + "description": "A collection of references to application gateway http listeners." + }, + "pathBasedRules": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "./applicationGateway.json#/definitions/SubResource" + }, + "description": "A collection of references to application gateway path rules." + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", From be5da8e48c621f44cf13ee96233acd719d23a199 Mon Sep 17 00:00:00 2001 From: Venkata Krishnan Anantha Raman Date: Fri, 4 Oct 2019 13:19:42 -0700 Subject: [PATCH 03/10] enforcing ordering --- .../2019-09-01/webapplicationfirewall.json | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json index 9ade7a07f159..9642bedf8502 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json @@ -306,22 +306,6 @@ }, "description": "A collection of references to application gateways." }, - "httpListeners": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "./applicationGateway.json#/definitions/SubResource" - }, - "description": "A collection of references to application gateway http listeners." - }, - "pathBasedRules": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "./applicationGateway.json#/definitions/SubResource" - }, - "description": "A collection of references to application gateway path rules." - }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", @@ -348,6 +332,22 @@ "managedRules": { "description": "Describes the managedRules structure", "$ref": "#/definitions/ManagedRulesDefinition" + }, + "httpListeners": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "./applicationGateway.json#/definitions/SubResource" + }, + "description": "A collection of references to application gateway http listeners." + }, + "pathBasedRules": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "./applicationGateway.json#/definitions/SubResource" + }, + "description": "A collection of references to application gateway path rules." } } }, From b0cbda888bc387463ed012f5a2d14b707e0c38f8 Mon Sep 17 00:00:00 2001 From: Venkata Krishnan Date: Thu, 3 Oct 2019 21:28:40 -0700 Subject: [PATCH 04/10] support for per listener/per-site firewall policy --- .../2019-09-01/webapplicationfirewall.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json index 9642bedf8502..ce1bca176e16 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json @@ -306,6 +306,22 @@ }, "description": "A collection of references to application gateways." }, + "httpListeners": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "./applicationGateway.json#/definitions/ApplicationGatewayHttpListener" + }, + "description": "A collection of references to application gateway httplisteners." + }, + "pathBasedRules": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "./applicationGateway.json#/definitions/ApplicationGatewayPathRule" + }, + "description": "A collection of references to application gateway pathrules." + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", From 68eaac95752e66bd1f5fc7c532c0412e5780f8de Mon Sep 17 00:00:00 2001 From: Venkata Krishnan Anantha Raman Date: Fri, 4 Oct 2019 13:03:07 -0700 Subject: [PATCH 05/10] Update specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json fixing review comments Co-Authored-By: Anton Evseev --- .../stable/2019-09-01/webapplicationfirewall.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json index ce1bca176e16..0f9a54dc2ff8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json @@ -312,7 +312,7 @@ "items": { "$ref": "./applicationGateway.json#/definitions/ApplicationGatewayHttpListener" }, - "description": "A collection of references to application gateway httplisteners." + "description": "A collection of references to application gateway http listeners." }, "pathBasedRules": { "readOnly": true, From 9cc1372f5eb4d0026f009d5db1390ee62ad12800 Mon Sep 17 00:00:00 2001 From: Venkata Krishnan Anantha Raman Date: Fri, 4 Oct 2019 13:03:23 -0700 Subject: [PATCH 06/10] Update specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json fixing review comments Co-Authored-By: Anton Evseev --- .../stable/2019-09-01/webapplicationfirewall.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json index 0f9a54dc2ff8..dd8a328b5224 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json @@ -320,7 +320,7 @@ "items": { "$ref": "./applicationGateway.json#/definitions/ApplicationGatewayPathRule" }, - "description": "A collection of references to application gateway pathrules." + "description": "A collection of references to application gateway path rules." }, "provisioningState": { "readOnly": true, From d5c0780aca0c5bfbe8a0b6e0bb082f11e1ce685f Mon Sep 17 00:00:00 2001 From: Venkata Krishnan Anantha Raman Date: Fri, 4 Oct 2019 13:14:53 -0700 Subject: [PATCH 07/10] Changing the reference to subresource --- .../stable/2019-09-01/webapplicationfirewall.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json index dd8a328b5224..6eddc95000a4 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json @@ -310,7 +310,7 @@ "readOnly": true, "type": "array", "items": { - "$ref": "./applicationGateway.json#/definitions/ApplicationGatewayHttpListener" + "$ref": "./applicationGateway.json#/definitions/SubResource" }, "description": "A collection of references to application gateway http listeners." }, @@ -318,7 +318,7 @@ "readOnly": true, "type": "array", "items": { - "$ref": "./applicationGateway.json#/definitions/ApplicationGatewayPathRule" + "$ref": "./applicationGateway.json#/definitions/SubResource" }, "description": "A collection of references to application gateway path rules." }, From 434706b5a4d0d7a0404d8179bf4d385588ec1ecb Mon Sep 17 00:00:00 2001 From: Venkata Krishnan Anantha Raman Date: Fri, 4 Oct 2019 13:19:42 -0700 Subject: [PATCH 08/10] enforcing ordering --- .../2019-09-01/webapplicationfirewall.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json index 6eddc95000a4..9642bedf8502 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json @@ -306,22 +306,6 @@ }, "description": "A collection of references to application gateways." }, - "httpListeners": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "./applicationGateway.json#/definitions/SubResource" - }, - "description": "A collection of references to application gateway http listeners." - }, - "pathBasedRules": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "./applicationGateway.json#/definitions/SubResource" - }, - "description": "A collection of references to application gateway path rules." - }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", From 83f19b7148ba319059a87acc58f176edbb57d233 Mon Sep 17 00:00:00 2001 From: Venkata Krishnan Anantha Raman Date: Fri, 4 Oct 2019 13:51:07 -0700 Subject: [PATCH 09/10] changing network.json --- .../stable/2019-09-01/webapplicationfirewall.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json index 9642bedf8502..11984f2f73c8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-09-01/webapplicationfirewall.json @@ -337,7 +337,7 @@ "readOnly": true, "type": "array", "items": { - "$ref": "./applicationGateway.json#/definitions/SubResource" + "$ref": "./network.json#/definitions/SubResource" }, "description": "A collection of references to application gateway http listeners." }, @@ -345,7 +345,7 @@ "readOnly": true, "type": "array", "items": { - "$ref": "./applicationGateway.json#/definitions/SubResource" + "$ref": "./network.json#/definitions/SubResource" }, "description": "A collection of references to application gateway path rules." } From 2bb9771cf1b8df90c11aae8b0071f72f6de8eb79 Mon Sep 17 00:00:00 2001 From: Venkata Krishnan Anantha Raman Date: Fri, 4 Oct 2019 13:53:10 -0700 Subject: [PATCH 10/10] remvoing the changes that were not required --- .../stable/2019-08-01/webapplicationfirewall.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-08-01/webapplicationfirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-08-01/webapplicationfirewall.json index cc2a4ff96d9d..00a41f894af9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-08-01/webapplicationfirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-08-01/webapplicationfirewall.json @@ -298,10 +298,6 @@ "$ref": "#/definitions/WebApplicationFirewallCustomRule" } }, - "managedRules": { - "description": "Describes the managedRules structure", - "$ref": "#/definitions/ManagedRulesDefinition" - }, "applicationGateways": { "readOnly": true, "type": "array",