validation for the name field

hashicorp · Feb 26, 2019 · d9b2221 · d9b2221
1 parent d7a3529
commit d9b2221
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 15 deletions.
diff --git a/azurerm/data_source_api_management_product.go b/azurerm/data_source_api_management_product.go
@@ -14,10 +14,7 @@ func dataSourceApiManagementProduct() *schema.Resource {
 		Read: dataSourceApiManagementProductRead,
 
 		Schema: map[string]*schema.Schema{
-			"product_id": {
-				Type:     schema.TypeString,
-				Required: true,
-			},
+			"product_id": azure.SchemaApiManagementProductDataSourceName(),
 
 			"api_management_name": azure.SchemaApiManagementDataSourceName(),
 

diff --git a/azurerm/helpers/azure/api_management.go b/azurerm/helpers/azure/api_management.go
@@ -21,3 +21,20 @@ func SchemaApiManagementDataSourceName() *schema.Schema {
 		ValidateFunc: validate.ApiManagementServiceName,
 	}
 }
+
+func SchemaApiManagementProductName() *schema.Schema {
+	return &schema.Schema{
+		Type:         schema.TypeString,
+		Required:     true,
+		ForceNew:     true,
+		ValidateFunc: validate.ApiManagementProductName,
+	}
+}
+
+func SchemaApiManagementProductDataSourceName() *schema.Schema {
+	return &schema.Schema{
+		Type:         schema.TypeString,
+		Required:     true,
+		ValidateFunc: validate.ApiManagementProductName,
+	}
+}
diff --git a/azurerm/helpers/validate/api_management.go b/azurerm/helpers/validate/api_management.go
@@ -5,6 +5,17 @@ import (
 	"regexp"
 )
 
+func ApiManagementProductName(v interface{}, k string) (warnings []string, errors []error) {
+	value := v.(string)
+
+	// from the portal: `The field may contain only numbers, letters, and dash (-) sign when preceded and followed by number or a letter.`
+	if matched := regexp.MustCompile(`(^[a-zA-Z0-9])([a-zA-Z0-9-]{1,78})([a-zA-Z0-9]$)`).Match([]byte(value)); !matched {
+		errors = append(errors, fmt.Errorf("%q may only contain alphanumeric characters and dashes up to 80 characters in length", k))
+	}
+
+	return warnings, errors
+}
+
 func ApiManagementServiceName(v interface{}, k string) (warnings []string, errors []error) {
 	value := v.(string)
 

diff --git a/azurerm/resource_arm_api_management_product.go b/azurerm/resource_arm_api_management_product.go
@@ -22,17 +22,7 @@ func resourceArmApiManagementProduct() *schema.Resource {
 		},
 
 		Schema: map[string]*schema.Schema{
-			"product_id": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-				/*
-					Constraints: []validation.Constraint{{Target: "productID", Name: validation.MaxLength, Rule: 80, Chain: nil},
-					{Target: "productID", Name: validation.MinLength, Rule: 1, Chain: nil},
-					{Target: "productID", Name: validation.Pattern, Rule: `(^[\w]+$)|(^[\w][\w\-]+[\w]$)`, Chain: nil}}},
-				*/
-				// TODO: validation
-			},
+			"product_id": azure.SchemaApiManagementProductName(),
 
 			"api_management_name": azure.SchemaApiManagementName(),