Fix incorrect Protobuf FileDescriptor references (#989)

Fixes several well known types were referencing incorrect descriptors. Additionally, changes the field behavior and source context imports, which are part of the standard protobuf distribution, to google.golang.org/protobuf instead of google.golang.org/genproto. --------- Co-authored-by: Mike Mann <[email protected]> Co-authored-by: PrasanthV454 <[email protected]>
confluentinc · May 16, 2023 · acd3a1e · acd3a1e
1 parent 2d73ce6
commit acd3a1e
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Confluent's Golang client for Apache Kafka
 
+
 # v2.2.0
 
 This is a feature release.
@@ -8,6 +9,7 @@ This is a feature release.
 
  * Fixes a nil pointer bug in the protobuf `Serializer.Serialize()`, caused due to
    an unchecked error (#997, @baganokodo2022).
+ * Fixes incorrect protofbuf FileDescriptor references (#989, @Mrmann87).
 
 
 ## v2.1.1

diff --git a/examples/protobuf_producer_example/my_record.pb.go b/examples/protobuf_producer_example/my_record.pb.go
diff --git a/examples/protobuf_producer_example/my_record.proto b/examples/protobuf_producer_example/my_record.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package main;
-option go_package="main";
+option go_package="./;main";
 
 message MyRecord {
     string productName = 1;

diff --git a/schemaregistry/serde/protobuf/protobuf.go b/schemaregistry/serde/protobuf/protobuf.go
@@ -40,19 +40,21 @@ import (
 	"google.golang.org/genproto/googleapis/type/fraction"
 	"google.golang.org/genproto/googleapis/type/latlng"
 	"google.golang.org/genproto/googleapis/type/money"
+	"google.golang.org/genproto/googleapis/type/month"
 	"google.golang.org/genproto/googleapis/type/postaladdress"
 	"google.golang.org/genproto/googleapis/type/quaternion"
 	"google.golang.org/genproto/googleapis/type/timeofday"
-	"google.golang.org/genproto/protobuf/field_mask"
-	"google.golang.org/genproto/protobuf/source_context"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protodesc"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/reflect/protoregistry"
 	"google.golang.org/protobuf/types/descriptorpb"
 	"google.golang.org/protobuf/types/known/anypb"
+	"google.golang.org/protobuf/types/known/apipb"
 	"google.golang.org/protobuf/types/known/durationpb"
 	"google.golang.org/protobuf/types/known/emptypb"
+	"google.golang.org/protobuf/types/known/fieldmaskpb"
+	"google.golang.org/protobuf/types/known/sourcecontextpb"
 	"google.golang.org/protobuf/types/known/structpb"
 	"google.golang.org/protobuf/types/known/timestamppb"
 	"google.golang.org/protobuf/types/known/typepb"
@@ -88,17 +90,17 @@ func init() {
 		"google/type/fraction.proto":           fraction.File_google_type_fraction_proto,
 		"google/type/latlng.proto":             latlng.File_google_type_latlng_proto,
 		"google/type/money.proto":              money.File_google_type_money_proto,
-		"google/type/month.proto":              money.File_google_type_money_proto,
+		"google/type/month.proto":              month.File_google_type_month_proto,
 		"google/type/postal_address.proto":     postaladdress.File_google_type_postal_address_proto,
 		"google/type/quaternion.proto":         quaternion.File_google_type_quaternion_proto,
 		"google/type/timeofday.proto":          timeofday.File_google_type_timeofday_proto,
 		"google/protobuf/any.proto":            anypb.File_google_protobuf_any_proto,
-		"google/protobuf/api.proto":            anypb.File_google_protobuf_any_proto,
+		"google/protobuf/api.proto":            apipb.File_google_protobuf_api_proto,
 		"google/protobuf/descriptor.proto":     descriptorpb.File_google_protobuf_descriptor_proto,
 		"google/protobuf/duration.proto":       durationpb.File_google_protobuf_duration_proto,
 		"google/protobuf/empty.proto":          emptypb.File_google_protobuf_empty_proto,
-		"google/protobuf/field_mask.proto":     field_mask.File_google_protobuf_field_mask_proto,
-		"google/protobuf/source_context.proto": source_context.File_google_protobuf_source_context_proto,
+		"google/protobuf/field_mask.proto":     fieldmaskpb.File_google_protobuf_field_mask_proto,
+		"google/protobuf/source_context.proto": sourcecontextpb.File_google_protobuf_source_context_proto,
 		"google/protobuf/struct.proto":         structpb.File_google_protobuf_struct_proto,
 		"google/protobuf/timestamp.proto":      timestamppb.File_google_protobuf_timestamp_proto,
 		"google/protobuf/type.proto":           typepb.File_google_protobuf_type_proto,