From c60f553409c5d113d1a2e8c2c756431075697e32 Mon Sep 17 00:00:00 2001 From: Arkadiy Tetelman Date: Thu, 23 May 2024 22:47:35 -0700 Subject: [PATCH] Fix enum default values --- pkg/protodump/proto.go | 2 +- pkg/protodump/proto_test.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/protodump/proto.go b/pkg/protodump/proto.go index 5f62e85..7336680 100644 --- a/pkg/protodump/proto.go +++ b/pkg/protodump/proto.go @@ -141,7 +141,7 @@ func (pd *ProtoDefinition) writeField(field protoreflect.FieldDescriptor) { if kind == "string" { pd.write(fmt.Sprintf("\"%s\"", field.Default().String())) } else if kind == "enum" { - pd.write(string(field.Enum().Values().ByNumber(field.Default().Enum()).Name())) + pd.write(string(field.DefaultEnumValue().Name())) } else { pd.write(field.Default().String()) } diff --git a/pkg/protodump/proto_test.go b/pkg/protodump/proto_test.go index e49cba9..8f35d3c 100644 --- a/pkg/protodump/proto_test.go +++ b/pkg/protodump/proto_test.go @@ -22,8 +22,10 @@ func convertProtoToFileDescriptor(filePath string) (*descriptorpb.FileDescriptor defer os.RemoveAll(dir) filename := "proto.bin" - err = exec.Command("protoc", fmt.Sprintf("--go_out=%s", dir), fmt.Sprintf("--descriptor_set_out=%s", path.Join(dir, filename)), filePath).Run() + cmd := exec.Command("protoc", fmt.Sprintf("--go_out=%s", dir), fmt.Sprintf("--descriptor_set_out=%s", path.Join(dir, filename)), filePath) + output, err := cmd.CombinedOutput() if err != nil { + fmt.Print(string(output)) return nil, err }