Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gRPC: fix server reflection #8945

Merged
merged 18 commits into from
Mar 22, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add: extensions reflection
  • Loading branch information
fdymylja committed Mar 22, 2021
commit 65674915d4957e039e560ab600811f892da2a2f3
43 changes: 43 additions & 0 deletions server/grpc/gogoreflection/fix_registration.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,46 @@ func getMessageType(name string) reflect.Type {
// nolint: staticcheck
return proto.MessageType(name)
}

func getExtension(extID int32, m proto.Message) *gogoproto.ExtensionDesc {
// check first in gogoproto registry
for id, desc := range gogoproto.RegisteredExtensions(m) {
if id == extID {
return desc
}
}
// check into proto registry
// nolint: staticcheck
for id, desc := range proto.RegisteredExtensions(m) {
if id == extID {
return &gogoproto.ExtensionDesc{
ExtendedType: desc.ExtendedType,
ExtensionType: desc.ExtensionType,
Field: desc.Field,
Name: desc.Name,
Tag: desc.Tag,
Filename: desc.Filename,
}
}
}

return nil
}

func getExtensionsNumbers(m proto.Message) []int32 {
gogoProtoExts := gogoproto.RegisteredExtensions(m)
out := make([]int32, 0, len(gogoProtoExts))
for id := range gogoProtoExts {
out = append(out, id)
}
if len(out) != 0 {
return out
}
// nolint: staticcheck
protoExts := proto.RegisteredExtensions(m)
out = make([]int32, 0, len(protoExts))
for id := range protoExts {
out = append(out, id)
}
return out
}
15 changes: 2 additions & 13 deletions server/grpc/gogoreflection/serverreflection.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ import (
"sort"
"sync"

gogoproto "github.com/gogo/protobuf/proto"
// nolint: staticcheck
"github.com/golang/protobuf/proto"
dpb "github.com/golang/protobuf/protoc-gen-go/descriptor"
Expand Down Expand Up @@ -243,13 +242,7 @@ func fileDescContainingExtension(st reflect.Type, ext int32) (*dpb.FileDescripto
return nil, fmt.Errorf("failed to create message from type: %v", st)
}

var extDesc *gogoproto.ExtensionDesc
for id, desc := range gogoproto.RegisteredExtensions(m) {
if id == ext {
extDesc = desc
break
}
}
extDesc := getExtension(ext, m)

if extDesc == nil {
return nil, fmt.Errorf("failed to find registered extension for extension number %v", ext)
Expand All @@ -264,11 +257,7 @@ func (s *serverReflectionServer) allExtensionNumbersForType(st reflect.Type) ([]
return nil, fmt.Errorf("failed to create message from type: %v", st)
}

exts := gogoproto.RegisteredExtensions(m)
out := make([]int32, 0, len(exts))
for id := range exts {
out = append(out, id)
}
out := getExtensionsNumbers(m)
return out, nil
}

Expand Down