diff --git a/pkg/cmd/attestation/tufrootverify/tufrootverify.go b/pkg/cmd/attestation/tufrootverify/tufrootverify.go index 224edd6c9..811e9458c 100644 --- a/pkg/cmd/attestation/tufrootverify/tufrootverify.go +++ b/pkg/cmd/attestation/tufrootverify/tufrootverify.go @@ -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 diff --git a/pkg/cmd/attestation/verification/sigstore.go b/pkg/cmd/attestation/verification/sigstore.go index 0f99313cc..e9e57dd3b 100644 --- a/pkg/cmd/attestation/verification/sigstore.go +++ b/pkg/cmd/attestation/verification/sigstore.go @@ -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) diff --git a/pkg/cmd/attestation/verification/tuf.go b/pkg/cmd/attestation/verification/tuf.go index b92f2bf5a..ad4b43670 100644 --- a/pkg/cmd/attestation/verification/tuf.go +++ b/pkg/cmd/attestation/verification/tuf.go @@ -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 } diff --git a/pkg/cmd/attestation/verification/tuf_test.go b/pkg/cmd/attestation/verification/tuf_test.go index 04327075b..348f9b222 100644 --- a/pkg/cmd/attestation/verification/tuf_test.go +++ b/pkg/cmd/attestation/verification/tuf_test.go @@ -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)