fixed: [help] HertzOptions change to Validator, exclude side-effect

weplanx · Oct 1, 2023 · cce2c8a · cce2c8a
1 parent 47e708c
commit cce2c8a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/help/help.go b/help/help.go
@@ -5,8 +5,6 @@ import (
 	errorsx "errors"
 	"github.com/bytedance/gopkg/util/logger"
 	"github.com/cloudwego/hertz/pkg/app"
-	"github.com/cloudwego/hertz/pkg/app/server"
-	"github.com/cloudwego/hertz/pkg/common/config"
 	"github.com/cloudwego/hertz/pkg/common/errors"
 	"github.com/cloudwego/hertz/pkg/common/utils"
 	"github.com/go-playground/validator/v10"
@@ -49,7 +47,7 @@ func IsEmpty(i any) bool {
 	return reflect.DeepEqual(v.Interface(), reflect.Zero(v.Type()).Interface())
 }
 
-func HertzOptions(input ...config.Option) *config.Options {
+func Validator() *go_playground.Validator {
 	vd := go_playground.NewValidator()
 	vd.SetValidateTag("vd")
 	vdx := vd.Engine().(*validator.Validate)
@@ -67,16 +65,7 @@ func HertzOptions(input ...config.Option) *config.Options {
 		}
 		return matched
 	})
-	opts := []config.Option{
-		server.WithCustomValidator(vd),
-	}
-	for _, x := range input {
-		opts = append(opts, x)
-	}
-	if os.Getenv("MODE") != "release" {
-		opts = append(opts, server.WithExitWaitTime(0))
-	}
-	return config.NewOptions(opts)
+	return vd
 }
 
 type EMeta struct {

diff --git a/rest/common_test.go b/rest/common_test.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"github.com/bytedance/sonic"
 	"github.com/cloudwego/hertz/pkg/app/server"
+	"github.com/cloudwego/hertz/pkg/common/config"
 	"github.com/cloudwego/hertz/pkg/common/ut"
 	"github.com/cloudwego/hertz/pkg/protocol"
 	"github.com/cloudwego/hertz/pkg/route"
@@ -107,7 +108,11 @@ func TestMain(m *testing.M) {
 	if err := MockStream(ctx); err != nil {
 		panic(err)
 	}
-	engine = route.NewEngine(help.HertzOptions(server.WithDisablePrintRoute(true)))
+	engine = route.NewEngine(config.NewOptions([]config.Option{
+		server.WithExitWaitTime(0),
+		server.WithDisablePrintRoute(true),
+		server.WithCustomValidator(help.Validator()),
+	}))
 	engine.Use(
 		requestid.New(),
 		help.EHandler(),

diff --git a/sessions/common_test.go b/sessions/common_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"github.com/bytedance/sonic"
 	"github.com/cloudwego/hertz/pkg/app/server"
+	"github.com/cloudwego/hertz/pkg/common/config"
 	"github.com/cloudwego/hertz/pkg/common/ut"
 	"github.com/cloudwego/hertz/pkg/protocol"
 	"github.com/cloudwego/hertz/pkg/route"
@@ -49,8 +50,11 @@ func TestMain(m *testing.M) {
 		sessions.SetRedis(rdb),
 		sessions.SetDynamicValues(&v),
 	)
-
-	engine = route.NewEngine(help.HertzOptions(server.WithDisablePrintRoute(true)))
+	engine = route.NewEngine(config.NewOptions([]config.Option{
+		server.WithExitWaitTime(0),
+		server.WithDisablePrintRoute(true),
+		server.WithCustomValidator(help.Validator()),
+	}))
 	engine.Use(
 		requestid.New(),
 		help.EHandler(),

diff --git a/values/common_test.go b/values/common_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"github.com/bytedance/sonic"
 	"github.com/cloudwego/hertz/pkg/app/server"
+	"github.com/cloudwego/hertz/pkg/common/config"
 	"github.com/cloudwego/hertz/pkg/common/ut"
 	"github.com/cloudwego/hertz/pkg/protocol"
 	"github.com/cloudwego/hertz/pkg/route"
@@ -56,7 +57,11 @@ func TestMain(m *testing.M) {
 		values.SetCipher(cipherx),
 		values.SetType(reflect.TypeOf(values.DynamicValues{})),
 	)
-	engine = route.NewEngine(help.HertzOptions(server.WithDisablePrintRoute(true)))
+	engine = route.NewEngine(config.NewOptions([]config.Option{
+		server.WithExitWaitTime(0),
+		server.WithDisablePrintRoute(true),
+		server.WithCustomValidator(help.Validator()),
+	}))
 	engine.Use(
 		requestid.New(),
 		help.EHandler(),