From 6dbe74e426e2b1b3ffb5cb3ca3eb92ea8be89311 Mon Sep 17 00:00:00 2001 From: ritesh-modi Date: Wed, 28 Oct 2020 11:55:07 +0530 Subject: [PATCH] ISSUE Fixed: azurerm_virtual_desktop_application_group name allowed length is 1-260 #8980 --- ...virtual_desktop_application_group_resource.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/azurerm/internal/services/desktopvirtualization/virtual_desktop_application_group_resource.go b/azurerm/internal/services/desktopvirtualization/virtual_desktop_application_group_resource.go index d865bdeef41e..2cfb811dbe3d 100644 --- a/azurerm/internal/services/desktopvirtualization/virtual_desktop_application_group_resource.go +++ b/azurerm/internal/services/desktopvirtualization/virtual_desktop_application_group_resource.go @@ -3,6 +3,7 @@ package desktopvirtualization import ( "fmt" "log" + "regexp" "time" "github.com/Azure/azure-sdk-for-go/services/preview/desktopvirtualization/mgmt/2019-12-10-preview/desktopvirtualization" @@ -10,7 +11,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/desktopvirtualization/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" @@ -40,10 +40,16 @@ func resourceArmVirtualDesktopApplicationGroup() *schema.Resource { Schema: map[string]*schema.Schema{ "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - ValidateFunc: validate.DevSpaceName(), + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: validation.All( + validation.StringIsNotEmpty, + validation.StringMatch( + regexp.MustCompile("^[-a-zA-Z0-9]{1,260}$"), + "Virtual desktop application group name must be 1 - 260 characters long, contain only letters, numbers and hyphens.", + ), + ), }, "location": azure.SchemaLocation(),