Discharge7443/fleet
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Make creation of http.Client uniform across the codebase (#3097)

Browse Source
This commit is contained in:
Martin Angers
2021-11-24 15:56:54 -05:00
committed by GitHub
parent 964f85b174
commit c997f853e5
33 changed files with 279 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/vulnerabilities/cpe.go
+2 -1
View File
@@ -13,6 +13,7 @@ import (
"strings"
"time"
"github.com/fleetdm/fleet/v4/pkg/fleethttp"
"github.com/fleetdm/fleet/v4/server/config"
"github.com/fleetdm/fleet/v4/server/contexts/ctxerr"
"github.com/fleetdm/fleet/v4/server/fleet"
@@ -226,7 +227,7 @@ func TranslateSoftwareToCPE(
) error {
dbPath := path.Join(vulnPath, "cpe.sqlite")
client := &http.Client{}
client := fleethttp.NewClient()
if err := SyncCPEDatabase(client, dbPath, config); err != nil {
return ctxerr.Wrap(ctx, err, "sync cpe db")
}
server/vulnerabilities/cpe_test.go
+6 -6
View File
@@ -15,6 +15,7 @@ import (
"github.com/dnaeon/go-vcr/v2/recorder"
"github.com/facebookincubator/nvdtools/cpedict"
"github.com/fleetdm/fleet/v4/pkg/fleethttp"
"github.com/fleetdm/fleet/v4/server/config"
"github.com/fleetdm/fleet/v4/server/fleet"
"github.com/fleetdm/fleet/v4/server/mock"
@@ -57,14 +58,13 @@ func TestSyncCPEDatabase(t *testing.T) {
t.Skip("set environment variable NETWORK_TEST=1 to run")
}
client := fleethttp.NewClient()
// Disabling vcr because the resulting file exceeds the 100mb limit for github
r, err := recorder.NewAsMode("fixtures/nvd-cpe-release", recorder.ModeDisabled, http.DefaultTransport)
r, err := recorder.NewAsMode("fixtures/nvd-cpe-release", recorder.ModeDisabled, client.Transport)
require.NoError(t, err)
defer r.Stop()
client := &http.Client{
Transport: r,
}
client.Transport = r
tempDir := os.TempDir()
dbPath := path.Join(tempDir, "cpe.sqlite")
@@ -213,7 +213,7 @@ func TestSyncsCPEFromURL(t *testing.T) {
}))
defer ts.Close()
client := &http.Client{}
client := fleethttp.NewClient()
tempDir := t.TempDir()
dbPath := path.Join(tempDir, "cpe.sqlite")
@@ -227,7 +227,7 @@ func TestSyncsCPEFromURL(t *testing.T) {
}
func TestSyncsCPESkipsIfDisableSync(t *testing.T) {
client := &http.Client{}
client := fleethttp.NewClient()
tempDir := t.TempDir()
dbPath := path.Join(tempDir, "cpe.sqlite")