delete old clients

scripts/generate_mock_resolution_universe/main.go

@@ -13,6 +13,7 @@ import (
 	"encoding/gob"
 	"errors"
 	"fmt"
+	"net/http"
 	"os"
 	"path/filepath"
 	"slices"
@@ -23,6 +24,7 @@ import (
 	"deps.dev/util/resolve"
 	"deps.dev/util/resolve/dep"
 	"github.com/google/osv-scanner/internal/clients/clientimpl/osvmatcher"
+	"github.com/google/osv-scanner/internal/clients/clientinterfaces"
 	"github.com/google/osv-scanner/internal/depsdev"
 	"github.com/google/osv-scanner/internal/osvdev"
 	"github.com/google/osv-scanner/internal/remediation"
@@ -51,13 +53,26 @@ var remediationOpts = remediation.Options{
 	UpgradeConfig: upgrade.NewConfig(),
 }
 
+const userAgent = "osv-scanner_generate_mock/" + version.OSVVersion
+
+func vulnMatcher() clientinterfaces.VulnerabilityMatcher {
+	config := osvdev.DefaultConfig()
+	config.UserAgent = userAgent
+
+	return &osvmatcher.CachedOSVMatcher{
+		Client: osvdev.OSVClient{
+			HTTPClient:  http.DefaultClient,
+			Config:      config,
+			BaseHostURL: osvdev.DefaultBaseURL,
+		},
+		InitialQueryTimeout: 5 * time.Minute,
+	}
+}
+
 func doRelockRelax(ddCl *client.DepsDevClient, rw manifest.ReadWriter, filename string) error {
 	cl := client.ResolutionClient{
-		VulnerabilityMatcher: &osvmatcher.CachedOSVMatcher{
-			Client:              *osvdev.DefaultClient(),
-			InitialQueryTimeout: 5 * time.Minute,
-		},
-		DependencyClient: ddCl,
+		VulnerabilityMatcher: vulnMatcher(),
+		DependencyClient:     ddCl,
 	}
 
 	f, err := lf.OpenLocalDepFile(filename)
@@ -83,11 +98,8 @@ func doRelockRelax(ddCl *client.DepsDevClient, rw manifest.ReadWriter, filename
 
 func doOverride(ddCl *client.DepsDevClient, rw manifest.ReadWriter, filename string) error {
 	cl := client.ResolutionClient{
-		VulnerabilityMatcher: &osvmatcher.CachedOSVMatcher{
-			Client:              *osvdev.DefaultClient(),
-			InitialQueryTimeout: 5 * time.Minute,
-		},
-		DependencyClient: ddCl,
+		VulnerabilityMatcher: vulnMatcher(),
+		DependencyClient:     ddCl,
 	}
 
 	f, err := lf.OpenLocalDepFile(filename)
@@ -113,11 +125,8 @@ func doOverride(ddCl *client.DepsDevClient, rw manifest.ReadWriter, filename str
 
 func doInPlace(ddCl *client.DepsDevClient, rw lockfile.ReadWriter, filename string) error {
 	cl := client.ResolutionClient{
-		VulnerabilityMatcher: &osvmatcher.CachedOSVMatcher{
-			Client:              *osvdev.DefaultClient(),
-			InitialQueryTimeout: 5 * time.Minute,
-		},
-		DependencyClient: ddCl,
+		VulnerabilityMatcher: vulnMatcher(),
+		DependencyClient:     ddCl,
 	}
 
 	f, err := lf.OpenLocalDepFile(filename)
@@ -294,7 +303,7 @@ func typeString(t dep.Type) string {
 }
 
 func main() {
-	cl, err := client.NewDepsDevClient(depsdev.DepsdevAPI, "osv-scanner_generate_mock/"+version.OSVVersion)
+	cl, err := client.NewDepsDevClient(depsdev.DepsdevAPI, userAgent)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)