From 6d4efa19bb132f0013ce04b4658ed55a0afd1580 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 4 Aug 2017 11:43:33 +0200 Subject: [PATCH] Support for the Windows_Client Hybrid Use Benefit --- azurerm/resource_arm_virtual_machine.go | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/azurerm/resource_arm_virtual_machine.go b/azurerm/resource_arm_virtual_machine.go index 6725b9c4f805..def180a7f3b3 100644 --- a/azurerm/resource_arm_virtual_machine.go +++ b/azurerm/resource_arm_virtual_machine.go @@ -76,10 +76,14 @@ func resourceArmVirtualMachine() *schema.Resource { }, "license_type": { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: validateLicenseType, + Type: schema.TypeString, + Optional: true, + Computed: true, + DiffSuppressFunc: ignoreCaseDiffSuppressFunc, + ValidateFunc: validation.StringInSlice([]string{ + "Windows_Client", + "Windows_Server", + }, true), }, "vm_size": { @@ -493,15 +497,6 @@ func resourceArmVirtualMachine() *schema.Resource { } } -func validateLicenseType(v interface{}, k string) (ws []string, errors []error) { - value := v.(string) - if value != "" && value != "Windows_Server" { - errors = append(errors, fmt.Errorf( - "[ERROR] license_type must be 'Windows_Server' or empty")) - } - return -} - func resourceArmVirtualMachineCreate(d *schema.ResourceData, meta interface{}) error { client := meta.(*ArmClient) vmClient := client.vmClient