STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove duplicate err checking

Browse source 
Signed-off-by: Meredith Lancaster <malancas@github.com>
This commit is contained in:
Meredith Lancaster 2024-12-03 12:29:35 -07:00
parent f0f86ecd23
commit 2a6ee87ba0
1 changed files with 5 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

34
pkg/cmd/attestation/verification/sigstore.go
View file

@ -88,22 +88,10 @@ func (v *LiveSigstoreVerifier) chooseVerifier(issuer string) (*verify.SignedEnti
if v.NoPublicGood {
return nil, fmt.Errorf("detected public good instance but requested verification without public good instance")
}
publicGoodVerifier, err := newPublicGoodVerifier()
if err != nil {
return nil, fmt.Errorf("failed to create Public Good Sigstore verifier: %v", err)
}
return publicGoodVerifier, nil
return newPublicGoodVerifier()
} else if issuer == GitHubIssuerOrg {
ghVerifier, err := newGitHubVerifier(v.TrustDomain)
if err != nil {
return nil, fmt.Errorf("failed to create GitHub Sigstore verifier: %v", err)
}
return ghVerifier, nil
return newGitHubVerifier(v.TrustDomain)
}
return nil, fmt.Errorf("leaf certificate issuer is not recognized")
}
@ -144,24 +132,12 @@ func (v *LiveSigstoreVerifier) chooseVerifier(issuer string) (*verify.SignedEnti
if v.NoPublicGood {
return nil, fmt.Errorf("detected public good instance but requested verification without public good instance")
}
verifier, err := newPublicGoodVerifierWithTrustedRoot(trustedRoot)
if err != nil {
return nil, err
}
return verifier, nil
return newPublicGoodVerifierWithTrustedRoot(trustedRoot)
} else if issuer == GitHubIssuerOrg {
verifier, err := newGitHubVerifierWithTrustedRoot(trustedRoot)
if err != nil {
return nil, err
}
return verifier, nil
return newGitHubVerifierWithTrustedRoot(trustedRoot)
} else {
// Make best guess at reasonable policy
customVerifier, err := newCustomVerifier(trustedRoot)
if err != nil {
return nil, fmt.Errorf("failed to create custom verifier: %v", err)
}
return customVerifier, nil
return newCustomVerifier(trustedRoot)
}
}
line, readError = reader.ReadBytes('\n')