pkg/manifests.list.AddInstance(): don't set Platform to an empty struct #1819
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
nalind
force-pushed
the
platform-optional
branch
from
89fdd08
to
f717d6c
Compare
If the Platform struct for an OCI instance being added to an image index is empty, set the Platform pointer field in the Descriptor struct to `nil` instead of setting it to point to a Platform struct filled with empty values. I expect this to be the case for at least some OCI artifacts being added to indexes. Likewise, if we're updating the Platform for an OCI instance and its value goes to zero, set its pointer to `nil` to avoid the same case. When reading information back from a descriptor, or setting a field in the Platform struct, don't assume that Platform is (already) set to a non-nil value. Signed-off-by: Nalin Dahyabhai <[email protected]>
nalind
force-pushed
the
platform-optional
branch
from
f717d6c
to
5030765
Compare
|
LGTM |
Luap99
reviewed
Jan 25, 2024
pkg/filters/filters_test.go
Outdated
Comment on lines
209
to
210
| sort.Strings(expectedLibpodFilters) | ||
| sort.Strings(got) |
There was a problem hiding this comment.
I think you can use assert.ElementsMatch() instead of sorting explicitly
There was a problem hiding this comment.
Ooh, that's a good one. I missed that somehow when doing a search of the functions in the package. Changing it.
Compare the two string slices in this test using ElementsMatch(), which ignores the order. One of them is built using a map traversal, the order of which is not guaranteed, so the regular equality check can fail. Signed-off-by: Nalin Dahyabhai <[email protected]>
nalind
force-pushed
the
platform-optional
branch
from
e1289a6
to
ff69f79
Compare
|
Any other review comments, anyone? |
|
/lgtm |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: nalind, rhatdan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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.
If the Platform struct for an OCI instance being added to an image index is empty, set the Platform pointer field in the Descriptor struct to
nilinstead of setting it to point to a Platform struct filled with empty values. I expect this to be the case for at least some OCI artifacts being added to indexes.Likewise, if we're updating the Platform for an OCI instance and its value goes to zero, set its pointer to
nilto avoid the same case.When reading information back from a descriptor, or setting a field in the Platform struct, don't assume that Platform is (already) set to a non-nil value.