Skip to content

Commit

Permalink
Fix #458 - Change fallback error message for non OCI images/results
Browse files Browse the repository at this point in the history
  • Loading branch information
haf-tech committed Jun 17, 2022
1 parent a4fce9f commit 1711617
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pkg/chains/storage/oci/oci.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ func (b *Backend) StorePayload(ctx context.Context, tr *v1beta1.TaskRun, rawPayl
return b.uploadAttestation(attestation, signature, storageOpts, auth)
}

return errors.New("OCI storage backend is only supported for OCI images and in-toto attestations")
// Fallback in case unsupported payload format is used or the deprecated "tekton" format
b.logger.Info("Skipping upload to OCI registry, OCI storage backend is only supported for OCI images and in-toto attestations")
return nil
}

func (b *Backend) uploadSignature(format simple.SimpleContainerImage, rawPayload []byte, signature string, storageOpts config.StorageOpts, remoteOpts ...remote.Option) error {
Expand Down
28 changes: 28 additions & 0 deletions pkg/chains/storage/oci/oci_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,34 @@ func TestBackend_StorePayload(t *testing.T) {
},
wantErr: false,
},
{
name: "in-toto-and-simple-payload",
fields: fields{
tr: tr,
},
args: args{
payload: simple,
signature: "",
storageOpts: config.StorageOpts{
PayloadFormat: "in-toto",
},
},
wantErr: false,
},
{
name: "tekton-and-simple-payload",
fields: fields{
tr: tr,
},
args: args{
payload: simple,
signature: "",
storageOpts: config.StorageOpts{
PayloadFormat: "tekton",
},
},
wantErr: false,
},
{
name: "no subject",
fields: fields{
Expand Down

0 comments on commit 1711617

Please sign in to comment.