Merge pull request #1351 from shanepoint/b-appserviceplan-validation

Updated resource_arm_app_service_plan Validation to Allow Underscore
hashicorp · Jun 6, 2018 · 47dcea0 · 47dcea0
2 parents 0e0d185 + a4956d5
commit 47dcea0
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 16 deletions.
diff --git a/azurerm/resource_arm_app_service.go b/azurerm/resource_arm_app_service.go
@@ -606,8 +606,8 @@ func flattenAzureRmAppServiceMachineIdentity(identity *web.ManagedServiceIdentit
 func validateAppServiceName(v interface{}, k string) (ws []string, es []error) {
 	value := v.(string)
 
-	if matched := regexp.MustCompile(`^[0-9a-zA-Z-]+$`).Match([]byte(value)); !matched {
-		es = append(es, fmt.Errorf("%q may only contain alphanumeric characters and dashes", k))
+	if matched := regexp.MustCompile(`^[0-9a-zA-Z-]{1,60}$`).Match([]byte(value)); !matched {
+		es = append(es, fmt.Errorf("%q may only contain alphanumeric characters and dashes and up to 60 characters in length", k))
 	}
 
 	return

diff --git a/azurerm/resource_arm_app_service_plan.go b/azurerm/resource_arm_app_service_plan.go
@@ -314,8 +314,8 @@ func flattenAppServiceProperties(props *web.AppServicePlanProperties) []interfac
 func validateAppServicePlanName(v interface{}, k string) (ws []string, es []error) {
 	value := v.(string)
 
-	if matched := regexp.MustCompile(`^[0-9a-zA-Z-]+$`).Match([]byte(value)); !matched {
-		es = append(es, fmt.Errorf("%q may only contain alphanumeric characters and dashes", k))
+	if matched := regexp.MustCompile(`^[0-9a-zA-Z-_]{1,60}$`).Match([]byte(value)); !matched {
+		es = append(es, fmt.Errorf("%q may only contain alphanumeric characters, dashes and underscores up to 60 characters in length", k))
 	}
 
 	return

diff --git a/azurerm/resource_arm_app_service_plan_test.go b/azurerm/resource_arm_app_service_plan_test.go
@@ -33,7 +33,7 @@ func TestAzureRMAppServicePlanName_validation(t *testing.T) {
 		},
 		{
 			Value:    "hello_world",
-			ErrCount: 1,
+			ErrCount: 0,
 		},
 		{
 			Value:    "helloworld21!",

diff --git a/examples/app-service/app.tf b/examples/app-service/app.tf
@@ -8,8 +8,15 @@ resource "azurerm_resource_group" "default" {
   location = "${var.location}"
 }
 
+
+resource "random_integer" "ri" {
+  min = 10000
+  max = 99999
+}
+
+
 resource "azurerm_app_service_plan" "default" {
-  name                = "${var.app_service_name}-plan"
+  name                = "tfex-appservice-${random_integer.ri.result}-plan"
   location            = "${azurerm_resource_group.default.location}"
   resource_group_name = "${azurerm_resource_group.default.name}"
 
@@ -20,7 +27,7 @@ resource "azurerm_app_service_plan" "default" {
 }
 
 resource "azurerm_app_service" "default" {
-  name                = "${var.app_service_name}"
+  name                = "tfex-appservice-${random_integer.ri.result}"
   location            = "${azurerm_resource_group.default.location}"
   resource_group_name = "${azurerm_resource_group.default.name}"
   app_service_plan_id = "${azurerm_app_service_plan.default.id}"

diff --git a/examples/app-service/variables.tf b/examples/app-service/variables.tf
@@ -1,21 +1,24 @@
 variable "resource_group_name" {
-  type = "string"
+  type        = "string"
+  description = "Name of the azure resource group."
+  default     = "tfex-appserviceplan"
 }
 
 variable "location" {
-  type = "string"
+  type        = "string"
+  description = "Location of the azure resource group."
+  default     = "westus"
 }
 
-variable "app_service_name" {
-  type = "string"
-}
 
 variable "app_service_plan_sku_tier" {
-  type    = "string"
-  default = "Basic"  # Basic | Standard | ...
+  type        = "string"
+  description = "SKU tier of the App Service Plan"
+  default     = "Basic"  # Basic | Standard | ...
 }
 
 variable "app_service_plan_sku_size" {
-  type    = "string"
-  default = "B1"     # B1 | S1 | ...
+  type        = "string"
+  description = "SKU size of the App Service Plan"
+  default     = "B1"     # B1 | S1 | ...
 }