Merge pull request #1293 from lafer-fz/optimize/pb-dynamic-import

feat(generic): PB DynamicGo support importDirs
cloudwego · Mar 12, 2024 · 4fdd216 · 4fdd216
2 parents 114e667 + 5fa16c1
commit 4fdd216
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/pkg/generic/jsonpb_test/idl/echo_import.proto b/pkg/generic/jsonpb_test/idl/echo_import.proto
@@ -0,0 +1,11 @@
+syntax = "proto3";
+package test;
+
+import "echo.proto";
+// The greeting service definition.
+option go_package = "./";
+
+
+service EchoService {
+  rpc Echo (test.Request) returns (test.Response) {}
+}
diff --git a/pkg/generic/pbidl_provider.go b/pkg/generic/pbidl_provider.go
@@ -109,12 +109,12 @@ func (p *PbContentProvider) Close() error {
 }
 
 // PbFileProviderWithDynamicGo
-func NewPbFileProviderWithDynamicGo(main string, ctx context.Context, options dproto.Options) (PbDescriptorProviderDynamicGo, error) {
+func NewPbFileProviderWithDynamicGo(main string, ctx context.Context, options dproto.Options, importDirs ...string) (PbDescriptorProviderDynamicGo, error) {
 	p := &PbFileProviderWithDynamicGo{
 		svcs: make(chan *dproto.ServiceDescriptor, 1),
 	}
 
-	svc, err := options.NewDescriptorFromPath(ctx, main)
+	svc, err := options.NewDescriptorFromPath(ctx, main, importDirs...)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/generic/pbidl_provider_test.go b/pkg/generic/pbidl_provider_test.go
@@ -60,3 +60,15 @@ func TestPbContentProviderDynamicGo(t *testing.T) {
 	svcDsc := <-p.Provide()
 	test.Assert(t, svcDsc != nil)
 }
+
+func TestPbFileProviderWithDynamicGo(t *testing.T) {
+	path := "./jsonpb_test/idl/echo_import.proto"
+
+	opts := dproto.Options{}
+	p, err := NewPbFileProviderWithDynamicGo(path, context.Background(), opts, "./jsonpb_test/idl")
+
+	test.Assert(t, err == nil)
+
+	svcDsc := <-p.Provide()
+	test.Assert(t, svcDsc != nil)
+}