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

fix: allow cosign download sbom when image is absent #3245

Merged
merged 4 commits into from
Oct 17, 2023
Merged

fix: allow cosign download sbom when image is absent #3245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29bf448
fix: allow cosign download sbom when image is absent
vishal-chdhry Sep 16, 2023
f42e033
fix: remove lint issue
vishal-chdhry Sep 16, 2023
5e46254
fix: add errors.As
vishal-chdhry Sep 16, 2023
6995070
feat: added comments
vishal-chdhry Oct 17, 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
13 changes: 12 additions & 1 deletion cmd/cosign/cli/download/attestation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package download
import (
"context"
"encoding/json"
"errors"
"fmt"

"github.com/google/go-containerregistry/pkg/name"
Expand Down Expand Up @@ -46,8 +47,18 @@ func AttestationCmd(ctx context.Context, regOpts options.RegistryOptions, attOpt
}

se, err := ociremote.SignedEntity(ref, ociremoteOpts...)
var entityNotFoundError *ociremote.EntityNotFoundError
if err != nil {
return err
if errors.As(err, &entityNotFoundError) {
if digest, ok := ref.(name.Digest); ok {
// We don't need to access the original image to download the attached attestation
se = ociremote.SignedUnknown(digest)
} else {
return err
}
} else {
return err
}
}

se, err = platform.SignedEntityForPlatform(se, attOptions.Platform)
Expand Down
12 changes: 11 additions & 1 deletion cmd/cosign/cli/download/sbom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,18 @@ func SBOMCmd(
}

se, err := ociremote.SignedEntity(ref, ociremoteOpts...)
var entityNotFoundError *ociremote.EntityNotFoundError
if err != nil {
return nil, err
if errors.As(err, &entityNotFoundError) {
// We don't need to access the original image to download the attached sbom
if digest, ok := ref.(name.Digest); ok {
se = ociremote.SignedUnknown(digest)
} else {
return nil, err
}
} else {
return nil, err
}
}

se, err = platform.SignedEntityForPlatform(se, dnOpts.Platform)
Expand Down
Loading