Merge pull request 'Update workflows' (#99) from atolstikhin/micro-config-env:master into master

Reviewed-on: #99

env.go

@@ -1,4 +1,4 @@
-package env
+package env // import "go.unistack.org/micro-config-env/v4"
 
 import (
 	"context"
@@ -7,11 +7,11 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
-	"time"
 
 	"dario.cat/mergo"
-	"go.unistack.org/micro/v3/config"
+	"go.unistack.org/micro/v4/config"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	"go.unistack.org/micro/v4/options"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 var DefaultStructTag = "env"
@@ -24,9 +24,13 @@ func (c *envConfig) Options() config.Options {
 	return c.opts
 }
 
-func (c *envConfig) Init(opts ...config.Option) error {
+func (c *envConfig) Init(opts ...options.Option) error {
+	var err error
+
 	for _, o := range opts {
-		o(&c.opts)
+		if err = o(&c.opts); err != nil {
+			return err
+		}
 	}
 
 	if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
@@ -40,7 +44,7 @@ func (c *envConfig) Init(opts ...config.Option) error {
 	return nil
 }
 
-func (c *envConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
+func (c *envConfig) Load(ctx context.Context, opts ...options.Option) error {
 	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
 		return nil
 	}
@@ -51,8 +55,6 @@ func (c *envConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
 
 	options := config.NewLoadOptions(opts...)
 	mopts := []func(*mergo.Config){mergo.WithTypeCheck}
-	tt := timeTransformer{override: options.Override}
-	mopts = append(mopts, mergo.WithTransformers(tt))
 	if options.Override {
 		mopts = append(mopts, mergo.WithOverride)
 	}
@@ -146,7 +148,7 @@ func fillValue(ctx context.Context, value reflect.Value, val string) error {
 		if err != nil {
 			return err
 		}
-		value.Set(reflect.ValueOf(int8(v)))
+		value.Set(reflect.ValueOf(v))
 	case reflect.Int16:
 		v, err := strconv.ParseInt(val, 10, 16)
 		if err != nil {
@@ -160,14 +162,6 @@ func fillValue(ctx context.Context, value reflect.Value, val string) error {
 		}
 		value.Set(reflect.ValueOf(int32(v)))
 	case reflect.Int64:
-		if value.Type() == reflect.TypeOf(time.Duration(0)) {
-			d, err := time.ParseDuration(val)
-			if err != nil {
-				return fmt.Errorf("cannot parse duration %q: %w", val, err)
-			}
-			value.SetInt(int64(d))
-			return nil
-		}
 		v, err := strconv.ParseInt(val, 10, 64)
 		if err != nil {
 			return err
@@ -228,7 +222,7 @@ func (c *envConfig) setValues(ctx context.Context, valueOf reflect.Value) error
 		if rutil.IsZero(value) {
 			continue
 		}
-		if !field.IsExported() {
+		if len(field.PkgPath) != 0 {
 			continue
 		}
 		switch value.Kind() {
@@ -259,20 +253,6 @@ func (c *envConfig) setValues(ctx context.Context, valueOf reflect.Value) error
 	return nil
 }
 
-func getEnvValue(field reflect.StructField, structTag string) (string, bool) {
-	tags, ok := field.Tag.Lookup(structTag)
-	if !ok {
-		return "", false
-	}
-	var val string
-	for _, tag := range strings.Split(tags, ",") {
-		if v, ok := os.LookupEnv(tag); ok {
-			val = v
-		}
-	}
-	return val, val != ""
-}
-
 func fillValues(ctx context.Context, valueOf reflect.Value, structTag string) error {
 	var values reflect.Value
 
@@ -290,42 +270,21 @@ func fillValues(ctx context.Context, valueOf reflect.Value, structTag string) er
 
 	for idx := 0; idx < fields.NumField(); idx++ {
 		field := fields.Field(idx)
-		if !field.IsExported() {
-			continue
-		}
 		value := values.Field(idx)
 		if !value.CanSet() {
 			continue
 		}
-
+		if len(field.PkgPath) != 0 {
+			continue
+		}
 		switch value.Kind() {
 		case reflect.Struct:
-			if value.Type() == reflect.TypeOf(time.Time{}) {
-				if eval, ok := getEnvValue(field, structTag); ok {
-					parsed, err := time.Parse(time.RFC3339, eval)
-					if err != nil {
-						return fmt.Errorf("cannot parse time.Time %q: %w", eval, err)
-					}
-					value.Set(reflect.ValueOf(parsed))
-				}
-				continue
-			}
 			value.Set(reflect.Indirect(reflect.New(value.Type())))
 			if err := fillValues(ctx, value, structTag); err != nil {
 				return err
 			}
 			continue
 		case reflect.Ptr:
-			if value.Type().Elem() == reflect.TypeOf(time.Time{}) {
-				if eval, ok := getEnvValue(field, structTag); ok {
-					parsed, err := time.Parse(time.RFC3339, eval)
-					if err != nil {
-						return fmt.Errorf("cannot parse *time.Time %q: %w", eval, err)
-					}
-					value.Set(reflect.ValueOf(&parsed))
-				}
-				continue
-			}
 			if value.IsNil() {
 				if value.Type().Elem().Kind() != reflect.Struct {
 					// nil pointer to a non-struct: leave it alone
@@ -334,22 +293,38 @@ func fillValues(ctx context.Context, valueOf reflect.Value, structTag string) er
 				// nil pointer to struct: create a zero instance
 				value.Set(reflect.New(value.Type().Elem()))
 			}
-			if err := fillValues(ctx, value.Elem(), structTag); err != nil {
+			value = value.Elem()
+			if err := fillValues(ctx, value, structTag); err != nil {
 				return err
 			}
 			continue
-		default:
+		}
-			if eval, ok := getEnvValue(field, structTag); ok {
+		tags, ok := field.Tag.Lookup(structTag)
-				if err := fillValue(ctx, value, eval); err != nil {
+		if !ok {
-					return err
+			continue
-				}
+		}
+
+		var eval string
+		for _, tag := range strings.Split(tags, ",") {
+			if val, ok := os.LookupEnv(tag); !ok {
+				continue
+			} else {
+				eval = val
 			}
 		}
+		if eval == "" {
+			continue
+		}
+
+		if err := fillValue(ctx, value, eval); err != nil {
+			return err
+		}
 	}
+
 	return nil
 }
 
-func (c *envConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
+func (c *envConfig) Save(ctx context.Context, opts ...options.Option) error {
 	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
 		return nil
 	}
@@ -384,7 +359,7 @@ func (c *envConfig) Name() string {
 	return c.opts.Name
 }
 
-func (c *envConfig) Watch(ctx context.Context, opts ...config.WatchOption) (config.Watcher, error) {
+func (c *envConfig) Watch(ctx context.Context, opts ...options.Option) (config.Watcher, error) {
 	w := &envWatcher{
 		opts:  c.opts,
 		wopts: config.NewWatchOptions(opts...),
@@ -398,45 +373,10 @@ func (c *envConfig) Watch(ctx context.Context, opts ...config.WatchOption) (conf
 	return w, nil
 }
 
-func NewConfig(opts ...config.Option) config.Config {
+func NewConfig(opts ...options.Option) config.Config {
 	options := config.NewOptions(opts...)
 	if len(options.StructTag) == 0 {
 		options.StructTag = DefaultStructTag
 	}
 	return &envConfig{opts: options}
 }
-
-type timeTransformer struct {
-	override bool
-}
-
-func (t timeTransformer) Transformer(typ reflect.Type) func(dst, src reflect.Value) error {
-	if typ == reflect.TypeOf(time.Time{}) {
-		return func(dst, src reflect.Value) error {
-			if !dst.CanSet() || src.IsZero() {
-				return nil
-			}
-			if !t.override && !dst.IsZero() {
-				return nil
-			}
-			dst.Set(src)
-			return nil
-		}
-	}
-	if typ == reflect.TypeOf((*time.Time)(nil)) {
-		return func(dst, src reflect.Value) error {
-			if !dst.CanSet() || src.IsNil() {
-				return nil
-			}
-			if src.Elem().IsZero() {
-				return nil
-			}
-			if !t.override && !dst.IsNil() && !dst.Elem().IsZero() {
-				return nil
-			}
-			dst.Set(src)
-			return nil
-		}
-	}
-	return nil
-}

env_test.go

@@ -6,9 +6,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/require"
+	"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 {
@@ -239,336 +238,3 @@ func TestLoadMultiple(t *testing.T) {
 		}
 	}
 }
-
-func TestEnv_SupportedTypes(t *testing.T) {
-	type Config struct {
-		IntValue   int   `env:"INT_VALUE"`
-		Int8Value  int8  `env:"INT8_VALUE"`
-		Int16Value int16 `env:"INT16_VALUE"`
-		Int32Value int32 `env:"INT32_VALUE"`
-		Int64Value int64 `env:"INT64_VALUE"`
-
-		UintValue   uint   `env:"UINT_VALUE"`
-		Uint8Value  uint8  `env:"UINT8_VALUE"`
-		Uint16Value uint16 `env:"UINT16_VALUE"`
-		Uint32Value uint32 `env:"UINT32_VALUE"`
-		Uint64Value uint64 `env:"UINT64_VALUE"`
-
-		Float32Value float32 `env:"FLOAT32_VALUE"`
-		Float64Value float64 `env:"FLOAT64_VALUE"`
-
-		BoolValue bool `env:"BOOL_VALUE"`
-
-		StringValue string `env:"STRING_VALUE"`
-
-		StringSlice []string `env:"STRING_SLICE"`
-		IntSlice    []int    `env:"INT_SLICE"`
-
-		MapStringValue map[string]string `env:"MAP_STRING"`
-		MapIntValue    map[string]int    `env:"MAP_INT"`
-
-		DurationValue time.Duration `env:"DURATION_VALUE"`
-		TimeValue     time.Time     `env:"TIME_VALUE"`
-		TimePtrValue  *time.Time    `env:"TIME_PTR_VALUE"`
-	}
-
-	tests := []struct {
-		name   string
-		envVar string
-		envVal string
-		want   func() *Config
-	}{
-		// integers
-		{
-			name:   "int type",
-			envVar: "INT_VALUE",
-			envVal: "100",
-			want:   func() *Config { return &Config{IntValue: 100} },
-		},
-		{
-			name:   "int8 type",
-			envVar: "INT8_VALUE",
-			envVal: "127",
-			want:   func() *Config { return &Config{Int8Value: 127} },
-		},
-		{
-			name:   "int16 type",
-			envVar: "INT16_VALUE",
-			envVal: "32767",
-			want:   func() *Config { return &Config{Int16Value: 32767} },
-		},
-		{
-			name:   "int32 type",
-			envVar: "INT32_VALUE",
-			envVal: "2147483647",
-			want:   func() *Config { return &Config{Int32Value: 2147483647} },
-		},
-		{
-			name:   "int64 type",
-			envVar: "INT64_VALUE",
-			envVal: "9223372036854775807",
-			want:   func() *Config { return &Config{Int64Value: 9223372036854775807} },
-		},
-		// unsigned integers
-		{
-			name:   "uint type",
-			envVar: "UINT_VALUE",
-			envVal: "100",
-			want:   func() *Config { return &Config{UintValue: 100} },
-		},
-		{
-			name:   "uint8 type",
-			envVar: "UINT8_VALUE",
-			envVal: "255",
-			want:   func() *Config { return &Config{Uint8Value: 255} },
-		},
-		{
-			name:   "uint16 type",
-			envVar: "UINT16_VALUE",
-			envVal: "65535",
-			want:   func() *Config { return &Config{Uint16Value: 65535} },
-		},
-		{
-			name:   "uint32 type",
-			envVar: "UINT32_VALUE",
-			envVal: "4294967295",
-			want:   func() *Config { return &Config{Uint32Value: 4294967295} },
-		},
-		{
-			name:   "uint64 type",
-			envVar: "UINT64_VALUE",
-			envVal: "18446744073709551615",
-			want:   func() *Config { return &Config{Uint64Value: 18446744073709551615} },
-		},
-		// floats
-		{
-			name:   "float32 type",
-			envVar: "FLOAT32_VALUE",
-			envVal: "3.14159",
-			want:   func() *Config { return &Config{Float32Value: 3.14159} },
-		},
-		{
-			name:   "float64 type",
-			envVar: "FLOAT64_VALUE",
-			envVal: "3.141592653589793",
-			want:   func() *Config { return &Config{Float64Value: 3.141592653589793} },
-		},
-		// bool
-		{
-			name:   "bool true",
-			envVar: "BOOL_VALUE",
-			envVal: "true",
-			want:   func() *Config { return &Config{BoolValue: true} },
-		},
-		{
-			name:   "bool false",
-			envVar: "BOOL_VALUE",
-			envVal: "false",
-			want:   func() *Config { return &Config{BoolValue: false} },
-		},
-		{
-			name:   "bool 1",
-			envVar: "BOOL_VALUE",
-			envVal: "1",
-			want:   func() *Config { return &Config{BoolValue: true} },
-		},
-		{
-			name:   "bool 0",
-			envVar: "BOOL_VALUE",
-			envVal: "0",
-			want:   func() *Config { return &Config{BoolValue: false} },
-		},
-		// string
-		{
-			name:   "string type",
-			envVar: "STRING_VALUE",
-			envVal: "hello world",
-			want:   func() *Config { return &Config{StringValue: "hello world"} },
-		},
-		// slices
-		{
-			name:   "string slice comma separated",
-			envVar: "STRING_SLICE",
-			envVal: "val1,val2,val3",
-			want:   func() *Config { return &Config{StringSlice: []string{"val1", "val2", "val3"}} },
-		},
-		{
-			name:   "string slice semicolon separated",
-			envVar: "STRING_SLICE",
-			envVal: "val1;val2;val3",
-			want:   func() *Config { return &Config{StringSlice: []string{"val1", "val2", "val3"}} },
-		},
-		{
-			name:   "int slice comma separated",
-			envVar: "INT_SLICE",
-			envVal: "1,2,3,4,5",
-			want:   func() *Config { return &Config{IntSlice: []int{1, 2, 3, 4, 5}} },
-		},
-		{
-			name:   "int slice semicolon separated",
-			envVar: "INT_SLICE",
-			envVal: "1;2;3;4;5",
-			want:   func() *Config { return &Config{IntSlice: []int{1, 2, 3, 4, 5}} },
-		},
-		// maps
-		{
-			name:   "string map",
-			envVar: "MAP_STRING",
-			envVal: "key1=val1,key2=val2",
-			want: func() *Config {
-				return &Config{MapStringValue: map[string]string{"key1": "val1", "key2": "val2"}}
-			},
-		},
-		{
-			name:   "int map",
-			envVar: "MAP_INT",
-			envVal: "key1=1,key2=2",
-			want: func() *Config {
-				return &Config{MapIntValue: map[string]int{"key1": 1, "key2": 2}}
-			},
-		},
-		// time && duration
-		{
-			name:   "duration type",
-			envVar: "DURATION_VALUE",
-			envVal: "15m30s",
-			want:   func() *Config { return &Config{DurationValue: 15*time.Minute + 30*time.Second} },
-		},
-		{
-			name:   "time type RFC3339",
-			envVar: "TIME_VALUE",
-			envVal: "2025-08-28T15:04:05Z",
-			want: func() *Config {
-				return &Config{TimeValue: time.Date(2025, 8, 28, 15, 4, 5, 0, time.UTC)}
-			},
-		},
-		{
-			name:   "time type RFC3339",
-			envVar: "TIME_PTR_VALUE",
-			envVal: "2025-08-28T15:04:05Z",
-			want: func() *Config {
-				timeValue := time.Date(2025, 8, 28, 15, 4, 5, 0, time.UTC)
-				return &Config{TimePtrValue: &timeValue}
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			require.NoError(t, os.Setenv(tt.envVar, tt.envVal))
-			defer os.Unsetenv(tt.envVar)
-
-			cfgData := &Config{}
-			cfg := NewConfig(config.Struct(cfgData))
-
-			require.NoError(t, cfg.Init())
-			require.NoError(t, cfg.Load(context.Background()))
-
-			require.Equal(t, tt.want(), cfgData)
-		})
-	}
-}
-
-func TestEnv_TimeType_Override(t *testing.T) {
-	type Config struct {
-		TimeValue time.Time `env:"TIME"`
-	}
-
-	tests := []struct {
-		name   string
-		cfg    *Config
-		envVar string
-		envVal string
-		want   *Config
-	}{
-		{
-			name:   "init value is empty",
-			cfg:    &Config{},
-			envVar: "TIME",
-			envVal: "2025-08-28T15:04:05Z",
-			want: &Config{
-				TimeValue: time.Date(2025, 8, 28, 15, 4, 5, 0, time.UTC),
-			},
-		},
-		{
-			name: "init value is not empty",
-			cfg: &Config{
-				TimeValue: time.Date(2025, 5, 25, 15, 5, 5, 5, time.UTC),
-			},
-			envVar: "TIME",
-			envVal: "2025-08-28T15:04:05Z",
-			want: &Config{
-				TimeValue: time.Date(2025, 8, 28, 15, 4, 5, 0, time.UTC),
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			require.NoError(t, os.Setenv(tt.envVar, tt.envVal))
-			defer os.Unsetenv(tt.envVar)
-
-			cfg := NewConfig(config.Struct(tt.cfg))
-			require.NoError(t, cfg.Init())
-			require.NoError(t, cfg.Load(context.Background(), config.LoadOverride(true)))
-			require.Equal(t, tt.want, tt.cfg)
-		})
-	}
-}
-
-func TestEnv_TimePointerType_Override(t *testing.T) {
-	type Config struct {
-		TimeValue *time.Time `env:"TIME"`
-	}
-
-	tests := []struct {
-		name   string
-		cfg    func() *Config
-		envVar string
-		envVal string
-		want   func() *Config
-	}{
-		{
-			name:   "init value is empty",
-			cfg:    func() *Config { return &Config{} },
-			envVar: "TIME",
-			envVal: "2025-08-28T15:04:05Z",
-			want: func() *Config {
-				timeValue := time.Date(2025, 8, 28, 15, 4, 5, 0, time.UTC)
-				return &Config{
-					TimeValue: &timeValue,
-				}
-			},
-		},
-		{
-			name: "init value is not empty",
-			cfg: func() *Config {
-				timeValue := time.Date(2025, 5, 25, 15, 5, 5, 5, time.UTC)
-				return &Config{
-					TimeValue: &timeValue,
-				}
-			},
-			envVar: "TIME",
-			envVal: "2025-08-28T15:04:05Z",
-			want: func() *Config {
-				timeValue := time.Date(2025, 8, 28, 15, 4, 5, 0, time.UTC)
-				return &Config{
-					TimeValue: &timeValue,
-				}
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			require.NoError(t, os.Setenv(tt.envVar, tt.envVal))
-			defer os.Unsetenv(tt.envVar)
-
-			cfgData := tt.cfg()
-			cfg := NewConfig(config.Struct(cfgData))
-			require.NoError(t, cfg.Init())
-			require.NoError(t, cfg.Load(context.Background(), config.LoadOverride(true)))
-			require.Equal(t, tt.want(), cfgData)
-		})
-	}
-}

go.mod

@@ -1,24 +1,10 @@
-module go.unistack.org/micro-config-env/v3
+module go.unistack.org/micro-config-env/v4
 
-go 1.22
+go 1.20
-
-toolchain go1.23.1
 
 require (
-	dario.cat/mergo v1.0.1
+	dario.cat/mergo v1.0.0
-	go.unistack.org/micro/v3 v3.11.14
+	go.unistack.org/micro/v4 v4.0.15
 )
 
-require (
+require github.com/google/uuid v1.5.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-)
-
-require (
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	github.com/stretchr/testify v1.11.1
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
-	google.golang.org/protobuf v1.35.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)

go.sum

@@ -1,22 +1,9 @@
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
+dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+go.unistack.org/micro/v4 v4.0.15 h1:o4++RYX5guVPxfcJpP7VCj2Xr9BPFo6fj4+b5FStdEI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+go.unistack.org/micro/v4 v4.0.15/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
-go.unistack.org/micro/v3 v3.11.14 h1:3e9T30Ih9cvqZTCD8inG1qsBWRk4x5ZinWuTiDFM4CE=
-go.unistack.org/micro/v3 v3.11.14/go.mod h1:k++F5Ej4LIy3XnOW/oj3P7B97wp2t9yLSlqtUzMpatM=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 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=

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 {