Reuse regex from validation

Emyrk · Emyrk · commit 49084e21620d · 2022-08-30T15:51:28.000-04:00
diff --git a/coderd/httpapi/username.go b/coderd/httpapi/username.go
@@ -12,6 +12,10 @@ var (
 	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 {
diff --git a/coderd/subdomain.go b/coderd/subdomain.go
@@ -6,6 +6,8 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/coder/coder/coderd/httpapi"
+
 	"github.com/coder/coder/coderd/httpmw"
 
 	"github.com/go-chi/chi/v5"
@@ -70,7 +72,8 @@ func (api *API) handleSubdomain(middlewares ...func(http.Handler) http.Handler)
 }
 
 var (
-	nameRegex = `[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*`
+	// Remove the "starts with" and "ends with" regex components.
+	nameRegex = strings.Trim(httpapi.UsernameValidRegexString(), "^$")
 	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)$`,
