.github/dependabot.yml

@@ -1,19 +0,0 @@
-# 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/renovate.json

@@ -0,0 +1,20 @@
+{
+  "extends": [
+    "config:base"
+  ],
+  "postUpdateOptions": ["gomodTidy"], 
+  "packageRules": [
+    {
+      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
+      "automerge": true
+    },
+    {
+      "groupName": "all deps",
+      "separateMajorMinor": true,
+      "groupSlug": "all",
+      "packagePatterns": [
+        "*"
+      ]
+    }
+  ]
+}

.github/workflows/autoapprove.yml

@@ -1,20 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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

@@ -3,20 +3,19 @@ on:
  push:
     branches:
     - master
-    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.16
     - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
     - name: cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -32,9 +31,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        uses: golangci/golangci-lint-action@v2
         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.

.github/workflows/codeql-analysis.yml

@@ -1,78 +0,0 @@
-# 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

@@ -1,27 +0,0 @@
-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

@@ -3,20 +3,19 @@ on:
   pull_request:
     branches:
     - master
-    - v3
 jobs:
   test:
     name: test
     runs-on: ubuntu-latest
     steps:
     - name: setup
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v2
       with:
-        go-version: 1.17
+        go-version: 1.16
     - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
     - name: cache
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -32,9 +31,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
       - name: lint
-        uses: golangci/golangci-lint-action@v3.4.0
+        uses: golangci/golangci-lint-action@v2
         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.

env.go

@@ -1,4 +1,4 @@
-package env // import "go.unistack.org/micro-config-env/v4"
+package env
 
 import (
 	"context"
@@ -8,13 +8,14 @@ import (
 	"strconv"
 	"strings"
 
-"dario.cat/mergo"
+	"github.com/imdario/mergo"
-	"go.unistack.org/micro/v4/config"
+	"github.com/unistack-org/micro/v3/config"
-	"go.unistack.org/micro/v4/options"
+	rutil "github.com/unistack-org/micro/v3/util/reflect"
-	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
-var DefaultStructTag = "env"
+var (
+	DefaultStructTag = "env"
+)
 
 type envConfig struct {
 	opts config.Options
@@ -24,64 +25,42 @@ 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)
 	}
-
-	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 && !c.opts.AllowFail {
-		return err
-	}
-
 	return nil
 }
 
-func (c *envConfig) Load(ctx context.Context, opts ...options.Option) error {
+func (c *envConfig) Load(ctx context.Context) error {
-	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
+	for _, fn := range c.opts.BeforeLoad {
-		return nil
+		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
-	}
+			return err
-
-	if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
-		return err
-	}
-
-	options := config.NewLoadOptions(opts...)
-	mopts := []func(*mergo.Config){mergo.WithTypeCheck}
-	if options.Override {
-		mopts = append(mopts, mergo.WithOverride)
-	}
-	if options.Append {
-		mopts = append(mopts, mergo.WithAppendSlice)
-	}
-
-	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(dst, src, mopts...)
 		}
 	}
 
+	src, err := rutil.Zero(c.opts.Struct)
+	if err == nil {
+		err = c.fillValues(ctx, reflect.ValueOf(src))
+	}
 	if err != nil && !c.opts.AllowFail {
 		return err
 	}
 
-	if err := config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
+	if err = mergo.Merge(c.opts.Struct, src, mergo.WithOverride, mergo.WithTypeCheck, mergo.WithAppendSlice); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
+	for _, fn := range c.opts.AfterLoad {
+		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
+			return err
+		}
+	}
+
 	return nil
 }
 
