From 2fb5039b8e75787392e753326bb167d4cb5690d9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 16:21:12 +0100 Subject: [PATCH] chore(deps): update azure bicep (major) (#1240) * chore(deps): update azure bicep * fix: generate bicep template --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Krisztian Gacsal --- installation/azure/vmclarity.bicep | 2 +- installation/azure/vmclarity.json | 32 +++++++++---------- .../azure/vmclarityDeployModule.bicep | 22 ++++++------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/installation/azure/vmclarity.bicep b/installation/azure/vmclarity.bicep index 2857b8500..ddd5beddd 100644 --- a/installation/azure/vmclarity.bicep +++ b/installation/azure/vmclarity.bicep @@ -95,7 +95,7 @@ param deploypostfix string var resourceGroupName = 'vmclarity-${deploypostfix}' -resource vmClarityResourceGroup 'Microsoft.Resources/resourceGroups@2022-09-01' = { +resource vmClarityResourceGroup 'Microsoft.Resources/resourceGroups@2023-07-01' = { name: resourceGroupName location: location } diff --git a/installation/azure/vmclarity.json b/installation/azure/vmclarity.json index 3faa3ce02..32b5a0636 100644 --- a/installation/azure/vmclarity.json +++ b/installation/azure/vmclarity.json @@ -5,7 +5,7 @@ "_generator": { "name": "bicep", "version": "0.25.3.34343", - "templateHash": "2921434033573746935" + "templateHash": "7261902024991961438" } }, "parameters": { @@ -203,7 +203,7 @@ "resources": [ { "type": "Microsoft.Resources/resourceGroups", - "apiVersion": "2022-09-01", + "apiVersion": "2023-07-01", "name": "[variables('resourceGroupName')]", "location": "[parameters('location')]" }, @@ -556,7 +556,7 @@ "_generator": { "name": "bicep", "version": "0.25.3.34343", - "templateHash": "5654666880978919332" + "templateHash": "2057808809876719344" } }, "parameters": { @@ -856,7 +856,7 @@ "resources": [ { "type": "Microsoft.Network/networkInterfaces", - "apiVersion": "2021-05-01", + "apiVersion": "2023-09-01", "name": "[variables('networkInterfaceName')]", "location": "[parameters('location')]", "properties": { @@ -886,7 +886,7 @@ }, { "type": "Microsoft.Network/networkSecurityGroups", - "apiVersion": "2021-05-01", + "apiVersion": "2023-09-01", "name": "[variables('vmClarityServerSecurityGroupName')]", "location": "[parameters('location')]", "properties": { @@ -909,7 +909,7 @@ }, { "type": "Microsoft.Network/virtualNetworks", - "apiVersion": "2021-05-01", + "apiVersion": "2023-09-01", "name": "[variables('vmClarityNetName')]", "location": "[parameters('location')]", "properties": { @@ -945,7 +945,7 @@ }, { "type": "Microsoft.Network/publicIPAddresses", - "apiVersion": "2021-05-01", + "apiVersion": "2023-09-01", "name": "[variables('publicIPAddressName')]", "location": "[parameters('location')]", "sku": { @@ -962,7 +962,7 @@ }, { "type": "Microsoft.Compute/virtualMachines", - "apiVersion": "2021-11-01", + "apiVersion": "2023-09-01", "name": "[variables('vmclarityServerVMName')]", "location": "[parameters('location')]", "identity": { @@ -1005,7 +1005,7 @@ { "condition": "[and(equals(parameters('securityType'), 'TrustedLaunch'), and(equals(variables('securityProfileJson').uefiSettings.secureBootEnabled, true()), equals(variables('securityProfileJson').uefiSettings.vTpmEnabled, true())))]", "type": "Microsoft.Compute/virtualMachines/extensions", - "apiVersion": "2022-03-01", + "apiVersion": "2023-09-01", "name": "[format('{0}/{1}', variables('vmclarityServerVMName'), variables('vmClarityGuestAttestationName'))]", "location": "[parameters('location')]", "properties": { @@ -1029,7 +1029,7 @@ }, { "type": "Microsoft.Compute/virtualMachines/extensions", - "apiVersion": "2023-03-01", + "apiVersion": "2023-09-01", "name": "[format('{0}/{1}', variables('vmclarityServerVMName'), variables('vmClarityServerCustomScriptName'))]", "location": "[parameters('location')]", "properties": { @@ -1050,7 +1050,7 @@ }, { "type": "Microsoft.Network/networkSecurityGroups", - "apiVersion": "2021-05-01", + "apiVersion": "2023-09-01", "name": "[variables('vmClarityScannerSecurityGroupName')]", "location": "[parameters('location')]", "properties": { @@ -1073,7 +1073,7 @@ }, { "type": "Microsoft.Storage/storageAccounts", - "apiVersion": "2022-09-01", + "apiVersion": "2023-01-01", "name": "[variables('storageAccountName')]", "location": "[parameters('location')]", "sku": { @@ -1099,7 +1099,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/blobServices", - "apiVersion": "2021-02-01", + "apiVersion": "2023-01-01", "name": "[format('{0}/{1}', variables('storageAccountName'), 'default')]", "dependsOn": [ "[resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName'))]" @@ -1107,7 +1107,7 @@ }, { "type": "Microsoft.Storage/storageAccounts/blobServices/containers", - "apiVersion": "2022-09-01", + "apiVersion": "2023-01-01", "name": "[format('{0}/{1}/{2}', variables('storageAccountName'), 'default', variables('snapshotContainerName'))]", "dependsOn": [ "[resourceId('Microsoft.Storage/storageAccounts/blobServices', variables('storageAccountName'), 'default')]" @@ -1135,11 +1135,11 @@ }, "hostname": { "type": "string", - "value": "[reference(resourceId('Microsoft.Network/publicIPAddresses', variables('publicIPAddressName')), '2021-05-01').dnsSettings.fqdn]" + "value": "[reference(resourceId('Microsoft.Network/publicIPAddresses', variables('publicIPAddressName')), '2023-09-01').dnsSettings.fqdn]" }, "sshCommand": { "type": "string", - "value": "[format('ssh {0}@{1}', parameters('adminUsername'), reference(resourceId('Microsoft.Network/publicIPAddresses', variables('publicIPAddressName')), '2021-05-01').dnsSettings.fqdn)]" + "value": "[format('ssh {0}@{1}', parameters('adminUsername'), reference(resourceId('Microsoft.Network/publicIPAddresses', variables('publicIPAddressName')), '2023-09-01').dnsSettings.fqdn)]" } } } diff --git a/installation/azure/vmclarityDeployModule.bicep b/installation/azure/vmclarityDeployModule.bicep index 109b7864b..0c6009089 100644 --- a/installation/azure/vmclarityDeployModule.bicep +++ b/installation/azure/vmclarityDeployModule.bicep @@ -195,7 +195,7 @@ var maaEndpoint = substring('emptystring', 0, 0) var vmClarityServerCustomScriptName = 'VmClarityServerCustomScript' -resource networkInterface 'Microsoft.Network/networkInterfaces@2021-05-01' = { +resource networkInterface 'Microsoft.Network/networkInterfaces@2023-09-01' = { name: networkInterfaceName location: location properties: { @@ -219,7 +219,7 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2021-05-01' = { } } -resource vmClarityServerSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-05-01' = { +resource vmClarityServerSecurityGroup 'Microsoft.Network/networkSecurityGroups@2023-09-01' = { name: vmClarityServerSecurityGroupName location: location properties: { @@ -244,7 +244,7 @@ resource vmClarityServerSecurityGroup 'Microsoft.Network/networkSecurityGroups@2 // Declare subnets inside of virtualNet so that they don't get deleted when // re-applying the template // https://github.com/Azure/bicep/issues/4653 -resource vmClarityNet 'Microsoft.Network/virtualNetworks@2021-05-01' = { +resource vmClarityNet 'Microsoft.Network/virtualNetworks@2023-09-01' = { name: vmClarityNetName location: location properties: { @@ -287,7 +287,7 @@ resource vmClarityNet 'Microsoft.Network/virtualNetworks@2021-05-01' = { } } -resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2021-05-01' = { +resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2023-09-01' = { name: publicIPAddressName location: location sku: { @@ -303,7 +303,7 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2021-05-01' = { } } -resource vmClarityServer 'Microsoft.Compute/virtualMachines@2021-11-01' = { +resource vmClarityServer 'Microsoft.Compute/virtualMachines@2023-09-01' = { name: vmclarityServerVMName location: location identity: { @@ -341,7 +341,7 @@ resource vmClarityServer 'Microsoft.Compute/virtualMachines@2021-11-01' = { } } -resource vmclarityServerGuestAttestation 'Microsoft.Compute/virtualMachines/extensions@2022-03-01' = if ((securityType == 'TrustedLaunch') && ((securityProfileJson.uefiSettings.secureBootEnabled == true) && (securityProfileJson.uefiSettings.vTpmEnabled == true))) { +resource vmclarityServerGuestAttestation 'Microsoft.Compute/virtualMachines/extensions@2023-09-01' = if ((securityType == 'TrustedLaunch') && ((securityProfileJson.uefiSettings.secureBootEnabled == true) && (securityProfileJson.uefiSettings.vTpmEnabled == true))) { parent: vmClarityServer name: vmClarityGuestAttestationName location: location @@ -362,7 +362,7 @@ resource vmclarityServerGuestAttestation 'Microsoft.Compute/virtualMachines/exte } } -resource vmclarityServerCustomScript 'Microsoft.Compute/virtualMachines/extensions@2023-03-01' = { +resource vmclarityServerCustomScript 'Microsoft.Compute/virtualMachines/extensions@2023-09-01' = { parent: vmClarityServer dependsOn: [ vmclarityServerGuestAttestation @@ -380,7 +380,7 @@ resource vmclarityServerCustomScript 'Microsoft.Compute/virtualMachines/extensio } } -resource vmClarityScannerSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-05-01' = { +resource vmClarityScannerSecurityGroup 'Microsoft.Network/networkSecurityGroups@2023-09-01' = { name: vmClarityScannerSecurityGroupName location: location properties: { @@ -406,7 +406,7 @@ var storageAccountName = toLower('store${uniqueString(resourceGroup().id)}') var storageAccountType = 'Standard_LRS' // var subnetRef = '${vmClarityNet.id}/subnets/${vmClarityServerSubnet.name}' -resource storageAccount 'Microsoft.Storage/storageAccounts@2022-09-01' = { +resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = { name: storageAccountName location: location sku: { @@ -428,14 +428,14 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2022-09-01' = { } } -resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2021-02-01' = { +resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2023-01-01' = { parent: storageAccount name: 'default' } var snapshotContainerName = 'snapshots' -resource snapshotContainer 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { +resource snapshotContainer 'Microsoft.Storage/storageAccounts/blobServices/containers@2023-01-01' = { parent: blobService name: snapshotContainerName }