Merge pull request #263 from terraform-providers/cosmosdb-name

CosmosDB: fixing the validation on the name field
hashicorp · Aug 22, 2017 · 4a6f115 · 4a6f115
2 parents 4ade5d5 + 753bcca
commit 4a6f115
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/azurerm/resource_arm_cosmos_db_account.go b/azurerm/resource_arm_cosmos_db_account.go
@@ -398,7 +398,7 @@ func resourceAzureRMCosmosDBAccountFailoverPolicyHash(v interface{}) int {
 func validateAzureRmCosmosDBAccountName(v interface{}, k string) (ws []string, errors []error) {
 	value := v.(string)
 
-	r, _ := regexp.Compile("[a-z0-9-]")
+	r, _ := regexp.Compile("^[a-z0-9\\-]+$")
 	if !r.MatchString(value) {
 		errors = append(errors, fmt.Errorf("CosmosDB Account Name can only contain lower-case characters, numbers and the `-` character."))
 	}

diff --git a/azurerm/resource_arm_cosmos_db_account_test.go b/azurerm/resource_arm_cosmos_db_account_test.go
@@ -24,6 +24,14 @@ func TestAccAzureRMCosmosDBAccountName_validation(t *testing.T) {
 			Value:    "abc",
 			ErrCount: 0,
 		},
+		{
+			Value:    "cosmosDBAccount1",
+			ErrCount: 1,
+		},
+		{
+			Value:    "hello-world",
+			ErrCount: 0,
+		},
 		{
 			Value:    str,
 			ErrCount: 0,