Merge pull request 'allow to override Struct on Save' (#94) from config-improve into v3

Reviewed-on: #94

file.go

@@ -1,16 +1,16 @@
-package file
+package file // import "go.unistack.org/micro-config-file/v3"
 
 import (
 	"context"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 
-	"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"
+	"github.com/imdario/mergo"
+	"go.unistack.org/micro/v3/codec"
+	"go.unistack.org/micro/v3/config"
+	rutil "go.unistack.org/micro/v3/util/reflect"
 )
 
 var DefaultStructTag = "file"
@@ -24,7 +24,7 @@ func (c *fileConfig) Options() config.Options {
 	return c.opts
 }
 
-func (c *fileConfig) Init(opts ...options.Option) error {
+func (c *fileConfig) Init(opts ...config.Option) error {
 	if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
@@ -53,11 +53,7 @@ func (c *fileConfig) Init(opts ...options.Option) error {
 	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
-	}
-
+func (c *fileConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
 	if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
@@ -70,7 +66,7 @@ func (c *fileConfig) Load(ctx context.Context, opts ...options.Option) error {
 		}
 	}
 
-	fp, err := os.OpenFile(path, os.O_RDONLY, os.FileMode(0o400))
+	fp, err := os.OpenFile(path, os.O_RDONLY, os.FileMode(0400))
 	if err != nil {
 		if !c.opts.AllowFail {
 			return fmt.Errorf("file load path %s error: %w", path, err)
@@ -84,7 +80,7 @@ func (c *fileConfig) Load(ctx context.Context, opts ...options.Option) error {
 
 	defer fp.Close()
 
-	buf, err := io.ReadAll(io.LimitReader(fp, int64(codec.DefaultMaxMsgSize)))
+	buf, err := ioutil.ReadAll(io.LimitReader(fp, int64(codec.DefaultMaxMsgSize)))
 	if err != nil {
 		if !c.opts.AllowFail {
 			return err
@@ -128,11 +124,7 @@ func (c *fileConfig) Load(ctx context.Context, opts ...options.Option) error {
 	return nil
 }
 
-func (c *fileConfig) Save(ctx context.Context, opts ...options.Option) error {
-	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
-		return nil
-	}
-
+func (c *fileConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
 	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
 		return err
 	}
@@ -162,7 +154,7 @@ func (c *fileConfig) Save(ctx context.Context, opts ...options.Option) error {
 		return nil
 	}
 
-	fp, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, os.FileMode(0o600))
+	fp, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, os.FileMode(0600))
 	if err != nil {
 		if !c.opts.AllowFail {
 			return err
@@ -198,7 +190,7 @@ func (c *fileConfig) Name() string {
 	return c.opts.Name
 }
 
-func (c *fileConfig) Watch(ctx context.Context, opts ...options.Option) (config.Watcher, error) {
+func (c *fileConfig) Watch(ctx context.Context, opts ...config.WatchOption) (config.Watcher, error) {
 	path := c.path
 	options := config.NewWatchOptions(opts...)
 	if options.Context != nil {
@@ -221,7 +213,7 @@ func (c *fileConfig) Watch(ctx context.Context, opts ...options.Option) (config.
 	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

go.mod

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

go.sum

@@ -1,9 +1,10 @@
-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/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
+github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
+github.com/silas/dag v0.0.0-20211117232152-9d50aa809f35/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
+go.unistack.org/micro/v3 v3.10.16 h1:2er/SKKYbV60M+UuJM4eYCF0MZYAIq/yNUrAbTfgq8Q=
+go.unistack.org/micro/v3 v3.10.16/go.mod h1:uMAc0U/x7dmtICCrblGf0ZLgYegu3VwQAquu+OFCw1Q=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

options.go

@@ -1,11 +1,23 @@
 package file
 
 import (
-	"go.unistack.org/micro/v4/options"
+	"go.unistack.org/micro/v3/config"
 )
 
 type pathKey struct{}
 
-func Path(path string) options.Option {
-	return options.ContextOption(pathKey{}, path)
+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)
 }

watcher.go

@@ -7,10 +7,10 @@ import (
 	"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"
+	"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"
 )
 
 type fileWatcher struct {