From 0113cab8f2d50ca650c20c63c0cd7b23277df282 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Tue, 4 Mar 2025 23:55:16 +0300 Subject: [PATCH] move to micro v4 Signed-off-by: Vasiliy Tolstov --- codec_test.go | 12 +----------- go.mod | 17 +++++++++++------ go.sum | 35 ++++++++++++++++++++++++++++++----- json.go | 6 +++--- options.go | 2 +- 5 files changed, 46 insertions(+), 26 deletions(-) diff --git a/codec_test.go b/codec_test.go index d2ed7c2..a95ba8e 100644 --- a/codec_test.go +++ b/codec_test.go @@ -4,19 +4,9 @@ import ( "bytes" "testing" - "go.unistack.org/micro/v3/broker" - "go.unistack.org/micro/v3/codec" + "go.unistack.org/micro/v4/codec" ) -func TestRawMessage(t *testing.T) { - b := &broker.Message{} - buf, err := NewCodec().Marshal(b) - if err != nil { - panic(err) - } - _ = buf -} - func TestFrame(t *testing.T) { s := &codec.Frame{Data: []byte("test")} diff --git a/go.mod b/go.mod index 9113c38..7f56c03 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,20 @@ -module go.unistack.org/micro-codec-json/v3 +module go.unistack.org/micro-codec-json/v4 -go 1.21 +go 1.22.0 -toolchain go1.23.4 +toolchain go1.24.0 require ( - go.unistack.org/micro-proto/v3 v3.4.1 - go.unistack.org/micro/v3 v3.10.88 + go.unistack.org/micro-proto/v4 v4.1.0 + go.unistack.org/micro/v4 v4.1.2 ) require ( + github.com/ash3in/uuidv8 v1.2.0 // indirect github.com/google/go-cmp v0.6.0 // indirect - google.golang.org/protobuf v1.35.2 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/matoous/go-nanoid v1.5.1 // indirect + github.com/spf13/cast v1.7.1 // indirect + google.golang.org/protobuf v1.36.3 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 9a524e8..4dea995 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,31 @@ +github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= +github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= +github.com/ash3in/uuidv8 v1.2.0 h1:2oogGdtCPwaVtyvPPGin4TfZLtOGE5F+W++E880G6SI= +github.com/ash3in/uuidv8 v1.2.0/go.mod h1:BnU0wJBxnzdEKmVg4xckBkD+VZuecTFTUP3M0dWgyY4= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -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.88 h1:MxlzP+77Y6Kphb3lzHxROL4XfE/WdCQMQpnPv4D9Z8U= -go.unistack.org/micro/v3 v3.10.88/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg= -google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +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= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/matoous/go-nanoid v1.5.1 h1:aCjdvTyO9LLnTIi0fgdXhOPPvOHjpXN6Ik9DaNjIct4= +github.com/matoous/go-nanoid v1.5.1/go.mod h1:zyD2a71IubI24efhpvkJz+ZwfwagzgSO6UNiFsZKN7U= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= +github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y= +github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +go.unistack.org/micro-proto/v4 v4.1.0 h1:qPwL2n/oqh9RE3RTTDgt28XK3QzV597VugQPaw9lKUk= +go.unistack.org/micro-proto/v4 v4.1.0/go.mod h1:ArmK7o+uFvxSY3dbJhKBBX4Pm1rhWdLEFf3LxBrMtec= +go.unistack.org/micro/v4 v4.1.2 h1:9SOlPYyPNNFpg1A7BsvhDyQm3gysLH1AhWbDCp1hyoY= +go.unistack.org/micro/v4 v4.1.2/go.mod h1:lr3oYED8Ay1vjK68QqRw30QOtdk/ffpZqMFDasOUhKw= +google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU= +google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/json.go b/json.go index 29b4922..d499371 100644 --- a/json.go +++ b/json.go @@ -6,9 +6,9 @@ import ( "encoding/json" "reflect" - pb "go.unistack.org/micro-proto/v3/codec" - "go.unistack.org/micro/v3/codec" - rutil "go.unistack.org/micro/v3/util/reflect" + pb "go.unistack.org/micro-proto/v4/codec" + "go.unistack.org/micro/v4/codec" + rutil "go.unistack.org/micro/v4/util/reflect" ) var _ codec.Codec = (*jsonCodec)(nil) diff --git a/options.go b/options.go index 9708c5e..64bbad3 100644 --- a/options.go +++ b/options.go @@ -1,7 +1,7 @@ package json import ( - codec "go.unistack.org/micro/v3/codec" + codec "go.unistack.org/micro/v4/codec" ) type unmarshalOptionsKey struct{}