Merge pull request #7478 from xinyi-joffre/master

Update path validation for azure_rm_api_management_api
hashicorp · Jun 25, 2020 · 127eb47 · 127eb47
2 parents f73cc48 + f2189a9
commit 127eb47
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/azurerm/helpers/validate/api_management.go b/azurerm/helpers/validate/api_management.go
@@ -71,7 +71,7 @@ func ApiManagementApiName(v interface{}, k string) (ws []string, es []error) {
 func ApiManagementApiPath(v interface{}, k string) (ws []string, es []error) {
 	value := v.(string)
 
-	if matched := regexp.MustCompile(`^(?:|[\w][\w-/.]{0,398}[\w-])$`).Match([]byte(value)); !matched {
+	if matched := regexp.MustCompile(`^(?:|[\w.][\w-/.]{0,398}[\w-])$`).Match([]byte(value)); !matched {
 		es = append(es, fmt.Errorf("%q may only be up to 400 characters in length, not start or end with `/` and only contain valid url characters", k))
 	}
 	return ws, es

diff --git a/azurerm/helpers/validate/api_management_test.go b/azurerm/helpers/validate/api_management_test.go
@@ -126,6 +126,10 @@ func TestAzureRMApiManagementApiPath_validation(t *testing.T) {
 			Value:    "api1/sub",
 			ErrCount: 0,
 		},
+		{
+			Value:    ".well-known",
+			ErrCount: 0,
+		},
 		{
 			Value:    s.Repeat("x", 401),
 			ErrCount: 1,