Merge pull request 'update for latest micro changes' (#98) from microv4 into master

Reviewed-on: #98

.gitea/workflows/job_lint.yml

@@ -1,29 +0,0 @@
-name: lint
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable' 
-    - name: setup deps
-      run: go get -v ./...
-    - name: run lint
-      uses: https://github.com/golangci/golangci-lint-action@v6
-      with:
-        version: 'latest'

.gitea/workflows/job_test.yml

@@ -1,34 +0,0 @@
-name: test
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-  push:
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable'
-    - name: setup deps
-      run: go get -v ./...
-    - name: run test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...

.gitea/workflows/job_tests.yml

@@ -1,53 +0,0 @@
-name: test
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-  push:
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: checkout tests
-      uses: actions/checkout@v4
-      with:
-        ref: master
-        filter: 'blob:none'
-        repository: unistack-org/micro-tests
-        path: micro-tests
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable'
-    - name: setup go work
-      env:
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: |
-        go work init
-        go work use .
-        go work use micro-tests        
-    - name: setup deps
-      env:
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: go get -v ./...
-    - name: run tests
-      env:
-        INTEGRATION_TESTS: yes
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: |
-        cd micro-tests
-        go test -mod readonly -v ./... || true        

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  # Maintain dependencies for Golang
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/autoapprove.yml

@@ -0,0 +1,20 @@
+name: "autoapprove"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  autoapprove:
+    runs-on: ubuntu-latest
+    steps:
+      - name: approve
+        uses: hmarr/auto-approve-action@v3
+        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
+        id: approve
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/automerge.yml

@@ -0,0 +1,21 @@
+name: "automerge"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    if: github.actor == 'vtolstov'
+    steps:
+      - name: merge
+        id: merge
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/build.yml

@@ -0,0 +1,47 @@
+name: build
+on:
+ push:
+    branches:
+    - master
+    - v3
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
+    - name: checkout
+      uses: actions/checkout@v3
+    - name: cache
+      uses: actions/cache@v3
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: ${{ runner.os }}-go-
+    - name: deps
+      run: go get -v -t -d ./...
+    - name: test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...
+  lint:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: lint
+        uses: golangci/golangci-lint-action@v3.4.0
+        continue-on-error: true
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.30
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+          # Optional: golangci-lint command line arguments.
+          # args: --issues-exit-code=0
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,78 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "codeql"
+
+on:
+  workflow_run:
+    workflows: ["prbuild"]
+    types:
+      - completed
+  push:
+    branches: [ master, v3 ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master, v3 ]
+  schedule:
+    - cron: '34 1 * * 0'
+
+jobs:
+  analyze:
+    name: analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: checkout
+      uses: actions/checkout@v3
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
+    # Initializes the CodeQL tools for scanning.
+    - name: init
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: analyze
+      uses: github/codeql-action/analyze@v2

.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,27 @@
+name: "dependabot-automerge"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.6
+        with:
+          github-token: "${{ secrets.TOKEN }}"
+      - name: merge
+        id: merge
+        if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/pr.yml

@@ -0,0 +1,47 @@
+name: prbuild
+on:
+  pull_request:
+    branches:
+    - master
+    - v3
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
+    - name: checkout
+      uses: actions/checkout@v3
+    - name: cache
+      uses: actions/cache@v3
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: ${{ runner.os }}-go-
+    - name: deps
+      run: go get -v -t -d ./...
+    - name: test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...
+  lint:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+      - name: lint
+        uses: golangci/golangci-lint-action@v3.4.0
+        continue-on-error: true
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.30
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+          # Optional: golangci-lint command line arguments.
+          # args: --issues-exit-code=0
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true

.golangci.yml

@@ -1,5 +0,0 @@
-run:
-  concurrency: 8
-  deadline: 5m
-  issues-exit-code: 1
-  tests: true

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"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	"github.com/imdario/mergo"
+	"go.unistack.org/micro/v4/config"
+	"go.unistack.org/micro/v4/options"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 var DefaultStructTag = "env"
@@ -24,7 +24,7 @@ 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 {
 	for _, o := range opts {
 		o(&c.opts)
 	}
@@ -40,19 +40,13 @@ func (c *envConfig) Init(opts ...config.Option) error {
 	return nil
 }
 
-func (c *envConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
-	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
-		return nil
-	}
-
+func (c *envConfig) Load(ctx context.Context, opts ...options.Option) error {
 	if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
 	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 +140,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 +154,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 +214,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 +245,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 +262,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,26 +285,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 {
-				if err := fillValue(ctx, value, eval); err != nil {
-					return err
-				}
+		}
+		tags, ok := field.Tag.Lookup(structTag)
+		if !ok {
+			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 {
-	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
-		return nil
-	}
-
+func (c *envConfig) Save(ctx context.Context, opts ...options.Option) error {
 	options := config.NewSaveOptions(opts...)
 
 	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
@@ -384,7 +347,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 +361,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/v3/config"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	"go.unistack.org/micro/v4/config"
+	rutil "go.unistack.org/micro/v4/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
-
-toolchain go1.23.1
+go 1.20
 
 require (
-	dario.cat/mergo v1.0.1
-	go.unistack.org/micro/v3 v3.11.14
+	github.com/imdario/mergo v0.3.16
+	go.unistack.org/micro/v4 v4.0.6
 )
 
-require (
-	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
-)
+require github.com/google/uuid v1.3.0 // indirect

go.sum

@@ -1,22 +1,12 @@
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-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=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
+github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
+github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
+go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo=
+go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs=
+go.unistack.org/micro/v4 v4.0.6 h1:YFWvTh3VwyOd6NHYTQcf47n2TF5+p/EhpnbuBQX3qhk=
+go.unistack.org/micro/v4 v4.0.6/go.mod h1:bVEYTlPi0EsdgZZt311bIroDg9ict7ky3C87dSCCAGk=
 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/v3/util/jitter"
-	rutil "go.unistack.org/micro/v3/util/reflect"
+	"go.unistack.org/micro/v4/config"
+	"go.unistack.org/micro/v4/util/jitter"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 type envWatcher struct {