.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

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

.github/workflows/dependabot-automerge.yml

@@ -1,27 +1,66 @@
-name: "dependabot-automerge"
+name: "prautomerge"
 
 on:
-  pull_request_target:
+  workflow_run:
-    types: [assigned, opened, synchronize, reopened]
+    workflows: ["prbuild"]
+    types:
+      - completed
 
 permissions:
-  pull-requests: write
   contents: write
+  pull-requests: write
 
 jobs:
-  automerge:
+  Dependabot-Automerge:
     runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]'
+    # Contains workaround to execute if dependabot updates the PR by checking for the base branch in the linked PR
+    # 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: metadata
+      - name: Approve Changes and Merge changes if label 'dependencies' is set
-        id: metadata
+        uses: actions/github-script@v5
-        uses: dependabot/fetch-metadata@v1.3.6
         with:
-          github-token: "${{ secrets.TOKEN }}"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: merge
+          script: |
-        id: merge
+            console.log(context.payload.workflow_run);
-        if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
+            
-        run: gh pr merge --auto --merge "$PR_URL"
+            var labelNames = await github.paginate(
-        env:
+              github.issues.listLabelsOnIssue,
-          PR_URL: ${{github.event.pull_request.html_url}}
+              {
-          GITHUB_TOKEN: ${{secrets.TOKEN}}
+                repo: context.repo.repo,
+                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,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.

file.go

@@ -4,25 +4,20 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
-	"regexp"
 
-	"dario.cat/mergo"
+	"github.com/imdario/mergo"
+	"go.unistack.org/micro/v3/codec"
 	"go.unistack.org/micro/v3/config"
 	rutil "go.unistack.org/micro/v3/util/reflect"
-	"golang.org/x/text/transform"
 )
 
-var (
+var DefaultStructTag = "file"
-	DefaultStructTag       = "file"
-	MaxFileSize      int64 = 1 * 1024 * 1024
-)
 
 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 {
@@ -30,10 +25,6 @@ func (c *fileConfig) Options() config.Options {
 }
 
 func (c *fileConfig) Init(opts ...config.Option) error {
-	if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
-		return err
-	}
-
 	for _, o := range opts {
 		o(&c.opts)
 	}
@@ -42,106 +33,45 @@ func (c *fileConfig) Init(opts ...config.Option) error {
 		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.opts.Codec == nil {
+	if c.path == "" {
-		return fmt.Errorf("Codec must be specified")
+		err := fmt.Errorf("file path not exists: %v", c.path)
-	}
+		c.opts.Logger.Error(c.opts.Context, err)
-
+		if !c.opts.AllowFail {
-	if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
+			return err
-		return err
+		}
 	}
 
 	return nil
 }
 
 func (c *fileConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
-	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
+	if err := config.DefaultBeforeLoad(ctx, c); err != nil {
-		return nil
-	}
-
-	if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
-	path := c.path
+	fp, err := os.OpenFile(c.path, os.O_RDONLY, os.FileMode(0400))
-	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 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, MaxFileSize))
 	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
 		}
-		if err = config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
+		return config.DefaultAfterLoad(ctx, c)
+	}
+
+	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
 	}
 
-	dst := c.opts.Struct
+	src, err := rutil.Zero(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 {
@@ -153,15 +83,18 @@ func (c *fileConfig) Load(ctx context.Context, opts ...config.LoadOption) error
 			if options.Append {
 				mopts = append(mopts, mergo.WithAppendSlice)
 			}
-			err = mergo.Merge(dst, src, mopts...)
+			err = mergo.Merge(c.opts.Struct, src, mopts...)
 		}
 	}
 
-	if err != nil && !c.opts.AllowFail {
+	if err != nil {
-		return err
+		c.opts.Logger.Errorf(c.opts.Context, "file load path %s error: %v", c.path, err)
+		if !c.opts.AllowFail {
+			return err
+		}
 	}
 
-	if err := config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
+	if err := config.DefaultAfterLoad(ctx, c); err != nil {
 		return err
 	}
 
@@ -169,49 +102,26 @@ func (c *fileConfig) Load(ctx context.Context, opts ...config.LoadOption) error
 }
 
 func (c *fileConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
-	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
+	if err := config.DefaultBeforeSave(ctx, c); err != nil {
-		return nil
-	}
-
-	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
 
-	path := c.path
+	buf, err := c.opts.Codec.Marshal(c.opts.Struct)
-	options := config.NewSaveOptions(opts...)
-	if options.Context != nil {
-		if v, ok := options.Context.Value(pathKey{}).(string); ok && v != "" {
-			path = v
-		}
-	}
-
-	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
 		}
-		if err = config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail {
+		return config.DefaultAfterSave(ctx, c)
-			return err
-		}
-
-		return nil
 	}
 
