Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix incorrect Protobuf FileDescriptor references #989

Merged
merged 4 commits into from
May 16, 2023
Merged

Fix incorrect Protobuf FileDescriptor references #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
164b8dd
Fix incorrect Protobuf FileDescriptor references
Mrmann87 Nov 3, 2022
b2fa4e1
maintaining same format for producer and consumer in protobuf examples
PrasanthV454 Feb 20, 2023
13416ee
Add changelog entry
milindl Apr 25, 2023
cc24ea1
Merge branch 'master' into dev_descriptor_refs
milindl May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Confluent's Golang client for Apache Kafka


# v2.2.0

This is a feature release.
Expand All @@ -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
Expand Down
74 changes: 36 additions & 38 deletions examples/protobuf_producer_example/my_record.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/protobuf_producer_example/my_record.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
syntax = "proto3";

package main;
option go_package="main";
option go_package="./;main";

message MyRecord {
string productName = 1;
Expand Down
14 changes: 8 additions & 6 deletions schemaregistry/serde/protobuf/protobuf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down