Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: improving error log for oras push and oras attach when the annotation file is invalid #1026

Merged
merged 13 commits into from
Jul 27, 2023
Merged

chore: improving error log for oras push and oras attach when the annotation file is invalid #1026

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2de9ec8
wrapped the returned error with filepath and adding link
1Shubham7 Jul 19, 2023
2a28f92
adding the changes as per billy's review
1Shubham7 Jul 20, 2023
b816bf3
workflow: add github stale action (#1024)
sajayantony Jul 20, 2023
c0f90ad
'newline in string' error resolve
1Shubham7 Jul 22, 2023
5f0e187
Merge branch 'main' into main
1Shubham7 Jul 22, 2023
6e42dda
Merge pull request #3 from oras-project/main
1Shubham7 Jul 23, 2023
addd92f
to prevent ".,"
1Shubham7 Jul 23, 2023
ee4ebed
accepting changes from @qweaeh
1Shubham7 Jul 24, 2023
9031066
addressing the issue of "."
1Shubham7 Jul 24, 2023
d2f64c2
accepting the changes from @qweaeh
1Shubham7 Jul 24, 2023
07bfd6e
issue solved - checks for "." and adds "." if not present
1Shubham7 Jul 24, 2023
0df604f
removed extra gap
1Shubham7 Jul 24, 2023
bdc38a8
Merge branch 'main' into main
qweeah Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion cmd/oras/internal/option/packer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,13 @@ func (opts *Packer) LoadManifestAnnotations() (annotations map[string]map[string
}
if opts.AnnotationFilePath != "" {
if err = decodeJSON(opts.AnnotationFilePath, &annotations); err != nil {
return nil, err
errStr := err.Error()
docLink := " Please refer to the document at https://oras.land/docs/how_to_guides/manifest_annotations."
if !strings.HasSuffix(errStr, ".") {
docLink = "."+docLink
}
return nil, fmt.Errorf("failed to load annotations from %s: %w" +
docLink, opts.AnnotationFilePath, err)
}
}
if len(opts.ManifestAnnotations) != 0 {
Expand Down