additional proto files are optional

vadimi · Sep 9, 2022 · 39637fd · 39637fd
1 parent 859470f
commit 39637fd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/internal/caller/parseprotos.go b/internal/caller/parseprotos.go
@@ -1,6 +1,7 @@
 package caller
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"io/fs"
@@ -12,14 +13,16 @@ import (
 	clifs "github.com/vadimi/grpc-client-cli/internal/fs"
 )
 
+var errNoProtoFilesFound = errors.New("no proto files found")
+
 func parseProtoFiles(protoDirs []string, protoImports []string) ([]*desc.FileDescriptor, error) {
 	protofiles, err := findProtoFiles(protoDirs)
 	if err != nil {
 		return nil, err
 	}
 
 	if len(protofiles) == 0 {
-		return nil, fmt.Errorf("no proto files found in %s", protoDirs)
+		return nil, fmt.Errorf("%w: %s", errNoProtoFilesFound, protoDirs)
 	}
 
 	importPaths := []string{}

diff --git a/internal/caller/servicemetabase.go b/internal/caller/servicemetabase.go
@@ -2,6 +2,7 @@ package caller
 
 import (
 	"context"
+	"errors"
 	"fmt"
 
 	"github.com/jhump/protoreflect/desc"
@@ -37,6 +38,9 @@ func (s serviceMetaBase) GetAdditionalFiles(protoImports []string) ([]*desc.File
 	}
 	fileDesc, err := parseProtoFiles(protoImports, nil)
 	if err != nil {
+		if errors.Is(err, errNoProtoFilesFound) {
+			return nil, nil
+		}
 		return nil, fmt.Errorf("error parsing additional proto files: %w", err)
 	}
 	return fileDesc, nil