cmd/oras/root/attach: pass --annotation $config:* through to PackManifestOptions#2037
Open
SAY-5 wants to merge 1 commit intooras-project:mainfrom
Open
cmd/oras/root/attach: pass --annotation $config:* through to PackManifestOptions#2037SAY-5 wants to merge 1 commit intooras-project:mainfrom
SAY-5 wants to merge 1 commit intooras-project:mainfrom
Conversation
…festOptions runAttach built PackManifestOptions without ConfigAnnotations, so users who supplied --annotation $config:key=val (and no explicit --config flag) saw their config annotations silently dropped: oras-go generated the default config descriptor with no annotations. The push subcommand already sets ConfigAnnotations unconditionally, so this is strictly an attach-path regression; the field is harmless when the user didn't pass any $config annotations (the map lookup returns nil). Wire ConfigAnnotations alongside the existing ManifestAnnotations entry. Fixes oras-project#2022 Signed-off-by: SAY-5 <SAY-5@users.noreply.github.com>
SAY-5
requested review from
TerryHowe,
Wwwsylvia,
sabre1041,
sajayantony and
shizhMSFT
as code owners
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Fixes #2022.
runAttachbuiltoras.PackManifestOptionswithout aConfigAnnotationsentry, so--annotation $config:key=valwas silently dropped whenever the user did not also pass--config: oras-go generated the default config descriptor and never saw the annotations.runPushalready wiresConfigAnnotationsunconditionally, so this was strictly an attach-path oversight.Fix
Add the same
ConfigAnnotations: opts.Annotations[option.AnnotationConfig]line to the attach packOpts. When the caller did not pass any$config:*annotations the map lookup returns nil and PackManifest keeps its current default-config behaviour.Test plan
go build ./cmd/oras/...cleango vet ./cmd/oras/...cleango test ./cmd/oras/... ./internal/...greenoras attach --artifact-type doc/example --annotation '$config:org.example.key=value' localhost:5000/hello:v1 hi.txtproduces a manifest whose config descriptor carries{"org.example.key": "value"}.