Fix optional and add debugging

srikrsna · Jul 4, 2021 · c1f01ee · c1f01ee
1 parent 61279e2
commit c1f01ee
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 8 deletions.
diff --git a/buf.gen.yaml b/buf.gen.yaml
@@ -3,6 +3,9 @@ plugins:
   - name: go
     out: .
     opt: paths=source_relative
+  - name: debug
+    out: .
+    opt: ./debug
   - name: gotag
     out: .
     opt: paths=source_relative,xxx=graphql+"-" bson+"-"
diff --git a/debug/code_generator_request.pb.bin b/debug/code_generator_request.pb.bin
diff --git a/example/example.pb.go b/example/example.pb.go
diff --git a/go.mod b/go.mod
@@ -1,11 +1,13 @@
 module github.com/srikrsna/protoc-gen-gotag
 
-go 1.11
+go 1.16
+
+retract v0.6.0
 
 require (
 	github.com/fatih/structtag v1.2.0
 	github.com/lyft/protoc-gen-star v0.5.3
-	github.com/spf13/afero v1.5.1 // indirect
+	github.com/spf13/afero v1.5.1
 	golang.org/x/text v0.3.5 // indirect
 	google.golang.org/protobuf v1.26.0
 )
diff --git a/go.sum b/go.sum
@@ -36,7 +36,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=

diff --git a/module/extract.go b/module/extract.go
@@ -83,7 +83,7 @@ func (v *tagExtractor) VisitField(f pgs.Field) (pgs.Visitor, error) {
 	}
 
 	msgName := v.Context.Name(f.Message()).String()
-	if f.InOneOf() {
+	if f.InOneOf() && !f.Descriptor().GetProto3Optional() {
 		msgName = f.Message().Name().UpperCamelCase().String() + "_" + f.Name().UpperCamelCase().String()
 	}
 

diff --git a/module/extract_test.go b/module/extract_test.go
@@ -0,0 +1,27 @@
+package module_test
+
+import (
+	"bytes"
+	"os"
+	"testing"
+
+	pgs "github.com/lyft/protoc-gen-star"
+	"github.com/spf13/afero"
+	"github.com/srikrsna/protoc-gen-gotag/module"
+)
+
+func TestExtract(t *testing.T) {
+	req, err := os.Open("../debug/code_generator_request.pb.bin")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	fs := afero.NewMemMapFs()
+	res := &bytes.Buffer{}
+
+	pgs.Init(
+		pgs.ProtocInput(req),
+		pgs.ProtocOutput(res),
+		pgs.FileSystem(fs),
+	).RegisterModule(module.New()).Render()
+}
diff --git a/module/replace_test.go b/module/replace_test.go
@@ -27,7 +27,7 @@ func TestRetag(t *testing.T) {
 	}
 
 	module.Retag(n, map[string]map[string]*structtag.Tags{
-		"Simple": map[string]*structtag.Tags{
+		"Simple": {
 			"Single":   tagMust(structtag.Parse(`sql:"-,omitempty"`)),
 			"Multiple": tagMust(structtag.Parse(`xml:"-,omitempty"`)),
 			"None":     tagMust(structtag.Parse(`json:"none,omitempty"`)),

diff --git a/module/test/golden.txt b/module/test/golden.txt
@@ -2,6 +2,6 @@ package main
 
 type Simple struct {
 	Single		string	`json:"key,option" sql:"-,omitempty"`
-	Multiple	string	`json:"ke,op" xml:"-,omitempty"`
+	Multiple	*string	`json:"ke,op" xml:"-,omitempty"`
 	None		int32	`json:"none,omitempty"`
 }
diff --git a/module/test/input.txt b/module/test/input.txt
@@ -2,6 +2,6 @@ package main
 
 type Simple struct {
 	Single   string `json:"key,option"`
-	Multiple string `json:"ke,op" xml:"ke,op"`
+	Multiple *string `json:"ke,op" xml:"ke,op"`
 	None     int32
 }