Skip to content
This repository was archived by the owner on Oct 14, 2024. It is now read-only.

Commit

Permalink
chore(deps): update azure bicep (major) (#1240)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
renovate[bot] and chrisgacsal authored Feb 9, 2024
1 parent e72a32c commit 2fb5039
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion installation/azure/vmclarity.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
32 changes: 16 additions & 16 deletions installation/azure/vmclarity.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.25.3.34343",
"templateHash": "2921434033573746935"
"templateHash": "7261902024991961438"
}
},
"parameters": {
Expand Down Expand Up @@ -203,7 +203,7 @@
"resources": [
{
"type": "Microsoft.Resources/resourceGroups",
"apiVersion": "2022-09-01",
"apiVersion": "2023-07-01",
"name": "[variables('resourceGroupName')]",
"location": "[parameters('location')]"
},
Expand Down Expand Up @@ -556,7 +556,7 @@
"_generator": {
"name": "bicep",
"version": "0.25.3.34343",
"templateHash": "5654666880978919332"
"templateHash": "2057808809876719344"
}
},
"parameters": {
Expand Down Expand Up @@ -856,7 +856,7 @@
"resources": [
{
"type": "Microsoft.Network/networkInterfaces",
"apiVersion": "2021-05-01",
"apiVersion": "2023-09-01",
"name": "[variables('networkInterfaceName')]",
"location": "[parameters('location')]",
"properties": {
Expand Down Expand Up @@ -886,7 +886,7 @@
},
{
"type": "Microsoft.Network/networkSecurityGroups",
"apiVersion": "2021-05-01",
"apiVersion": "2023-09-01",
"name": "[variables('vmClarityServerSecurityGroupName')]",
"location": "[parameters('location')]",
"properties": {
Expand All @@ -909,7 +909,7 @@
},
{
"type": "Microsoft.Network/virtualNetworks",
"apiVersion": "2021-05-01",
"apiVersion": "2023-09-01",
"name": "[variables('vmClarityNetName')]",
"location": "[parameters('location')]",
"properties": {
Expand Down Expand Up @@ -945,7 +945,7 @@
},
{
"type": "Microsoft.Network/publicIPAddresses",
"apiVersion": "2021-05-01",
"apiVersion": "2023-09-01",
"name": "[variables('publicIPAddressName')]",
"location": "[parameters('location')]",
"sku": {
Expand All @@ -962,7 +962,7 @@
},
{
"type": "Microsoft.Compute/virtualMachines",
"apiVersion": "2021-11-01",
"apiVersion": "2023-09-01",
"name": "[variables('vmclarityServerVMName')]",
"location": "[parameters('location')]",
"identity": {
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand All @@ -1050,7 +1050,7 @@
},
{
"type": "Microsoft.Network/networkSecurityGroups",
"apiVersion": "2021-05-01",
"apiVersion": "2023-09-01",
"name": "[variables('vmClarityScannerSecurityGroupName')]",
"location": "[parameters('location')]",
"properties": {
Expand All @@ -1073,7 +1073,7 @@
},
{
"type": "Microsoft.Storage/storageAccounts",
"apiVersion": "2022-09-01",
"apiVersion": "2023-01-01",
"name": "[variables('storageAccountName')]",
"location": "[parameters('location')]",
"sku": {
Expand All @@ -1099,15 +1099,15 @@
},
{
"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'))]"
]
},
{
"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')]"
Expand Down Expand Up @@ -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)]"
}
}
}
Expand Down
22 changes: 11 additions & 11 deletions installation/azure/vmclarityDeployModule.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -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: {
Expand All @@ -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: {
Expand Down Expand Up @@ -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: {
Expand All @@ -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: {
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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: {
Expand All @@ -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: {
Expand All @@ -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
}
Expand Down

0 comments on commit 2fb5039

Please sign in to comment.