dont fail on init for empty reader/path

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

file.go

@@ -8,13 +8,15 @@ import (
 	"regexp"
 
 	"dario.cat/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 DefaultStructTag = "file"
+var (
+	DefaultStructTag       = "file"
+	MaxFileSize      int64 = 1 * 1024 * 1024
+)
 
 type fileConfig struct {
 	opts        config.Options
@@ -52,13 +54,6 @@ func (c *fileConfig) Init(opts ...config.Option) error {
 		return fmt.Errorf("Codec must be specified")
 	}
 
-	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
 	}
@@ -76,11 +71,20 @@ func (c *fileConfig) Load(ctx context.Context, opts ...config.LoadOption) error
 	}
 
 	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
@@ -89,7 +93,7 @@ func (c *fileConfig) Load(ctx context.Context, opts ...config.LoadOption) error
 	if c.path != "" {
 		fp, err = os.OpenFile(path, os.O_RDONLY, os.FileMode(0o400))
 	} else if c.reader != nil {
-		fp = c.reader
+		fp = reader
 	} else {
 		err = fmt.Errorf("Path or Reader must be specified")
 	}
@@ -114,13 +118,13 @@ func (c *fileConfig) Load(ctx context.Context, opts ...config.LoadOption) error
 	}
 
 	var r io.Reader
-	if c.transformer != nil {
+	if transformer != nil {
 		r = transform.NewReader(fp, c.transformer)
 	} else {
 		r = fp
 	}
 
-	buf, err := io.ReadAll(io.LimitReader(r, int64(codec.DefaultMaxMsgSize)))
+	buf, err := io.ReadAll(io.LimitReader(r, MaxFileSize))
 	if err != nil {
 		if !c.opts.AllowFail {
 			return err

file_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"io"
 	"os"
 	"testing"
 
@@ -22,22 +21,10 @@ func (*jsoncodec) Unmarshal(buf []byte, v interface{}, opts ...codec.Option) err
 	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

go.mod

@@ -1,10 +1,18 @@
 module go.unistack.org/micro-config-file/v3
 
-go 1.18
+go 1.22
+
+toolchain go1.23.1
 
 require (
-	dario.cat/mergo v1.0.0
-	go.unistack.org/micro/v3 v3.10.44
+	dario.cat/mergo v1.0.1
+	go.unistack.org/micro/v3 v3.10.100
+	golang.org/x/text v0.20.0
 )
 
-require github.com/google/uuid v1.6.0 // indirect
+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,9 +1,25 @@
-dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
-dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
+dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+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/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-go.unistack.org/micro/v3 v3.10.44 h1:Vgyy9BrJOSdFvo29/klrgIBE/Nme9E8udPAljos34o0=
-go.unistack.org/micro/v3 v3.10.44/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
+go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+go.unistack.org/micro/v3 v3.10.97 h1:8l7fv+i06/PjPrBBhRC/ZQkWGIOuHPg3jJN0vktYE78=
+go.unistack.org/micro/v3 v3.10.97/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+go.unistack.org/micro/v3 v3.10.100 h1:yWOaU0ImCGm5k5MUzlIobJUOr+KLfrR/BoDZvcHyKxM=
+go.unistack.org/micro/v3 v3.10.100/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
+golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+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=
+google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
+google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 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=

watcher.go

@@ -7,7 +7,6 @@ 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"
@@ -44,7 +43,7 @@ func (w *fileWatcher) run() {
 					return
 				}
 				var buf []byte
-				buf, err = ioutil.ReadAll(io.LimitReader(fp, int64(codec.DefaultMaxMsgSize)))
+				buf, err = ioutil.ReadAll(io.LimitReader(fp, MaxFileSize))
 				if err == nil {
 					err = w.opts.Codec.Unmarshal(buf, dst)
 				}