refactor(pkg): factor out subdomain extraction fn

Author: rektdeckard

cmd/lk/app.go

@@ -153,7 +153,7 @@ func requireProject(ctx context.Context, cmd *cli.Command) (context.Context, err
 		if len(cliConfig.Projects) > 0 {
 			var options []huh.Option[*config.ProjectConfig]
 			for _, p := range cliConfig.Projects {
-				options = append(options, huh.NewOption(p.Name+" ["+p.APIKey+"]", &p))
+				options = append(options, huh.NewOption(p.Name+" ["+util.ExtractSubdomain(p.URL)+"]", &p))
 			}
 			if err = huh.NewForm(
 				huh.NewGroup(huh.NewSelect[*config.ProjectConfig]().

pkg/config/config.go

@@ -19,9 +19,9 @@ import (
 	"fmt"
 	"os"
 	"path"
-	"regexp"
 	"strings"
 
+	"github.com/livekit/livekit-cli/v2/pkg/util"
 	"gopkg.in/yaml.v3"
 )
 
@@ -70,17 +70,8 @@ func LoadProjectBySubdomain(subdomain string) (*ProjectConfig, error) {
 
 	fmt.Println("Loading project by subdomain", subdomain)
 
-	extractSubdomain := func(url string) string {
-		subdomainPattern := regexp.MustCompile(`^(?:https?|wss?)://([^.]+)\.`)
-		matches := subdomainPattern.FindStringSubmatch(url)
-		if len(matches) > 1 {
-			return matches[1]
-		}
-		return ""
-	}
-
 	for _, p := range conf.Projects {
-		projectSubdomain := extractSubdomain(p.URL)
+		projectSubdomain := util.ExtractSubdomain(p.URL)
 		if projectSubdomain == subdomain {
 			return &p, nil
 		}

pkg/util/url.go

@@ -0,0 +1,14 @@
+package util
+
+import (
+	"regexp"
+)
+
+func ExtractSubdomain(url string) string {
+	subdomainPattern := regexp.MustCompile(`^(?:https?|wss?)://([^.]+)\.`)
+	matches := subdomainPattern.FindStringSubmatch(url)
+	if len(matches) > 1 {
+		return matches[1]
+	}
+	return ""
+}