From badb240565ad7b657fdb0247e0d4530222e5c313 Mon Sep 17 00:00:00 2001 From: Rainer Halanek Date: Tue, 2 Jul 2024 16:37:30 +0200 Subject: [PATCH] Revert "make two disk parameter optional" This reverts commit 8efad8ce3f57bc20dd0b6ea6dcf106775b875f53. --- avm/res/compute/virtual-machine/main.bicep | 8 ++++---- avm/res/compute/virtual-machine/main.json | 8 +++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/avm/res/compute/virtual-machine/main.bicep b/avm/res/compute/virtual-machine/main.bicep index 3125725bdba..ce604273635 100644 --- a/avm/res/compute/virtual-machine/main.bicep +++ b/avm/res/compute/virtual-machine/main.bicep @@ -1145,8 +1145,8 @@ type osDiskType = { @description('Optional. The disk name.') name: string? - @description('Optional. Specifies the size of an empty data disk in gigabytes.') - diskSizeGB: int? + @description('Required. Specifies the size of an empty data disk in gigabytes.') + diskSizeGB: int @description('Optional. Specifies how the virtual machine should be created.') createOption: 'Attach' | 'Empty' | 'FromImage'? @@ -1159,7 +1159,7 @@ type osDiskType = { @description('Required. The managed disk parameters.') managedDisk: { - @description('Optional. Specifies the storage account type for the managed disk.') + @description('Required. Specifies the storage account type for the managed disk.') storageAccountType: | 'PremiumV2_LRS' | 'Premium_LRS' @@ -1167,7 +1167,7 @@ type osDiskType = { | 'StandardSSD_LRS' | 'StandardSSD_ZRS' | 'Standard_LRS' - | 'UltraSSD_LRS'? + | 'UltraSSD_LRS' @description('Optional. Specifies the customer managed disk encryption set resource id for the managed disk.') diskEncryptionSetResourceId: string? diff --git a/avm/res/compute/virtual-machine/main.json b/avm/res/compute/virtual-machine/main.json index 0f6e43482d8..202bb809dcf 100644 --- a/avm/res/compute/virtual-machine/main.json +++ b/avm/res/compute/virtual-machine/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.26.54.24096", - "templateHash": "5878958605426596334" + "templateHash": "8007594709688742996" }, "name": "Virtual Machines", "description": "This module deploys a Virtual Machine with one or multiple NICs and optionally one or multiple public IPs.", @@ -139,9 +139,8 @@ }, "diskSizeGB": { "type": "int", - "nullable": true, "metadata": { - "description": "Optional. Specifies the size of an empty data disk in gigabytes." + "description": "Required. Specifies the size of an empty data disk in gigabytes." } }, "createOption": { @@ -193,9 +192,8 @@ "Standard_LRS", "UltraSSD_LRS" ], - "nullable": true, "metadata": { - "description": "Optional. Specifies the storage account type for the managed disk." + "description": "Required. Specifies the storage account type for the managed disk." } }, "diskEncryptionSetResourceId": {