fixup load options using

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

.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

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

.github/workflows/codeql-analysis.yml

@@ -9,7 +9,7 @@
 # the `language` matrix defined below to confirm you have the correct set of
 # supported CodeQL languages.
 #
-name: "CodeQL"
+name: "codeql"
 
 on:
   workflow_run:
@@ -17,16 +17,16 @@ on:
     types:
       - completed
   push:
-    branches: [ master ]
+    branches: [ master, v3 ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ master, v3 ]
   schedule:
     - cron: '34 1 * * 0'
 
 jobs:
   analyze:
-    name: Analyze
+    name: analyze
     runs-on: ubuntu-latest
     permissions:
       actions: read
@@ -42,12 +42,15 @@ jobs:
         # 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 repository
+    - name: checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
-
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
     # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
+    - name: init
-      uses: github/codeql-action/init@v1
+      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.
@@ -57,8 +60,8 @@ jobs:
 
     # 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
+    - name: autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -71,5 +74,5 @@ jobs:
     #   make bootstrap
     #   make release
 
-    - name: Perform CodeQL Analysis
+    - name: analyze
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/dependabot-automerge.yml

@@ -1,66 +1,27 @@
-name: "prautomerge"
+name: "dependabot-automerge"
 
 on:
-  workflow_run:
+  pull_request_target:
-    workflows: ["prbuild"]
+    types: [assigned, opened, synchronize, reopened]
-    types:
-      - completed
 
 permissions:
-  contents: write
   pull-requests: write
+  contents: write
 
 jobs:
-  Dependabot-Automerge:
+  automerge:
     runs-on: ubuntu-latest
-    # Contains workaround to execute if dependabot updates the PR by checking for the base branch in the linked PR
+    if: github.actor == 'dependabot[bot]'
-    # The the github.event.workflow_run.event value is 'push' and not 'pull_request'
-    # dont work with multiple workflows when last returns success
-    if: >-
-      github.event.workflow_run.conclusion == 'success'
-      && github.actor == 'dependabot[bot]'
-      && github.event.sender.login == 'dependabot[bot]'
-      && github.event.sender.type == 'Bot'
-      && (github.event.workflow_run.event == 'pull_request'
-          || (github.event.workflow_run.event == 'push' && github.event.workflow_run.pull_requests[0].base.ref == github.event.repository.default_branch ))
     steps:
-      - name: Approve Changes and Merge changes if label 'dependencies' is set
+      - name: metadata
-        uses: actions/github-script@v5
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.6
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: "${{ secrets.TOKEN }}"
-          script: |
+      - name: merge
-            console.log(context.payload.workflow_run);
+        id: merge
-            
+        if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
-            var labelNames = await github.paginate(
+        run: gh pr merge --auto --merge "$PR_URL"
-              github.issues.listLabelsOnIssue,
+        env:
-              {
+          PR_URL: ${{github.event.pull_request.html_url}}
-                repo: context.repo.repo,
+          GITHUB_TOKEN: ${{secrets.TOKEN}}
-                owner: context.repo.owner,
-                issue_number: context.payload.workflow_run.pull_requests[0].number,
-              },
-              (response) => response.data.map(
-                (label) => label.name
-              )
-            );
-
-            console.log(labelNames);
-
-            if (labelNames.includes('dependencies')) {
-              console.log('Found label');
-
-              await github.pulls.createReview({
-                repo: context.repo.repo,
-                owner: context.repo.owner,
-                pull_number: context.payload.workflow_run.pull_requests[0].number,
-                event: 'APPROVE'
-              });
-              console.log('Approved PR');
-
-              await github.pulls.merge({
-                repo: context.repo.repo,
-                owner: context.repo.owner,
-                pull_number: context.payload.workflow_run.pull_requests[0].number,
-              });
-
-              console.log('Merged PR');
-            }

.github/workflows/pr.yml

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

file.go

