astelm/grpcurl
1
0
Fork 0
mirror of https://github.com/fullstorydev/grpcurl.git synced 2026-05-24 04:31:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

update all deps; use new ResolveFilenames method (#103)

Browse Source
This commit is contained in:
Joshua Humphries
2019-05-24 10:26:38 -04:00
committed by GitHub
parent e5b4fc6cc0
commit 7e4045565f
3 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
desc_source.go
View File

@@ -58,9 +58,14 @@ func DescriptorSourceFromProtoSets(fileNames ...string) (DescriptorSource, error
// whose contents are Protocol Buffer source files. The given importPaths are used to locate
// any imported files.
func DescriptorSourceFromProtoFiles(importPaths []string, fileNames ...string) (DescriptorSource, error) {
fileNames, err := protoparse.ResolveFilenames(importPaths, fileNames...)
if err != nil {
return nil, err
}
p := protoparse.Parser{
ImportPaths: importPaths,
InferImportPaths: len(importPaths) == 0,
ImportPaths: importPaths,
InferImportPaths: len(importPaths) == 0,
IncludeSourceCodeInfo: true,
}
fds, err := p.ParseFiles(fileNames...)
if err != nil {