add sql wrapper tests, regen

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2023-01-07 19:16:48 +03:00
parent de763a4f92
commit 7c71e65d02
50 changed files with 1635 additions and 273 deletions
--- a/server/grpc/generate.go
+++ b/server/grpc/generate.go
@@ -1,4 +1,4 @@
 package grpc

 //go:generate go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
-//go:generate sh -c "protoc -I./proto -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) -I. --go-grpc_out=paths=source_relative:./proto --go_out=paths=source_relative:./proto --go-micro_out=components='micro|rpc',debug=true,standalone=true,paths=source_relative:./gproto proto/test.proto"
+//go:generate sh -c "protoc -I./proto -I$(go list -f '{{ .Dir }}' -m go.unistack.org/micro-proto/v3) -I. --go-grpc_out=paths=source_relative:./proto --go_out=paths=source_relative:./proto --go-micro_out=components='micro|grpc',debug=true,standalone=true,paths=source_relative:./gproto proto/test.proto"
--- a/server/grpc/gproto/test_micro.pb.go
+++ b/server/grpc/gproto/test_micro.pb.go
@@ -1,5 +1,7 @@
 // Code generated by protoc-gen-go-micro. DO NOT EDIT.
-// protoc-gen-go-micro version: v3.5.3
+// versions:
+// - protoc-gen-go-micro v3.5.3
+// - protoc              v3.21.12
 // source: test.proto

 package helloworld