-	fp, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, os.FileMode(0o600))
+	fp, err := os.OpenFile(c.path, os.O_WRONLY|os.O_CREATE, os.FileMode(0600))
 	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
 		}
-		if err = config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail {
+		return config.DefaultAfterSave(ctx, c)
-			return err
-		}
-
-		return nil
 	}
 	defer fp.Close()
 
@@ -219,11 +129,14 @@ func (c *fileConfig) Save(ctx context.Context, opts ...config.SaveOption) error
 		err = fp.Close()
 	}
 
-	if err != nil && !c.opts.AllowFail {
+	if err != nil {
-		return err
+		c.opts.Logger.Errorf(c.opts.Context, "file save path %s error: %v", c.path, err)
+		if !c.opts.AllowFail {
+			return err
+		}
 	}
 
-	if err := config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail {
+	if err := config.DefaultAfterSave(ctx, c); err != nil {
 		return err
 	}
 
@@ -239,16 +152,8 @@ func (c *fileConfig) Name() string {
 }
 
 func (c *fileConfig) Watch(ctx context.Context, opts ...config.WatchOption) (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:  path,
+		path:  c.path,
 		opts:  c.opts,
 		wopts: config.NewWatchOptions(opts...),
 		done:  make(chan struct{}),
@@ -268,82 +173,3 @@ func NewConfig(opts ...config.Option) config.Config {
 	}
 	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

@@ -1,59 +0,0 @@
-package file
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"os"
-	"testing"
-
-	"go.unistack.org/micro/v3/codec"
-	"go.unistack.org/micro/v3/config"
-)
-
-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) String() string {
-	return "json"
-}
-
-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(config.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,18 +1,8 @@
 module go.unistack.org/micro-config-file/v3
 
-go 1.22
+go 1.16
-
-toolchain go1.23.1
 
 require (
-	dario.cat/mergo v1.0.1
+	github.com/imdario/mergo v0.3.12
-	go.unistack.org/micro/v3 v3.10.100
+	go.unistack.org/micro/v3 v3.8.5
-	golang.org/x/text v0.20.0
-)
-
-require (
-	github.com/google/uuid v1.6.0 // indirect
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
-	google.golang.org/protobuf v1.35.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,25 +1,28 @@
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
+github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
+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/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-go.unistack.org/micro/v3 v3.10.97 h1:8l7fv+i06/PjPrBBhRC/ZQkWGIOuHPg3jJN0vktYE78=
+go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA=
-go.unistack.org/micro/v3 v3.10.97/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8=
-go.unistack.org/micro/v3 v3.10.100 h1:yWOaU0ImCGm5k5MUzlIobJUOr+KLfrR/BoDZvcHyKxM=
+go.unistack.org/micro/v3 v3.8.5 h1:DIYWRsQF+NPhKZP45sCtNsUhaRw6u2+Ps7U+pKU7i3s=
-go.unistack.org/micro/v3 v3.10.100/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+go.unistack.org/micro/v3 v3.8.5/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA=
-golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+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=
-google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+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.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=

options.go

@@ -1,12 +1,7 @@
 package file
 
 import (
-	"io"
-	"os"
-	"regexp"
-
 	"go.unistack.org/micro/v3/config"
-	"golang.org/x/text/transform"
 )
 
 type pathKey struct{}
@@ -14,51 +9,3 @@ type pathKey struct{}
 func Path(path string) config.Option {
 	return config.SetOption(pathKey{}, path)
 }
-
-func LoadPath(path string) config.LoadOption {
-	return config.SetLoadOption(pathKey{}, path)
-}
-
-func SavePath(path string) config.SaveOption {
-	return config.SetSaveOption(pathKey{}, path)
-}
-
-func WatchPath(path string) config.WatchOption {
-	return config.SetWatchOption(pathKey{}, path)
-}
-
-type readerKey struct{}
-
-func Reader(r io.Reader) config.Option {
-	return config.SetOption(readerKey{}, r)
-}
-
-type transformerKey struct{}
-
-type TransformerFunc func(src []byte, index []int) []byte
-
-func Transformer(t transform.Transformer) config.Option {
-	return config.SetOption(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,6 +7,7 @@ import (
 	"os"
 	"reflect"
 
+	"go.unistack.org/micro/v3/codec"
 	"go.unistack.org/micro/v3/config"
 	"go.unistack.org/micro/v3/util/jitter"
 	rutil "go.unistack.org/micro/v3/util/reflect"
@@ -43,7 +44,7 @@ func (w *fileWatcher) run() {
 					return
 				}
 				var buf []byte
-				buf, err = ioutil.ReadAll(io.LimitReader(fp, MaxFileSize))
+				buf, err = ioutil.ReadAll(io.LimitReader(fp, int64(codec.DefaultMaxMsgSize)))
 				if err == nil {
 					err = w.opts.Codec.Unmarshal(buf, dst)
 				}