@@ -4,74 +4,154 @@ import (
 	"context"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
+	"regexp"
 
-	"github.com/imdario/mergo"
+	"dario.cat/mergo"
-	"github.com/unistack-org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
-	"github.com/unistack-org/micro/v3/config"
+	"go.unistack.org/micro/v4/config"
-	rutil "github.com/unistack-org/micro/v3/util/reflect"
+	"go.unistack.org/micro/v4/options"
+	rutil "go.unistack.org/micro/v4/util/reflect"
+	"golang.org/x/text/transform"
 )
 
 var DefaultStructTag = "file"
 
 type fileConfig struct {
-	opts config.Options
+	opts        config.Options
-	path string
+	path        string
+	reader      io.Reader
+	transformer transform.Transformer
 }
 
 func (c *fileConfig) Options() config.Options {
 	return c.opts
 }
 
-func (c *fileConfig) Init(opts ...config.Option) error {
+func (c *fileConfig) Init(opts ...options.Option) error {
+	var err error
+
+	if err = config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
+		return err
+	}
+
 	for _, o := range opts {
-		o(&c.opts)
+		if err = o(&c.opts); err != nil {
+			return err
+		}
 	}
 
 	if c.opts.Context != nil {
 		if v, ok := c.opts.Context.Value(pathKey{}).(string); ok {
 			c.path = v
 		}
+		if v, ok := c.opts.Context.Value(transformerKey{}).(transform.Transformer); ok {
+			c.transformer = v
+		}
+		if v, ok := c.opts.Context.Value(readerKey{}).(io.Reader); ok {
+			c.reader = v
+		}
 	}
 
-	if c.path == "" {
+	if c.opts.Codec == nil {
-		err := fmt.Errorf("file path not exists: %v", c.path)
+		return fmt.Errorf("Codec must be specified")
-		c.opts.Logger.Error(c.opts.Context, err)
+	}
+
+	if c.path == "" && c.reader == nil {
+		err := fmt.Errorf("Path or Reader must be specified")
 		if !c.opts.AllowFail {
 			return err
 		}
 	}
 
+	if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
+		return err
+	}
+
 	return nil
 }
 
