From b404bdff5b352f44d4567d992399e3c7b943f151 Mon Sep 17 00:00:00 2001 From: Harshavardhan Musanalli Date: Thu, 17 Oct 2024 05:07:10 +0200 Subject: [PATCH] azurerm_linux_virtual_machine - Support UBUNTU_PRO license_type for azurerm_linux_virtual_machine (#27534) --- internal/services/compute/linux_virtual_machine_resource.go | 1 + .../compute/linux_virtual_machine_resource_other_test.go | 4 ++-- website/docs/r/linux_virtual_machine.html.markdown | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/services/compute/linux_virtual_machine_resource.go b/internal/services/compute/linux_virtual_machine_resource.go index 2a27490e543f..a92e1ec8bd34 100644 --- a/internal/services/compute/linux_virtual_machine_resource.go +++ b/internal/services/compute/linux_virtual_machine_resource.go @@ -244,6 +244,7 @@ func resourceLinuxVirtualMachine() *pluginsdk.Resource { "SLES_BYOS", "SLES_SAP", "SLES_HPC", + "UBUNTU_PRO", }, false), }, diff --git a/internal/services/compute/linux_virtual_machine_resource_other_test.go b/internal/services/compute/linux_virtual_machine_resource_other_test.go index 6ca4182bf481..20d1695a6733 100644 --- a/internal/services/compute/linux_virtual_machine_resource_other_test.go +++ b/internal/services/compute/linux_virtual_machine_resource_other_test.go @@ -387,7 +387,7 @@ func TestAccLinuxVirtualMachine_otherLicenseType(t *testing.T) { Config: r.otherLicenseType(data), Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), - check.That(data.ResourceName).Key("license_type").HasValue("SLES_BYOS"), + check.That(data.ResourceName).Key("license_type").HasValue("UBUNTU_PRO"), ), }, data.ImportStep(), @@ -1990,7 +1990,7 @@ resource "azurerm_linux_virtual_machine" "test" { location = azurerm_resource_group.test.location size = "Standard_F2" admin_username = "adminuser" - license_type = "SLES_BYOS" + license_type = "UBUNTU_PRO" network_interface_ids = [ azurerm_network_interface.test.id, ] diff --git a/website/docs/r/linux_virtual_machine.html.markdown b/website/docs/r/linux_virtual_machine.html.markdown index 9a6128b0cf0b..8cd9fd75f2f7 100644 --- a/website/docs/r/linux_virtual_machine.html.markdown +++ b/website/docs/r/linux_virtual_machine.html.markdown @@ -95,7 +95,7 @@ The following arguments are supported: * `location` - (Required) The Azure location where the Linux Virtual Machine should exist. Changing this forces a new resource to be created. -* `license_type` - (Optional) Specifies the License Type for this Virtual Machine. Possible values are `RHEL_BYOS`, `RHEL_BASE`, `RHEL_EUS`, `RHEL_SAPAPPS`, `RHEL_SAPHA`, `RHEL_BASESAPAPPS`, `RHEL_BASESAPHA`, `SLES_BYOS`, `SLES_SAP`, `SLES_HPC`. +* `license_type` - (Optional) Specifies the License Type for this Virtual Machine. Possible values are `RHEL_BYOS`, `RHEL_BASE`, `RHEL_EUS`, `RHEL_SAPAPPS`, `RHEL_SAPHA`, `RHEL_BASESAPAPPS`, `RHEL_BASESAPHA`, `SLES_BYOS`, `SLES_SAP`, `SLES_HPC`, `UBUNTU_PRO`. * `name` - (Required) The name of the Linux Virtual Machine. Changing this forces a new resource to be created.