Conradhanson/test external changes for supporting proto optionals (#20)

* make generated-code with protoc 3.15.8

* non-generated changes from external branch

* use internal hashstructure package; make generated-code

main.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	pgsgo "github.com/lyft/protoc-gen-star/lang/go"
+	"google.golang.org/protobuf/types/pluginpb"
+
 	"github.com/solo-io/protoc-gen-ext/module/clone"
 	"github.com/solo-io/protoc-gen-ext/module/equal"
 	"github.com/solo-io/protoc-gen-ext/module/hash"
@@ -11,8 +13,10 @@ import (
 )
 
 func main() {
+	feat := uint64(pluginpb.CodeGeneratorResponse_FEATURE_PROTO3_OPTIONAL)
 	pgs.Init(
 		pgs.DebugEnv("PROTO_DEBUG"),
+		pgs.SupportedFeatures(&feat),
 	).RegisterModule(
 		hash.Hash(),
 		equal.Equal(),

templates/clone/msg.go

@@ -13,7 +13,14 @@ func (m {{ (msgTyp .).Pointer }}) Clone() proto.Message {
 			{{ render . }}
 		{{ end }}
 
-		{{ range .OneOfs }}
+		{{ range .SyntheticOneOfFields }}
+		if m.{{ name . }} != nil {
+			v := m.Get{{ name . }}()
+			target.{{ name . }} = &v
+		}
+		{{ end }}
+
+		{{ range .RealOneOfs }}
 			switch m.{{ name . }}.(type) {
 				{{ $oneOfInterface := name .}}
 				{{ range .Fields }}

templates/equal/msg.go

@@ -26,7 +26,20 @@ func (m {{ (msgTyp .).Pointer }}) Equal(that interface{}) bool {
 			{{ render . }}
 		{{ end }}
 
-		{{ range .OneOfs }}
+		{{ range .SyntheticOneOfFields }}
+		if m.{{ name . }} != nil {
+			if target.{{ name . }} == nil {
+				return false
+			}
+			if m.Get{{ name . }}() != target.Get{{ name . }}() {
+				return false
+			}
+		} else if target.{{ name . }} != nil {
+			return false
+		}
+		{{ end }}
+
+		{{ range .RealOneOfs }}
 			switch m.{{ name . }}.(type) {
 				{{ $oneOfInterface := name .}}
 				{{ range .Fields }}

templates/hash/msg.go

@@ -14,7 +14,10 @@ func (m {{ (msgTyp .).Pointer }}) Hash(hasher hash.Hash64) (uint64, error) {
 			{{ render . }}
 		{{ end }}
 
-		{{ range .OneOfs }}
+		{{ range .SyntheticOneOfFields }}
+			{{ render . }}
+		{{ end }}
+		{{ range .RealOneOfs }}
 			switch m.{{ name . }}.(type) {
 				{{ range .Fields }}
 					case {{ oneof . }}:

templates/merge/functions.go

@@ -20,6 +20,7 @@ func register(tpl *template.Template, params pgs.Parameters) {
 		"pkg":         fns.PackageName,
 		"renderField": fns.renderField,
 		"renderOneOf": fns.renderOneOf,
+		"name":        fns.Name,
 	})
 }
 

templates/merge/msg.go

@@ -9,7 +9,14 @@ func (m {{ (msgTyp .).Pointer }}) Merge(overrides {{ (msgTyp .).Pointer }}) {
 		{{ renderField . }}
 	{{ end }}
 
-	{{ range .OneOfs }}
+	{{ range .SyntheticOneOfFields }}
+	if overrides.{{ name . }} != nil {
+		v := overrides.Get{{ name . }}()
+		m.{{ name . }} = &v
+	}
+	{{ end }}
+
+	{{ range .RealOneOfs }}
 		{{ renderOneOf . }}
 	{{ end }}