-func fillValue(ctx context.Context, value reflect.Value, val string) error {
+func (c *envConfig) fillValue(ctx context.Context, value reflect.Value, val string) error {
 	switch value.Kind() {
 	case reflect.Map:
 		t := value.Type()
@@ -95,10 +74,10 @@ func fillValue(ctx context.Context, value reflect.Value, val string) error {
 			kv := strings.FieldsFunc(nval, func(c rune) bool { return c == '=' })
 			mkey := reflect.Indirect(reflect.New(kt))
 			mval := reflect.Indirect(reflect.New(et))
-			if err := fillValue(ctx, mkey, kv[0]); err != nil {
+			if err := c.fillValue(ctx, mkey, kv[0]); err != nil {
 				return err
 			}
-			if err := fillValue(ctx, mval, kv[1]); err != nil {
+			if err := c.fillValue(ctx, mval, kv[1]); err != nil {
 				return err
 			}
 			value.SetMapIndex(mkey, mval)
@@ -108,7 +87,7 @@ func fillValue(ctx context.Context, value reflect.Value, val string) error {
 		value.Set(reflect.MakeSlice(reflect.SliceOf(value.Type().Elem()), len(nvals), len(nvals)))
 		for idx, nval := range nvals {
 			nvalue := reflect.Indirect(reflect.New(value.Type().Elem()))
-			if err := fillValue(ctx, nvalue, nval); err != nil {
+			if err := c.fillValue(ctx, nvalue, nval); err != nil {
 				return err
 			}
 			value.Index(idx).Set(nvalue)
@@ -235,21 +214,20 @@ func (c *envConfig) setValues(ctx context.Context, valueOf reflect.Value) error
 			continue
 		}
 
-		tags, ok := field.Tag.Lookup(c.opts.StructTag)
+		tag, ok := field.Tag.Lookup(c.opts.StructTag)
 		if !ok {
 			continue
 		}
-		for _, tag := range strings.Split(tags, ",") {
+
-			if err := os.Setenv(tag, fmt.Sprintf("%v", value.Interface())); err != nil && !c.opts.AllowFail {
+		if err := os.Setenv(tag, fmt.Sprintf("%v", value.Interface())); err != nil && !c.opts.AllowFail {
-				return err
+			return err
-			}
 		}
 	}
 
 	return nil
 }
 
-func fillValues(ctx context.Context, valueOf reflect.Value, structTag string) error {
+func (c *envConfig) fillValues(ctx context.Context, valueOf reflect.Value) error {
 	var values reflect.Value
 
 	if valueOf.Kind() == reflect.Ptr {
@@ -276,7 +254,7 @@ func fillValues(ctx context.Context, valueOf reflect.Value, structTag string) er
 		switch value.Kind() {
 		case reflect.Struct:
 			value.Set(reflect.Indirect(reflect.New(value.Type())))
-			if err := fillValues(ctx, value, structTag); err != nil {
+			if err := c.fillValues(ctx, value); err != nil {
 				return err
 			}
 			continue
@@ -290,29 +268,21 @@ func fillValues(ctx context.Context, valueOf reflect.Value, structTag string) er
 				value.Set(reflect.New(value.Type().Elem()))
 			}
 			value = value.Elem()
-			if err := fillValues(ctx, value, structTag); err != nil {
+			if err := c.fillValues(ctx, value); err != nil {
 				return err
 			}
 			continue
 		}
-		tags, ok := field.Tag.Lookup(structTag)
+		tag, ok := field.Tag.Lookup(c.opts.StructTag)
+		if !ok {
+			continue
+		}
+		val, ok := os.LookupEnv(tag)
 		if !ok {
 			continue
 		}
 
-		var eval string
+		if err := c.fillValue(ctx, value, val); err != nil {
-		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
 		}
 	}
@@ -320,28 +290,21 @@ 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) error {
-	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
+	for _, fn := range c.opts.BeforeSave {
-		return nil
+		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
+			return err
+		}
 	}
 
-	options := config.NewSaveOptions(opts...)
+	if err := c.setValues(ctx, reflect.ValueOf(c.opts.Struct)); err != nil && !c.opts.AllowFail {
-
-	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
-	dst := c.opts.Struct
+	for _, fn := range c.opts.AfterSave {
-	if options.Struct != nil {
+		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
-		dst = options.Struct
+			return err
-	}
+		}
-
-	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
 	}
 
 	return nil
@@ -355,21 +318,7 @@ func (c *envConfig) Name() string {
 	return c.opts.Name
 }
 
-func (c *envConfig) Watch(ctx context.Context, opts ...options.Option) (config.Watcher, error) {
+func NewConfig(opts ...config.Option) config.Config {
-	w := &envWatcher{
-		opts:  c.opts,
-		wopts: config.NewWatchOptions(opts...),
-		done:  make(chan struct{}),
-		vchan: make(chan map[string]interface{}),
-		echan: make(chan error),
-	}
-
-	go w.run()
-
-	return w, nil
-}
-
-func NewConfig(opts ...options.Option) config.Config {
 	options := config.NewOptions(opts...)
 	if len(options.StructTag) == 0 {
 		options.StructTag = DefaultStructTag

env_test.go

@@ -1,17 +1,16 @@
-package env
+package env_test
 
 import (
 	"context"
 	"os"
 	"testing"
-	"time"
 
-	"go.unistack.org/micro/v4/config"
+	env "github.com/unistack-org/micro-config-env/v3"
-	rutil "go.unistack.org/micro/v4/util/reflect"
+	"github.com/unistack-org/micro/v3/config"
 )
 
 type Config struct {
-	StringValue    string            `env:"STRING_VALUE,STRING_VALUE2"`
+	StringValue    string            `env:"STRING_VALUE"`
 	BoolValue      bool              `env:"BOOL_VALUE"`
 	StringSlice    []string          `env:"STRING_SLICE"`
 	IntSlice       []int             `env:"INT_SLICE"`
@@ -19,81 +18,16 @@ type Config struct {
 	MapIntValue    map[string]int    `env:"MAP_INT"`
 }
 
-func TestMerge(t *testing.T) {
-	defer func() {
-		for _, v := range []string{"STRING_VALUE", "BOOL_VALUE", "STRING_SLICE", "INT_SLICE", "MAP_STRING", "MAP_INT"} {
-			if err := os.Unsetenv(v); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}()
-
-	ctx := context.Background()
-	type Nested struct {
-		Name string `env:"NAME_VALUE"`
-	}
-	type Cfg struct {
-		Name   string `env:"NAME_VALUE"`
-		Nested Nested
-	}
-
-	conf := &Cfg{}
-
-	cfg := NewConfig(config.Struct(conf))
-
-	if err := cfg.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := cfg.Load(ctx, config.LoadOverride(true), config.LoadAppend(true)); err != nil {
-		t.Fatal(err)
-	}
-
-	w, err := cfg.Watch(ctx, config.WatchInterval(50*time.Millisecond, 500*time.Millisecond))
-	defer func() {
-		if err := w.Stop(); err != nil {
-			t.Fatal(err)
-		}
-	}()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	os.Setenv("NAME_VALUE", "after")
-	changes, err := w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for k, v := range changes {
-		if err := rutil.SetFieldByPath(conf, v, k); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	if conf.Name != "after" || conf.Nested.Name != "after" {
-		t.Fatalf("changes %#+v not applied to %#+v", changes, conf)
-	}
-}
-
 func TestLoad(t *testing.T) {
-	defer func() {
-		for _, v := range []string{"STRING_VALUE", "STRING_VALUE2", "BOOL_VALUE", "STRING_SLICE", "INT_SLICE", "MAP_STRING", "MAP_INT"} {
-			if err := os.Unsetenv(v); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}()
-
 	ctx := context.Background()
 	conf := &Config{StringValue: "before_load"}
-	cfg := NewConfig(config.Struct(conf))
+	cfg := env.NewConfig(config.Struct(conf))
 
 	if err := cfg.Init(); err != nil {
 		t.Fatal(err)
 	}
 
-	if err := cfg.Load(ctx, config.LoadOverride(true), config.LoadAppend(true)); err != nil {
+	if err := cfg.Load(ctx); err != nil {
 		t.Fatal(err)
 	}
 
@@ -108,7 +42,7 @@ func TestLoad(t *testing.T) {
 	os.Setenv("MAP_STRING", "key1=val1,key2=val2")
 	os.Setenv("MAP_INT", "key1=1,key2=2")
 
-	if err := cfg.Load(ctx, config.LoadOverride(true), config.LoadAppend(true)); err != nil {
+	if err := cfg.Load(ctx); err != nil {
 		t.Fatal(err)
 	}
 	if conf.StringValue != "STRING_VALUE" {
@@ -131,25 +65,12 @@ func TestLoad(t *testing.T) {
 		t.Fatalf("something wrong with env config: %#+v", conf.MapIntValue)
 	}
 
-	for _, v := range []string{"STRING_VALUE", "STRING_VALUE2", "BOOL_VALUE", "STRING_SLICE", "INT_SLICE", "MAP_STRING", "MAP_INT"} {
+	t.Logf("cfg %#+v", conf)
-		if err := os.Unsetenv(v); err != nil {
-			t.Fatal(err)
-		}
-	}
 }
-
 func TestSave(t *testing.T) {
-	defer func() {
-		for _, v := range []string{"STRING_VALUE", "STRING_VALUE2", "BOOL_VALUE", "STRING_SLICE", "INT_SLICE", "MAP_STRING", "MAP_INT"} {
-			if err := os.Unsetenv(v); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}()
-
 	ctx := context.Background()
 	conf := &Config{StringValue: "MICRO_CONFIG_ENV"}
-	cfg := NewConfig(config.Struct(conf))
+	cfg := env.NewConfig(config.Struct(conf))
 
 	if err := cfg.Init(); err != nil {
 		t.Fatal(err)
@@ -181,60 +102,7 @@ func TestSave(t *testing.T) {
 		if v, ok := os.LookupEnv("STRING_VALUE"); ok {
 			t.Fatalf("env value %s=%s set", tv, v)
 		}
+
 	}
 
-	for _, v := range []string{"STRING_VALUE", "STRING_VALUE2", "BOOL_VALUE", "STRING_SLICE", "INT_SLICE", "MAP_STRING", "MAP_INT"} {
-		if err := os.Unsetenv(v); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestLoadMultiple(t *testing.T) {
-	defer func() {
-		for _, v := range []string{"STRING_VALUE", "STRING_VALUE2", "BOOL_VALUE", "STRING_SLICE", "INT_SLICE", "MAP_STRING", "MAP_INT"} {
-			if err := os.Unsetenv(v); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}()
-
-	ctx := context.Background()
-	conf := &Config{StringValue: "before_load"}
-	cfg := NewConfig(config.Struct(conf))
-
-	if err := cfg.Init(); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := cfg.Load(ctx, config.LoadOverride(true), config.LoadAppend(true)); err != nil {
-		t.Fatal(err)
-	}
-
-	if conf.StringValue != "before_load" {
-		t.Fatalf("something wrong with env config: %#+v", conf)
-	}
-
-	os.Setenv("STRING_VALUE", "STRING_VALUE1")
-	os.Setenv("STRING_VALUE2", "STRING_VALUE2")
-	defer func() {
-		for _, v := range []string{"STRING_VALUE", "STRING_VALUE2"} {
-			if err := os.Unsetenv(v); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}()
-
-	if err := cfg.Load(ctx, config.LoadOverride(true), config.LoadAppend(true)); err != nil {
-		t.Fatal(err)
-	}
-	if conf.StringValue != "STRING_VALUE2" {
-		t.Fatalf("something wrong with env config: %#+v", conf)
-	}
-
-	for _, v := range []string{"STRING_VALUE", "STRING_VALUE2", "BOOL_VALUE", "STRING_SLICE", "INT_SLICE", "MAP_STRING", "MAP_INT"} {
-		if err := os.Unsetenv(v); err != nil {
-			t.Fatal(err)
-		}
-	}
 }

go.mod

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

go.sum

@@ -1,9 +1,18 @@
-dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
-github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
+github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
-go.unistack.org/micro/v4 v4.0.15 h1:o4++RYX5guVPxfcJpP7VCj2Xr9BPFo6fj4+b5FStdEI=
+github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-go.unistack.org/micro/v4 v4.0.15/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+github.com/unistack-org/micro/v3 v3.3.17 h1:WcyS7InP0DlS/JpRQGLh5sG6VstkdHJbgpMp+gmHmwg=
+github.com/unistack-org/micro/v3 v3.3.17/go.mod h1:022EOEZZ789hZY3yB5ZSMXU6jLiadBgcNB/cpediV3c=
+golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 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.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

watcher.go

@@ -1,82 +0,0 @@
-package env
-
-import (
-	"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 {
-	opts  config.Options
-	wopts config.WatchOptions
-	done  chan struct{}
-	vchan chan map[string]interface{}
-	echan chan error
-}
-
-func (w *envWatcher) run() {
-	ticker := jitter.NewTicker(w.wopts.MinInterval, w.wopts.MaxInterval)
-	defer ticker.Stop()
-
-	src := w.opts.Struct
-	if w.wopts.Struct != nil {
-		src = w.wopts.Struct
-	}
-
-	for {
-		select {
-		case <-w.done:
-			return
-		case <-ticker.C:
-			dst, err := rutil.Zero(src)
-			if err == nil {
-				err = fillValues(w.opts.Context, reflect.ValueOf(dst), w.opts.StructTag)
-			}
-			if err != nil {
-				w.echan <- err
-				return
-			}
-			srcmp, err := rutil.StructFieldsMap(src)
-			if err != nil {
-				w.echan <- err
-				return
-			}
-			dstmp, err := rutil.StructFieldsMap(dst)
-			if err != nil {
-				w.echan <- err
-				return
-			}
-			for sk, sv := range srcmp {
-				if reflect.DeepEqual(dstmp[sk], sv) {
-					delete(dstmp, sk)
-				}
-			}
-			if len(dstmp) > 0 {
-				w.vchan <- dstmp
-				src = dst
-			}
-		}
-	}
-}
-
-func (w *envWatcher) Next() (map[string]interface{}, error) {
-	select {
-	case <-w.done:
-		break
-	case err := <-w.echan:
-		return nil, err
-	case v, ok := <-w.vchan:
-		if !ok {
-			break
-		}
-		return v, nil
-	}
-	return nil, config.ErrWatcherStopped
-}
-
-func (w *envWatcher) Stop() error {
-	close(w.done)
-	return nil
-}