.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/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/build.yml

@@ -0,0 +1,46 @@
+name: build
+on:
+ push:
+    branches:
+    - master
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: setup
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.16
+    - name: checkout
+      uses: actions/checkout@v2
+    - name: cache
+      uses: actions/cache@v2
+      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@v2
+      - name: lint
+        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.
+          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/pr.yml

@@ -0,0 +1,46 @@
+name: prbuild
+on:
+  pull_request:
+    branches:
+    - master
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: setup
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.16
+    - name: checkout
+      uses: actions/checkout@v2
+    - name: cache
+      uses: actions/cache@v2
+      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@v2
+      - name: lint
+        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.
+          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

file.go

@@ -2,156 +2,70 @@ package file
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
-	"regexp"
 
-	"dario.cat/mergo"
-	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/config"
-	"go.unistack.org/micro/v4/options"
-	rutil "go.unistack.org/micro/v4/util/reflect"
-	"golang.org/x/text/transform"
+	"github.com/imdario/mergo"
+	"github.com/unistack-org/micro/v3/codec"
+	"github.com/unistack-org/micro/v3/config"
+	rutil "github.com/unistack-org/micro/v3/util/reflect"
 )
 
-var DefaultStructTag = "file"
+var (
+	DefaultStructTag = "file"
+	ErrPathNotExist  = errors.New("path is not exist")
+)
 
 type fileConfig struct {
 	opts config.Options
 	path string
-	reader      io.Reader
-	transformer transform.Transformer
 }
 
 func (c *fileConfig) Options() config.Options {
 	return c.opts
 }
 
-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
-	}
-
+func (c *fileConfig) Init(opts ...config.Option) error {
 	for _, o := range opts {
-		if err = o(&c.opts); err != nil {
-			return err
-		}
+		o(&c.opts)
 	}
 
+	path := ""
+
 	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
+			path = v
 		}
 	}
 
-	if c.opts.Codec == nil {
-		return fmt.Errorf("Codec must be specified")
+	if path == "" {
+		return ErrPathNotExist
 	}
 
-	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
-	}
+	c.path = path
 
 	return nil
 }
 
