blueprint: fix filesystem customization parsing #885
Merged
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
The toml tag and bootc-image-builder uses the new key "minsize", but the custom unmarshaller still referred to the old "size" key. Unfortunately, the test was also wrong. This commit changes both the unmarshaller and the test to use new "minsize" key, hopefully finally bringing sanity to this code. I also changed some require.Nil calls to require.NoError to make the test results more readable if these tests fail.
There's no functional change except for a minor adjustements of an error. I just made sure that everything refers to minsize instead of size. Also, I removed a comment that mentioned that the keys are called differently in json than in toml, but that's no longer true. See e.g. the previous commit.
mvo5
reviewed
Sep 2, 2024
There was a problem hiding this comment.
Thank you! This looks fine, thanks for fixing this. I was about to approve but there is the open question about backward compatiblity (I assume we do not need that as this is a bug but wanted to double check).
I would also encourage two small test tweaks that I added, happy to push them directly to this branch if people are okay with or alternatively push them as a followup :)
| @@ -23,16 +23,16 @@ version = "2.4.*" | |||
|
|
|||
| [[customizations.filesystem]] | |||
| mountpoint = "/var" | |||
| size = 2147483648 | |||
| minsize = 2147483648 | |||
There was a problem hiding this comment.
I assume there is no risk here that there are "wrong" blueprint tomls out there that we would break with this change?
There was a problem hiding this comment.
Those cases are handled by the custom unmarshaller in osbuild-composer before being sent through to the code here in images.
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.
In the filesystem customization, the toml tags clearly sets the
MinSizefield's key tominsize, this is also reflected inbootc-image-builderdocs. However, the custom unmarshallers are actually wrong, they still refer to the oldsizename (see #825).This PR fixes the unmarshallers, and adds more test coverage.