From 98f7f744ca879d89937fd062358d0bf7d0b48644 Mon Sep 17 00:00:00 2001 From: Ishani Gupta Date: Thu, 14 May 2020 14:14:25 -0700 Subject: [PATCH 1/6] Adding DnsProxySettings Support in Firewall Policy dnsServers, dnsEnableProxy, dnsRequireProxyForNetworkRules are added as subproperties. --- .../examples/FirewallPolicyGet.json | 9 ++++++- .../FirewallPolicyListByResourceGroup.json | 9 ++++++- .../FirewallPolicyListBySubscription.json | 9 ++++++- .../examples/FirewallPolicyPut.json | 25 +++++++++++++++++-- .../stable/2020-05-01/firewallPolicy.json | 25 +++++++++++++++++++ 5 files changed, 72 insertions(+), 5 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json index 16e9142108d9..720d889e6903 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json @@ -32,7 +32,14 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1" } ], - "firewalls": [] + "firewalls": [], + "dnsProxySettings": { + "dnsServers": [ + "30.3.4.5" + ], + "dnsEnableProxy": true, + "dnsRequireProxyForNetworkRules": false + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json index 51621a041c49..4f4389f550a9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json @@ -25,7 +25,14 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1" } ], - "firewalls": [] + "firewalls": [], + "dnsProxySettings": { + "dnsServers": [ + "30.3.4.5" + ], + "dnsEnableProxy": true, + "dnsRequireProxyForNetworkRules": false + } } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json index 6d312447394f..f7bb095faca6 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json @@ -24,7 +24,14 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/ruleGroup1" } ], - "firewalls": [] + "firewalls": [], + "dnsProxySettings": { + "dnsServers": [ + "30.3.4.5" + ], + "dnsEnableProxy": true, + "dnsRequireProxyForNetworkRules": false + } } } ] diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json index 7dc9b4b3325a..d2c7e9f1de3b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json @@ -18,6 +18,13 @@ "fqdns": [ "*.microsoft.com" ] + }, + "dnsProxySettings": { + "dnsServers": [ + "30.3.4.5" + ], + "dnsEnableProxy": true, + "dnsRequireProxyForNetworkRules": false } } } @@ -52,7 +59,14 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup2" } ], - "firewalls": [] + "firewalls": [], + "dnsProxySettings": { + "dnsServers": [ + "30.3.4.5" + ], + "dnsEnableProxy": true, + "dnsRequireProxyForNetworkRules": false + } } } }, @@ -85,7 +99,14 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/firewallPolicies/firewallPolicy/ruleGroups/rulegroup2" } ], - "firewalls": [] + "firewalls": [], + "dnsProxySettings": { + "dnsServers": [ + "30.3.4.5" + ], + "dnsEnableProxy": true, + "dnsRequireProxyForNetworkRules": false + } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json index 02db63cb6fe4..9c75629cc61f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json @@ -630,6 +630,10 @@ "transportSecurity": { "description": "TLS Configuration definition.", "$ref": "#/definitions/FirewallPolicyTransportSecurity" + }, + "dnsProxySettings": { + "description": "DNS Proxy Settings definition.", + "$ref": "#/definitions/DnsProxySettings" } }, "description": "Firewall Policy definition." @@ -1183,6 +1187,27 @@ } } } + }, + "DnsProxySettings": { + "description": "DNS Proxy Settings in Firewall Policy.", + "x-ms-discriminator-value": "DnsProxySettings", + "properties": { + "dnsServers": { + "type": "array", + "description": "List of Custome DNS Servers.", + "items": { + "type": "string" + } + }, + "dnsEnableProxy": { + "type": "boolean", + "description": "Enable DNS Proxy on Firewalls attached to the Firewall Policy" + }, + "dnsRequireProxyForNetworkRules": { + "type": "boolean", + "description": "FQDNs in Network Rules are supported when set to true." + } + } } } } From 0667c7514945b0de6f651b45fd95f56ae03e33f0 Mon Sep 17 00:00:00 2001 From: Ishani Gupta Date: Thu, 14 May 2020 14:34:51 -0700 Subject: [PATCH 2/6] spell check --- .../Microsoft.Network/stable/2020-05-01/firewallPolicy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json index 9c75629cc61f..7a0d30d790df 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json @@ -1194,7 +1194,7 @@ "properties": { "dnsServers": { "type": "array", - "description": "List of Custome DNS Servers.", + "description": "List of Custom DNS Servers.", "items": { "type": "string" } From cca4a027b97f467d1bdfc67b22c1c63d602f49de Mon Sep 17 00:00:00 2001 From: Ishani Gupta Date: Thu, 14 May 2020 15:24:59 -0700 Subject: [PATCH 3/6] Removing DNS as prefix on sub properties. --- .../2020-05-01/examples/FirewallPolicyGet.json | 6 +++--- .../FirewallPolicyListByResourceGroup.json | 6 +++--- .../FirewallPolicyListBySubscription.json | 6 +++--- .../2020-05-01/examples/FirewallPolicyPut.json | 18 +++++++++--------- .../stable/2020-05-01/firewallPolicy.json | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json index 720d889e6903..0fb44a0c67dc 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json @@ -34,11 +34,11 @@ ], "firewalls": [], "dnsProxySettings": { - "dnsServers": [ + "servers": [ "30.3.4.5" ], - "dnsEnableProxy": true, - "dnsRequireProxyForNetworkRules": false + "enableProxy": true, + "requireProxyForNetworkRules": false } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json index 4f4389f550a9..5c6a8c794cf9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json @@ -27,11 +27,11 @@ ], "firewalls": [], "dnsProxySettings": { - "dnsServers": [ + "servers": [ "30.3.4.5" ], - "dnsEnableProxy": true, - "dnsRequireProxyForNetworkRules": false + "enableProxy": true, + "requireProxyForNetworkRules": false } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json index f7bb095faca6..4995de58f697 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json @@ -26,11 +26,11 @@ ], "firewalls": [], "dnsProxySettings": { - "dnsServers": [ + "servers": [ "30.3.4.5" ], - "dnsEnableProxy": true, - "dnsRequireProxyForNetworkRules": false + "enableProxy": true, + "requireProxyForNetworkRules": false } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json index d2c7e9f1de3b..2b4fb4ef9c8b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json @@ -20,11 +20,11 @@ ] }, "dnsProxySettings": { - "dnsServers": [ + "servers": [ "30.3.4.5" ], - "dnsEnableProxy": true, - "dnsRequireProxyForNetworkRules": false + "enableProxy": true, + "requireProxyForNetworkRules": false } } } @@ -61,11 +61,11 @@ ], "firewalls": [], "dnsProxySettings": { - "dnsServers": [ + "servers": [ "30.3.4.5" ], - "dnsEnableProxy": true, - "dnsRequireProxyForNetworkRules": false + "enableProxy": true, + "requireProxyForNetworkRules": false } } } @@ -101,11 +101,11 @@ ], "firewalls": [], "dnsProxySettings": { - "dnsServers": [ + "servers": [ "30.3.4.5" ], - "dnsEnableProxy": true, - "dnsRequireProxyForNetworkRules": false + "enableProxy": true, + "requireProxyForNetworkRules": false } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json index 7a0d30d790df..46042b9590ca 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json @@ -1192,18 +1192,18 @@ "description": "DNS Proxy Settings in Firewall Policy.", "x-ms-discriminator-value": "DnsProxySettings", "properties": { - "dnsServers": { + "servers": { "type": "array", "description": "List of Custom DNS Servers.", "items": { "type": "string" } }, - "dnsEnableProxy": { + "enableProxy": { "type": "boolean", "description": "Enable DNS Proxy on Firewalls attached to the Firewall Policy" }, - "dnsRequireProxyForNetworkRules": { + "requireProxyForNetworkRules": { "type": "boolean", "description": "FQDNs in Network Rules are supported when set to true." } From 74ca1793d6ecf604e5c8d7871802e97ef502a39e Mon Sep 17 00:00:00 2001 From: Ishani Gupta Date: Thu, 14 May 2020 19:36:50 -0700 Subject: [PATCH 4/6] Syntax error. --- .../Microsoft.Network/stable/2020-05-01/firewallPolicy.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json index 46042b9590ca..57bc88c0d62a 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json @@ -1201,7 +1201,7 @@ }, "enableProxy": { "type": "boolean", - "description": "Enable DNS Proxy on Firewalls attached to the Firewall Policy" + "description": "Enable DNS Proxy on Firewalls attached to the Firewall Policy." }, "requireProxyForNetworkRules": { "type": "boolean", From b0d53e21685e606921ac7f79891fb9ba9dfeca20 Mon Sep 17 00:00:00 2001 From: Ishani Gupta Date: Mon, 18 May 2020 16:50:32 -0700 Subject: [PATCH 5/6] DnsProxySettings to DNSSettings --- .../stable/2020-05-01/examples/FirewallPolicyGet.json | 2 +- .../examples/FirewallPolicyListByResourceGroup.json | 2 +- .../examples/FirewallPolicyListBySubscription.json | 2 +- .../stable/2020-05-01/examples/FirewallPolicyPut.json | 2 +- .../stable/2020-05-01/firewallPolicy.json | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json index 0fb44a0c67dc..e62b93edd20b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyGet.json @@ -33,7 +33,7 @@ } ], "firewalls": [], - "dnsProxySettings": { + "dnsSettings": { "servers": [ "30.3.4.5" ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json index 5c6a8c794cf9..aefd4423efcf 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListByResourceGroup.json @@ -26,7 +26,7 @@ } ], "firewalls": [], - "dnsProxySettings": { + "dnsSettings": { "servers": [ "30.3.4.5" ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json index 4995de58f697..6ee5a8d3c844 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyListBySubscription.json @@ -25,7 +25,7 @@ } ], "firewalls": [], - "dnsProxySettings": { + "dnsSettings": { "servers": [ "30.3.4.5" ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json index 2b4fb4ef9c8b..46ee7860be50 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json @@ -100,7 +100,7 @@ } ], "firewalls": [], - "dnsProxySettings": { + "dnsSettings": { "servers": [ "30.3.4.5" ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json index 57bc88c0d62a..4632832333da 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/firewallPolicy.json @@ -631,9 +631,9 @@ "description": "TLS Configuration definition.", "$ref": "#/definitions/FirewallPolicyTransportSecurity" }, - "dnsProxySettings": { + "dnsSettings": { "description": "DNS Proxy Settings definition.", - "$ref": "#/definitions/DnsProxySettings" + "$ref": "#/definitions/DnsSettings" } }, "description": "Firewall Policy definition." @@ -1188,9 +1188,9 @@ } } }, - "DnsProxySettings": { + "DnsSettings": { "description": "DNS Proxy Settings in Firewall Policy.", - "x-ms-discriminator-value": "DnsProxySettings", + "x-ms-discriminator-value": "DnsSettings", "properties": { "servers": { "type": "array", From e9503c629e1d5f12fc4c00b3d9bb19a1ab4bb109 Mon Sep 17 00:00:00 2001 From: Ishani Gupta Date: Thu, 21 May 2020 08:25:23 -0700 Subject: [PATCH 6/6] Fixing proxy settings name. --- .../stable/2020-05-01/examples/FirewallPolicyPut.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json index 46ee7860be50..0481fa5c0a9d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2020-05-01/examples/FirewallPolicyPut.json @@ -19,7 +19,7 @@ "*.microsoft.com" ] }, - "dnsProxySettings": { + "dnsSettings": { "servers": [ "30.3.4.5" ], @@ -60,7 +60,7 @@ } ], "firewalls": [], - "dnsProxySettings": { + "dnsSettings": { "servers": [ "30.3.4.5" ],