Skip to content

Commit

Permalink
fix: Allow null package name (#44)
Browse files Browse the repository at this point in the history
  • Loading branch information
amaury1093 authored Feb 20, 2023
1 parent 61eccf0 commit d830bdb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## [Unreleased]
## [v1.4.5](https://github.com/cosmos/gogoproto/releases/tag/v1.4.5) - 2023-02-20

### Improvements

Expand Down
11 changes: 5 additions & 6 deletions proto/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,8 @@ func mergedFileDescriptors(debug bool) (*descriptorpb.FileDescriptorSet, error)
// Add protoregistry file descriptors to our final file descriptor set.
protoregistry.GlobalFiles.RangeFiles(func(fileDescriptor protoreflect.FileDescriptor) bool {
fd := protodesc.ToFileDescriptorProto(fileDescriptor)
if fd.Name != nil && fd.Package != nil {
if err := CheckImportPath(*fd.Name, *fd.Package); err != nil {
checkImportErr = append(checkImportErr, err.Error())
}
if err := CheckImportPath(fd.GetName(), fd.GetPackage()); err != nil {
checkImportErr = append(checkImportErr, err.Error())
}

fds.File = append(fds.File, protodesc.ToFileDescriptorProto(fileDescriptor))
Expand All @@ -82,7 +80,7 @@ func mergedFileDescriptors(debug bool) (*descriptorpb.FileDescriptorSet, error)
return nil, err
}

err = CheckImportPath(*fd.Name, *fd.Package)
err = CheckImportPath(fd.GetName(), fd.GetPackage())
if err != nil {
checkImportErr = append(checkImportErr, err.Error())
}
Expand Down Expand Up @@ -149,7 +147,8 @@ func MergedRegistry() (*protoregistry.Files, error) {
}

// CheckImportPath checks that the import path of the given file descriptor
// matches its fully qualified package name.
// matches its fully qualified package name. To mimic gogo's old behavior, the
// fdPackage string can be empty.
//
// Example:
// Proto file "google/protobuf/descriptor.proto" should be imported
Expand Down

0 comments on commit d830bdb

Please sign in to comment.