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

Fixed descriptor filename #205

Merged
merged 1 commit into from
Feb 20, 2024
Merged
Changes from all commits
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
34 changes: 32 additions & 2 deletions src/protoeval-cli/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ package cmd
import (
"encoding/base64"
"errors"
"fmt"
"os"
"strings"

Expand Down Expand Up @@ -66,7 +65,37 @@ func terminate(err error) {
}
}

func compileMsgDescriptor(desc []byte, MasterMsgName, fileName string) (protoreflect.MessageDescriptor, error) {
descriptorSet := descriptorpb.FileDescriptorSet{}
err := proto.Unmarshal(desc, &descriptorSet)
if err != nil {
return nil, err
}

localRegistry, err := protodesc.NewFiles(&descriptorSet)
if err != nil {
return nil, err
}

fileDesc, err := localRegistry.FindFileByPath(fileName)
if err != nil {
return nil, err
}

msgsDesc := fileDesc.Messages()
return msgsDesc.ByName(protoreflect.Name(MasterMsgName)), nil
}

func compileDescriptor(desc64 string, masterMsgName string, fileName string) (protoreflect.MessageDescriptor, error) {
dbytes, err := base64.StdEncoding.DecodeString(desc64)
if err != nil {
return nil, err
}
return compileMsgDescriptor(dbytes, masterMsgName, fileName)
}

// deprecated
func compileDescriptorOld(desc64 string, masterMsgName string, fileName string) (protoreflect.MessageDescriptor, error) {
descriptorSet := descriptorpb.FileDescriptorSet{}
dbytes, err := base64.StdEncoding.DecodeString(desc64)
if err != nil {
Expand All @@ -82,7 +111,8 @@ func compileDescriptor(desc64 string, masterMsgName string, fileName string) (pr
return nil, err
}

filePath := fmt.Sprintf("%v.proto", fileName)
// filePath := fmt.Sprintf("%v.proto", fileName)
filePath := fileName
fileDesc, err := localRegistry.FindFileByPath(filePath)
if err != nil {
return nil, err
Expand Down
Loading