Make function a varadic

Emyrk · Emyrk · commit 5c571dd94157 · 2023-07-07T12:31:17.000-04:00
diff --git a/cli/clibase/values.go b/cli/clibase/values.go
@@ -24,8 +24,17 @@ type Validator[T pflag.Value] struct {
 	validate func(T) error
 }
 
-func Validate[T pflag.Value](opt T, validate func(value T) error) *Validator[T] {
-	return &Validator[T]{Value: opt, validate: validate}
+func Validate[T pflag.Value](opt T, validate ...func(value T) error) *Validator[T] {
+	return &Validator[T]{Value: opt, validate: func(value T) error {
+		// Run all validate functions
+		for _, v := range validate {
+			err := v(value)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}}
 }
 
 func (i *Validator[T]) String() string {
diff --git a/enterprise/cli/workspaceproxy.go b/enterprise/cli/workspaceproxy.go
@@ -236,7 +236,7 @@ func (r *RootCmd) createProxy() *clibase.Cmd {
 		formatter   = newUpdateProxyResponseFormatter()
 	)
 	validateIcon := func(s *clibase.String) error {
-		if !(strings.HasPrefix(s.Value(), "/emojis/") || strings.HasPrefix(s, "http")) {
+		if !(strings.HasPrefix(s.Value(), "/emojis/") || strings.HasPrefix(s.Value(), "http")) {
 			return xerrors.New("icon must be a relative path to an emoji or a publicly hosted image URL")
 		}
 		return nil

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ func (r RootCmd) createProxy() clibase.Cmd {`
`236`	`236`	`formatter = newUpdateProxyResponseFormatter()`
`237`	`237`	`)`
`238`	`238`	`validateIcon := func(s *clibase.String) error {`
`239`		`- if !(strings.HasPrefix(s.Value(), "/emojis/") \|\| strings.HasPrefix(s, "http")) {`
	`239`	`+ if !(strings.HasPrefix(s.Value(), "/emojis/") \|\| strings.HasPrefix(s.Value(), "http")) {`
`240`	`240`	`return xerrors.New("icon must be a relative path to an emoji or a publicly hosted image URL")`
`241`	`241`	`}`
`242`	`242`	`return nil`