fixup conditions

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

env.go

@@ -1,4 +1,4 @@
-package env // import "go.unistack.org/micro-config-env/v4"
+package env // import "go.unistack.org/micro-config-env/v3"
 
 import (
 	"context"
@@ -8,10 +8,9 @@ import (
 	"strconv"
 	"strings"
 
-"dario.cat/mergo"
+	"github.com/imdario/mergo"
-	"go.unistack.org/micro/v4/config"
+	"go.unistack.org/micro/v3/config"
-	"go.unistack.org/micro/v4/options"
+	rutil "go.unistack.org/micro/v3/util/reflect"
-	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 var DefaultStructTag = "env"
@@ -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,7 +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
 	}
@@ -320,7 +319,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
 	}
@@ -355,7 +354,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 +368,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

env_test.go

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

go.mod

@@ -1,10 +1,10 @@
-module go.unistack.org/micro-config-env/v4
+module go.unistack.org/micro-config-env/v3
 
-go 1.20
+go 1.18
 
 require (
-	dario.cat/mergo v1.0.0
+	github.com/imdario/mergo v0.3.16
-	go.unistack.org/micro/v4 v4.0.15
+	go.unistack.org/micro/v3 v3.10.36
 )
 
 require github.com/google/uuid v1.5.0 // indirect

go.sum

@@ -1,9 +1,16 @@
-dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
-dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
 github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-go.unistack.org/micro/v4 v4.0.15 h1:o4++RYX5guVPxfcJpP7VCj2Xr9BPFo6fj4+b5FStdEI=
+github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
-go.unistack.org/micro/v4 v4.0.15/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
+github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
+github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+go.unistack.org/micro/v3 v3.10.16 h1:2er/SKKYbV60M+UuJM4eYCF0MZYAIq/yNUrAbTfgq8Q=
+go.unistack.org/micro/v3 v3.10.16/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
+go.unistack.org/micro/v3 v3.10.36 h1:+XPhpguDC0HldSePp5TODdMJ06+IUy1AQkYN7ub84DA=
+go.unistack.org/micro/v3 v3.10.36/go.mod h1:eUgtvbtiiz6te93m0ZdmoecbitWwjdBmmr84srmEIKA=
 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/v4/config"
+	"go.unistack.org/micro/v3/config"
-	"go.unistack.org/micro/v4/util/jitter"
+	"go.unistack.org/micro/v3/util/jitter"
-	rutil "go.unistack.org/micro/v4/util/reflect"
+	rutil "go.unistack.org/micro/v3/util/reflect"
 )
 
 type envWatcher struct {