diff --git a/go.mod b/go.mod index f537573..3ca00c4 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/onsi/ginkgo/v2 v2.21.0 github.com/onsi/gomega v1.35.1 github.com/shipengqi/component-base v0.2.11 - github.com/shipengqi/golib v0.2.17 + github.com/shipengqi/golib v0.2.18 github.com/shipengqi/log v0.2.3 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 @@ -30,7 +30,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect - github.com/fatih/color v1.17.0 // indirect + github.com/fatih/color v1.18.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -53,7 +53,7 @@ require ( go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.30.0 // indirect golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.26.0 // indirect + golang.org/x/sys v0.27.0 // indirect golang.org/x/text v0.19.0 // indirect golang.org/x/tools v0.26.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect diff --git a/go.sum b/go.sum index 226e020..950dce0 100644 --- a/go.sum +++ b/go.sum @@ -33,8 +33,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4= github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM= -github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= -github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= +github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= +github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= @@ -88,8 +88,8 @@ github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shipengqi/component-base v0.2.11 h1:oNCwa3FhFBGtKVJHSc3Tr+h9ERMX6JAVxkKToeIIh4M= github.com/shipengqi/component-base v0.2.11/go.mod h1:YJoIETZyVgILBSqiA7ze+WXgh8j/qz8WN+gpiTfnhc8= -github.com/shipengqi/golib v0.2.17 h1:PxjhI77kIZYxvttD2jZGx92yt9XVrZ6dLp60xGsAUrs= -github.com/shipengqi/golib v0.2.17/go.mod h1:r0CuK2GNT1dcjo359+gvCIb7Wlblkwr/uWvfazVlYVw= +github.com/shipengqi/golib v0.2.18 h1:zuzf+Mk5QcUQecwBhw+MIZFYSRfoLrJp2cLMutgvpo4= +github.com/shipengqi/golib v0.2.18/go.mod h1:m3QxEauvNWZyI75xR4elXxOaCTAszD8GNys8bvc5fCQ= github.com/shipengqi/log v0.2.3 h1:dH1LEgFV1jkojNvVf2qdjcYrWIEQ7LsHPkPaeefsTcA= github.com/shipengqi/log v0.2.3/go.mod h1:YqXfNjg7aDR/KrXoU5KC3vCQ/YldJltQbyEwnlpJOb4= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= @@ -121,8 +121,8 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= diff --git a/internal/parameter/validators/int.go b/internal/parameter/validators/int.go index fd7e94e..9b689e8 100644 --- a/internal/parameter/validators/int.go +++ b/internal/parameter/validators/int.go @@ -6,27 +6,27 @@ import ( "strconv" ) -func Max(max int) func(string) error { +func Max(maxVal int) func(string) error { return func(str string) error { v, err := strconv.Atoi(str) if err != nil { return errors.New("invalid integer") } - if v > max { - return fmt.Errorf("value must less than or equal to %d", max) + if v > maxVal { + return fmt.Errorf("value must less than or equal to %d", maxVal) } return nil } } -func Min(min int) func(string) error { +func Min(minVal int) func(string) error { return func(str string) error { v, err := strconv.Atoi(str) if err != nil { return errors.New("invalid integer") } - if v < min { - return fmt.Errorf("value must less than or equal to %d", min) + if v < minVal { + return fmt.Errorf("value must less than or equal to %d", minVal) } return nil } diff --git a/internal/parameter/validators/str.go b/internal/parameter/validators/str.go index 31acd80..6c8b338 100644 --- a/internal/parameter/validators/str.go +++ b/internal/parameter/validators/str.go @@ -10,19 +10,19 @@ var ( regexFQDN = regexp.MustCompile(`^([a-zA-Z0-9][a-zA-Z0-9-]{0,62})(\.[a-zA-Z0-9][a-zA-Z0-9-]{0,62})*?(\.[a-zA-Z][a-zA-Z0-9]{0,62})\.?$`) ) -func MaxLength(max int) func(string) error { +func MaxLength(maxLen int) func(string) error { return func(str string) error { - if len(str) > max { - return fmt.Errorf("string must be less than or equal to %d characters", max) + if len(str) > maxLen { + return fmt.Errorf("string must be less than or equal to %d characters", maxLen) } return nil } } -func MinLength(min int) func(string) error { +func MinLength(minLen int) func(string) error { return func(str string) error { - if len(str) < min { - return fmt.Errorf("string must be greater than or equal to %d characters", min) + if len(str) < minLen { + return fmt.Errorf("string must be greater than or equal to %d characters", minLen) } return nil } diff --git a/internal/parameter/validators/str_test.go b/internal/parameter/validators/str_test.go index 9063924..069ffd0 100644 --- a/internal/parameter/validators/str_test.go +++ b/internal/parameter/validators/str_test.go @@ -75,7 +75,6 @@ func TestIPv6Validator(t *testing.T) { for _, v := range tests { err := IPv6Validator()(v.ip) if v.expected { - assert.Equal(t) assert.NoError(t, err) } else { assert.Error(t, err)