diff options
| author | Michael Matloob <matloob@golang.org> | 2023-08-28 13:39:03 -0400 |
|---|---|---|
| committer | Michael Matloob <matloob@golang.org> | 2023-08-29 23:29:11 +0000 |
| commit | ebe617b30c52774fccf9d36331cbff31e99aaf9e (patch) | |
| tree | 9b413e7ec61ce6a08e169d8ab95eb3bca1b1effc /devtools/cmd | |
| parent | 6b2c42d38504a02ea8b77abc7c592b64aa39109d (diff) | |
| download | go-x-pkgsite-ebe617b30c52774fccf9d36331cbff31e99aaf9e.tar.xz | |
internal/source: inject *http.Client into source.NewClient
This removes the dependency from package source onto ochttp. The users
of source.NewClient that want an ochttp.Transport can set the
transport on the *http.Client.
For golang/go#61399
Change-Id: Ifb7126c482f664ee5a359f594d9324f0fd90f8b2
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/523510
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Robert Findley <rfindley@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Michael Matloob <matloob@golang.org>
kokoro-CI: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'devtools/cmd')
| -rw-r--r-- | devtools/cmd/seeddb/main.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/devtools/cmd/seeddb/main.go b/devtools/cmd/seeddb/main.go index 5fd7b065..e2002a30 100644 --- a/devtools/cmd/seeddb/main.go +++ b/devtools/cmd/seeddb/main.go @@ -18,6 +18,7 @@ import ( "time" _ "github.com/jackc/pgx/v4/stdlib" // for pgx driver + "go.opencensus.io/plugin/ochttp" "golang.org/x/pkgsite/internal" "golang.org/x/pkgsite/internal/config" "golang.org/x/pkgsite/internal/config/dynconfig" @@ -76,7 +77,10 @@ func run(ctx context.Context, db *database.DB, proxyURL string) error { return err } - sourceClient := source.NewClient(config.SourceTimeout) + sourceClient := source.NewClient(&http.Client{ + Transport: &ochttp.Transport{}, + Timeout: config.SourceTimeout, + }) seedModules, err := readSeedFile(ctx, *seedfile) if err != nil { return err |