From b22f15060119bc1195a009d49bee2faa923617dc Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Tue, 17 Sep 2024 13:11:39 +0300 Subject: [PATCH] update to latest micro Signed-off-by: Vasiliy Tolstov --- codec.go | 62 ----------------------------------------------------- go.mod | 19 +++++++++------- go.sum | 16 ++++++++++++++ response.go | 6 +----- 4 files changed, 28 insertions(+), 75 deletions(-) diff --git a/codec.go b/codec.go index 885b294..7111807 100644 --- a/codec.go +++ b/codec.go @@ -1,8 +1,6 @@ package grpc import ( - "io" - "go.unistack.org/micro/v3/codec" "google.golang.org/grpc" "google.golang.org/grpc/encoding" @@ -65,63 +63,3 @@ func (w *wrapGrpcCodec) Unmarshal(d []byte, v interface{}, opts ...codec.Option) } return w.Codec.Unmarshal(d, v) } - -/* -type grpcCodec struct { - grpc.ServerStream - // headers - id string - target string - method string - endpoint string - - c encoding.Codec -} - -*/ - -func (w *wrapGrpcCodec) ReadHeader(conn io.Reader, m *codec.Message, mt codec.MessageType) error { - /* - if m == nil { - m = codec.NewMessage(codec.Request) - } - - if md, ok := metadata.FromIncomingContext(g.ServerStream.Context()); ok { - if m.Header == nil { - m.Header = meta.New(len(md)) - } - for k, v := range md { - m.Header[k] = strings.Join(v, ",") - } - } - - m.Id = g.id - m.Target = g.target - m.Method = g.method - m.Endpoint = g.endpoint - */ - return nil -} - -func (w *wrapGrpcCodec) ReadBody(conn io.Reader, v interface{}) error { - // caller has requested a frame - if m, ok := v.(*codec.Frame); ok { - _, err := conn.Read(m.Data) - return err - } - return codec.ErrInvalidMessage -} - -func (w *wrapGrpcCodec) Write(conn io.Writer, m *codec.Message, v interface{}) error { - // if we don't have a body - if v != nil { - b, err := w.Marshal(v) - if err != nil { - return err - } - m.Body = b - } - // write the body using the framing codec - _, err := conn.Write(m.Body) - return err -} diff --git a/go.mod b/go.mod index 0a9d2e8..4a0be0a 100644 --- a/go.mod +++ b/go.mod @@ -1,16 +1,19 @@ module go.unistack.org/micro-client-grpc/v3 -go 1.20 +go 1.21 + +toolchain go1.23.1 require ( - go.unistack.org/micro/v3 v3.10.64 - google.golang.org/grpc v1.63.2 + go.unistack.org/micro/v3 v3.10.88 + google.golang.org/grpc v1.66.2 ) require ( - golang.org/x/net v0.24.0 // indirect - golang.org/x/sys v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect - google.golang.org/protobuf v1.33.0 // indirect + go.unistack.org/micro-proto/v3 v3.4.1 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect + google.golang.org/protobuf v1.34.2 // indirect ) diff --git a/go.sum b/go.sum index 1ad39e6..747aec3 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,31 @@ 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.64 h1:hTRW/4krLjdGb1gDwN8UDub0RmUqrn/oYclL4RXZTOw= go.unistack.org/micro/v3 v3.10.64/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg= +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= golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A= google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= +google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= diff --git a/response.go b/response.go index e0b7b27..6c449cb 100644 --- a/response.go +++ b/response.go @@ -34,9 +34,5 @@ func (r *response) Header() metadata.Metadata { // Read the undecoded response func (r *response) Read() ([]byte, error) { - f := &codec.Frame{} - if err := r.codec.ReadBody(&wrapStream{r.stream}, f); err != nil { - return nil, err - } - return f.Data, nil + return nil, nil }