fix: use proto.Merge instead of value assignment in opaque API mode#6384
Closed
clarabennettdev wants to merge 1 commit intogrpc-ecosystem:mainfrom
Closed
fix: use proto.Merge instead of value assignment in opaque API mode#6384clarabennettdev wants to merge 1 commit intogrpc-ecosystem:mainfrom
clarabennettdev wants to merge 1 commit intogrpc-ecosystem:mainfrom
Conversation
Fixes #6380 When use_opaque_api=true, the generated code copies proto messages by value (protoReq = bodyData), which copies the sync.Mutex embedded in protoimpl.MessageState and triggers go vet copylocks. Replace all 4 occurrences of value assignment with proto.Merge in both request and local request handler templates.
Collaborator
|
Thanks for this, looks like a dupe of #6383? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #6380
Summary
When
use_opaque_api=true, the generated*.pb.gw.gofiles contain value assignments (protoReq = bodyData) that copyprotoimpl.MessageState, which embedssync.MutexvianoCopy. This triggersgo vet copylocksviolations.Changes
Replaced all 4 occurrences of
protoReq = bodyDatawithproto.Merge(&protoReq, &bodyData)inprotoc-gen-grpc-gateway/internal/gengateway/template.go:protois already imported in generated code viagenerator.go, so no import changes needed.All existing tests pass.