Merge pull request #41 from unistack-org/master

merge master

.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/renovate.json

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

.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@v2
+    - name: setup
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.16
+    # Initializes the CodeQL tools for scanning.
+    - name: init
+      uses: github/codeql-action/init@v1
+      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@v1
+
+    # ℹ️ 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@v1

.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,31 @@
+name: "prautomerge"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.1.1
+        with:
+          github-token: "${{ secrets.TOKEN }}"
+      - name: approve
+        run: gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}
+      - name: 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}}

env.go

@@ -1,4 +1,4 @@
-package env
+package env // import "go.unistack.org/micro-config-env/v3"
 
 import (
 	"context"
@@ -9,13 +9,11 @@ import (
 	"strings"
 
 	"github.com/imdario/mergo"
-	"github.com/unistack-org/micro/v3/config"
+	"go.unistack.org/micro/v3/config"
-	rutil "github.com/unistack-org/micro/v3/util/reflect"
+	rutil "go.unistack.org/micro/v3/util/reflect"
 )
 
-var (
+var DefaultStructTag = "env"
-	DefaultStructTag = "env"
-)
 
 type envConfig struct {
 	opts config.Options
@@ -33,11 +31,9 @@ func (c *envConfig) Init(opts ...config.Option) error {
 }
 
 func (c *envConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
-	for _, fn := range c.opts.BeforeLoad {
+	if err := config.DefaultBeforeLoad(ctx, c); err != nil {
-		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
-	}
 
 	options := config.NewLoadOptions(opts...)
 	mopts := []func(*mergo.Config){mergo.WithTypeCheck}
@@ -50,23 +46,22 @@ func (c *envConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
 
 	src, err := rutil.Zero(c.opts.Struct)
 	if err == nil {
-		err = fillValues(ctx, reflect.ValueOf(src), c.opts.StructTag)
+		if err = fillValues(ctx, reflect.ValueOf(src), c.opts.StructTag); err == nil {
-	}
-	if err != nil && !c.opts.AllowFail {
-		return err
-	}
-
 			err = mergo.Merge(c.opts.Struct, src, mopts...)
-	if err != nil && !c.opts.AllowFail {
+		}
-		return err
 	}
 
-	for _, fn := range c.opts.AfterLoad {
+	if err != nil {
-		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
+		c.opts.Logger.Errorf(c.opts.Context, "env load err: %v", err)
+		if !c.opts.AllowFail {
 			return err
 		}
 	}
 
+	if err := config.DefaultAfterLoad(ctx, c); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -301,22 +296,21 @@ func fillValues(ctx context.Context, valueOf reflect.Value, structTag string) er
 }
 
 func (c *envConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
-	for _, fn := range c.opts.BeforeSave {
+	if err := config.DefaultBeforeSave(ctx, c); err != nil {
-		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
+		return err
+	}
+
+	if err := c.setValues(ctx, reflect.ValueOf(c.opts.Struct)); err != nil {
+		c.opts.Logger.Errorf(c.opts.Context, "env save error: %v", err)
+		if !c.opts.AllowFail {
 			return err
 		}
 	}
 
-	if err := c.setValues(ctx, reflect.ValueOf(c.opts.Struct)); err != nil && !c.opts.AllowFail {
+	if err := config.DefaultAfterSave(ctx, c); err != nil {
 		return err
 	}
 
-	for _, fn := range c.opts.AfterSave {
-		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
-			return err
-		}
-	}
-
 	return nil
 }
 

env_test.go

@@ -1,12 +1,13 @@
-package env_test
+package env
 
 import (
 	"context"
 	"os"
 	"testing"
+	"time"
 
-	env "github.com/unistack-org/micro-config-env/v3"
+	"go.unistack.org/micro/v3/config"
-	"github.com/unistack-org/micro/v3/config"
+	rutil "go.unistack.org/micro/v3/util/reflect"
 )
 
 type Config struct {
@@ -18,10 +19,56 @@ type Config struct {
 	MapIntValue    map[string]int    `env:"MAP_INT"`
 }
 
+func TestMerge(t *testing.T) {
+	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)
+		}
+	}()
+
+	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) {
 	ctx := context.Background()
 	conf := &Config{StringValue: "before_load"}
-	cfg := env.NewConfig(config.Struct(conf))
+	cfg := NewConfig(config.Struct(conf))
 
 	if err := cfg.Init(); err != nil {
 		t.Fatal(err)
@@ -64,13 +111,12 @@ func TestLoad(t *testing.T) {
 	if len(conf.MapIntValue) != 2 {
 		t.Fatalf("something wrong with env config: %#+v", conf.MapIntValue)
 	}
-
-	t.Logf("cfg %#+v", conf)
 }
+
 func TestSave(t *testing.T) {
 	ctx := context.Background()
 	conf := &Config{StringValue: "MICRO_CONFIG_ENV"}
-	cfg := env.NewConfig(config.Struct(conf))
+	cfg := NewConfig(config.Struct(conf))
 
 	if err := cfg.Init(); err != nil {
 		t.Fatal(err)
@@ -102,7 +148,5 @@ func TestSave(t *testing.T) {
 		if v, ok := os.LookupEnv("STRING_VALUE"); ok {
 			t.Fatalf("env value %s=%s set", tv, v)
 		}
-
 	}
-
 }

go.mod

@@ -1,8 +1,8 @@
-module github.com/unistack-org/micro-config-env/v3
+module go.unistack.org/micro-config-env/v3
 
 go 1.16
 
 require (
 	github.com/imdario/mergo v0.3.12
-	github.com/unistack-org/micro/v3 v3.5.9
+	go.unistack.org/micro/v3 v3.8.11
 )

go.sum

@@ -1,18 +1,28 @@
 github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
 github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 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/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/unistack-org/micro/v3 v3.5.9 h1:9iIxGZ56bVME7E9hqKIHeSHXkn69M9KFyJfaUzi7B9k=
+go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA=
-github.com/unistack-org/micro/v3 v3.5.9/go.mod h1:zQnZPEy842kQNcyjmVys6tdMjty4PHdyUUKYm1wrg1s=
+go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8=
-golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+go.unistack.org/micro/v3 v3.8.11 h1:Wv1YopcYNcsN3bW8Mv8v6AF99s0uKBtWQ1M/Ag8QLec=
+go.unistack.org/micro/v3 v3.8.11/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA=
+golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 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=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

watcher.go

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