diff options
| author | Michael Matloob <matloob@golang.org> | 2023-08-24 13:15:52 -0400 |
|---|---|---|
| committer | Michael Matloob <matloob@golang.org> | 2023-08-25 19:08:11 +0000 |
| commit | f2193d53311cecde544ee4947608de94ed3e3716 (patch) | |
| tree | f600f2d458a7a7743d6ea87f2d49cedcbadebd9c /devtools/cmd/db | |
| parent | 3841ba374e90486051d46d443d472b09710b601a (diff) | |
| download | go-x-pkgsite-f2193d53311cecde544ee4947608de94ed3e3716.tar.xz | |
internal/config: separate config initialization into serverconfig
This change creates a new package that does config initialization and
other GCP-specific operations that were previously done in package
config, so that config can have no cloud dependencies.
For golang/go#61399
Change-Id: I8d78294834e325b47d838892a1cef87003a4b90a
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/522516
Run-TryBot: Michael Matloob <matloob@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Robert Findley <rfindley@google.com>
kokoro-CI: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'devtools/cmd/db')
| -rw-r--r-- | devtools/cmd/db/main.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/devtools/cmd/db/main.go b/devtools/cmd/db/main.go index 848a4915..d2e5a03a 100644 --- a/devtools/cmd/db/main.go +++ b/devtools/cmd/db/main.go @@ -14,7 +14,7 @@ import ( "strings" _ "github.com/jackc/pgx/v4/stdlib" // for pgx driver - "golang.org/x/pkgsite/internal/config" + "golang.org/x/pkgsite/internal/config/serverconfig" "golang.org/x/pkgsite/internal/database" "golang.org/x/pkgsite/internal/log" ) @@ -39,12 +39,12 @@ func main() { } ctx := context.Background() - cfg, err := config.Init(ctx) + cfg, err := serverconfig.Init(ctx) if err != nil { log.Fatal(ctx, err) } - dbName := config.GetEnv("GO_DISCOVERY_DATABASE_NAME", "discovery-db") + dbName := serverconfig.GetEnv("GO_DISCOVERY_DATABASE_NAME", "discovery-db") if err := run(ctx, flag.Args()[0], dbName, cfg.DBConnInfo()); err != nil { log.Fatal(ctx, err) } |