From 01482ba790262e41044a34124b8aee2c8728bb96 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Fri, 24 Sep 2021 00:29:28 +0300 Subject: [PATCH] fix codec.Frame in case of flatten struct tag Signed-off-by: Vasiliy Tolstov --- codec_test.go | 32 ++++++++++++++++++++++++++++++ go.mod | 2 +- go.sum | 9 ++------- toml.go | 54 ++++++++++++++++++++++++++++++++------------------- 4 files changed, 69 insertions(+), 28 deletions(-) diff --git a/codec_test.go b/codec_test.go index f1beaab..f110667 100644 --- a/codec_test.go +++ b/codec_test.go @@ -3,8 +3,40 @@ package toml import ( "bytes" "testing" + + "github.com/unistack-org/micro/v3/codec" ) +func TestFrame(t *testing.T) { + s := &codec.Frame{Data: []byte("test")} + + buf, err := NewCodec().Marshal(s) + if err != nil { + t.Fatal(err) + } + if !bytes.Equal(buf, []byte(`test`)) { + t.Fatalf("bytes not equal %s != %s", buf, `test`) + } +} + +func TestFrameFlatten(t *testing.T) { + s := &struct { + One string + Name *codec.Frame `toml:"name" codec:"flatten"` + }{ + One: "xx", + Name: &codec.Frame{Data: []byte("test")}, + } + + buf, err := NewCodec().Marshal(s) + if err != nil { + t.Fatal(err) + } + if !bytes.Equal(buf, []byte(`test`)) { + t.Fatalf("bytes not equal %s != %s", buf, `test`) + } +} + func TestReadBody(t *testing.T) { s := &struct { Name string diff --git a/go.mod b/go.mod index aa8cc58..1af1910 100644 --- a/go.mod +++ b/go.mod @@ -4,5 +4,5 @@ go 1.16 require ( github.com/BurntSushi/toml v0.4.1 - github.com/unistack-org/micro/v3 v3.7.1 + github.com/unistack-org/micro/v3 v3.7.4 ) diff --git a/go.sum b/go.sum index 0277fd5..d8c825c 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,5 @@ github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw= github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg= github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= @@ -8,14 +7,11 @@ 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/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/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/unistack-org/micro-proto v0.0.9 h1:KrWLS4FUX7UAWNAilQf70uad6ZPf/0EudeddCXllRVc= github.com/unistack-org/micro-proto v0.0.9/go.mod h1:Cckwmzd89gvS7ThxzZp9kQR/EOdksFQcsTAtDDyKwrg= -github.com/unistack-org/micro/v3 v3.7.1 h1:gjCon1U8i9upNgw9+iEgbZh2LCeBizDYotQ+THHV0lo= -github.com/unistack-org/micro/v3 v3.7.1/go.mod h1:gBoY6gvzeFiJTZ4FgDttGNSs4Y1+1PRg2cV1yTRMSlg= +github.com/unistack-org/micro/v3 v3.7.4 h1:nRk7f58v0VsiW7aKL0UQaFCQxFoursHQLoWdeZ1RYbg= +github.com/unistack-org/micro/v3 v3.7.4/go.mod h1:78vy7ggElJD+ayx8ruhJsY+SkGUupfR32LXrg1UObvg= 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= @@ -29,4 +25,3 @@ google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+Rur google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/toml.go b/toml.go index 2baad4f..fb6b6af 100644 --- a/toml.go +++ b/toml.go @@ -10,49 +10,63 @@ import ( rutil "github.com/unistack-org/micro/v3/util/reflect" ) -type tomlCodec struct{} +type tomlCodec struct { + opts codec.Options +} + +var _ codec.Codec = &tomlCodec{} const ( flattenTag = "flatten" ) -func (c *tomlCodec) Marshal(v interface{}) ([]byte, error) { - switch m := v.(type) { - case nil: +func (c *tomlCodec) Marshal(v interface{}, opts ...codec.Option) ([]byte, error) { + if v == nil { return nil, nil - case *codec.Frame: + } + + options := c.opts + for _, o := range opts { + o(&options) + } + + if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil { + v = nv + } + + if m, ok := v.(*codec.Frame); ok { return m.Data, nil } buf := bytes.NewBuffer(nil) - defer buf.Reset() - - if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil { - v = nv - } - err := toml.NewEncoder(buf).Encode(v) if err != nil { return nil, err } + return buf.Bytes(), nil } -func (c *tomlCodec) Unmarshal(b []byte, v interface{}) error { - if len(b) == 0 || v == nil { +func (c *tomlCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) error { + if v == nil || len(d) == 0 { return nil } - if m, ok := v.(*codec.Frame); ok { - m.Data = b - return nil + options := c.opts + for _, o := range opts { + o(&options) } - if nv, nerr := rutil.StructFieldByTag(v, codec.DefaultTagName, flattenTag); nerr == nil { + if nv, nerr := rutil.StructFieldByTag(v, options.TagName, flattenTag); nerr == nil { v = nv } - return toml.Unmarshal(b, v) + if m, ok := v.(*codec.Frame); ok { + m.Data = d + return nil + } + + return toml.Unmarshal(d, v) } func (c *tomlCodec) ReadHeader(conn io.Reader, m *codec.Message, t codec.MessageType) error { @@ -92,6 +106,6 @@ func (c *tomlCodec) String() string { return "toml" } -func NewCodec() codec.Codec { - return &tomlCodec{} +func NewCodec(opts ...codec.Option) *tomlCodec { + return &tomlCodec{opts: codec.NewOptions(opts...)} }