-func (c *fileConfig) Load(ctx context.Context, opts ...options.Option) error {
-	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
-		return nil
-	}
-
-	if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
+func (c *fileConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
+	for _, fn := range c.opts.BeforeLoad {
+		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
 			return err
 		}
-
-	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 {
-		if !c.opts.AllowFail {
-			return err
-		}
-		if err = config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
-			return err
-		}
-
-		return nil
-	}
-
-	dst := c.opts.Struct
-	if options.Struct != nil {
-		dst = options.Struct
-	}
-
-	src, err := rutil.Zero(dst)
+	fp, err := os.OpenFile(c.path, os.O_RDONLY, os.FileMode(0400))
+	if err != nil && !c.opts.AllowFail {
+		return fmt.Errorf("failed to open: %s, error: %w", c.path, ErrPathNotExist)
+	} else if err == nil {
+		defer fp.Close()
+		var buf []byte
+		buf, err = ioutil.ReadAll(io.LimitReader(fp, int64(codec.DefaultMaxMsgSize)))
+		if err == nil {
+			src, err := rutil.Zero(c.opts.Struct)
 			if err == nil {
 				err = c.opts.Codec.Unmarshal(buf, src)
 				if err == nil {
@@ -163,79 +77,57 @@ func (c *fileConfig) Load(ctx context.Context, opts ...options.Option) 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 {
 			return err
 		}
+	}
 
-	if err := config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
+	for _, fn := range c.opts.AfterLoad {
+		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
 			return err
 		}
+	}
 
 	return nil
 }
 
-func (c *fileConfig) Save(ctx context.Context, opts ...options.Option) error {
-	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
+func (c *fileConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
+	for _, fn := range c.opts.BeforeSave {
+		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
+			return err
+		}
+	}
+
+	buf, err := c.opts.Codec.Marshal(c.opts.Struct)
+	if err == nil {
+		var fp *os.File
+		fp, err = os.OpenFile(c.path, os.O_RDONLY, os.FileMode(0400))
+		if err != nil && c.opts.AllowFail {
 			return nil
+		} else if err != nil && !c.opts.AllowFail {
+			return fmt.Errorf("failed to open: %s, error: %w", c.path, ErrPathNotExist)
 		}
 
-	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
-		return err
-	}
-
-	path := c.path
-	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 {
-		if !c.opts.AllowFail {
-			return err
-		}
-		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()
-
-	if _, err = fp.Write(buf); err == nil {
+		if _, werr := fp.Write(buf); werr == nil {
 			err = fp.Close()
+		} else {
+			err = werr
+		}
 	}
 
 	if err != nil && !c.opts.AllowFail {
 		return err
 	}
 
-	if err := config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail {
+	for _, fn := range c.opts.AfterSave {
+		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
 			return err
 		}
+	}
 
 	return nil
 }
@@ -248,112 +140,10 @@ func (c *fileConfig) Name() string {
 	return c.opts.Name
 }
 
-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:  path,
-		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 {
+func NewConfig(opts ...config.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

@@ -1,73 +0,0 @@
-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,10 +1,8 @@
-module go.unistack.org/micro-config-file/v4
+module github.com/unistack-org/micro-config-file/v3
 
-go 1.20
+go 1.16
 
 require (
-	dario.cat/mergo v1.0.0
-	go.unistack.org/micro/v4 v4.0.17
+	github.com/imdario/mergo v0.3.12
+	github.com/unistack-org/micro/v3 v3.4.0
 )
-
-require github.com/google/uuid v1.6.0 // indirect

go.sum

@@ -1,9 +1,18 @@
-dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
-dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-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=
-go.unistack.org/micro/v4 v4.0.17 h1:mF7uM+J4ILdG+1fcwzKYCwDlxhdbF/e1WnGzKKLnIXc=
-go.unistack.org/micro/v4 v4.0.17/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
+github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+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/unistack-org/micro/v3 v3.4.0 h1:z9F3lgAb2j4cZ1ib5qBj66JPYUAzR4sNIJqUDjVwyVQ=
+github.com/unistack-org/micro/v3 v3.4.0/go.mod h1:LXmPfbJnJNvL0kQs8HfnkV3Wya2Wb+C7keVq++RCZnk=
+golang.org/x/net v0.0.0-20210510120150-4163338589ed/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=
 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=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

options.go

@@ -1,52 +1,11 @@
 package file
 
 import (
-	"io"
-	"os"
-	"regexp"
-
-	"go.unistack.org/micro/v4/options"
-	"golang.org/x/text/transform"
+	"github.com/unistack-org/micro/v3/config"
 )
 
 type pathKey struct{}
 
-func Path(path string) options.Option {
-	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
+func Path(path string) config.Option {
+	return config.SetOption(pathKey{}, path)
 }

watcher.go

@@ -1,102 +0,0 @@
-package file
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"reflect"
-
-	"go.unistack.org/micro/v4/codec"
-	"go.unistack.org/micro/v4/config"
-	"go.unistack.org/micro/v4/util/jitter"
-	rutil "go.unistack.org/micro/v4/util/reflect"
-)
-
-type fileWatcher struct {
-	path  string
-	opts  config.Options
-	wopts config.WatchOptions
-	done  chan struct{}
-	vchan chan map[string]interface{}
-	echan chan error
-}
-
-func (w *fileWatcher) 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 {
-				var fp *os.File
-				if fp, err = os.OpenFile(w.path, os.O_RDONLY, os.FileMode(0400)); err != nil {
-					w.echan <- fmt.Errorf("failed to open: %s, error: %w", w.path, err)
-					return
-				}
-				var buf []byte
-				buf, err = io.ReadAll(io.LimitReader(fp, int64(codec.DefaultMaxMsgSize)))
-				if err == nil {
-					err = w.opts.Codec.Unmarshal(buf, dst)
-				}
-				if err != nil {
-					_ = fp.Close()
-					w.echan <- err
-					return
-				}
-				err = fp.Close()
-			}
-			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 *fileWatcher) 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 *fileWatcher) Stop() error {
-	close(w.done)
-	return nil
-}