From fa6536493f9334e37a9474264ebc356c422fee1d Mon Sep 17 00:00:00 2001 From: Meredith Lancaster Date: Fri, 25 Oct 2024 14:54:52 -0600 Subject: [PATCH] predicate-type is no longer empty Signed-off-by: Meredith Lancaster --- pkg/cmd/attestation/verify/verify.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkg/cmd/attestation/verify/verify.go b/pkg/cmd/attestation/verify/verify.go index 014ffdbe0..7107cd93b 100644 --- a/pkg/cmd/attestation/verify/verify.go +++ b/pkg/cmd/attestation/verify/verify.go @@ -246,16 +246,12 @@ func runVerify(opts *Options) error { } // Apply predicate type filter to returned attestations - if opts.PredicateType != "" { - filteredAttestations := verification.FilterAttestations(opts.PredicateType, attestations) - - if len(filteredAttestations) == 0 { - opts.Logger.Printf(opts.Logger.ColorScheme.Red("✗ No attestations found with predicate type: %s\n"), opts.PredicateType) - return err - } - - attestations = filteredAttestations + filteredAttestations := verification.FilterAttestations(opts.PredicateType, attestations) + if len(filteredAttestations) == 0 { + opts.Logger.Printf(opts.Logger.ColorScheme.Red("✗ No attestations found with predicate type: %s\n"), opts.PredicateType) + return err } + attestations = filteredAttestations policy, err := buildVerifyPolicy(opts, *artifact) if err != nil { @@ -263,6 +259,8 @@ func runVerify(opts *Options) error { return err } + opts.Logger.VerbosePrintf("Verifying attestations with the predicate type %s\n", opts.PredicateType) + sigstoreRes := opts.SigstoreVerifier.Verify(attestations, policy) if sigstoreRes.Error != nil { opts.Logger.Println(opts.Logger.ColorScheme.Red("✗ Verification failed"))