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.

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

deps: fix backwards compatibility with encoding #6965

Merged
merged 2 commits into from Feb 5, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 17 additions & 4 deletions encoding/proto/proto.go
Expand Up @@ -25,6 +25,7 @@

"google.golang.org/grpc/encoding"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/protoadapt"
)

// Name is the name registered for the proto compressor.
Expand All @@ -38,18 +39,30 @@
type codec struct{}

func (codec) Marshal(v any) ([]byte, error) {
vv, ok := v.(proto.Message)
if !ok {
var vv proto.Message
switch v := v.(type) {
case protoadapt.MessageV1:
vv = protoadapt.MessageV2Of(v)
case protoadapt.MessageV2:
vv = v
default:

Check warning on line 48 in encoding/proto/proto.go

View check run for this annotation

Codecov / codecov/patch

encoding/proto/proto.go#L46-L48

Added lines #L46 - L48 were not covered by tests
return nil, fmt.Errorf("failed to marshal, message is %T, want proto.Message", v)
}

return proto.Marshal(vv)
}

func (codec) Unmarshal(data []byte, v any) error {
vv, ok := v.(proto.Message)
if !ok {
var vv proto.Message
switch v := v.(type) {
case protoadapt.MessageV1:
vv = protoadapt.MessageV2Of(v)
case protoadapt.MessageV2:
vv = v
default:

Check warning on line 62 in encoding/proto/proto.go

View check run for this annotation

Codecov / codecov/patch

encoding/proto/proto.go#L60-L62

Added lines #L60 - L62 were not covered by tests
arvindbr8 marked this conversation as resolved.
Show resolved Hide resolved
return fmt.Errorf("failed to unmarshal, message is %T, want proto.Message", v)
}

return proto.Unmarshal(data, vv)
}

Expand Down