Merge pull request 'move set content-type in client publish' (#138) from devstigneev/micro-client-grpc:v3 into v3

Reviewed-on: #138

codec_test.go

@@ -0,0 +1,66 @@
+package grpc
+
+import (
+	"context"
+	"go.unistack.org/micro/v3/codec"
+	gmetadata "google.golang.org/grpc/metadata"
+	"testing"
+)
+
+type mockStream struct {
+	msg any
+}
+
+func (m mockStream) Header() (gmetadata.MD, error) {
+	return nil, nil
+}
+
+func (m mockStream) Trailer() gmetadata.MD {
+	return nil
+}
+
+func (m mockStream) CloseSend() error {
+	return nil
+}
+
+func (m mockStream) Context() context.Context {
+	return nil
+}
+
+func (m *mockStream) SendMsg(msg any) error {
+	m.msg = msg
+	return nil
+}
+
+func (m *mockStream) RecvMsg(msg any) error {
+
+	c := msg.(*codec.Frame)
+	c.Data = m.msg.(*codec.Frame).Data
+
+	return nil
+}
+
+func Test_ReadWrap(t *testing.T) {
+
+	wp := wrapStream{
+		&mockStream{},
+	}
+
+	write, err := wp.Write([]byte("test_data"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if write != 9 {
+		t.Error("uncorrected number wrote bytes")
+	}
+
+	b := make([]byte, write)
+	read, err := wp.Read(b)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if read != 9 || string(b) != "test_data" {
+		t.Error("uncorrected number wrote bytes or data")
+	}
+}

grpc.go

@@ -803,7 +803,6 @@ func (g *grpcClient) publish(ctx context.Context, ps []client.Message, opts ...c
 
 	for _, p := range ps {
 		md := metadata.Copy(omd)
-		md[metadata.HeaderContentType] = p.ContentType()
 		topic := p.Topic()
 		if len(exchange) > 0 {
 			topic = exchange
@@ -815,6 +814,8 @@ func (g *grpcClient) publish(ctx context.Context, ps []client.Message, opts ...c
 			md.Set(k, v)
 		}
 
+		md[metadata.HeaderContentType] = p.ContentType()
+
 		// passed in raw data
 		if d, ok := p.Payload().(*codec.Frame); ok {
 			body = d.Data

grpc_pool.go

@@ -130,7 +130,7 @@ func (p *ConnPool) Get(ctx context.Context, addr string, opts ...grpc.DialOption
 	}
 	p.Unlock()
 
-	//  create new conn)
+	// nolint (TODO need fix)  create new conn)
 	cc, err := grpc.DialContext(ctx, addr, opts...)
 	if err != nil {
 		return nil, err