--- a/server/grpc/gproto/test_micro_grpc.pb.go
+++ b/server/grpc/gproto/test_micro_grpc.pb.go
--- a/server/grpc/grpc_test.go
+++ b/server/grpc/grpc_test.go
@@ -3,6 +3,7 @@ package grpc_test
 import (
 	"context"
 	"io"
+	"net"
 	"net/http"
 	"testing"

@@ -17,17 +18,26 @@ import (
 	"go.unistack.org/micro/v3/client"
 	"go.unistack.org/micro/v3/codec"
 	"go.unistack.org/micro/v3/errors"
+	"go.unistack.org/micro/v3/logger"
+	"go.unistack.org/micro/v3/metadata"
 	"go.unistack.org/micro/v3/register"
 	"go.unistack.org/micro/v3/router"
 	"go.unistack.org/micro/v3/server"
 	health "go.unistack.org/micro/v3/server/health"
-	jsonpb "google.golang.org/protobuf/encoding/protojson"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+	"google.golang.org/grpc/encoding/gzip"
+	gmetadata "google.golang.org/grpc/metadata"
 )

 type testServer struct {
 	pb.UnimplementedTestServer
 }

+type testnServer struct {
+	pb.UnimplementedTestServer
+}
+
 func NewServerHandlerWrapper() server.HandlerWrapper {
 	return func(fn server.HandlerFunc) server.HandlerFunc {
 		return func(ctx context.Context, req server.Request, rsp interface{}) error {
@@ -38,6 +48,10 @@ func NewServerHandlerWrapper() server.HandlerWrapper {
 }

 func (g *testServer) Call(ctx context.Context, req *pb.Request, rsp *pb.Response) error {
+	_, ok := metadata.FromIncomingContext(ctx)
+	if !ok {
+		return errors.InternalServerError("xxx", "missing metadata")
+	}
 	if req.Name == "Error" {
 		return &errors.Error{ID: "id", Code: 99, Detail: "detail"}
 	}
@@ -47,16 +61,34 @@ func (g *testServer) Call(ctx context.Context, req *pb.Request, rsp *pb.Response
 	return nil
 }

+func (g *testnServer) Call(ctx context.Context, req *pb.Request) (*pb.Response, error) {
+	_, ok := gmetadata.FromIncomingContext(ctx)
+	if !ok {
+		return nil, errors.InternalServerError("xxx", "missing metadata")
+	}
+
+	if req.Name == "Error" {
+		return nil, &errors.Error{ID: "id", Code: 99, Detail: "detail"}
+	}
+	rsp := &pb.Response{}
+
+	for i := 0; i < 650; i++ {
+		rsp.Msg += "Hello " + req.Name
+	}
+	return rsp, nil
+}
+
 func TestGRPCServer(t *testing.T) {
 	var err error
-
+	codec.DefaultMaxMsgSize = 8 * 1024 * 1024
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-
+	_ = logger.DefaultLogger.Init(logger.WithLevel(logger.ErrorLevel))
 	r := register.NewRegister()
 	b := broker.NewBroker(broker.Register(r))
 	s := gserver.NewServer(
 		server.Codec("application/grpc+proto", protocodec.NewCodec()),
+		server.Codec("application/grpc", protocodec.NewCodec()),
 		server.Address("127.0.0.1:0"),
 		server.Register(r),
 		server.Name("helloworld"),
@@ -122,35 +154,91 @@ func TestGRPCServer(t *testing.T) {
 		t.Fatalf("unknown version returned from health handler: %s", buf)
 	}

+	lis, err := net.Listen("tcp", "127.0.0.1:0")
+	if err != nil {
+		t.Fatalf("failed to listen: %v", err)
+	}
+	gs := grpc.NewServer()
+	pb.RegisterTestServer(gs, &testnServer{})
+	go func() {
+		if err := gs.Serve(lis); err != nil {
+			t.Fatalf("failed to serve: %v", err)
+		}
+	}()
+
+	// lookup server
+	service, err := r.LookupService(ctx, "helloworld")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(service) != 1 {
+		t.Fatalf("Expected 1 service got %d: %+v", len(service), service)
+	}
+
+	if len(service[0].Nodes) != 1 {
+		t.Fatalf("Expected 1 node got %d: %+v", len(service[0].Nodes), service[0].Nodes)
+	}
+
 	// create client
-	c := gclient.NewClient(client.Codec("application/grpc+proto", protocodec.NewCodec()), client.Router(rtr), client.Register(r), client.Broker(b))
+	gc := gclient.NewClient(
+		client.ContentType("application/grpc"),
+		client.Codec("application/grpc", protocodec.NewCodec()), client.Router(rtr), client.Register(r), client.Broker(b))

-	testMethods := []string{
-		"Test.Call",
+	c := gpb.NewTestClient("helloworld", gc)
+
+	var md metadata.Metadata
+	t.Logf("call micro via micro")
+	rq := &pb.Request{Name: "John"}
+	for i := 0; i < 1500; i++ {
+		rq.Name += "name"
 	}
-
-	for _, method := range testMethods {
-		req := c.NewRequest("helloworld", method, &pb.Request{
-			Name: "John",
-		})
-
-		rsp := &pb.Response{}
-
-		err = c.Call(context.TODO(), req, rsp)
-		if err != nil {
-			t.Fatalf("method: %s err: %v", method, err)
-		}
-
-		if rsp.Msg != "Hello John" {
-			t.Fatalf("Got unexpected response %v", rsp.Msg)
-		}
-
-		enc := &jsonpb.MarshalOptions{EmitUnpopulated: true}
-		_, err := enc.Marshal(rsp)
-		if err != nil {
-			t.Fatal(err)
-		}
+	_, err = c.Call(ctx, rq,
+		client.WithResponseMetadata(&md),
+		gclient.CallOptions(grpc.UseCompressor(gzip.Name)))
+	if err != nil {
+		t.Fatalf("err: %v", err)
 	}
+	t.Logf("response md %#+v", md)
+
+	ngcli, err := grpc.DialContext(ctx,
+		// lis.Addr().String(),
+		service[0].Nodes[0].Address,
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+	)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer ngcli.Close()
+
+	var gmd gmetadata.MD
+	ngrpcsvc := pb.NewTestClient(ngcli)
+	t.Logf("call micro via native")
+	if _, err = ngrpcsvc.Call(ctx, rq,
+		grpc.UseCompressor(gzip.Name),
+		grpc.Header(&gmd)); err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("gmd %#+v\n", gmd)
+
+	nxgcli, err := grpc.DialContext(ctx,
+		lis.Addr().String(),
+		// service[0].Nodes[0].Address,
+		grpc.WithTransportCredentials(insecure.NewCredentials()),
+	)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer nxgcli.Close()
+
+	ngrpcsvc = pb.NewTestClient(nxgcli)
+	t.Logf("call native via native")
+	if _, err := ngrpcsvc.Call(ctx, rq,
+		grpc.UseCompressor(gzip.Name),
+		grpc.Header(&gmd)); err != nil {
+		t.Fatal(err)
+	}
+	t.Logf("gmd %#+v\n", gmd)

 	//rsp := rpb.ServerReflectionResponse{}
 	//req := c.NewRequest("helloworld", "Test.ServerReflectionInfo", &rpb.ServerReflectionRequest{}, client.StreamingRequest())
--- a/server/grpc/proto/test.pb.go
+++ b/server/grpc/proto/test.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
 // 	protoc-gen-go v1.26.0
-// 	protoc        v3.19.4
+// 	protoc        v3.21.12
 // source: test.proto

 package helloworld
--- a/server/grpc/proto/test_grpc.pb.go
+++ b/server/grpc/proto/test_grpc.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-grpc v1.2.0
-// - protoc             v3.19.4
+// - protoc             v3.21.12
 // source: test.proto

 package helloworld