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.

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

Update the API versions #6255

Merged
merged 3 commits into from Jul 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion 101-application-gateway-waf/README.md
Expand Up @@ -7,4 +7,4 @@
<img src="http://armviz.io/visualizebutton.png"/>
</a>

This template deploys an Application Gateway with Web Application Firewall functionality in a virtual network.
This template deploys an Application Gateway with the Web Application Firewall functionality in a virtual network.
47 changes: 26 additions & 21 deletions 101-application-gateway-waf/azuredeploy.json
Expand Up @@ -2,32 +2,44 @@
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"addressPrefix": {
"location": {
"type": "string",
"defaultValue": "[resourceGroup().location]",
"metadata": {
"description": "Specifies the location for all resources that is created by this template."
}
},
"vNetAddressPrefix": {
"type": "string",
"defaultValue": "10.0.0.0/16",
"metadata": {
"description": "Address prefix for the Virtual Network"
"description": "Specifies the address prefix for the Virtual Network."
}
},
"subnetPrefix": {
"vNetSubnetPrefix": {
"type": "string",
"defaultValue": "10.0.0.0/28",
"metadata": {
"description": "Subnet prefix"
"description": "Specifies the subnet prefix"
}
},
"applicationGatewaySize": {
"type": "string",
"allowedValues": [
"Standard_Small",
"Standard_Medium",
"Standard_Large",
"WAF_Medium",
"WAF_Large"
"WAF_Large",
"Standard_v2",
"WAF_v2"
],
"defaultValue": "WAF_Medium",
"metadata": {
"description": "application gateway size"
"description": "Specifies the application gateway SKU name."
}
},
"capacity": {
"applicationGatewayCapacity": {
"type": "int",
"allowedValues": [
1,
Expand All @@ -43,7 +55,7 @@
],
"defaultValue": 2,
"metadata": {
"description": "Number of instances"
"description": "Specifies the number of the application gateway instances."
}
},
"backendIpAddress1": {
Expand Down Expand Up @@ -98,13 +110,6 @@
"metadata": {
"description": "WAF Rule Set Version"
}
},
"location": {
"type": "string",
"defaultValue": "[resourceGroup().location]",
"metadata": {
"description": "Location for all resources."
}
}
},
"variables": {
Expand All @@ -118,7 +123,7 @@
},
"resources": [
{
"apiVersion": "2017-03-01",
"apiVersion": "2019-04-01",
"type": "Microsoft.Network/publicIPAddresses",
"name": "[variables('publicIPAddressName')]",
"location": "[parameters('location')]",
Expand All @@ -127,28 +132,28 @@
}
},
{
"apiVersion": "2017-03-01",
"apiVersion": "2019-04-01",
"type": "Microsoft.Network/virtualNetworks",
"name": "[variables('virtualNetworkName')]",
"location": "[parameters('location')]",
"properties": {
"addressSpace": {
"addressPrefixes": [
"[parameters('addressPrefix')]"
"[parameters('vNetAddressPrefix')]"
]
},
"subnets": [
{
"name": "[variables('subnetName')]",
"properties": {
"addressPrefix": "[parameters('subnetPrefix')]"
"addressPrefix": "[parameters('vNetSubnetPrefix')]"
}
}
]
}
},
{
"apiVersion": "2017-06-01",
"apiVersion": "2019-04-01",
"name": "[variables('applicationGatewayName')]",
"type": "Microsoft.Network/applicationGateways",
"location": "[parameters('location')]",
Expand All @@ -160,7 +165,7 @@
"sku": {
"name": "[parameters('applicationGatewaySize')]",
"tier": "WAF",
"capacity": "[parameters('capacity')]"
"capacity": "[parameters('applicationGateWayCapacity')]"
},
"gatewayIPConfigurations": [
{
Expand Down
2 changes: 1 addition & 1 deletion 101-application-gateway-waf/metadata.json
Expand Up @@ -5,7 +5,7 @@
"description": "This template creates an application gateway with Web Application Firewall functionality in a virtual network and sets up load balancing rules for any number of virtual machines",
"summary": "Create an Application Gateway",
"githubUsername": "bwanner",
"dateUpdated": "2017-03-24"
"dateUpdated": "2019-06-21"
}


2 changes: 1 addition & 1 deletion 101-servicebus-create-namespace/azuredeploy.json
Expand Up @@ -54,4 +54,4 @@
"value": "[listkeys(variables('defaultAuthRuleResourceId'), variables('sbVersion')).primaryKey]"
}
}
}
}
2 changes: 1 addition & 1 deletion 101-servicebus-create-namespace/metadata.json
Expand Up @@ -5,6 +5,6 @@
"description": "This template enables you to deploy a Service Bus namespace with a Basic/Standard SKU.",
"summary": "This template creates a Service Bus Basic/Standard namespace.",
"githubUsername": "v-ajnava",
"dateUpdated": "2017-06-22"
"dateUpdated": "2019-06-19"
}