hashicorp#27520: Support UBUNTU_PRO license_type for linux vm resource

AmadeusITGroup · Sep 30, 2024 · 78ce30a · 78ce30a
1 parent fa13433
commit 78ce30a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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.