rename to just validate

Emyrk · Emyrk · commit b1094fc4508f · 2023-07-07T11:49:04.000-04:00
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -138,7 +138,9 @@ linters-settings:
       - name: blank-imports
       - name: bool-literal-in-expr
       - name: call-to-gc
-      - name: confusing-naming
+      # This inconsistently marks struct methods as confusing if they have
+      # the same name... which for interfaces they do.
+#      - name: confusing-naming
       - name: confusing-results
       - name: constant-logical-expr
       - name: context-as-argument
diff --git a/cli/clibase/values.go b/cli/clibase/values.go
@@ -20,44 +20,25 @@ import (
 // of the value after or before it has been set.
 type Validator[T pflag.Value] struct {
 	Value T
-	// validateBefore is called before the value is set.
-	validateBefore func(input string) error
-	// validateAfter is called after the value is set.
-	validateAfter func(T) error
+	// validate is called after the value is set.
+	validate func(T) error
 }
 
-func Validate[T pflag.Value](opt T) *Validator[T] {
-	return &Validator[T]{Value: opt}
-}
-
-func (i *Validator[T]) Before(fn func(input string) error) *Validator[T] {
-	i.validateBefore = fn
-	return i
-}
-
-func (i *Validator[T]) After(fn func(value T) error) *Validator[T] {
-	i.validateAfter = fn
-	return i
+func Validate[T pflag.Value](opt T, validate func(value T) error) *Validator[T] {
+	return &Validator[T]{Value: opt, validate: validate}
 }
 
 func (i *Validator[T]) String() string {
 	return i.Value.String()
 }
 
 func (i *Validator[T]) Set(input string) error {
-	if i.validateBefore != nil {
-		err := i.validateBefore(input)
-		if err != nil {
-			return err
-		}
-	}
-
 	err := i.Value.Set(input)
 	if err != nil {
 		return err
 	}
-	if i.validateAfter != nil {
-		err = i.validateAfter(i.Value)
+	if i.validate != nil {
+		err = i.validate(i.Value)
 		if err != nil {
 			return err
 		}
diff --git a/enterprise/cli/proxyserver.go b/enterprise/cli/proxyserver.go
@@ -78,7 +78,7 @@ func (*RootCmd) proxyServer() *clibase.Cmd {
 			Env:         "CODER_PRIMARY_ACCESS_URL",
 			YAML:        "primaryAccessURL",
 			Required:    true,
-			Value: clibase.Validate(&primaryAccessURL).After(func(value *clibase.URL) error {
+			Value: clibase.Validate(&primaryAccessURL, func(value *clibase.URL) error {
 				if !(value.Scheme == "http" || value.Scheme == "https") {
 					return xerrors.Errorf("'--primary-access-url' value must be http or https: url=%s", primaryAccessURL.String())
 				}
diff --git a/enterprise/cli/workspaceproxy.go b/enterprise/cli/workspaceproxy.go
@@ -235,8 +235,8 @@ func (r *RootCmd) createProxy() *clibase.Cmd {
 		noPrompts   bool
 		formatter   = newUpdateProxyResponseFormatter()
 	)
-	validateIcon := func(s string) error {
-		if !(strings.HasPrefix(s, "/emojis/") || strings.HasPrefix(s, "http")) {
+	validateIcon := func(s *clibase.String) error {
+		if !(strings.HasPrefix(s.Value(), "/emojis/") || strings.HasPrefix(s, "http")) {
 			return xerrors.New("icon must be a relative path to an emoji or a publicly hosted image URL")
 		}
 		return nil
@@ -274,9 +274,11 @@ func (r *RootCmd) createProxy() *clibase.Cmd {
 
 			if proxyIcon == "" && !noPrompts {
 				proxyIcon, err = cliui.Prompt(inv, cliui.PromptOptions{
-					Text:     "Icon URL:",
-					Default:  "/emojis/1f5fa.png",
-					Validate: validateIcon,
+					Text:    "Icon URL:",
+					Default: "/emojis/1f5fa.png",
+					Validate: func(s string) error {
+						return validateIcon(clibase.StringOf(&s))
+					},
 				})
 				if err != nil {
 					return err
@@ -320,7 +322,7 @@ func (r *RootCmd) createProxy() *clibase.Cmd {
 		clibase.Option{
 			Flag:        "icon",
 			Description: "Display icon of the proxy.",
-			Value:       clibase.Validate(clibase.StringOf(&proxyIcon)).Before(validateIcon),
+			Value:       clibase.Validate(clibase.StringOf(&proxyIcon), validateIcon),
 		},
 		clibase.Option{
 			Flag:        "no-prompt",

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func (RootCmd) proxyServer() clibase.Cmd {`
`78`	`78`	`Env: "CODER_PRIMARY_ACCESS_URL",`
`79`	`79`	`YAML: "primaryAccessURL",`
`80`	`80`	`Required: true,`
`81`		`- Value: clibase.Validate(&primaryAccessURL).After(func(value *clibase.URL) error {`
	`81`	`+ Value: clibase.Validate(&primaryAccessURL, func(value *clibase.URL) error {`
`82`	`82`	`if !(value.Scheme == "http" \|\| value.Scheme == "https") {`
`83`	`83`	`return xerrors.Errorf("'--primary-access-url' value must be http or https: url=%s", primaryAccessURL.String())`
`84`	`84`	`}`