From 7fcd0f1a750caf07e53e52650120adb102deddf6 Mon Sep 17 00:00:00 2001 From: Iavor Todorov Date: Tue, 26 Nov 2019 10:41:13 -0800 Subject: [PATCH 1/6] Adding management IP configuration to firewall --- .../stable/2019-11-01/azureFirewall.json | 14 +- .../AzureFirewallGetWithMgmtSubnet.json | 190 +++++++ .../AzureFirewallListByResourceGroup.json | 16 +- .../AzureFirewallListBySubscription.json | 16 +- .../AzureFirewallPutWithMgmtSubnet.json | 507 ++++++++++++++++++ 5 files changed, 739 insertions(+), 4 deletions(-) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallGetWithMgmtSubnet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallPutWithMgmtSubnet.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json index 860fb665d169..e5326ee07000 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json @@ -139,6 +139,9 @@ "Get Azure Firewall With Zones": { "$ref": "./examples/AzureFirewallGetWithZones.json" }, + "Get Azure Firewall With management subnet": { + "$ref": "./examples/AzureFirewallGetWithMgmtSubnet.json" + }, "Get Azure Firewall With Additional Properties": { "$ref": "./examples/AzureFirewallGetWithAdditionalProperties.json" } @@ -208,6 +211,9 @@ "Create Azure Firewall With Zones": { "$ref": "./examples/AzureFirewallPutWithZones.json" }, + "Create Azure Firewall With management subnet": { + "$ref": "./examples/AzureFirewallPutWithMgmtSubnet.json" + }, "Create Azure Firewall in virtual Hub": { "$ref": "./examples/AzureFirewallPutInHub.json" }, @@ -374,11 +380,11 @@ }, "subnet": { "$ref": "./network.json#/definitions/SubResource", - "description": "Reference to the subnet resource. This resource must be named 'AzureFirewallSubnet'." + "description": "Reference of the subnet resource. This resource must be named 'AzureFirewallSubnet' or 'AzureFirewallManagementSubnet'." }, "publicIPAddress": { "$ref": "./network.json#/definitions/SubResource", - "description": "Reference to the PublicIP resource. This field is a mandatory input if subnet is not null." + "description": "Reference of the PublicIP resource. This field is a mandatory input if subnet is not null." }, "provisioningState": { "readOnly": true, @@ -467,6 +473,10 @@ }, "description": "IP configuration of the Azure Firewall resource." }, + "managementIpConfiguration": { + "$ref": "#/definitions/AzureFirewallIPConfiguration", + "description": "IP configuration of the Azure Firewall used for management traffic" + }, "provisioningState": { "readOnly": true, "$ref": "./network.json#/definitions/ProvisioningState", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallGetWithMgmtSubnet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallGetWithMgmtSubnet.json new file mode 100644 index 000000000000..9dd83496772d --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallGetWithMgmtSubnet.json @@ -0,0 +1,190 @@ +{ + "parameters": { + "api-version": "2019-09-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "azureFirewallName": "azurefirewall" + }, + "responses": { + "200": { + "body": { + "name": "azurefirewall", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewall", + "type": "Microsoft.Network/azureFirewalls", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "location": "West US", + "zones": [], + "tags": { + "key1": "value1" + }, + "properties": { + "provisioningState": "Succeeded", + "sku": { + "name": "AZFW_VNet", + "tier": "Standard" + }, + "threatIntelMode": "Alert", + "ipConfigurations": [ + { + "name": "azureFirewallIpConfiguration", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewallgw/ipConfigurations/azureFirewallIpConfiguration", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "privateIPAddress": "10.0.0.0", + "subnet": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet2/subnets/AzureFirewallSubnet" + }, + "publicIPAddress": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/pipName" + } + } + } + ], + "managementIpConfiguration": { + "name": "azureFirewallMgmtIpConfiguration", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewallgw/ipConfigurations/azureFirewallMgmtIpConfiguration", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "subnet": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet2/subnets/AzureFirewallManagementSubnet" + }, + "publicIPAddress": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/managementPipName" + } + } + }, + "applicationRuleCollections": [ + { + "name": "apprulecoll", + "properties": { + "priority": 110, + "action": { + "type": "Deny" + }, + "rules": [ + { + "name": "rule1", + "description": "Deny inbound rule", + "protocols": [ + { + "protocolType": "Https", + "port": 443 + } + ], + "targetFqdns": [ + "www.test.com" + ], + "sourceAddresses": [ + "216.58.216.164", + "10.0.0.0/24" + ] + } + ] + } + } + ], + "natRuleCollections": [ + { + "name": "natrulecoll", + "properties": { + "priority": 112, + "action": { + "type": "Dnat" + }, + "rules": [ + { + "name": "DNAT-HTTPS-traffic", + "description": "D-NAT all outbound web traffic for inspection", + "sourceAddresses": [ + "*" + ], + "destinationAddresses": [ + "1.2.3.4" + ], + "destinationPorts": [ + "443" + ], + "protocols": [ + "TCP" + ], + "translatedAddress": "1.2.3.5", + "translatedPort": "8443" + }, + { + "name": "DNAT-HTTP-traffic-With-FQDN", + "description": "D-NAT all inbound web traffic for inspection", + "sourceAddresses": [ + "*" + ], + "destinationAddresses": [ + "1.2.3.4" + ], + "destinationPorts": [ + "80" + ], + "protocols": [ + "TCP" + ], + "translatedFqdn": "internalhttpserver", + "translatedPort": "880" + } + ] + } + } + ], + "networkRuleCollections": [ + { + "name": "netrulecoll", + "properties": { + "priority": 112, + "action": { + "type": "Deny" + }, + "rules": [ + { + "name": "L4-traffic", + "description": "Block traffic based on source IPs and ports", + "sourceAddresses": [ + "192.168.1.1-192.168.1.12", + "10.1.4.12-10.1.4.255" + ], + "destinationPorts": [ + "443-444", + "8443" + ], + "destinationAddresses": [ + "*" + ], + "protocols": [ + "TCP" + ] + }, + { + "name": "L4-traffic-with-FQDN", + "description": "Block traffic based on source IPs and ports to amazon", + "sourceAddresses": [ + "10.2.4.12-10.2.4.255" + ], + "destinationPorts": [ + "443-444", + "8443" + ], + "destinationFqdns": [ + "www.amazon.com" + ], + "protocols": [ + "TCP" + ] + } + ] + } + } + ], + "additionalProperties": {} + } + } + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListByResourceGroup.json index 934b87f9cd0f..3330fcee7f1b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListByResourceGroup.json @@ -38,6 +38,20 @@ } } ], + "managementIpConfiguration": { + "name": "azureFirewallMgmtIpConfiguration", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewallgw/ipConfigurations/azureFirewallMgmtIpConfiguration", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "subnet": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet2/subnets/AzureFirewallManagementSubnet" + }, + "publicIPAddress": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/managementPipName" + } + } + }, "applicationRuleCollections": [ { "name": "apprulecoll", @@ -175,4 +189,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListBySubscription.json index 77b2869e9921..2bd43c96936b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListBySubscription.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListBySubscription.json @@ -37,6 +37,20 @@ } } ], + "managementIpConfiguration": { + "name": "azureFirewallMgmtIpConfiguration", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewallgw/ipConfigurations/azureFirewallMgmtIpConfiguration", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "subnet": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet2/subnets/AzureFirewallManagementSubnet" + }, + "publicIPAddress": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/managementPipName" + } + } + }, "applicationRuleCollections": [ { "name": "apprulecoll", @@ -174,4 +188,4 @@ } } } -} +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallPutWithMgmtSubnet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallPutWithMgmtSubnet.json new file mode 100644 index 000000000000..679fdf977d55 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallPutWithMgmtSubnet.json @@ -0,0 +1,507 @@ +{ + "parameters": { + "api-version": "2019-09-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "azureFirewallName": "azurefirewall", + "parameters": { + "tags": { + "key1": "value1" + }, + "location": "West US", + "zones": [], + "properties": { + "sku": { + "name": "AZFW_VNet", + "tier": "Standard" + }, + "threatIntelMode": "Alert", + "ipConfigurations": [ + { + "name": "azureFirewallIpConfiguration", + "properties": { + "subnet": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet2/subnets/AzureFirewallSubnet" + }, + "publicIPAddress": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/pipName" + } + } + } + ], + "managementIpConfiguration": { + "name": "azureFirewallMgmtIpConfiguration", + "properties": { + "subnet": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet2/subnets/AzureFirewallManagementSubnet" + }, + "publicIPAddress": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/managementPipName" + } + } + }, + "applicationRuleCollections": [ + { + "name": "apprulecoll", + "properties": { + "priority": 110, + "action": { + "type": "Deny" + }, + "rules": [ + { + "name": "rule1", + "description": "Deny inbound rule", + "protocols": [ + { + "protocolType": "Https", + "port": 443 + } + ], + "targetFqdns": [ + "www.test.com" + ], + "sourceAddresses": [ + "216.58.216.164", + "10.0.0.0/24" + ] + } + ] + } + } + ], + "natRuleCollections": [ + { + "name": "natrulecoll", + "properties": { + "priority": 112, + "action": { + "type": "Dnat" + }, + "rules": [ + { + "name": "DNAT-HTTPS-traffic", + "description": "D-NAT all outbound web traffic for inspection", + "sourceAddresses": [ + "*" + ], + "destinationAddresses": [ + "1.2.3.4" + ], + "destinationPorts": [ + "443" + ], + "protocols": [ + "TCP" + ], + "translatedAddress": "1.2.3.5", + "translatedPort": "8443" + }, + { + "name": "DNAT-HTTP-traffic-With-FQDN", + "description": "D-NAT all inbound web traffic for inspection", + "sourceAddresses": [ + "*" + ], + "destinationAddresses": [ + "1.2.3.4" + ], + "destinationPorts": [ + "80" + ], + "protocols": [ + "TCP" + ], + "translatedFqdn": "internalhttpserver", + "translatedPort": "880" + } + ] + } + } + ], + "networkRuleCollections": [ + { + "name": "netrulecoll", + "properties": { + "priority": 112, + "action": { + "type": "Deny" + }, + "rules": [ + { + "name": "L4-traffic", + "description": "Block traffic based on source IPs and ports", + "sourceAddresses": [ + "192.168.1.1-192.168.1.12", + "10.1.4.12-10.1.4.255" + ], + "destinationPorts": [ + "443-444", + "8443" + ], + "destinationAddresses": [ + "*" + ], + "protocols": [ + "TCP" + ] + }, + { + "name": "L4-traffic-with-FQDN", + "description": "Block traffic based on source IPs and ports to amazon", + "sourceAddresses": [ + "10.2.4.12-10.2.4.255" + ], + "destinationPorts": [ + "443-444", + "8443" + ], + "destinationFqdns": [ + "www.amazon.com" + ], + "protocols": [ + "TCP" + ] + } + ] + } + } + ] + } + } + }, + "responses": { + "200": { + "body": { + "name": "azurefirewall", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewall", + "type": "Microsoft.Network/azureFirewalls", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "location": "West US", + "zones": [], + "tags": { + "key1": "value1" + }, + "properties": { + "provisioningState": "Succeeded", + "sku": { + "name": "AZFW_VNet", + "tier": "Standard" + }, + "threatIntelMode": "Alert", + "ipConfigurations": [ + { + "name": "azureFirewallIpConfiguration", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azfirewallgw/ipConfigurations/azureFirewallIpConfiguration", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "privateIPAddress": "10.0.0.0", + "subnet": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet2/subnets/AzureFirewallSubnet" + }, + "publicIPAddress": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/pipName" + } + } + } + ], + "applicationRuleCollections": [ + { + "name": "apprulecoll", + "properties": { + "priority": 110, + "action": { + "type": "Deny" + }, + "rules": [ + { + "name": "rule1", + "description": "Deny inbound rule", + "protocols": [ + { + "protocolType": "Https", + "port": 443 + } + ], + "targetFqdns": [ + "www.test.com" + ], + "sourceAddresses": [ + "216.58.216.164", + "10.0.0.0/24" + ] + } + ] + } + } + ], + "natRuleCollections": [ + { + "name": "natrulecoll", + "properties": { + "priority": 112, + "action": { + "type": "Dnat" + }, + "rules": [ + { + "name": "DNAT-HTTPS-traffic", + "description": "D-NAT all outbound web traffic for inspection", + "sourceAddresses": [ + "*" + ], + "destinationAddresses": [ + "1.2.3.4" + ], + "destinationPorts": [ + "443" + ], + "protocols": [ + "TCP" + ], + "translatedAddress": "1.2.3.5", + "translatedPort": "8443" + }, + { + "name": "DNAT-HTTP-traffic-With-FQDN", + "description": "D-NAT all inbound web traffic for inspection", + "sourceAddresses": [ + "*" + ], + "destinationAddresses": [ + "1.2.3.4" + ], + "destinationPorts": [ + "80" + ], + "protocols": [ + "TCP" + ], + "translatedPort": "880", + "translatedFqdn": "internalhttpserver" + } + ] + } + } + ], + "networkRuleCollections": [ + { + "name": "netrulecoll", + "properties": { + "priority": 112, + "action": { + "type": "Deny" + }, + "rules": [ + { + "name": "L4-traffic", + "description": "Block traffic based on source IPs and ports", + "sourceAddresses": [ + "192.168.1.1-192.168.1.12", + "10.1.4.12-10.1.4.255" + ], + "destinationPorts": [ + "443-444", + "8443" + ], + "destinationAddresses": [ + "*" + ], + "protocols": [ + "TCP" + ] + }, + { + "name": "L4-traffic-with-FQDN", + "description": "Block traffic based on source IPs and ports to amazon", + "sourceAddresses": [ + "10.2.4.12-10.2.4.255" + ], + "destinationPorts": [ + "443-444", + "8443" + ], + "protocols": [ + "TCP" + ], + "destinationFqdns": [ + "www.amazon.com" + ] + } + ] + } + } + ], + "additionalProperties": {} + } + } + }, + "201": { + "body": { + "name": "azurefirewall", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewall", + "type": "Microsoft.Network/azureFirewalls", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "location": "West US", + "zones": [], + "tags": { + "key1": "value1" + }, + "properties": { + "provisioningState": "Succeeded", + "sku": { + "name": "AZFW_VNet", + "tier": "Standard" + }, + "threatIntelMode": "Alert", + "ipConfigurations": [ + { + "name": "azureFirewallIpConfiguration", + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azfirewallgw/ipConfigurations/azureFirewallIpConfiguration", + "etag": "w/\\00000000-0000-0000-0000-000000000000\\", + "properties": { + "provisioningState": "Succeeded", + "privateIPAddress": "10.0.0.0", + "subnet": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet2/subnets/AzureFirewallSubnet" + }, + "publicIPAddress": { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/pipName" + } + } + } + ], + "applicationRuleCollections": [ + { + "name": "apprulecoll", + "properties": { + "priority": 110, + "action": { + "type": "Deny" + }, + "rules": [ + { + "name": "rule1", + "description": "Deny inbound rule", + "protocols": [ + { + "protocolType": "Https", + "port": 443 + } + ], + "targetFqdns": [ + "www.test.com" + ], + "sourceAddresses": [ + "216.58.216.164", + "10.0.0.0/24" + ] + } + ] + } + } + ], + "natRuleCollections": [ + { + "name": "natrulecoll", + "properties": { + "priority": 112, + "action": { + "type": "Dnat" + }, + "rules": [ + { + "name": "DNAT-HTTPS-traffic", + "description": "D-NAT all outbound web traffic for inspection", + "sourceAddresses": [ + "*" + ], + "destinationAddresses": [ + "1.2.3.4" + ], + "destinationPorts": [ + "443" + ], + "protocols": [ + "TCP" + ], + "translatedAddress": "1.2.3.5", + "translatedPort": "8443" + }, + { + "name": "DNAT-HTTP-traffic-With-FQDN", + "description": "D-NAT all inbound web traffic for inspection", + "sourceAddresses": [ + "*" + ], + "destinationAddresses": [ + "1.2.3.4" + ], + "destinationPorts": [ + "80" + ], + "protocols": [ + "TCP" + ], + "translatedFqdn": "internalhttpserver", + "translatedPort": "880" + } + ] + } + } + ], + "networkRuleCollections": [ + { + "name": "netrulecoll", + "properties": { + "priority": 112, + "action": { + "type": "Deny" + }, + "rules": [ + { + "name": "L4-traffic", + "description": "Block traffic based on source IPs and ports", + "sourceAddresses": [ + "192.168.1.1-192.168.1.12", + "10.1.4.12-10.1.4.255" + ], + "destinationPorts": [ + "443-444", + "8443" + ], + "destinationAddresses": [ + "*" + ], + "protocols": [ + "TCP" + ] + }, + { + "name": "L4-traffic-with-FQDN", + "description": "Block traffic based on source IPs and ports to amazon", + "sourceAddresses": [ + "10.2.4.12-10.2.4.255" + ], + "destinationPorts": [ + "443-444", + "8443" + ], + "destinationFqdns": [ + "www.amazon.com" + ], + "protocols": [ + "TCP" + ] + } + ] + } + } + ], + "additionalProperties": {} + } + } + } + } +} \ No newline at end of file From c2afe8023e9d1cf96225193480fbc346023f7403 Mon Sep 17 00:00:00 2001 From: Iavor Todorov Date: Tue, 26 Nov 2019 10:44:24 -0800 Subject: [PATCH 2/6] Changing description wording back --- .../Microsoft.Network/stable/2019-11-01/azureFirewall.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json index e5326ee07000..d9fece56057c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json @@ -380,11 +380,11 @@ }, "subnet": { "$ref": "./network.json#/definitions/SubResource", - "description": "Reference of the subnet resource. This resource must be named 'AzureFirewallSubnet' or 'AzureFirewallManagementSubnet'." + "description": "Reference to the subnet resource. This resource must be named 'AzureFirewallSubnet' or 'AzureFirewallManagementSubnet'." }, "publicIPAddress": { "$ref": "./network.json#/definitions/SubResource", - "description": "Reference of the PublicIP resource. This field is a mandatory input if subnet is not null." + "description": "Reference to the PublicIP resource. This field is a mandatory input if subnet is not null." }, "provisioningState": { "readOnly": true, From a5869fa34deea362e3962437bc8b6b75ab4e2fb7 Mon Sep 17 00:00:00 2001 From: Iavor Todorov Date: Tue, 26 Nov 2019 11:09:50 -0800 Subject: [PATCH 3/6] Adding type property to AzureFirewallIpConfiguration --- .../stable/2019-11-01/azureFirewall.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json index d9fece56057c..30dd73272b1d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json @@ -409,6 +409,11 @@ "type": "string", "readOnly": true, "description": "A unique read-only string that changes whenever the resource is updated." + }, + "type": { + "readOnly": true, + "type": "string", + "description": "Type of the resource." } }, "allOf": [ @@ -474,8 +479,8 @@ "description": "IP configuration of the Azure Firewall resource." }, "managementIpConfiguration": { - "$ref": "#/definitions/AzureFirewallIPConfiguration", - "description": "IP configuration of the Azure Firewall used for management traffic" + "$ref": "#/definitions/AzureFirewallIPConfiguration", + "description": "IP configuration of the Azure Firewall used for management traffic" }, "provisioningState": { "readOnly": true, @@ -1021,4 +1026,4 @@ "description": "SKU of an Azure Firewall." } } -} +} \ No newline at end of file From 626d540c1bf61350338cc5ad2abeb4163dc5c5dc Mon Sep 17 00:00:00 2001 From: Iavor Todorov Date: Tue, 26 Nov 2019 16:42:44 -0800 Subject: [PATCH 4/6] Bumping API version in example files --- .../2019-11-01/examples/AzureFirewallGetWithMgmtSubnet.json | 2 +- .../2019-11-01/examples/AzureFirewallPutWithMgmtSubnet.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallGetWithMgmtSubnet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallGetWithMgmtSubnet.json index 9dd83496772d..6dd3111c1b34 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallGetWithMgmtSubnet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallGetWithMgmtSubnet.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-09-01", + "api-version": "2019-11-01", "subscriptionId": "subid", "resourceGroupName": "rg1", "azureFirewallName": "azurefirewall" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallPutWithMgmtSubnet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallPutWithMgmtSubnet.json index 679fdf977d55..e9ec8018a7ed 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallPutWithMgmtSubnet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallPutWithMgmtSubnet.json @@ -1,6 +1,6 @@ { "parameters": { - "api-version": "2019-09-01", + "api-version": "2019-11-01", "subscriptionId": "subid", "resourceGroupName": "rg1", "azureFirewallName": "azurefirewall", From 9e3a60b352edd451b44f58f5a55ea2d2e19f77d3 Mon Sep 17 00:00:00 2001 From: Iavor Todorov Date: Tue, 26 Nov 2019 19:59:21 -0800 Subject: [PATCH 5/6] Fixing style issues --- .../Microsoft.Network/stable/2019-11-01/azureFirewall.json | 2 +- .../2019-11-01/examples/AzureFirewallGetWithMgmtSubnet.json | 2 +- .../2019-11-01/examples/AzureFirewallListByResourceGroup.json | 2 +- .../2019-11-01/examples/AzureFirewallListBySubscription.json | 2 +- .../2019-11-01/examples/AzureFirewallPutWithMgmtSubnet.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json index 30dd73272b1d..f791f7c5f0db 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json @@ -1026,4 +1026,4 @@ "description": "SKU of an Azure Firewall." } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallGetWithMgmtSubnet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallGetWithMgmtSubnet.json index 6dd3111c1b34..8f973406057c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallGetWithMgmtSubnet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallGetWithMgmtSubnet.json @@ -187,4 +187,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListByResourceGroup.json index 3330fcee7f1b..bf18f64dd4bf 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListByResourceGroup.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListByResourceGroup.json @@ -189,4 +189,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListBySubscription.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListBySubscription.json index 2bd43c96936b..d5213ba838c9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListBySubscription.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallListBySubscription.json @@ -188,4 +188,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallPutWithMgmtSubnet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallPutWithMgmtSubnet.json index e9ec8018a7ed..b6d6a84a2cde 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallPutWithMgmtSubnet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/examples/AzureFirewallPutWithMgmtSubnet.json @@ -504,4 +504,4 @@ } } } -} \ No newline at end of file +} From 89c82da13274ea04ea312c3b9b32e08649806e61 Mon Sep 17 00:00:00 2001 From: Iavor Todorov Date: Wed, 27 Nov 2019 08:22:19 -0800 Subject: [PATCH 6/6] Missed period at end of description --- .../Microsoft.Network/stable/2019-11-01/azureFirewall.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json index f791f7c5f0db..c840a6337040 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-11-01/azureFirewall.json @@ -480,7 +480,7 @@ }, "managementIpConfiguration": { "$ref": "#/definitions/AzureFirewallIPConfiguration", - "description": "IP configuration of the Azure Firewall used for management traffic" + "description": "IP configuration of the Azure Firewall used for management traffic." }, "provisioningState": { "readOnly": true,