Skip to content

Commit 3637f5a

Browse files
committed
add missing http client field in sigstoreConfig
Signed-off-by: Meredith Lancaster <malancas@github.com>
1 parent ec5f108 commit 3637f5a

3 files changed

Lines changed: 13 additions & 0 deletions

File tree

pkg/cmd/attestation/verification/sigstore_integration_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package verification
44

55
import (
6+
"net/http"
67
"testing"
78

89
"github.com/cli/cli/v2/pkg/cmd/attestation/api"
@@ -51,6 +52,7 @@ func TestLiveSigstoreVerifier(t *testing.T) {
5152
for _, tc := range testcases {
5253
t.Run(tc.name, func(t *testing.T) {
5354
verifier, err := NewLiveSigstoreVerifier(SigstoreConfig{
55+
HttpClient: http.DefaultClient,
5456
Logger: io.NewTestHandler(),
5557
TUFMetadataDir: o.Some(t.TempDir()),
5658
})
@@ -71,6 +73,7 @@ func TestLiveSigstoreVerifier(t *testing.T) {
7173

7274
t.Run("with 2/3 verified attestations", func(t *testing.T) {
7375
verifier, err := NewLiveSigstoreVerifier(SigstoreConfig{
76+
HttpClient: http.DefaultClient,
7477
Logger: io.NewTestHandler(),
7578
TUFMetadataDir: o.Some(t.TempDir()),
7679
})
@@ -89,6 +92,7 @@ func TestLiveSigstoreVerifier(t *testing.T) {
8992

9093
t.Run("fail with 0/2 verified attestations", func(t *testing.T) {
9194
verifier, err := NewLiveSigstoreVerifier(SigstoreConfig{
95+
HttpClient: http.DefaultClient,
9296
Logger: io.NewTestHandler(),
9397
TUFMetadataDir: o.Some(t.TempDir()),
9498
})
@@ -114,6 +118,7 @@ func TestLiveSigstoreVerifier(t *testing.T) {
114118
attestations := getAttestationsFor(t, "../test/data/github_provenance_demo-0.0.12-py3-none-any-bundle.jsonl")
115119

116120
verifier, err := NewLiveSigstoreVerifier(SigstoreConfig{
121+
HttpClient: http.DefaultClient,
117122
Logger: io.NewTestHandler(),
118123
TUFMetadataDir: o.Some(t.TempDir()),
119124
})
@@ -128,6 +133,7 @@ func TestLiveSigstoreVerifier(t *testing.T) {
128133
attestations := getAttestationsFor(t, "../test/data/sigstore-js-2.1.0_with_2_bundles.jsonl")
129134

130135
verifier, err := NewLiveSigstoreVerifier(SigstoreConfig{
136+
HttpClient: http.DefaultClient,
131137
Logger: io.NewTestHandler(),
132138
TrustedRoot: test.NormalizeRelativePath("../test/data/trusted_root.json"),
133139
TUFMetadataDir: o.Some(t.TempDir()),

pkg/cmd/attestation/verify/attestation_integration_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package verify
44

55
import (
6+
"net/http"
67
"testing"
78

89
"github.com/cli/cli/v2/pkg/cmd/attestation/api"
@@ -26,6 +27,7 @@ func getAttestationsFor(t *testing.T, bundlePath string) []*api.Attestation {
2627

2728
func TestVerifyAttestations(t *testing.T) {
2829
sgVerifier, err := verification.NewLiveSigstoreVerifier(verification.SigstoreConfig{
30+
HttpClient: http.DefaultClient,
2931
Logger: io.NewTestHandler(),
3032
TUFMetadataDir: o.Some(t.TempDir()),
3133
})

pkg/cmd/attestation/verify/verify_integration_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package verify
44

55
import (
6+
"net/http"
67
"testing"
78

89
"github.com/cli/cli/v2/pkg/cmd/attestation/api"
@@ -20,6 +21,7 @@ func TestVerifyIntegration(t *testing.T) {
2021
logger := io.NewTestHandler()
2122

2223
sigstoreConfig := verification.SigstoreConfig{
24+
HttpClient: http.DefaultClient,
2325
Logger: logger,
2426
TUFMetadataDir: o.Some(t.TempDir()),
2527
}
@@ -136,6 +138,7 @@ func TestVerifyIntegrationCustomIssuer(t *testing.T) {
136138
logger := io.NewTestHandler()
137139

138140
sigstoreConfig := verification.SigstoreConfig{
141+
HttpClient: http.DefaultClient,
139142
Logger: logger,
140143
TUFMetadataDir: o.Some(t.TempDir()),
141144
}
@@ -209,6 +212,7 @@ func TestVerifyIntegrationReusableWorkflow(t *testing.T) {
209212
logger := io.NewTestHandler()
210213

211214
sigstoreConfig := verification.SigstoreConfig{
215+
HttpClient: http.DefaultClient,
212216
Logger: logger,
213217
TUFMetadataDir: o.Some(t.TempDir()),
214218
}
@@ -301,6 +305,7 @@ func TestVerifyIntegrationReusableWorkflowSignerWorkflow(t *testing.T) {
301305
logger := io.NewTestHandler()
302306

303307
sigstoreConfig := verification.SigstoreConfig{
308+
HttpClient: http.DefaultClient,
304309
Logger: logger,
305310
TUFMetadataDir: o.Some(t.TempDir()),
306311
}

0 commit comments

Comments
 (0)