containerimage: fix removeinternalannotations #3394
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
tonistiigi
force-pushed
the
fix-annotations
branch
from
f05a432
to
06cae48
Compare
AkihiroSuda
reviewed
Dec 13, 2022
exporter/containerimage/writer.go
Outdated
| func RemoveInternalLayerAnnotations(desc ocispecs.Descriptor, oci bool) map[string]string { | ||
| m := make(map[string]string, len(desc.Annotations)) | ||
| for k, v := range desc.Annotations { | ||
| if oci { |
There was a problem hiding this comment.
nit: if oci can be checked before the for loop
jedevc
reviewed
Dec 13, 2022
exporter/containerimage/writer.go
Outdated
| for k := range desc.Annotations { | ||
| if strings.HasPrefix(k, "containerd.io/distribution.source.") { | ||
| delete(desc.Annotations, k) | ||
| func RemoveInternalLayerAnnotations(desc ocispecs.Descriptor, oci bool) map[string]string { |
There was a problem hiding this comment.
nit: signature can be func (annotations map[string]string, oci bool) map[string]string, instead of needing the full descriptor.
tonistiigi
force-pushed
the
fix-annotations
branch
from
06cae48
to
b285602
Compare
It is unsafe to make direct modifications in the Annotations map of the Remote descriptor. The same map inside the Descriptor could be used in other components. Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
tonistiigi
force-pushed
the
fix-annotations
branch
from
b285602
to
19f375e
Compare
crazy-max
approved these changes
Dec 13, 2022
AkihiroSuda
approved these changes
Dec 13, 2022
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.
It is unsafe to map direct modifications in the
Annotations make of the Remote descriptor. The same map inside the Descriptor could be used in other
components.
Signed-off-by: Tonis Tiigi tonistiigi@gmail.com