Use relocation map during bundle fixup #109
Merged
+100
−649
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
carolynvs
force-pushed
the
fixup-with-relocation-map
branch
from
c11067a to
cc53831
Compare
|
/brig run |
carolynvs
force-pushed
the
fixup-with-relocation-map
branch
3 times, most recently
from
76007cc to
4cf5358
Compare
|
So the cnab-to-oci build is currently broken. It's on go 1.13 but using the latest of tools that no longer support 1.13. I played around with bumping to go 1.15 in this PR and ran into more issues. I'll try pinning the tools to older versions and see how that plays out, and then will open a separate PR with the fix for the build. |
carolynvs
force-pushed
the
fixup-with-relocation-map
branch
from
4cf5358 to
4b8b4d8
Compare
vdice
reviewed
Jun 9, 2021
There was a problem hiding this comment.
This looks good to me! Defer to maintainers @silvin-lubecki and @radu-matei for final approval.
radu-matei
approved these changes
Jun 11, 2021
I believe the relocation map was accidentally not used after WithRelocationMap is set, and it news up an empty relocation map before fixing the images in the bundle. I have updated the fixup to use the relocation mapping set by the caller, and fixed the mocks in the tests to account for the new code flow. Signed-off-by: Carolyn Van Slyck <[email protected]>
carolynvs
force-pushed
the
fixup-with-relocation-map
branch
from
4b8b4d8 to
bf4ec40
Compare
|
@radu-matei Rebased! |
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.
I believe the relocation map was accidentally not used after
WithRelocationMapis set, and it news up an empty relocation map before fixing the images in the bundle.I have updated the fixup to use the relocation mapping set by the caller, and fixed the mocks in the tests to account for the new code flow. I've also tweaked the log messages so that you can see exactly which image is being pushed (i.e. pushing the relocated image instead always printing the original image name).
Fixes #108