update after protoc-gen-micro changes

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

client/grpc/generate.go

@@ -1,3 +1,3 @@
 package grpc
 
-//go:generate protoc -I./proto -I. --go-grpc_out=paths=source_relative:./proto --go_out=paths=source_relative:./proto --micro_out=paths=source_relative:./proto proto/test.proto
+//go:generate protoc -I./proto -I. --go-grpc_out=paths=source_relative:./proto --go_out=paths=source_relative:./proto --micro_out=standalone=true,paths=source_relative:./gproto proto/test.proto

client/grpc/gproto/test_micro.pb.go

@@ -0,0 +1,42 @@
+// Code generated by protoc-gen-micro
+// source: test.proto
+package helloworld
+
+import (
+	context "context"
+	proto "github.com/unistack-org/micro-tests/client/grpc/proto"
+	api "github.com/unistack-org/micro/v3/api"
+	client "github.com/unistack-org/micro/v3/client"
+)
+
+func NewTestEndpoints() []*api.Endpoint {
+	return []*api.Endpoint{}
+}
+
+type TestClient interface {
+	Call(ctx context.Context, req *proto.Request, opts ...client.CallOption) (*proto.Response, error)
+	Stream(ctx context.Context, opts ...client.CallOption) (Test_StreamClient, error)
+}
+
+type Test_StreamClient interface {
+	Context() context.Context
+	SendMsg(msg interface{}) error
+	RecvMsg(msg interface{}) error
+	Close() error
+	Send(msg *proto.Request) error
+	Recv() (*proto.Response, error)
+}
+
+type TestServer interface {
+	Call(ctx context.Context, req *proto.Request, rsp *proto.Response) error
+	Stream(ctx context.Context, stream Test_StreamStream) error
+}
+
+type Test_StreamStream interface {
+	Context() context.Context
+	SendMsg(msg interface{}) error
+	RecvMsg(msg interface{}) error
+	Close() error
+	Recv() (*proto.Request, error)
+	Send(msg *proto.Response) error
+}

client/grpc/gproto/test_micro_rpc.pb.go

@@ -0,0 +1,128 @@
+// Code generated by protoc-gen-micro
+// source: test.proto
+package helloworld
+
+import (
+	context "context"
+	proto "github.com/unistack-org/micro-tests/client/grpc/proto"
+	api "github.com/unistack-org/micro/v3/api"
+	client "github.com/unistack-org/micro/v3/client"
+	server "github.com/unistack-org/micro/v3/server"
+)
+
+type testClient struct {
+	c    client.Client
+	name string
+}
+
+func NewTestClient(name string, c client.Client) TestClient {
+	return &testClient{c: c, name: name}
+}
+
+func (c *testClient) Call(ctx context.Context, req *proto.Request, opts ...client.CallOption) (*proto.Response, error) {
+	rsp := &proto.Response{}
+	err := c.c.Call(ctx, c.c.NewRequest(c.name, "Test.Call", req), rsp, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return rsp, nil
+}
+
+func (c *testClient) Stream(ctx context.Context, opts ...client.CallOption) (Test_StreamClient, error) {
+	stream, err := c.c.Stream(ctx, c.c.NewRequest(c.name, "Test.Stream", &proto.Request{}), opts...)
+	if err != nil {
+		return nil, err
+	}
+	return &testClientStream{stream}, nil
+}
+
+type testClientStream struct {
+	stream client.Stream
+}
+
+func (s *testClientStream) Close() error {
+	return s.stream.Close()
+}
+
+func (s *testClientStream) Context() context.Context {
+	return s.stream.Context()
+}
+
+func (s *testClientStream) SendMsg(msg interface{}) error {
+	return s.stream.Send(msg)
+}
+
+func (s *testClientStream) RecvMsg(msg interface{}) error {
+	return s.stream.Recv(msg)
+}
+
+func (s *testClientStream) Send(msg *proto.Request) error {
+	return s.stream.Send(msg)
+}
+
+func (s *testClientStream) Recv() (*proto.Response, error) {
+	msg := &proto.Response{}
+	if err := s.stream.Recv(msg); err != nil {
+		return nil, err
+	}
+	return msg, nil
+}
+
+type testServer struct {
+	TestServer
+}
+
+func (h *testServer) Call(ctx context.Context, req *proto.Request, rsp *proto.Response) error {
+	return h.TestServer.Call(ctx, req, rsp)
+}
+
+func (h *testServer) Stream(ctx context.Context, stream server.Stream) error {
+	return h.TestServer.Stream(ctx, &testStreamStream{stream})
+}
+
+type testStreamStream struct {
+	stream server.Stream
+}
+
+func (s *testStreamStream) Close() error {
+	return s.stream.Close()
+}
+
+func (s *testStreamStream) Context() context.Context {
+	return s.stream.Context()
+}
+
+func (s *testStreamStream) SendMsg(msg interface{}) error {
+	return s.stream.Send(msg)
+}
+
+func (s *testStreamStream) RecvMsg(msg interface{}) error {
+	return s.stream.Recv(msg)
+}
+
+func (s *testStreamStream) Send(msg *proto.Response) error {
+	return s.stream.Send(msg)
+}
+
+func (s *testStreamStream) Recv() (*proto.Request, error) {
+	msg := &proto.Request{}
+	if err := s.stream.Recv(msg); err != nil {
+		return nil, err
+	}
+	return msg, nil
+}
+
+func RegisterTestServer(s server.Server, sh TestServer, opts ...server.HandlerOption) error {
+	type test interface {
+		Call(ctx context.Context, req *proto.Request, rsp *proto.Response) error
+		Stream(ctx context.Context, stream server.Stream) error
+	}
+	type Test struct {
+		test
+	}
+	h := &testServer{sh}
+	for _, endpoint := range NewTestEndpoints() {
+		opts = append(opts, api.WithEndpoint(endpoint))
+	}
+	return s.Handle(s.NewHandler(&Test{h}, opts...))
+}

client/grpc/proto/test.pb.go

@@ -144,8 +144,11 @@ var file_test_proto_rawDesc = []byte{
 	0x12, 0x13, 0x2e, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72, 0x6c, 0x64, 0x2e, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72,
 	0x6c, 0x64, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30,
-	0x01, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x3b, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72, 0x6c,
-	0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x01, 0x42, 0x42, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x75, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x6d, 0x69, 0x63,
+	0x72, 0x6f, 0x2d, 0x74, 0x65, 0x73, 0x74, 0x73, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x2f,
+	0x67, 0x72, 0x70, 0x63, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x68, 0x65, 0x6c, 0x6c, 0x6f,
+	0x77, 0x6f, 0x72, 0x6c, 0x64, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (

client/grpc/proto/test.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package helloworld;
-option go_package = ".;helloworld";
+option go_package = "github.com/unistack-org/micro-tests/client/grpc/proto;helloworld";
 
 service Test {
 	rpc Call(Request) returns (Response) {};