diff --git a/CHANGELOG.md b/CHANGELOG.md index 61e93567..f57c7d15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [Unreleased] +## [v1.4.5](https://github.com/cosmos/gogoproto/releases/tag/v1.4.5) - 2023-02-20 ### Improvements diff --git a/proto/merge.go b/proto/merge.go index 98da8075..095aa258 100644 --- a/proto/merge.go +++ b/proto/merge.go @@ -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)) @@ -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()) } @@ -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