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

GitHubTUFOptions no longer needs to return error

Browse source 
Signed-off-by: Meredith Lancaster <malancas@github.com>
This commit is contained in:
Meredith Lancaster 2024-03-15 06:45:36 -06:00
parent 2ef8eb6a1f
commit b5f6bd5cfa
4 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkg/cmd/attestation/tufrootverify/tufrootverify.go
View file

@ -68,10 +68,7 @@ func tufRootVerify(mirror, root string) error {
if err != nil {
return fmt.Errorf("failed to read root file %s: %w", root, err)
}
opts, err := verification.GitHubTUFOptions()
if err != nil {
return err
}
opts := verification.GitHubTUFOptions()
opts.Root = rb
opts.RepositoryBaseURL = mirror
// The purpose is the verify the TUF root and repository, make

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

@ -172,10 +172,7 @@ func newCustomVerifier(trustedRootFilePath string) (*verify.SignedEntityVerifier
}
func newGitHubVerifier() (*verify.SignedEntityVerifier, error) {
opts, err := GitHubTUFOptions()
if err != nil {
return nil, err
}
opts := GitHubTUFOptions()
client, err := tuf.New(opts)
if err != nil {
return nil, fmt.Errorf("failed to create TUF client: %w", err)

4
pkg/cmd/attestation/verification/tuf.go
View file

@ -26,11 +26,11 @@ func DefaultOptionsWithCacheSetting() *tuf.Options {
return opts
}
func GitHubTUFOptions() (*tuf.Options, error) {
func GitHubTUFOptions() *tuf.Options {
opts := DefaultOptionsWithCacheSetting()
opts.Root = githubRoot
opts.RepositoryBaseURL = GitHubTUFMirror
return opts, nil
return opts
}

3
pkg/cmd/attestation/verification/tuf_test.go
View file

@ -9,8 +9,7 @@ import (
func TestGitHubTUFOptions(t *testing.T) {
os.Setenv("CODESPACES", "true")
opts, err := GitHubTUFOptions()
require.NoError(t, err)
opts := GitHubTUFOptions()
require.Equal(t, GitHubTUFMirror, opts.RepositoryBaseURL)
require.NotNil(t, opts.Root)