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 <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Robert Findley <[email protected]> kokoro-CI: kokoro <[email protected]>
golang · Aug 25, 2023 · f2193d5 · f2193d5
1 parent 3841ba3
commit f2193d5
Show file tree

Hide file tree

Showing 16 changed files with 436 additions and 427 deletions.
diff --git a/cmd/frontend/main.go b/cmd/frontend/main.go
@@ -18,6 +18,7 @@ import (
 	"golang.org/x/pkgsite/cmd/internal/cmdconfig"
 	"golang.org/x/pkgsite/internal"
 	"golang.org/x/pkgsite/internal/config"
+	"golang.org/x/pkgsite/internal/config/serverconfig"
 	"golang.org/x/pkgsite/internal/dcensus"
 	"golang.org/x/pkgsite/internal/fetch"
 	"golang.org/x/pkgsite/internal/fetchdatasource"
@@ -35,7 +36,7 @@ import (
 )
 
 var (
-	queueName      = config.GetEnv("GO_DISCOVERY_FRONTEND_TASK_QUEUE", "")
+	queueName      = serverconfig.GetEnv("GO_DISCOVERY_FRONTEND_TASK_QUEUE", "")
 	workers        = flag.Int("workers", 10, "number of concurrent requests to the fetch service, when running locally")
 	staticFlag     = flag.String("static", "static", "path to folder containing static files served")
 	thirdPartyPath = flag.String("third_party", "third_party", "path to folder containing third-party libraries")
@@ -53,7 +54,7 @@ var (
 func main() {
 	flag.Parse()
 	ctx := context.Background()
-	cfg, err := config.Init(ctx)
+	cfg, err := serverconfig.Init(ctx)
 	if err != nil {
 		log.Fatal(ctx, err)
 	}
@@ -169,7 +170,7 @@ func main() {
 	}
 	// We are not currently forwarding any ports on AppEngine, so serving debug
 	// information is broken.
-	if !cfg.OnAppEngine() {
+	if !serverconfig.OnAppEngine() {
 		dcensusServer, err := dcensus.NewServer()
 		if err != nil {
 			log.Fatal(ctx, err)

diff --git a/cmd/internal/cmdconfig/cmdconfig.go b/cmd/internal/cmdconfig/cmdconfig.go
@@ -19,6 +19,7 @@ import (
 	"golang.org/x/pkgsite/internal"
 	"golang.org/x/pkgsite/internal/config"
 	"golang.org/x/pkgsite/internal/config/dynconfig"
+	"golang.org/x/pkgsite/internal/config/serverconfig"
 	"golang.org/x/pkgsite/internal/database"
 	"golang.org/x/pkgsite/internal/derrors"
 	"golang.org/x/pkgsite/internal/log"
@@ -30,12 +31,12 @@ import (
 
 // Logger configures a middleware.Logger.
 func Logger(ctx context.Context, cfg *config.Config, logName string) middleware.Logger {
-	if cfg.OnGCP() {
+	if serverconfig.OnGCP() {
 		opts := []logging.LoggerOption{logging.CommonResource(&mrpb.MonitoredResource{
 			Type:   cfg.MonitoredResource.Type,
 			Labels: cfg.MonitoredResource.Labels,
 		})}
-		if cfg.OnGKE() {
+		if serverconfig.OnGKE() {
 			opts = append(opts, logging.CommonLabels(map[string]string{
 				"k8s-pod/env": cfg.DeploymentEnvironment(),
 				"k8s-pod/app": cfg.Application(),
@@ -53,7 +54,7 @@ func Logger(ctx context.Context, cfg *config.Config, logName string) middleware.
 
 // Reporter configures an Error Reporting client.
 func Reporter(ctx context.Context, cfg *config.Config) derrors.Reporter {
-	if !cfg.OnGCP() || cfg.DisableErrorReporting {
+	if !serverconfig.OnGCP() || cfg.DisableErrorReporting {
 		return nil
 	}
 	reportingClient, err := errorreporting.NewClient(ctx, cfg.ProjectID, errorreporting.Config{

diff --git a/cmd/worker/main.go b/cmd/worker/main.go
@@ -19,6 +19,7 @@ import (
 	_ "github.com/jackc/pgx/v4/stdlib" // for pgx driver
 	"golang.org/x/pkgsite/cmd/internal/cmdconfig"
 	"golang.org/x/pkgsite/internal/config"
+	"golang.org/x/pkgsite/internal/config/serverconfig"
 	"golang.org/x/pkgsite/internal/dcensus"
 	"golang.org/x/pkgsite/internal/index"
 	"golang.org/x/pkgsite/internal/log"
@@ -31,8 +32,8 @@ import (
 )
 
 var (
-	timeout   = config.GetEnvInt(context.Background(), "GO_DISCOVERY_WORKER_TIMEOUT_MINUTES", 10)
-	queueName = config.GetEnv("GO_DISCOVERY_WORKER_TASK_QUEUE", "")
+	timeout   = serverconfig.GetEnvInt(context.Background(), "GO_DISCOVERY_WORKER_TIMEOUT_MINUTES", 10)
+	queueName = serverconfig.GetEnv("GO_DISCOVERY_WORKER_TASK_QUEUE", "")
 	workers   = flag.Int("workers", 10, "number of concurrent requests to the fetch service, when running locally")
 	// flag used in call to safehtml/template.TrustedSourceFromFlag
 	_                  = flag.String("static", "static", "path to folder containing static files served")
@@ -44,7 +45,7 @@ func main() {
 
 	ctx := context.Background()
 
-	cfg, err := config.Init(ctx)
+	cfg, err := serverconfig.Init(ctx)
 	if err != nil {
 		log.Fatal(ctx, err)
 	}
@@ -128,7 +129,7 @@ func main() {
 	}
 	// We are not currently forwarding any ports on AppEngine, so serving debug
 	// information is broken.
-	if !cfg.OnAppEngine() {
+	if !serverconfig.OnAppEngine() {
 		dcensusServer, err := dcensus.NewServer()
 		if err != nil {
 			log.Fatal(ctx, err)

diff --git 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)
 	}

diff --git a/devtools/cmd/seeddb/main.go b/devtools/cmd/seeddb/main.go
@@ -21,6 +21,7 @@ import (
 	"golang.org/x/pkgsite/internal"
 	"golang.org/x/pkgsite/internal/config"
 	"golang.org/x/pkgsite/internal/config/dynconfig"
+	"golang.org/x/pkgsite/internal/config/serverconfig"
 	"golang.org/x/pkgsite/internal/database"
 	"golang.org/x/pkgsite/internal/derrors"
 	"golang.org/x/pkgsite/internal/experiment"
@@ -45,7 +46,7 @@ func main() {
 	flag.Parse()
 
 	ctx := context.Background()
-	cfg, err := config.Init(ctx)
+	cfg, err := serverconfig.Init(ctx)
 	if err != nil {
 		log.Fatal(ctx, err)
 	}