Merge pull request #8 from arkadiyt/atetelman--fix

Fix enum default values
arkadiyt · May 24, 2024 · 16270c3 · 16270c3
2 parents 5a6bdfe + c60f553
commit 16270c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
 	}