feat(parameter): remove regex message

Author: shipengqi

internal/parameter/secret/secret.go

@@ -28,7 +28,7 @@ func (p Param) Render() huh.Field {
 		group = append(group, validators.MaxLength(*p.MaxLength))
 	}
 	if p.Regex != "" {
-		group = append(group, validators.RegexValidator(p.Regex, p.RegexMessage))
+		group = append(group, validators.RegexValidator(p.Regex))
 	}
 	if len(group) > 0 {
 		param.Validate(validators.Group(group...))

internal/parameter/str/str.go

@@ -16,7 +16,6 @@ type Param struct {
 	Trim         bool   `yaml:"trim"          json:"trim"          mapstructure:"trim"` // Todo implement trim??
 	DefaultValue string `yaml:"default_value" json:"default_value" mapstructure:"default_value"`
 	Regex        string `yaml:"regex"         json:"regex"         mapstructure:"regex"`
-	RegexMessage string `yaml:"regex_message" json:"regex_message" mapstructure:"regex_message"`
 	MinLength    *int   `yaml:"min_length"    json:"min_length"    mapstructure:"min_length"`
 	MaxLength    *int   `yaml:"max_length"    json:"max_length"    mapstructure:"max_length"`
 }
@@ -53,7 +52,7 @@ func (p Param) RenderInput() *huh.Input {
 		group = append(group, validators.FQDNValidator())
 	}
 	if p.Regex != "" {
-		group = append(group, validators.RegexValidator(p.Regex, p.RegexMessage))
+		group = append(group, validators.RegexValidator(p.Regex))
 	}
 
 	if len(group) > 0 {

internal/parameter/text/text.go

@@ -13,7 +13,6 @@ type Param struct {
 	Required     bool   `yaml:"required"      json:"required"      mapstructure:"required"`
 	DefaultValue string `yaml:"default_value" json:"default_value" mapstructure:"default_value"`
 	Regex        string `yaml:"regex"         json:"regex"         mapstructure:"regex"`
-	RegexMessage string `yaml:"regex_message" json:"regex_message" mapstructure:"regex_message"`
 	MinLength    *int   `yaml:"min_length"    json:"min_length"    mapstructure:"min_length"`
 	MaxLength    *int   `yaml:"max_length"    json:"max_length"    mapstructure:"max_length"`
 	Height       *int   `yaml:"height"        json:"height"        mapstructure:"height"`
@@ -45,7 +44,7 @@ func (p Param) Render() huh.Field {
 		group = append(group, validators.MaxLength(*p.MaxLength))
 	}
 	if p.Regex != "" {
-		group = append(group, validators.RegexValidator(p.Regex, p.RegexMessage))
+		group = append(group, validators.RegexValidator(p.Regex))
 	}
 
 	if len(group) > 0 {

internal/parameter/validators/str.go

@@ -1,7 +1,6 @@
 package validators
 
 import (
-	"errors"
 	"fmt"
 	"net"
 	"regexp"
@@ -29,11 +28,11 @@ func MinLength(min int) func(string) error {
 	}
 }
 
-func RegexValidator(regex, message string) func(string) error {
+func RegexValidator(regex string) func(string) error {
 	return func(str string) error {
 		re := regexp.MustCompile(regex)
 		if !re.MatchString(str) {
-			return errors.New(message)
+			return fmt.Errorf("contents must match the regex: %s", regex)
 		}
 		return nil
 	}