Merge pull request 'move to micro v4' (#97) from v4 into master

Reviewed-on: #97

env.go

@@ -1,4 +1,4 @@
-package env // import "go.unistack.org/micro-config-env/v3"
+package env // import "go.unistack.org/micro-config-env/v4"
 
 import (
 	"context"
@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"github.com/imdario/mergo"
-	"go.unistack.org/micro/v3/config"
+	"go.unistack.org/micro/v4/config"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 var DefaultStructTag = "env"
@@ -28,11 +28,11 @@ func (c *envConfig) Init(opts ...config.Option) error {
 		o(&c.opts)
 	}
 
-	if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil {
+	if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
-	if err := config.DefaultAfterInit(c.opts.Context, c); err != nil {
+	if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
@@ -40,7 +40,7 @@ func (c *envConfig) Init(opts ...config.Option) error {
 }
 
 func (c *envConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
-	if err := config.DefaultBeforeLoad(ctx, c); err != nil {
+	if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
@@ -53,21 +53,23 @@ func (c *envConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
 		mopts = append(mopts, mergo.WithAppendSlice)
 	}
 
-	src, err := rutil.Zero(c.opts.Struct)
+	dst := c.opts.Struct
+	if options.Struct != nil {
+		dst = options.Struct
+	}
+
+	src, err := rutil.Zero(dst)
 	if err == nil {
 		if err = fillValues(ctx, reflect.ValueOf(src), c.opts.StructTag); err == nil {
-			err = mergo.Merge(c.opts.Struct, src, mopts...)
+			err = mergo.Merge(dst, src, mopts...)
 		}
 	}
 
-	if err != nil {
+	if err != nil && !c.opts.AllowFail {
-		c.opts.Logger.Errorf(c.opts.Context, "env load err: %v", err)
+		return err
-		if !c.opts.AllowFail {
-			return err
-		}
 	}
 
-	if err := config.DefaultAfterLoad(ctx, c); err != nil {
+	if err := config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
@@ -314,18 +316,22 @@ func fillValues(ctx context.Context, valueOf reflect.Value, structTag string) er
 }
 
 func (c *envConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
-	if err := config.DefaultBeforeSave(ctx, c); err != nil {
+	options := config.NewSaveOptions(opts...)
+
+	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
-	if err := c.setValues(ctx, reflect.ValueOf(c.opts.Struct)); err != nil {
+	dst := c.opts.Struct
-		c.opts.Logger.Errorf(c.opts.Context, "env save error: %v", err)
+	if options.Struct != nil {
-		if !c.opts.AllowFail {
+		dst = options.Struct
-			return err
-		}
 	}
 
-	if err := config.DefaultAfterSave(ctx, c); err != nil {
+	if err := c.setValues(ctx, reflect.ValueOf(dst)); err != nil && !c.opts.AllowFail {
+		return err
+	}
+
+	if err := config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 

env_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 	"time"
 
-	"go.unistack.org/micro/v3/config"
+	"go.unistack.org/micro/v4/config"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 type Config struct {

go.mod

@@ -1,8 +1,8 @@
-module go.unistack.org/micro-config-env/v3
+module go.unistack.org/micro-config-env/v4
 
-go 1.18
+go 1.20
 
 require (
-	github.com/imdario/mergo v0.3.13
+	github.com/imdario/mergo v0.3.14
-	go.unistack.org/micro/v3 v3.10.15
+	go.unistack.org/micro/v4 v4.0.1
 )

go.sum

@@ -1,10 +1,7 @@
-github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
+github.com/imdario/mergo v0.3.14 h1:fOqeC1+nCuuk6PKQdg9YmosXX7Y7mHX6R/0ZldI9iHo=
-github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
+github.com/imdario/mergo v0.3.14/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
-github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
-go.unistack.org/micro/v3 v3.10.15 h1:vliCUhERMuDB08+XX5V6I+9YZl4jPUaBo3S+Jx1JLSo=
-go.unistack.org/micro/v3 v3.10.15/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

watcher.go

@@ -3,9 +3,9 @@ package env
 import (
 	"reflect"
 
-	"go.unistack.org/micro/v3/config"
+	"go.unistack.org/micro/v4/config"
-	"go.unistack.org/micro/v3/util/jitter"
+	"go.unistack.org/micro/v4/util/jitter"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 type envWatcher struct {