Fix conversion determination when encrypting #1930
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
- When encrypting, actually make a choice even if the destination does not care about manifest formats - Don't try converting to formats that don't support encryption at all - Fail with a readable error messsage instead of "internal error" if we filter out all candidates. Signed-off-by: Miloslav Trmač <[email protected]>
…geCopier We will want to access imageCopier.cannotModifyManifestReason. All the ...Step functions are now methods of imageCopier, which is more consistent. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
Exit early if we are not changing anything, to make the "no change" case easier to follow, and most of the code less indented. Should not change behavior. Signed-off-by: Miloslav Trmač <[email protected]>
We would fail with an internal error anyway, this fails explicitly. Signed-off-by: Miloslav Trmač <[email protected]>
mtrmac
commented
Apr 25, 2023
| }, nil | ||
| } | ||
|
|
||
| if ic.cannotModifyManifestReason != "" { |
There was a problem hiding this comment.
I’m not immediately sure how this interacts with podman pull of digest references, I need to test that. (It seems to me that that never worked, in which case this is, I guess, good enough…)
There was a problem hiding this comment.
Actually, no need to test, this is tracked as #1768 . I’ll just add a comment here.
There was a problem hiding this comment.
… not even a comment; #1768 would probably be cleanest to fix by recording the original manifest, and the updated manifest, separately; and in that case cannotModifyManifestReason would not be set.
This was referenced Apr 25, 2023
mtrmac
added
the
kind/bug
This was referenced Apr 25, 2023
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.
See individual commit messages for a bit more detail.