Fixes for rebase and log message improvements #1122
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
Member
natalieparellano
commented
Jun 9, 2023
natalieparellano
commented
- Fix daemon invocation by trying to read app image after we have a docker client
- Don't do stack validation for images built on newer platforms
natalieparellano
commented
Jun 9, 2023
Comment on lines
+268
to
+269
| encoding.ToJSONMaybe(d.AnalyzeMD.RunImage.TargetMetadata), | ||
| encoding.ToJSONMaybe(descriptor.TargetsList()), |
There was a problem hiding this comment.
Improves the log message
natalieparellano
changed the title
natalieparellano
commented
Jun 9, 2023
Comment on lines
+150
to
+162
| it("overrides the existing metadata", func() { | ||
| _, err := rebaser.Rebase(fakeAppImage, fakeNewBaseImage, fakeAppImage.Name(), additionalNames) | ||
| h.AssertNil(t, err) | ||
|
|
||
| h.AssertNil(t, image.DecodeLabel(fakeAppImage, platform.LifecycleMetadataLabel, &md)) | ||
| var empty []string | ||
| h.AssertEq(t, md.RunImage.TopLayer, "new-top-layer-sha") | ||
| h.AssertEq(t, md.RunImage.Reference, "new-run-id") | ||
| h.AssertEq(t, md.RunImage.Image, "some-repo/new-base-image") | ||
| h.AssertEq(t, md.RunImage.Mirrors, empty) | ||
| h.AssertEq(t, md.Stack.RunImage.Image, "some-repo/new-base-image") | ||
| h.AssertEq(t, md.Stack.RunImage.Mirrors, empty) | ||
| }) |
There was a problem hiding this comment.
Moved assertions for newer platforms out of when and above the older platform assertions
- Fix daemon invocation by trying to read app image after we have a docker client - Don't do stack validation for images built on newer platforms Signed-off-by: Natalie Arellano <narellano@vmware.com>
natalieparellano
force-pushed
the
fix/rebase
branch
from
25a184d
to
fea7127
Compare
jabrown85
approved these changes
Jun 14, 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.