env.go

@@ -8,9 +8,8 @@ import (
 	"strconv"
 	"strings"
 
-"dario.cat/mergo"
+	"github.com/imdario/mergo"
 	"go.unistack.org/micro/v4/config"
-	"go.unistack.org/micro/v4/options"
 	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
@@ -24,7 +23,7 @@ func (c *envConfig) Options() config.Options {
 	return c.opts
 }
 
-func (c *envConfig) Init(opts ...options.Option) error {
+func (c *envConfig) Init(opts ...config.Option) error {
 	for _, o := range opts {
 		o(&c.opts)
 	}
@@ -40,11 +39,7 @@ func (c *envConfig) Init(opts ...options.Option) error {
 	return nil
 }
 
-func (c *envConfig) Load(ctx context.Context, opts ...options.Option) error {
+func (c *envConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
-	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
-		return nil
-	}
-
 	if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
@@ -320,11 +315,7 @@ func fillValues(ctx context.Context, valueOf reflect.Value, structTag string) er
 	return nil
 }
 
-func (c *envConfig) Save(ctx context.Context, opts ...options.Option) error {
+func (c *envConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
-	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
-		return nil
-	}
-
 	options := config.NewSaveOptions(opts...)
 
 	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
@@ -355,7 +346,7 @@ func (c *envConfig) Name() string {
 	return c.opts.Name
 }
 
-func (c *envConfig) Watch(ctx context.Context, opts ...options.Option) (config.Watcher, error) {
+func (c *envConfig) Watch(ctx context.Context, opts ...config.WatchOption) (config.Watcher, error) {
 	w := &envWatcher{
 		opts:  c.opts,
 		wopts: config.NewWatchOptions(opts...),
@@ -369,7 +360,7 @@ func (c *envConfig) Watch(ctx context.Context, opts ...options.Option) (config.W
 	return w, nil
 }
 
-func NewConfig(opts ...options.Option) config.Config {
+func NewConfig(opts ...config.Option) config.Config {
 	options := config.NewOptions(opts...)
 	if len(options.StructTag) == 0 {
 		options.StructTag = DefaultStructTag

go.mod

@@ -3,8 +3,6 @@ module go.unistack.org/micro-config-env/v4
 go 1.20
 
 require (
-	dario.cat/mergo v1.0.0
+	github.com/imdario/mergo v0.3.14
-	go.unistack.org/micro/v4 v4.0.15
+	go.unistack.org/micro/v4 v4.0.1
 )
-
-require github.com/google/uuid v1.5.0 // indirect

go.sum

@@ -1,9 +1,7 @@
-dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
+github.com/imdario/mergo v0.3.14 h1:fOqeC1+nCuuk6PKQdg9YmosXX7Y7mHX6R/0ZldI9iHo=
-dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+github.com/imdario/mergo v0.3.14/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
-github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
-github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
-go.unistack.org/micro/v4 v4.0.15 h1:o4++RYX5guVPxfcJpP7VCj2Xr9BPFo6fj4+b5FStdEI=
-go.unistack.org/micro/v4 v4.0.15/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=