Updated storage share directory name regex to allow underscore (#12454)

catriona-m · web-flow · commit 7f46b07f5c70 · 2021-07-05T10:34:48.000+01:00
* updated storage share directory name regex to allow underscore

* updated storage share directory name regex to allow underscore
diff --git a/azurerm/internal/services/storage/validate/storage.go b/azurerm/internal/services/storage/validate/storage.go
@@ -8,8 +8,8 @@ import (
 func StorageShareDirectoryName(v interface{}, k string) (warnings []string, errors []error) {
 	value := v.(string)
 
-	if !regexp.MustCompile(`^[A-Za-z0-9-]+(/[A-Za-z0-9-]+)*$`).MatchString(value) {
-		errors = append(errors, fmt.Errorf("%s must contain only uppercase and lowercase alphanumeric characters, numbers and hyphens, and can be nested multiple levels", k))
+	if !regexp.MustCompile(`^[A-Za-z0-9\-_]+(/[A-Za-z0-9\-_]+)*$`).MatchString(value) {
+		errors = append(errors, fmt.Errorf("%s must contain only uppercase and lowercase alphanumeric characters, numbers, hyphens and underscores, and can be nested multiple levels", k))
 	}
 
 	return warnings, errors

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ import (`
`8`	`8`	`func StorageShareDirectoryName(v interface{}, k string) (warnings []string, errors []error) {`
`9`	`9`	`value := v.(string)`
`10`	`10`
`11`		- if !regexp.MustCompile(`^[A-Za-z0-9-]+(/[A-Za-z0-9-]+)*$`).MatchString(value) {
`12`		`- errors = append(errors, fmt.Errorf("%s must contain only uppercase and lowercase alphanumeric characters, numbers and hyphens, and can be nested multiple levels", k))`
	`11`	+ if !regexp.MustCompile(`^[A-Za-z0-9\-_]+(/[A-Za-z0-9\-_]+)*$`).MatchString(value) {
	`12`	`+ errors = append(errors, fmt.Errorf("%s must contain only uppercase and lowercase alphanumeric characters, numbers, hyphens and underscores, and can be nested multiple levels", k))`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`return warnings, errors`