protobuf: fix casing of json attributes with the switch from gogo #5524
Conversation
This file contains 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
tonistiigi
reviewed
Nov 15, 2024
|
I'll change the marshal side of the tests to use an expected string output for the JSON rather than relying on the previous marshal. I'll still have it deserialize both to a map though because maps are easier to compare than JSON strings. |
With the switch from gogo, the `oneof` fields no longer have their `json:"name"` fields emitted. Protobuf doesn't formally support these fields and tells users to use the `protojson` package, but we didn't and the official format is incompatible with the current format we use. This adds some custom marshaling code to the already existant custom unmarshaling code to ensure these fields are marshaled with the correct casing. Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
jsternberg
force-pushed
the
json-casing-regression
branch
from
7a15c23 to
56ffa9f
Compare
|
The tests now have raw JSON in them which should be more reliable. |
tonistiigi
approved these changes
Nov 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
With the switch from gogo, the
oneoffields no longer have theirjson:"name"fields emitted. Protobuf doesn't formally support these fields and tells users to use theprotojsonpackage, but we didn't and the official format is incompatible with the current format we use.This adds some custom marshaling code to the already existant custom unmarshaling code to ensure these fields are marshaled with the correct casing.