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>
This commit is contained in:
Василий Толстов 2024-09-17 13:09:10 +03:00
parent d7ffcd19f8
commit 89b41364c3
3 changed files with 6 additions and 18 deletions

View File

@ -8,13 +8,15 @@ import (
"regexp" "regexp"
"dario.cat/mergo" "dario.cat/mergo"
"go.unistack.org/micro/v3/codec"
"go.unistack.org/micro/v3/config" "go.unistack.org/micro/v3/config"
rutil "go.unistack.org/micro/v3/util/reflect" rutil "go.unistack.org/micro/v3/util/reflect"
"golang.org/x/text/transform" "golang.org/x/text/transform"
) )
var DefaultStructTag = "file" var (
DefaultStructTag = "file"
MaxFileSize int64 = 1 * 1024 * 1024
)
type fileConfig struct { type fileConfig struct {
opts config.Options opts config.Options
@ -129,7 +131,7 @@ func (c *fileConfig) Load(ctx context.Context, opts ...config.LoadOption) error
r = fp r = fp
} }
buf, err := io.ReadAll(io.LimitReader(r, int64(codec.DefaultMaxMsgSize))) buf, err := io.ReadAll(io.LimitReader(r, MaxFileSize))
if err != nil { if err != nil {
if !c.opts.AllowFail { if !c.opts.AllowFail {
return err return err

View File

@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"context" "context"
"encoding/json" "encoding/json"
"io"
"os" "os"
"testing" "testing"
@ -22,22 +21,10 @@ func (*jsoncodec) Unmarshal(buf []byte, v interface{}, opts ...codec.Option) err
return json.Unmarshal(buf, v) 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 { func (*jsoncodec) String() string {
return "json" return "json"
} }
func (*jsoncodec) Write(w io.Writer, m *codec.Message, v interface{}) error {
return nil
}
func TestLoadReplace(t *testing.T) { func TestLoadReplace(t *testing.T) {
type Config struct { type Config struct {
Key string Key string

View File

@ -7,7 +7,6 @@ import (
"os" "os"
"reflect" "reflect"
"go.unistack.org/micro/v3/codec"
"go.unistack.org/micro/v3/config" "go.unistack.org/micro/v3/config"
"go.unistack.org/micro/v3/util/jitter" "go.unistack.org/micro/v3/util/jitter"
rutil "go.unistack.org/micro/v3/util/reflect" rutil "go.unistack.org/micro/v3/util/reflect"
@ -44,7 +43,7 @@ func (w *fileWatcher) run() {
return return
} }
var buf []byte var buf []byte
buf, err = ioutil.ReadAll(io.LimitReader(fp, int64(codec.DefaultMaxMsgSize))) buf, err = ioutil.ReadAll(io.LimitReader(fp, MaxFileSize))
if err == nil { if err == nil {
err = w.opts.Codec.Unmarshal(buf, dst) err = w.opts.Codec.Unmarshal(buf, dst)
} }