go.mod

@@ -6,14 +6,13 @@ require (
 	github.com/go-co-op/gocron/v2 v2.12.3
 	github.com/google/gnostic v0.7.0
 	github.com/google/uuid v1.6.0
-	github.com/smartystreets/goconvey v1.8.1
+	github.com/stretchr/testify v1.9.0
 	go.unistack.org/micro-client-grpc/v3 v3.11.10
 	go.unistack.org/micro-client-http/v3 v3.9.14
 	go.unistack.org/micro-codec-json/v3 v3.10.1
 	go.unistack.org/micro-codec-jsonpb/v3 v3.10.3
 	go.unistack.org/micro-codec-proto/v3 v3.10.2
 	go.unistack.org/micro-codec-yaml/v3 v3.10.2
-	go.unistack.org/micro-config-file/v3 v3.8.10
 	go.unistack.org/micro-meter-victoriametrics/v3 v3.8.9
 	go.unistack.org/micro-proto/v3 v3.4.1
 	go.unistack.org/micro-server-http/v3 v3.11.34
@@ -22,13 +21,11 @@ require (
 )
 
 require (
-	dario.cat/mergo v1.0.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
-	github.com/gopherjs/gopherjs v1.17.2 // indirect
 	github.com/jonboulle/clockwork v0.4.0 // indirect
-	github.com/jtolds/gls v4.20.0+incompatible // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
-	github.com/smarty/assertions v1.15.0 // indirect
 	github.com/valyala/fastrand v1.1.0 // indirect
 	github.com/valyala/histogram v1.2.0 // indirect
 	go.unistack.org/metrics v0.0.1 // indirect

go.sum

@@ -593,8 +593,6 @@ cloud.google.com/go/workflows v1.8.0/go.mod h1:ysGhmEajwZxGn1OhGOGKsTXc5PyxOc0vf
 cloud.google.com/go/workflows v1.9.0/go.mod h1:ZGkj1aFIOd9c8Gerkjjq7OW7I5+l6cSvT3ujaO/WwSA=
 cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
@@ -784,8 +782,6 @@ github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57Q
 github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI=
 github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
-github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
@@ -798,8 +794,6 @@ github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST
 github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
@@ -851,10 +845,6 @@ github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/f
 github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
 github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk=
 github.com/silas/dag v0.0.0-20220518035006-a7e85ada93c5/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY=
-github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec=
-github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY=
-github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
@@ -918,8 +908,6 @@ go.unistack.org/micro-codec-proto/v3 v3.10.2 h1:9iUQjBjTsd/RgIqB5rAQMZE0CYWngoW9
 go.unistack.org/micro-codec-proto/v3 v3.10.2/go.mod h1:54e1jb6aLL9obJUwJjtVupE5zY4PugTcMSqWDhz9aC4=
 go.unistack.org/micro-codec-yaml/v3 v3.10.2 h1:02I9XzhaBHqZU8Vd5e2zhf8j4foJ4muPT/x4gdR6E4c=
 go.unistack.org/micro-codec-yaml/v3 v3.10.2/go.mod h1:A/tYj7x9CRhuin7WxeIvnuo8bMDrZYcJkogVYN8X7rU=
-go.unistack.org/micro-config-file/v3 v3.8.10 h1:/IyD/i6I7Ic8jCNq7ZsTpWT8sToNG14gIFkSVPxbNpY=
-go.unistack.org/micro-config-file/v3 v3.8.10/go.mod h1:w7uw5KxK3H2OrZwX4p0hQHbp9UzwDODYqJvdofySgxY=
 go.unistack.org/micro-meter-victoriametrics/v3 v3.8.9 h1:ZXCS0eFiSdvcFYxpxV2Q77gfwAjpIRydwAEI1QBrwuQ=
 go.unistack.org/micro-meter-victoriametrics/v3 v3.8.9/go.mod h1:xODJQ0Nu/F8k34D/z2ITL91OskI/C674XCkugAxmc3Q=
 go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=

pkg/protoset/protoset.go

@@ -29,7 +29,7 @@ func NewProtoSet() *ProtoSet {
 }
 
 func (p *ProtoSet) GetMessage(addr, pkg, svc, mth string) (protoreflect.Message, protoreflect.Message, error) {
-	if addr == "" || svc == "" || mth == "" {
+	if addr == "" || svc == "" || mth == "" || pkg == "" {
 		return nil, nil, errors.New("addr or service name is empty")
 	}
 	p.mu.Lock()
@@ -41,7 +41,7 @@ func (p *ProtoSet) GetMessage(addr, pkg, svc, mth string) (protoreflect.Message,
 
 	pdesc, err := pfile.FindDescriptorByName(protoreflect.FullName(pkg + "." + svc))
 	if err != nil {
-		return nil, nil, fmt.Errorf("failed to find service %s.%s, err: %s", pkg, svc, err)
+		return nil, nil, fmt.Errorf("failed to find service %s.%s, err: %w", pkg, svc, err)
 	}
 
 	sdesc, ok := pdesc.(protoreflect.ServiceDescriptor)
@@ -63,13 +63,13 @@ func (p *ProtoSet) GetMessage(addr, pkg, svc, mth string) (protoreflect.Message,
 func (p *ProtoSet) AddProtoset(addr, svc string, data []byte) error {
 	fdset := &descriptorpb.FileDescriptorSet{}
 	if err := protocodec.NewCodec().Unmarshal(data, fdset); err != nil {
-		return fmt.Errorf("failed to unmarshal protoset file: %s", err)
+		return fmt.Errorf("failed to unmarshal protoset file: %w", err)
 	}
 
 	pfileoptions := protodesc.FileOptions{AllowUnresolvable: true}
 	pfiles, err := pfileoptions.NewFiles(fdset)
 	if err != nil {
-		return fmt.Errorf("failed to use protoset file, err: %s", err)
+		return fmt.Errorf("failed to use protoset file, err: %w", err)
 	}
 
 	p.mu.Lock()

pkg/protoset/protoset_test.go

@@ -1,50 +1,49 @@
 package protoset
 
 import (
-	"context"
 	"fmt"
 	"os"
 	"testing"
 
-	. "github.com/smartystreets/goconvey/convey"
+	"github.com/stretchr/testify/assert"
-	"go.unistack.org/micro/v3/logger"
 )
 
-func TestProtoSet(t *testing.T) {
+func TestProtoSet_1(t *testing.T) {
-	Convey("test1", t, func() {
+	p := NewProtoSet()
-		ctx := context.Background()
+	data, err := os.ReadFile("path to .protoset")
-		p := NewProtoSet(logger.DefaultLogger)
+	assert.Nil(t, err)
-		data, err := os.ReadFile("/Users/kgorbunov/GolandProjects/src/card-proto/card-grpc.protoset")
-		So(err, ShouldBeNil)
 
-		err = p.AddProtoset(ctx, "localhost:9090", "CardService", data)
+	err = p.AddProtoset("localhost:9090", "CardService", data)
-		So(err, ShouldBeNil)
+	assert.Nil(t, err)
 
-		req, rsp, err := p.GetMessage(ctx, "localhost:9090", "card_proto", "CardService", "GetCardList")
+	req, rsp, err := p.GetMessage("localhost:9090", "card_proto", "CardService", "GetCardList")
-		So(err, ShouldBeNil)
+	assert.Nil(t, err)
-		fmt.Printf("req: %v, rsp: %v", req, rsp)
+	assert.NotNil(t, req)
-	})
+	assert.NotNil(t, rsp)
-
+	fmt.Printf("req: %v, rsp: %v \n", req, rsp)
-	Convey("test2-bad", t, func() {
+}
-		ctx := context.Background()
+
-		p := NewProtoSet(logger.DefaultLogger)
+func TestProtoSet_2_bad(t *testing.T) {
-		data, err := os.ReadFile("/Users/kgorbunov/GolandProjects/src/card-proto/card-grpc.protoset")
+	p := NewProtoSet()
-		So(err, ShouldBeNil)
+	data, err := os.ReadFile("path to .protoset")
-
+	assert.Nil(t, err)
-		err = p.AddProtoset(ctx, "localhost:9090", "CardService", data)
+
-		So(err, ShouldBeNil)
+	err = p.AddProtoset("localhost:9090", "CardService", data)
-
+	assert.Nil(t, err)
-		req, rsp, err := p.GetMessage(ctx, "localhost:9090", "card_proto", "Card", "GetCardList")
+
-		So(err, ShouldBeError)
+	req, rsp, err := p.GetMessage("localhost:9090", "card_proto", "Card", "GetCardList")
-		fmt.Printf("req: %v, rsp: %v", req, rsp)
+	assert.Error(t, err)
-	})
+	assert.Nil(t, req)
-
+	assert.Nil(t, rsp)
-	Convey("test2-not-found", t, func() {
+	fmt.Printf("req: %v, rsp: %v \n", req, rsp)
-		ctx := context.Background()
+}
-		p := NewProtoSet(logger.DefaultLogger)
+
-
+func TestProtoSet_3_not_found(t *testing.T) {
-		req, rsp, err := p.GetMessage(ctx, "localhost:9090", "card_proto", "CardService", "GetCardList")
+	p := NewProtoSet()
-		So(err, ShouldEqual, errNotFound)
+
-		fmt.Printf("req: %v, rsp: %v", req, rsp)
+	req, rsp, err := p.GetMessage("localhost:9090", "card_proto", "CardService", "GetCardList")
-	})
+	assert.ErrorIs(t, err, errNotFound)
+	assert.Nil(t, req)
+	assert.Nil(t, rsp)
+	fmt.Printf("req: %v, rsp: %v \n", req, rsp)
 }