Export valid name regex

Emyrk · Emyrk · commit 4696bf9f4bad · 2022-08-31T10:57:50.000-04:00
diff --git a/coderd/httpapi/username.go b/coderd/httpapi/username.go
@@ -8,14 +8,10 @@ import (
 )
 
 var (
-	usernameValid   = regexp.MustCompile("^[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*$")
-	usernameReplace = regexp.MustCompile("[^a-zA-Z0-9-]*")
+	UsernameValidRegex = regexp.MustCompile("^[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*$")
+	usernameReplace    = regexp.MustCompile("[^a-zA-Z0-9-]*")
 )
 
-func UsernameValidRegexString() string {
-	return usernameValid.String()
-}
-
 // UsernameValid returns whether the input string is a valid username.
 func UsernameValid(str string) bool {
 	if len(str) > 32 {
@@ -24,7 +20,7 @@ func UsernameValid(str string) bool {
 	if len(str) < 1 {
 		return false
 	}
-	return usernameValid.MatchString(str)
+	return UsernameValidRegex.MatchString(str)
 }
 
 // UsernameFrom returns a best-effort username from the provided string.
diff --git a/coderd/subdomain.go b/coderd/subdomain.go
@@ -73,7 +73,7 @@ func (api *API) handleSubdomain(middlewares ...func(http.Handler) http.Handler)
 
 var (
 	// Remove the "starts with" and "ends with" regex components.
-	nameRegex = strings.Trim(httpapi.UsernameValidRegexString(), "^$")
+	nameRegex = strings.Trim(httpapi.UsernameValidRegex.String(), "^$")
 	appURL    = regexp.MustCompile(fmt.Sprintf(
 		// {USERNAME}--{WORKSPACE_NAME}}--{{AGENT_NAME}}--{{PORT}}
 		`^(?P<UserName>%[1]s)--(?P<WorkspaceName>%[1]s)(--(?P<AgentName>%[1]s))?--(?P<AppName>%[1]s)$`,

Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,10 @@ import (`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`var (`
`11`		`- usernameValid = regexp.MustCompile("^[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*$")`
`12`		`- usernameReplace = regexp.MustCompile("[^a-zA-Z0-9-]*")`
	`11`	`+ UsernameValidRegex = regexp.MustCompile("^[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*$")`
	`12`	`+ usernameReplace = regexp.MustCompile("[^a-zA-Z0-9-]*")`
`13`	`13`	`)`
`14`	`14`
`15`		`-func UsernameValidRegexString() string {`
`16`		`- return usernameValid.String()`
`17`		`-}`
`18`		`-`
`19`	`15`	`// UsernameValid returns whether the input string is a valid username.`
`20`	`16`	`func UsernameValid(str string) bool {`
`21`	`17`	`if len(str) > 32 {`
`@@ -24,7 +20,7 @@ func UsernameValid(str string) bool {`
`24`	`20`	`if len(str) < 1 {`
`25`	`21`	`return false`
`26`	`22`	`}`
`27`		`- return usernameValid.MatchString(str)`
	`23`	`+ return UsernameValidRegex.MatchString(str)`
`28`	`24`	`}`
`29`	`25`
`30`	`26`	`// UsernameFrom returns a best-effort username from the provided string.`