Unistore: Relax resource validation regex (#111885)

Signed-off-by: Maicon Costa <maiconscosta@gmail.com>

pkg/apimachinery/validation/validation.go

@@ -23,9 +23,9 @@ const qualifiedNameFmt string = "^(" + qnameCharFmt + qnameExtCharFmt + "*)?" +
 const qualifiedNameErrMsg string = "must consist of alphanumeric characters, '-', '_' or '.', and must start and end with an alphanumeric character"
 
 const alphaCharFmt string = "[A-Za-z]"
-const resourceCharFmt string = "[A-Za-z0-9]" // alpha numeric
+const resourceCharFmt string = "[A-Za-z0-9-]" // alpha numeric plus dashes
 const resourceFmt string = "^" + alphaCharFmt + resourceCharFmt + "*$"
-const resourceErrMsg string = "must consist of alphanumeric characters"
+const resourceErrMsg string = "must consist of alphanumeric characters and dashes, and must start with an alphabetic character"
 
 var (
 	grafanaNameRegexp   = regexp.MustCompile(grafanaNameFmt).MatchString

pkg/apimachinery/validation/validation_test.go

@@ -198,16 +198,17 @@ func TestValidation(t *testing.T) {
 				"folders",
 				"folders123",
 				"aaa",
+				"hello-world",
+				"hello-world-",
 			},
 		}, {
 			name: "bad input",
 			expect: []string{
-				"resource must consist of alphanumeric characters (e.g. 'dashboards',  or 'folders', regex used for validation is '^[A-Za-z][A-Za-z0-9]*$')",
+				"resource must consist of alphanumeric characters and dashes, and must start with an alphabetic character (e.g. 'dashboards',  or 'folders', regex used for validation is '^[A-Za-z][A-Za-z0-9-]*$')",
 			},
 			input: []string{
 				"_bad_input",
 				"hello world",
-				"hello-world",
 				"hello!",
 				"hello~",
 				"hello ",