-func (c *fileConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
+func (c *fileConfig) Load(ctx context.Context, opts ...options.Option) error {
-	if err := config.DefaultBeforeLoad(ctx, c); err != nil {
+	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
+		return nil
+	}
+
+	if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
-	fp, err := os.OpenFile(c.path, os.O_RDONLY, os.FileMode(0400))
+	path := c.path
+	transformer := c.transformer
+	reader := c.reader
+
+	options := config.NewLoadOptions(opts...)
+	if options.Context != nil {
+		if v, ok := options.Context.Value(pathKey{}).(string); ok && v != "" {
+			path = v
+		}
+		if v, ok := c.opts.Context.Value(transformerKey{}).(transform.Transformer); ok {
+			transformer = v
+		}
+		if v, ok := c.opts.Context.Value(readerKey{}).(io.Reader); ok {
+			reader = v
+		}
+	}
+
+	var fp io.Reader
+	var err error
+
+	if c.path != "" {
+		fp, err = os.OpenFile(path, os.O_RDONLY, os.FileMode(0o400))
+	} else if c.reader != nil {
+		fp = reader
+	} else {
+		err = fmt.Errorf("Path or Reader must be specified")
+	}
+
+	if err != nil {
+		if !c.opts.AllowFail {
+			if c.path != "" {
+				return fmt.Errorf("file load path %s error: %w", path, err)
+			} else {
+				return fmt.Errorf("file load error: %w", err)
+			}
+		}
+		if err = config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
+			return err
+		}
+
+		return nil
+	}
+
+	if fpc, ok := fp.(io.Closer); ok {
+		defer fpc.Close()
+	}
+
+	var r io.Reader
+	if transformer != nil {
+		r = transform.NewReader(fp, c.transformer)
+	} else {
+		r = fp
+	}
+
+	buf, err := io.ReadAll(io.LimitReader(r, int64(codec.DefaultMaxMsgSize)))
 	if err != nil {
-		c.opts.Logger.Errorf(c.opts.Context, "file load path %s error: %v", c.path, err)
 		if !c.opts.AllowFail {
 			return err
 		}
-		return config.DefaultAfterLoad(ctx, c)
+		if err = config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
-	}
-
-	defer fp.Close()
-
-	buf, err := ioutil.ReadAll(io.LimitReader(fp, int64(codec.DefaultMaxMsgSize)))
-	if err != nil {
-		c.opts.Logger.Errorf(c.opts.Context, "file load path %s error: %v", c.path, err)
-		if !c.opts.AllowFail {
 			return err
 		}
-		return config.DefaultAfterLoad(ctx, c)
+
+		return nil
 	}
 
-	src, err := rutil.Zero(c.opts.Struct)
+	dst := c.opts.Struct
+	if options.Struct != nil {
+		dst = options.Struct
+	}
+
+	src, err := rutil.Zero(dst)
 	if err == nil {
 		err = c.opts.Codec.Unmarshal(buf, src)
 		if err == nil {
@@ -83,45 +163,65 @@ func (c *fileConfig) Load(ctx context.Context, opts ...config.LoadOption) error
 			if options.Append {
 				mopts = append(mopts, mergo.WithAppendSlice)
 			}
-			err = mergo.Merge(c.opts.Struct, src, mopts...)
+			err = mergo.Merge(dst, src, mopts...)
 		}
 	}
 
-	if err != nil {
+	if err != nil && !c.opts.AllowFail {
-		c.opts.Logger.Errorf(c.opts.Context, "file load path %s error: %v", c.path, err)
+		return err
-		if !c.opts.AllowFail {
-			return err
-		}
 	}
 
-	if err := config.DefaultAfterLoad(ctx, c); err != nil {
+	if err := config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
 	return nil
 }
 
-func (c *fileConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
+func (c *fileConfig) Save(ctx context.Context, opts ...options.Option) error {
-	if err := config.DefaultBeforeSave(ctx, c); err != nil {
+	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
+		return nil
+	}
+
+	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
-	buf, err := c.opts.Codec.Marshal(c.opts.Struct)
+	path := c.path
-	if err != nil {
+	options := config.NewSaveOptions(opts...)
-		c.opts.Logger.Errorf(c.opts.Context, "file save path %s error: %v", c.path, err)
+	if options.Context != nil {
-		if !c.opts.AllowFail {
+		if v, ok := options.Context.Value(pathKey{}).(string); ok && v != "" {
-			return err
+			path = v
 		}
-		return config.DefaultAfterSave(ctx, c)
 	}
 
-	fp, err := os.OpenFile(c.path, os.O_WRONLY|os.O_CREATE, os.FileMode(0600))
+	dst := c.opts.Struct
+	if options.Struct != nil {
+		dst = options.Struct
+	}
+
+	buf, err := c.opts.Codec.Marshal(dst)
 	if err != nil {
-		c.opts.Logger.Errorf(c.opts.Context, "file save path %s error: %v", c.path, err)
 		if !c.opts.AllowFail {
 			return err
 		}
-		return config.DefaultAfterSave(ctx, c)
+		if err = config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail {
+			return err
+		}
+
+		return nil
+	}
+
+	fp, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, os.FileMode(0o600))
+	if err != nil {
+		if !c.opts.AllowFail {
+			return err
+		}
+		if err = config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail {
+			return err
+		}
+
+		return nil
 	}
 	defer fp.Close()
 
@@ -129,14 +229,11 @@ func (c *fileConfig) Save(ctx context.Context, opts ...config.SaveOption) error
 		err = fp.Close()
 	}
 
-	if err != nil {
+	if err != nil && !c.opts.AllowFail {
-		c.opts.Logger.Errorf(c.opts.Context, "file save path %s error: %v", c.path, err)
+		return err
-		if !c.opts.AllowFail {
-			return err
-		}
 	}
 
-	if err := config.DefaultAfterSave(ctx, c); err != nil {
+	if err := config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
@@ -151,9 +248,17 @@ func (c *fileConfig) Name() string {
 	return c.opts.Name
 }
 
-func (c *fileConfig) Watch(ctx context.Context, opts ...config.WatchOption) (config.Watcher, error) {
+func (c *fileConfig) Watch(ctx context.Context, opts ...options.Option) (config.Watcher, error) {
+	path := c.path
+	options := config.NewWatchOptions(opts...)
+	if options.Context != nil {
+		if v, ok := options.Context.Value(pathKey{}).(string); ok && v != "" {
+			path = v
+		}
+	}
+
 	w := &fileWatcher{
-		path:  c.path,
+		path:  path,
 		opts:  c.opts,
 		wopts: config.NewWatchOptions(opts...),
 		done:  make(chan struct{}),
@@ -166,10 +271,89 @@ func (c *fileConfig) Watch(ctx context.Context, opts ...config.WatchOption) (con
 	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 &fileConfig{opts: options}
 }
+
+type EnvTransformer struct {
+	maxMatchSize    int
+	Regexp          *regexp.Regexp
+	TransformerFunc TransformerFunc
+	overflow        []byte
+}
+
+var _ transform.Transformer = (*EnvTransformer)(nil)
+
+// Transform implements golang.org/x/text/transform#Transformer
+func (t *EnvTransformer) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
+	t.maxMatchSize = 1024
+	var n int
+	// copy any overflow from the last call
+	if len(t.overflow) > 0 {
+		n, err = fullcopy(dst, t.overflow)
+		nDst += n
+		if err != nil {
+			t.overflow = t.overflow[n:]
+			return
+		}
+		t.overflow = nil
+	}
+	for _, index := range t.Regexp.FindAllSubmatchIndex(src, -1) {
+		// copy everything up to the match
+		n, err = fullcopy(dst[nDst:], src[nSrc:index[0]])
+		nSrc += n
+		nDst += n
+		if err != nil {
+			return
+		}
+		// skip the match if it ends at the end the src buffer.
+		// it could potentially match more
+		if index[1] == len(src) && !atEOF {
+			break
+		}
+		// copy the replacement
+		rep := t.TransformerFunc(src, index)
+		n, err = fullcopy(dst[nDst:], rep)
+		nDst += n
+		nSrc = index[1]
+		if err != nil {
+			t.overflow = rep[n:]
+			return
+		}
+	}
+	// if we're at the end, tack on any remaining bytes
+	if atEOF {
+		n, err = fullcopy(dst[nDst:], src[nSrc:])
+		nDst += n
+		nSrc += n
+		return
+	}
+	// skip any bytes which exceede the max match size
+	if skip := len(src[nSrc:]) - t.maxMatchSize; skip > 0 {
+		n, err = fullcopy(dst[nDst:], src[nSrc:nSrc+skip])
+		nSrc += n
+		nDst += n
+		if err != nil {
+			return
+		}
+	}
+	err = transform.ErrShortSrc
+	return
+}
+
+// Reset resets the state and allows a Transformer to be reused.
+func (t *EnvTransformer) Reset() {
+	t.overflow = nil
+}
+
+func fullcopy(dst, src []byte) (n int, err error) {
+	n = copy(dst, src)
+	if n < len(src) {
+		err = transform.ErrShortDst
+	}
+	return
+}

file_test.go

@@ -0,0 +1,73 @@
+package file
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"io"
+	"os"
+	"testing"
+
+	"go.unistack.org/micro/v4/codec"
+	"go.unistack.org/micro/v4/config"
+	"go.unistack.org/micro/v4/options"
+)
+
+type jsoncodec struct{}
+
+func (*jsoncodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) {
+	return json.Marshal(v)
+}
+
+func (*jsoncodec) Unmarshal(buf []byte, v interface{}, opts ...codec.Option) error {
+	return json.Unmarshal(buf, v)
+}
+
+func (*jsoncodec) ReadBody(r io.Reader, v interface{}) error {
+	return nil
+}
+
+func (*jsoncodec) ReadHeader(r io.Reader, m *codec.Message, t codec.MessageType) error {
+	return nil
+}
+
+func (*jsoncodec) String() string {
+	return "json"
+}
+
+func (*jsoncodec) Write(w io.Writer, m *codec.Message, v interface{}) error {
+	return nil
+}
+
+func TestLoadReplace(t *testing.T) {
+	type Config struct {
+		Key  string
+		Pass string
+	}
+	os.Setenv("PLACEHOLDER", "test")
+	cfg := &Config{}
+	ctx := context.TODO()
+	buf := bytes.NewReader([]byte(`{"key":"val","pass":"${PLACEHOLDER}"}`))
+	tr, err := NewEnvTransformer(`(?s)\$\{.*?\}`, 2, 1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	c := NewConfig(options.Codec(
+		&jsoncodec{}),
+		config.Struct(cfg),
+		Reader(buf),
+		Transformer(tr),
+	)
+
+	if err := c.Init(); err != nil {
+		t.Fatal(err)
+	}
+
+	if err := c.Load(ctx); err != nil {
+		t.Fatal(err)
+	}
+
+	if cfg.Pass != "test" {
+		t.Fatalf("not works %#+v\n", cfg)
+	}
+}

go.mod

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

go.sum

@@ -1,28 +1,9 @@
-github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
+dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
-github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+go.unistack.org/micro/v4 v4.0.17 h1:mF7uM+J4ILdG+1fcwzKYCwDlxhdbF/e1WnGzKKLnIXc=
-github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
+go.unistack.org/micro/v4 v4.0.17/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4=
-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-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/unistack-org/micro-proto v0.0.9 h1:KrWLS4FUX7UAWNAilQf70uad6ZPf/0EudeddCXllRVc=
-github.com/unistack-org/micro-proto v0.0.9/go.mod h1:Cckwmzd89gvS7ThxzZp9kQR/EOdksFQcsTAtDDyKwrg=
-github.com/unistack-org/micro/v3 v3.7.6 h1:cobNkaicZR+8nbDWRUmX3/CSLh6ZNSytK2zWth4s4IM=
-github.com/unistack-org/micro/v3 v3.7.6/go.mod h1:Ke/8WJlNZi4ZYwL9HcsANAbQ66/HocTBEZM+od99/mM=
-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.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

options.go

@@ -1,11 +1,52 @@
 package file
 
 import (
-	"github.com/unistack-org/micro/v3/config"
+	"io"
+	"os"
+	"regexp"
+
+	"go.unistack.org/micro/v4/options"
+	"golang.org/x/text/transform"
 )
 
 type pathKey struct{}
 
-func Path(path string) config.Option {
+func Path(path string) options.Option {
-	return config.SetOption(pathKey{}, path)
+	return options.ContextOption(pathKey{}, path)
+}
+
+type readerKey struct{}
+
+func Reader(r io.Reader) options.Option {
+	return options.ContextOption(readerKey{}, r)
+}
+
+type transformerKey struct{}
+
+type TransformerFunc func(src []byte, index []int) []byte
+
+func Transformer(t transform.Transformer) options.Option {
+	return options.ContextOption(transformerKey{}, t)
+}
+
+func NewEnvTransformer(rs string, trimLeft, trimRight int) (*EnvTransformer, error) {
+	re, err := regexp.Compile(rs)
+	if err != nil {
+		return nil, err
+	}
+	return &EnvTransformer{
+		Regexp: re,
+		TransformerFunc: func(src []byte, index []int) []byte {
+			var envKey string
+			if len(src) > index[1]-trimRight {
+				envKey = string(src[index[0]+trimLeft : index[1]-trimRight])
+			}
+
+			if envVal, ok := os.LookupEnv(envKey); ok {
+				return []byte(envVal)
+			}
+
+			return src[index[0]:index[1]]
+		},
+	}, nil
 }

watcher.go

@@ -7,10 +7,10 @@ import (
 	"os"
 	"reflect"
 
-	"github.com/unistack-org/micro/v3/codec"
+	"go.unistack.org/micro/v4/codec"
-	"github.com/unistack-org/micro/v3/config"
+	"go.unistack.org/micro/v4/config"
-	"github.com/unistack-org/micro/v3/util/jitter"
+	"go.unistack.org/micro/v4/util/jitter"
-	rutil "github.com/unistack-org/micro/v3/util/reflect"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 type fileWatcher struct {