Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Firewall Manager Feature Swagger Updates for Public Preview #7266

Merged
merged 4 commits into from
Sep 25, 2019
+87 −8
Merged

Firewall Manager Feature Swagger Updates for Public Preview #7266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5e4101d
Add Azure Firewall SKU
gimotwanMSFT Sep 19, 2019
8e290f9
Move SecurityProvider to the vHub from vWan
gimotwanMSFT Sep 19, 2019
beef6f1
Add AZFW to custom words
gimotwanMSFT Sep 19, 2019
6f41395
Address review comments
gimotwanMSFT Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions custom-words.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ autoscalesettings
autoscaling
Avro
avrodeflate
AZFW
azns
azpkg
azureaccounts
Expand Down
32 changes: 32 additions & 0 deletions ...ification/network/resource-manager/Microsoft.Network/stable/2019-08-01/azureFirewall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,10 @@
"readOnly": true,
"description": "IP addresses associated with AzureFirewall.",
"$ref": "#/definitions/HubIPAddresses"
},
"sku": {
"description": "The Azure Firewall Resource SKU.",
"$ref": "#/definitions/AzureFirewallSku"
}
},
"description": "Properties of the Azure Firewall."
Expand Down Expand Up @@ -880,6 +884,34 @@
"name": "AzureFirewallApplicationRuleProtocolType",
"modelAsString": true
}
},
"AzureFirewallSku": {
"properties": {
"name": {
"type": "string",
"description": "Name of an Azure Firewall SKU.",
"enum": [
"AZFW_VNet",
"AZFW_Hub"
],
"x-ms-enum": {
"name": "AzureFirewallSkuName",
"modelAsString": true
}
},
"tier": {
"type": "string",
"description": "Tier of an Azure Firewall.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"description": "Tier of an Azure Firewall.",
"description": "Tier of an Azure Firewall SKU.",

To keep consistency with SKU's name

"enum": [
"Standard"
],
"x-ms-enum": {
"name": "AzureFirewallSkuTier",
"modelAsString": true
}
}
},
"description": "SKU of an Azure Firewall."
}
}
}
4 changes: 4 additions & 0 deletions ...twork/resource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
},
"properties": {
"provisioningState": "Succeeded",
"sku": {
"name": "AZFW_VNet",
"tier": "Standard"
},
"threatIntelMode": "Alert",
"ipConfigurations": [
{
Expand Down
4 changes: 4 additions & 0 deletions ...ource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallGetWithZones.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
},
"properties": {
"provisioningState": "Succeeded",
"sku": {
"name": "AZFW_VNet",
"tier": "Standard"
},
"threatIntelMode": "Alert",
"ipConfigurations": [
{
Expand Down
12 changes: 12 additions & 0 deletions ...twork/resource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallPut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
"location": "West US",
"zones": [],
"properties": {
"sku": {
"name": "AZFW_VNet",
"tier": "Standard"
},
"threatIntelMode": "Alert",
"ipConfigurations": [
{
Expand Down Expand Up @@ -134,6 +138,10 @@
},
"properties": {
"provisioningState": "Succeeded",
"sku": {
"name": "AZFW_VNet",
"tier": "Standard"
},
"threatIntelMode": "Alert",
"ipConfigurations": [
{
Expand Down Expand Up @@ -260,6 +268,10 @@
},
"properties": {
"provisioningState": "Succeeded",
"sku": {
"name": "AZFW_VNet",
"tier": "Standard"
},
"threatIntelMode": "Alert",
"ipConfigurations": [
{
Expand Down
12 changes: 12 additions & 0 deletions .../resource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallPutInHub.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
"location": "West US",
"zones": [],
"properties": {
"sku": {
"name": "AZFW_Hub",
"tier": "Standard"
},
"threatIntelMode": "Alert",
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
Expand All @@ -35,6 +39,10 @@
},
"properties": {
"provisioningState": "Succeeded",
"sku": {
"name": "AZFW_Hub",
"tier": "Standard"
},
"threatIntelMode": "Alert",
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
Expand Down Expand Up @@ -66,6 +74,10 @@
},
"properties": {
"provisioningState": "Succeeded",
"sku": {
"name": "AZFW_Hub",
"tier": "Standard"
},
"threatIntelMode": "Alert",
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
Expand Down
12 changes: 12 additions & 0 deletions ...ource-manager/Microsoft.Network/stable/2019-08-01/examples/AzureFirewallPutWithZones.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
],
"properties": {
"threatIntelMode": "Alert",
"sku": {
"name": "AZFW_VNet",
"tier": "Standard"
},
"ipConfigurations": [
{
"name": "azureFirewallIpConfiguration",
Expand Down Expand Up @@ -142,6 +146,10 @@
},
"properties": {
"provisioningState": "Succeeded",
"sku": {
"name": "AZFW_VNet",
"tier": "Standard"
},
"threatIntelMode": "Alert",
"ipConfigurations": [
{
Expand Down Expand Up @@ -272,6 +280,10 @@
},
"properties": {
"provisioningState": "Succeeded",
"sku": {
"name": "AZFW_VNet",
"tier": "Standard"
},
"threatIntelMode": "Alert",
"ipConfigurations": [
{
Expand Down
6 changes: 2 additions & 4 deletions ...fication/network/resource-manager/Microsoft.Network/stable/2019-08-01/firewallPolicy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,8 +896,7 @@
"type": "string",
"description": "The action type of a rule.",
"enum": [
"DNAT",
"SNAT"
"DNAT"
],
"x-ms-enum": {
"name": "FirewallPolicyNatRuleActionType",
Expand All @@ -918,8 +917,7 @@
"description": "The action type of a rule.",
"enum": [
"Allow",
"Deny",
"Alert "
"Deny"
],
"x-ms-enum": {
"name": "FirewallPolicyFilterRuleActionType",
Expand Down
12 changes: 8 additions & 4 deletions specification/network/resource-manager/Microsoft.Network/stable/2019-08-01/virtualWan.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2651,10 +2651,6 @@
},
"description": "List of VpnSites in the VirtualWAN."
},
"securityProviderName": {
"type": "string",
"description": "The Security Provider name."
},
"allowBranchToBranchTraffic": {
"type": "boolean",
"description": "True if branch to branch traffic is allowed."
Expand Down Expand Up @@ -2906,6 +2902,10 @@
"$ref": "./network.json#/definitions/SubResource",
"description": "The expressRouteGateway associated with this VirtualHub."
},
"azureFirewall": {
"$ref": "./network.json#/definitions/SubResource",
"description": "The azureFirewall associated with this VirtualHub."
},
"virtualNetworkConnections": {
"type": "array",
"description": "List of all vnet connections with this VirtualHub.",
Expand All @@ -2924,6 +2924,10 @@
"provisioningState": {
"$ref": "./network.json#/definitions/ProvisioningState",
"description": "The provisioning state of the virtual hub resource."
},
"securityProviderName": {
"type": "string",
"description": "The Security Provider name."
}
},
"description": "Parameters for VirtualHub."
Expand Down