Repository navigation
types: accept single-number ulimits when unmarshalling JSON - #988
Closed
Sanjays2402 wants to merge 1 commit into
Closed
Sanjays2402 wants to merge 1 commit into
Sanjays2402 wants to merge 1 commit into
Conversation
UlimitsConfig.MarshalJSON writes a single limit as a bare number, but there was no UnmarshalJSON, so unmarshalling a marshalled project with encoding/json failed on that ulimit. Add UnmarshalJSON accepting both shapes MarshalJSON produces: a bare number for a single limit, and an object with soft and hard limits. Fixes compose-spec#980 Signed-off-by: Sanjay Santhanam <51058514+Sanjays2402@users.noreply.github.com>
Collaborator
|
we have tests in place to confirm marshalling / unmarshalling works as expected (see usage of |
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
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 #980
UlimitsConfig.MarshalJSON writes a single limit as a bare number ("nproc": 65535), but there was no UnmarshalJSON to match, so unmarshalling a marshalled project with encoding/json failed:
json: cannot unmarshal number into Go struct field Project.services.app.ulimits.nproc of type types.UlimitsConfig
This adds UnmarshalJSON accepting both shapes MarshalJSON produces: a bare number for a single limit, and an object with soft and hard limits. A JSON null is left alone.
Repro, before the fix on main at 6ac9323: load a service with ulimits nproc 65535, json.Marshal the project, then json.Unmarshal it back. It failed with the error above; after the fix it round-trips, and the soft/hard form is unchanged.
Tests: