Skip to content

Commit

Permalink
Merge pull request #41 from fortinet/rel_3.3.2_verbra
Browse files Browse the repository at this point in the history
Bumping version to 3.3.2

Fix missing function auth token in the url.
Fix ARM template dependency on existing VNet.
  • Loading branch information
JaydenLiang authored Jun 11, 2021
2 parents 56ab832 + 11a082e commit 172f559
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ A deployment guide is available from the Fortinet Document Library:

## Launch a demo

<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.luolix.top%2Ffortinet%2Ffortigate-autoscale-azure%2F3.3.1%2Ftemplates%2Fdeploy_fortigate_autoscale.hybrid_licensing.json" target="_blank"><img src="http://azuredeploy.net/deploybutton.png"/></a>
<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.luolix.top%2Ffortinet%2Ffortigate-autoscale-azure%2F3.3.2%2Ftemplates%2Fdeploy_fortigate_autoscale.hybrid_licensing.json" target="_blank"><img src="http://azuredeploy.net/deploybutton.png"/></a>

# Support

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fortigate-autoscale-azure",
"version": "3.3.1",
"version": "3.3.2",
"description": "Fortinet FortiGate Autoscale for Azure",
"main": "dist/transpiled/index.js",
"types": "dist/types/index.d.ts",
Expand Down
14 changes: 7 additions & 7 deletions templates/deploy_fortigate_autoscale.hybrid_licensing.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "3.3.1.0",
"contentVersion": "3.3.2.0",
"parameters": {
"AccessRestrictionIPRange": {
"defaultValue": "",
Expand Down Expand Up @@ -192,7 +192,7 @@
},
"PackageResURL": {
"type": "String",
"defaultValue": "https://github.com/fortinet/fortigate-autoscale-azure/releases/download/3.3.1/fortigate-autoscale-azure-funcapp.zip",
"defaultValue": "https://github.com/fortinet/fortigate-autoscale-azure/releases/download/3.3.2/fortigate-autoscale-azure-funcapp.zip",
"metadata": {
"description": "The public URL of the function source file named fortigate-autoscale-azure-funcapp.zip, and can be found inside fortigate-autoscale-azure-template-deployment.zip. The public URL of the deployment package zip file that contains the resource used to deploy the Function App. This URL must be accessible by Azure. The default URL points to the GitHub release corresponding to this ARM template contentVersion."
}
Expand Down Expand Up @@ -1524,7 +1524,7 @@
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.3.1/templates/linked_template.faz_integration.json"
"uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.3.2/templates/linked_template.faz_integration.json"
},
"parameters": {
"AdminPassword": {
Expand Down Expand Up @@ -1567,7 +1567,7 @@
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.3.1/templates/linked_template.function_app.json"
"uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.3.2/templates/linked_template.function_app.json"
},
"parameters": {
"FunctionAppName": {
Expand Down Expand Up @@ -1606,7 +1606,7 @@
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.3.1/templates/linked_template.function_app.setup.json"
"uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.3.2/templates/linked_template.function_app.setup.json"
},
"parameters": {
"AdminPortNumber": {
Expand Down Expand Up @@ -1724,7 +1724,7 @@
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.3.1/templates/linked_template.vmss.json"
"uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.3.2/templates/linked_template.vmss.json"
},
"parameters": {
"AdminPassword": {
Expand Down Expand Up @@ -1890,7 +1890,7 @@
},
"deploymentPackageVersion": {
"type": "string",
"value": "3.3.1"
"value": "3.3.2"
},
"fazPublicIp": {
"type": "String",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
"contentVersion": "3.3.1.0",
"contentVersion": "3.3.2.0",
"parameters": {
"AccessRestrictionIPRange": {
"value": ""
Expand Down
2 changes: 1 addition & 1 deletion templates/linked_template.faz_integration.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "3.3.1.0",
"contentVersion": "3.3.2.0",
"parameters": {
"AdminPassword": {
"type": "SecureString"
Expand Down
2 changes: 1 addition & 1 deletion templates/linked_template.function_app.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "3.3.1.0",
"contentVersion": "3.3.2.0",
"parameters": {
"FunctionAppName": {
"type": "String"
Expand Down
4 changes: 2 additions & 2 deletions templates/linked_template.function_app.setup.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "3.3.1.0",
"contentVersion": "3.3.2.0",
"parameters": {
"AdminPortNumber": {
"type": "Int"
Expand Down Expand Up @@ -117,7 +117,7 @@
"properties": {
"mode": "Incremental",
"templateLink": {
"uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.3.1/templates/linked_template.function_app.update.json"
"uri": "https://raw.githubusercontent.com/fortinet/fortigate-autoscale-azure/3.3.2/templates/linked_template.function_app.update.json"
},
"parameters": {
"AdminPortNumber": {
Expand Down
2 changes: 1 addition & 1 deletion templates/linked_template.function_app.update.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "3.3.1.0",
"contentVersion": "3.3.2.0",
"parameters": {
"AdminPortNumber": {
"type": "Int"
Expand Down
2 changes: 1 addition & 1 deletion templates/linked_template.vmss.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"contentVersion": "3.3.1.0",
"contentVersion": "3.3.2.0",
"parameters": {
"AdminPassword": {
"type": "SecureString"
Expand Down

0 comments on commit 172f559

Please sign in to comment.