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

fix: only fallback to OCI image when current media type is OCI artifact #673

Merged
merged 6 commits into from
Nov 4, 2022
Merged

fix: only fallback to OCI image when current media type is OCI artifact #673

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2dbc455
style: make fallback code readability
qweeah Nov 4, 2022
6a4a31f
rename the func
qweeah Nov 4, 2022
9c30541
rename again
qweeah Nov 4, 2022
7afa04c
fix
qweeah Nov 4, 2022
c2d413f
code clean
qweeah Nov 4, 2022
8519bc7
code clean
qweeah Nov 4, 2022
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
5 changes: 3 additions & 2 deletions cmd/oras/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,8 @@ func pushArtifact(dst *remote.Repository, pack packFunc, packOpts *oras.PackOpti
return root, nil
}

if !copyRootAttempted || !isArtifactUnsupported(err) {
if !copyRootAttempted || root.MediaType != ocispec.MediaTypeArtifactManifest ||
!isManifestUnsupported(err) {
return ocispec.Descriptor{}, err
}

Expand Down Expand Up @@ -276,7 +277,7 @@ func pushArtifact(dst *remote.Repository, pack packFunc, packOpts *oras.PackOpti
return root, nil
}

func isArtifactUnsupported(err error) bool {
func isManifestUnsupported(err error) bool {
var errResp *errcode.ErrorResponse
if !errors.As(err, &errResp) || errResp.StatusCode != http.StatusBadRequest {
return false
Expand Down