From db4d1dbf847232abeab852076c6ef11f77f651ad Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Mon, 13 Dec 2021 09:59:04 +0200 Subject: [PATCH] dbtest: remove dsn from getDSN argument (#28833) dsn is always an empty string, so we can just remove it as an argument to getDSN. This commit should not change any behaviour. --- internal/database/dbtest/dbtest.go | 10 +++++----- internal/database/dbtest/dbtest_fast.go | 2 +- internal/database/dbtest/dsn.go | 15 ++++----------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/internal/database/dbtest/dbtest.go b/internal/database/dbtest/dbtest.go index b4e6ac7c45a..2173ce6adb3 100644 --- a/internal/database/dbtest/dbtest.go +++ b/internal/database/dbtest/dbtest.go @@ -62,22 +62,22 @@ func NewDB(t testing.TB) *sql.DB { if os.Getenv("USE_FAST_DBTEST") != "" { return NewFastDB(t) } - return newFromDSN(t, "", "migrated") + return newFromDSN(t, "migrated") } // NewRawDB returns a connection to a clean, new temporary testing database. func NewRawDB(t testing.TB) *sql.DB { - return newFromDSN(t, "", "raw") + return newFromDSN(t, "raw") } -func newFromDSN(t testing.TB, dsn, templateNamespace string) *sql.DB { +func newFromDSN(t testing.TB, templateNamespace string) *sql.DB { if testing.Short() { t.Skip("skipping DB test since -short specified") } - config, err := getDSN(dsn) + config, err := getDSN() if err != nil { - t.Fatalf("failed to parse dsn %q: %s", dsn, err) + t.Fatalf("failed to parse dsn: %s", err) } initTemplateDB(t, config) diff --git a/internal/database/dbtest/dbtest_fast.go b/internal/database/dbtest/dbtest_fast.go index ffa8ddabce0..dbe7efebbc8 100644 --- a/internal/database/dbtest/dbtest_fast.go +++ b/internal/database/dbtest/dbtest_fast.go @@ -76,7 +76,7 @@ var ( // us from opening a ton of parallel database connections per process. func getDefaultPool() (*testDatabasePool, *url.URL, error) { defaultOnce.Do(func() { - defaultURL, defaultErr = getDSN("") + defaultURL, defaultErr = getDSN() if defaultErr != nil { return } diff --git a/internal/database/dbtest/dsn.go b/internal/database/dbtest/dsn.go index f128e85ab61..f013f772378 100644 --- a/internal/database/dbtest/dsn.go +++ b/internal/database/dbtest/dsn.go @@ -5,19 +5,12 @@ import ( "os" ) -func getDSN(dsn string) (*url.URL, error) { - if dsn == "" { - var ok bool - if dsn, ok = os.LookupEnv("PGDATASOURCE"); !ok { - dsn = `postgres://sourcegraph:sourcegraph@127.0.0.1:5432/sourcegraph?sslmode=disable&timezone=UTC` - } else { - // If the user specified PGDATASOURCE, don't try and mux in other - // environment variables. Our code which does that is not always - // correct. For example it fails on unix sockets. - return url.Parse(dsn) - } +func getDSN() (*url.URL, error) { + if dsn, ok := os.LookupEnv("PGDATASOURCE"); ok { + return url.Parse(dsn) } + dsn := `postgres://sourcegraph:sourcegraph@127.0.0.1:5432/sourcegraph?sslmode=disable&timezone=UTC` u, err := url.Parse(dsn) if err != nil { return nil, err