Skip to content

Commit

Permalink
Update API version on different resources
Browse files Browse the repository at this point in the history
  • Loading branch information
jvhoof committed Jan 23, 2024
1 parent e8cf995 commit 6d67066
Show file tree
Hide file tree
Showing 29 changed files with 337 additions and 337 deletions.
16 changes: 8 additions & 8 deletions FortiAnalyzer/ha/mainTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@
},
"resources": [
{
"apiVersion": "2021-04-01",
"apiVersion": "2023-07-01",
"name": "pid-21c3b606-4b14-4eca-ad0d-1d8537ebd14e-partnercenter",
"type": "Microsoft.Resources/deployments",
"properties": {
Expand Down Expand Up @@ -505,7 +505,7 @@
{
"condition": "[equals(parameters('vnetNewOrExisting'), 'new')]",
"type": "Microsoft.Network/virtualNetworks",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"name": "[variables('vnetName')]",
"location": "[parameters('location')]",
"properties": {
Expand All @@ -525,7 +525,7 @@
}
},
{
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"tags": {
"provider": "[toUpper(parameters('fortinetTags').provider)]"
},
Expand Down Expand Up @@ -624,7 +624,7 @@
{
"condition": "[equals(parameters('publicIPNewOrExisting'), 'new')]",
"type": "Microsoft.Network/publicIPAddresses",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"tags": {
"provider": "[toUpper(parameters('fortinetTags').provider)]"
},
Expand All @@ -640,7 +640,7 @@
{
"condition": "[equals(parameters('publicIP2NewOrExisting'), 'new')]",
"type": "Microsoft.Network/publicIPAddresses",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"tags": {
"provider": "[toUpper(parameters('fortinetTags').provider)]"
},
Expand All @@ -656,7 +656,7 @@
{
"condition": "[equals(parameters('publicIP3NewOrExisting'), 'new')]",
"type": "Microsoft.Network/publicIPAddresses",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"tags": {
"provider": "[toUpper(parameters('fortinetTags').provider)]"
},
Expand All @@ -670,7 +670,7 @@
}
},
{
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"tags": {
"provider": "[toUpper(parameters('fortinetTags').provider)]"
},
Expand Down Expand Up @@ -701,7 +701,7 @@
}
},
{
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"tags": {
"provider": "[toUpper(parameters('fortinetTags').provider)]"
},
Expand Down
10 changes: 5 additions & 5 deletions FortiAnalyzer/single/mainTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@
},
"resources": [
{
"apiVersion": "2021-04-01",
"apiVersion": "2023-07-01",
"name": "pid-21c3b606-4b14-4eca-ad0d-1d8537ebd14e-partnercenter",
"type": "Microsoft.Resources/deployments",
"properties": {
Expand Down Expand Up @@ -366,7 +366,7 @@
{
"condition": "[equals(parameters('vnetNewOrExisting'), 'new')]",
"type": "Microsoft.Network/virtualNetworks",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"name": "[variables('vnetName')]",
"location": "[parameters('location')]",
"properties": {
Expand All @@ -386,7 +386,7 @@
}
},
{
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"tags": {
"provider": "[toUpper(parameters('fortinetTags').provider)]"
},
Expand Down Expand Up @@ -472,7 +472,7 @@
"condition": "[equals(parameters('publicIPNewOrExisting'), 'new')]",
"type": "Microsoft.Network/publicIPAddresses",
"name": "[variables('publicIPName')]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"tags": {
"provider": "[toUpper(parameters('fortinetTags').provider)]"
Expand All @@ -486,7 +486,7 @@
}
},
{
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"tags": {
"provider": "[toUpper(parameters('fortinetTags').provider)]"
},
Expand Down
14 changes: 7 additions & 7 deletions FortiGate/A-Single-VM/azuredeploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@
},
"resources": [
{
"apiVersion": "2021-04-01",
"apiVersion": "2023-07-01",
"name": "[concat(parameters('fortiGateNamePrefix'), '-fortinetdeployment-', uniquestring(resourceGroup().id))]",
"type": "Microsoft.Resources/deployments",
"properties": {
Expand Down Expand Up @@ -552,7 +552,7 @@
"condition": "[equals(parameters('vnetNewOrExisting'), 'new')]",
"name": "[variables('vnetName')]",
"type": "Microsoft.Network/virtualNetworks",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Network/virtualNetworks'), union(parameters('fortinetTags'),parameters('tagsByResource')['Microsoft.Network/virtualNetworks']), parameters('fortinetTags')) ]",
"dependsOn": [
Expand Down Expand Up @@ -593,7 +593,7 @@
"condition": "[equals(parameters('vnetNewOrExisting'), 'new')]",
"type": "Microsoft.Network/routeTables",
"name": "[variables('routeTableProtectedName')]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Network/routeTables'), union(parameters('fortinetTags'),parameters('tagsByResource')['Microsoft.Network/routeTables']), parameters('fortinetTags')) ]",
"properties": {
Expand Down Expand Up @@ -627,7 +627,7 @@
{
"type": "Microsoft.Network/networkSecurityGroups",
"name": "[variables('NSGName')]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Network/networkSecurityGroups'), union(parameters('fortinetTags'),parameters('tagsByResource')['Microsoft.Network/networkSecurityGroups']), parameters('fortinetTags')) ]",
"properties": {
Expand Down Expand Up @@ -667,7 +667,7 @@
"condition": "[equals(parameters('publicIP1NewOrExisting'), 'new')]",
"type": "Microsoft.Network/publicIPAddresses",
"name": "[variables('publicIP1Name')]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Network/publicIPAddresses'), union(parameters('fortinetTags'),parameters('tagsByResource')['Microsoft.Network/publicIPAddresses']), parameters('fortinetTags')) ]",
"sku": {
Expand All @@ -684,7 +684,7 @@
{
"type": "Microsoft.Network/networkInterfaces",
"name": "[variables('fgtNic1Name')]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Network/networkInterfaces'), union(parameters('fortinetTags'),parameters('tagsByResource')['Microsoft.Network/networkInterfaces']), parameters('fortinetTags')) ]",
"dependsOn": [
Expand Down Expand Up @@ -715,7 +715,7 @@
{
"type": "Microsoft.Network/networkInterfaces",
"name": "[variables('fgtNic2Name')]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Network/networkInterfaces'), union(parameters('fortinetTags'),parameters('tagsByResource')['Microsoft.Network/networkInterfaces']), parameters('fortinetTags')) ]",
"dependsOn": [
Expand Down
22 changes: 11 additions & 11 deletions FortiGate/Active-Active-ELB-ILB/azuredeploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@
},
"resources": [
{
"apiVersion": "2021-04-01",
"apiVersion": "2023-07-01",
"name": "[concat(parameters('fortiGateNamePrefix'), '-fortinetdeployment-', uniquestring(resourceGroup().id))]",
"type": "Microsoft.Resources/deployments",
"properties": {
Expand Down Expand Up @@ -552,7 +552,7 @@
"condition": "[equals(parameters('vnetNewOrExisting'), 'new')]",
"name": "[variables('vnetName')]",
"type": "Microsoft.Network/virtualNetworks",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Network/virtualNetworks'), union(parameters('fortinetTags'),parameters('tagsByResource')['Microsoft.Network/virtualNetworks']), parameters('fortinetTags')) ]",
"dependsOn": [
Expand Down Expand Up @@ -592,7 +592,7 @@
{
"type": "Microsoft.Network/routeTables",
"name": "[variables('routeTable3Name')]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Network/routeTables'), union(parameters('fortinetTags'),parameters('tagsByResource')['Microsoft.Network/routeTables']), parameters('fortinetTags')) ]",
"properties": {
Expand All @@ -611,7 +611,7 @@
{
"type": "Microsoft.Network/networkSecurityGroups",
"name": "[variables('nsgName')]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Network/networkSecurityGroups'), union(parameters('fortinetTags'),parameters('tagsByResource')['Microsoft.Network/networkSecurityGroups']), parameters('fortinetTags')) ]",
"properties": {
Expand Down Expand Up @@ -651,7 +651,7 @@
"condition": "[and(equals(parameters('publicIP1NewOrExisting'), 'new'),parameters('externalLoadBalancer'))]",
"type": "Microsoft.Network/publicIPAddresses",
"name": "[variables('publicIP1Name')]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Network/publicIPAddresses'), union(parameters('fortinetTags'),parameters('tagsByResource')['Microsoft.Network/publicIPAddresses']), parameters('fortinetTags')) ]",
"sku": {
Expand All @@ -669,7 +669,7 @@
"condition": "[parameters('externalLoadBalancer')]",
"type": "Microsoft.Network/loadBalancers",
"name": "[variables('externalLBName')]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Network/loadBalancers'), union(parameters('fortinetTags'),parameters('tagsByResource')['Microsoft.Network/loadBalancers']), parameters('fortinetTags')) ]",
"sku": {
Expand Down Expand Up @@ -751,7 +751,7 @@
"condition": "[parameters('externalLoadBalancer')]",
"type": "Microsoft.Network/loadBalancers/inboundNatRules",
"name": "[concat(variables('externalLBName'), '/', variables('fgVmName'), '-', copyIndex(1), '-MGMT-SSH')]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"dependsOn": [
"[variables('externalLBId')]"
Expand All @@ -774,7 +774,7 @@
"condition": "[parameters('externalLoadBalancer')]",
"type": "Microsoft.Network/loadBalancers/inboundNatRules",
"name": "[concat(variables('externalLBName'), '/', variables('fgVmName'), '-', copyIndex(1), '-MGMT-HTTPS')]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"dependsOn": [
"[variables('externalLBId')]"
Expand All @@ -796,7 +796,7 @@
{
"type": "Microsoft.Network/loadBalancers",
"name": "[variables('internalLBName')]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"location": "[parameters('location')]",
"tags": "[ if(contains(parameters('tagsByResource'), 'Microsoft.Network/loadBalancers'), union(parameters('fortinetTags'),parameters('tagsByResource')['Microsoft.Network/loadBalancers']), parameters('fortinetTags')) ]",
"sku": {
Expand Down Expand Up @@ -862,7 +862,7 @@
"condition": "[parameters('externalLoadBalancer')]",
"type": "Microsoft.Network/networkInterfaces",
"name": "[concat(variables('fgVmName'),'-',copyIndex(1),'-Nic',if(not(parameters('externalLoadBalancer')), 2, 1))]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"copy": {
"name": "nodeCopy",
"count": "[parameters('fortiGateCount')]"
Expand Down Expand Up @@ -911,7 +911,7 @@
{
"type": "Microsoft.Network/networkInterfaces",
"name": "[concat(variables('fgVmName'),'-',copyIndex(1),'-Nic',if(not(parameters('externalLoadBalancer')), 1, 2))]",
"apiVersion": "2022-01-01",
"apiVersion": "2023-06-01",
"copy": {
"name": "nodeCopy",
"count": "[parameters('fortiGateCount')]"
Expand Down
Loading

0 comments on commit 6d67066

Please sign in to comment.