Skip to content

Commit dcca4b2

Browse files
committed
replace deprecated type
Signed-off-by: Meredith Lancaster <malancas@github.com>
1 parent 1ebed26 commit dcca4b2

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

pkg/cmd/attestation/verification/sigstore.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ type SigstoreVerifier interface {
4646
type LiveSigstoreVerifier struct {
4747
Logger *io.Handler
4848
NoPublicGood bool
49-
PublicGood *verify.SignedEntityVerifier
50-
GitHub *verify.SignedEntityVerifier
51-
Custom map[string]*verify.SignedEntityVerifier
49+
PublicGood *verify.Verifier
50+
GitHub *verify.Verifier
51+
Custom map[string]*verify.Verifier
5252
}
5353

5454
var ErrNoAttestationsVerified = errors.New("no attestations were verified")
@@ -86,13 +86,13 @@ func NewLiveSigstoreVerifier(config SigstoreConfig) (*LiveSigstoreVerifier, erro
8686
return liveVerifier, nil
8787
}
8888

89-
func createCustomVerifiers(trustedRoot string, noPublicGood bool) (map[string]*verify.SignedEntityVerifier, error) {
89+
func createCustomVerifiers(trustedRoot string, noPublicGood bool) (map[string]*verify.Verifier, error) {
9090
customTrustRoots, err := os.ReadFile(trustedRoot)
9191
if err != nil {
9292
return nil, fmt.Errorf("unable to read file %s: %v", trustedRoot, err)
9393
}
9494

95-
verifiers := make(map[string]*verify.SignedEntityVerifier)
95+
verifiers := make(map[string]*verify.Verifier)
9696
reader := bufio.NewReader(bytes.NewReader(customTrustRoots))
9797
var line []byte
9898
var readError error
@@ -189,7 +189,7 @@ func getBundleIssuer(b *bundle.Bundle) (string, error) {
189189
return leafCert.Issuer.Organization[0], nil
190190
}
191191

192-
func (v *LiveSigstoreVerifier) chooseVerifier(issuer string) (*verify.SignedEntityVerifier, error) {
192+
func (v *LiveSigstoreVerifier) chooseVerifier(issuer string) (*verify.Verifier, error) {
193193
// if no custom trusted root is set, return either the Public Good or GitHub verifier
194194
// If the chosen verifier has not yet been created, create it as a LiveSigstoreVerifier field for use in future calls
195195
if v.Custom != nil {
@@ -291,7 +291,7 @@ func (v *LiveSigstoreVerifier) Verify(attestations []*api.Attestation, policy ve
291291
return results, nil
292292
}
293293

294-
func newCustomVerifier(trustedRoot *root.TrustedRoot) (*verify.SignedEntityVerifier, error) {
294+
func newCustomVerifier(trustedRoot *root.TrustedRoot) (*verify.Verifier, error) {
295295
// All we know about this trust root is its configuration so make some
296296
// educated guesses as to what the policy should be.
297297
verifierConfig := []verify.VerifierOption{}
@@ -314,7 +314,7 @@ func newCustomVerifier(trustedRoot *root.TrustedRoot) (*verify.SignedEntityVerif
314314
return gv, nil
315315
}
316316

317-
func newGitHubVerifier(trustDomain string, tufMetadataDir o.Option[string]) (*verify.SignedEntityVerifier, error) {
317+
func newGitHubVerifier(trustDomain string, tufMetadataDir o.Option[string]) (*verify.Verifier, error) {
318318
var tr string
319319

320320
opts := GitHubTUFOptions(tufMetadataDir)
@@ -339,7 +339,7 @@ func newGitHubVerifier(trustDomain string, tufMetadataDir o.Option[string]) (*ve
339339
return newGitHubVerifierWithTrustedRoot(trustedRoot)
340340
}
341341

342-
func newGitHubVerifierWithTrustedRoot(trustedRoot *root.TrustedRoot) (*verify.SignedEntityVerifier, error) {
342+
func newGitHubVerifierWithTrustedRoot(trustedRoot *root.TrustedRoot) (*verify.Verifier, error) {
343343
gv, err := verify.NewSignedEntityVerifier(trustedRoot, verify.WithSignedTimestamps(1))
344344
if err != nil {
345345
return nil, fmt.Errorf("failed to create GitHub verifier: %v", err)
@@ -348,7 +348,7 @@ func newGitHubVerifierWithTrustedRoot(trustedRoot *root.TrustedRoot) (*verify.Si
348348
return gv, nil
349349
}
350350

351-
func newPublicGoodVerifier(tufMetadataDir o.Option[string]) (*verify.SignedEntityVerifier, error) {
351+
func newPublicGoodVerifier(tufMetadataDir o.Option[string]) (*verify.Verifier, error) {
352352
opts := DefaultOptionsWithCacheSetting(tufMetadataDir)
353353
client, err := tuf.New(opts)
354354
if err != nil {
@@ -362,7 +362,7 @@ func newPublicGoodVerifier(tufMetadataDir o.Option[string]) (*verify.SignedEntit
362362
return newPublicGoodVerifierWithTrustedRoot(trustedRoot)
363363
}
364364

365-
func newPublicGoodVerifierWithTrustedRoot(trustedRoot *root.TrustedRoot) (*verify.SignedEntityVerifier, error) {
365+
func newPublicGoodVerifierWithTrustedRoot(trustedRoot *root.TrustedRoot) (*verify.Verifier, error) {
366366
sv, err := verify.NewSignedEntityVerifier(trustedRoot, verify.WithSignedCertificateTimestamps(1), verify.WithTransparencyLog(1), verify.WithObserverTimestamps(1))
367367
if err != nil {
368368
return nil, fmt.Errorf("failed to create Public Good verifier: %v", err)

0 commit comments

Comments
 (0)