remove Verify in favor of explicit `VerifyImage{Signatures, Attesta…

…tions}` Signed-off-by: Jake Sanders <[email protected]>
sigstore · Nov 10, 2021 · 38840cc · 38840cc
1 parent cb41bd4
commit 38840cc
Show file tree

Hide file tree

Showing 5 changed files with 216 additions and 127 deletions.
diff --git a/cmd/cosign/cli/verify/verify.go b/cmd/cosign/cli/verify/verify.go
@@ -120,7 +120,7 @@ func (c *VerifyCommand) Exec(ctx context.Context, images []string) (err error) {
 			return errors.Wrapf(err, "resolving attachment type %s for image %s", c.Attachment, img)
 		}
 
-		verified, bundleVerified, err := cosign.VerifySignatures(ctx, ref, co)
+		verified, bundleVerified, err := cosign.VerifyImageSignatures(ctx, ref, co)
 		if err != nil {
 			return err
 		}

diff --git a/cmd/cosign/cli/verify/verify_attestation.go b/cmd/cosign/cli/verify/verify_attestation.go
@@ -107,7 +107,7 @@ func (c *VerifyAttestationCommand) Exec(ctx context.Context, images []string) (e
 			return err
 		}
 
-		verified, bundleVerified, err := cosign.VerifyAttestations(ctx, ref, co)
+		verified, bundleVerified, err := cosign.VerifyImageAttestations(ctx, ref, co)
 		if err != nil {
 			return err
 		}

diff --git a/pkg/cosign/kubernetes/webhook/validation.go b/pkg/cosign/kubernetes/webhook/validation.go
@@ -72,7 +72,7 @@ func valid(ctx context.Context, ref name.Reference, keys []*ecdsa.PublicKey, opt
 }
 
 // For testing
-var cosignVerifySignatures = cosign.VerifySignatures
+var cosignVerifySignatures = cosign.VerifyImageSignatures
 
 func validSignatures(ctx context.Context, ref name.Reference, verifier signature.Verifier, opts ...ociremote.Option) ([]oci.Signature, error) {
 	sigs, _, err := cosignVerifySignatures(ctx, ref, &cosign.CheckOpts{