Compare commits

...

2 Commits
v3.8.6 ... v3

Author SHA1 Message Date
89b41364c3 update to latest micro
Some checks failed
build / test (push) Failing after 9s
build / lint (push) Failing after 10s
codeql / analyze (go) (push) Failing after 10s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-09-17 13:09:10 +03:00
d7ffcd19f8 fixup load options using
Some checks failed
build / test (push) Has been cancelled
build / lint (push) Has been cancelled
codeql / analyze (go) (push) Has been cancelled
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-04-17 16:55:13 +03:00
3 changed files with 17 additions and 20 deletions

21
file.go
View File

@ -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
@ -76,11 +78,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 +100,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 +125,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

View File

@ -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

View File

@ -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)
}