make postgres connection string optional (#948)

* make postgres connection string optional * CR fix: simplify! * fix import * CR fix: use temp var
treeverse · Nov 23, 2020 · b69c89a · b69c89a
1 parent 24974e3
commit b69c89a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/config/config.go b/config/config.go
@@ -22,8 +22,6 @@ import (
 )
 
 const (
-	DefaultDatabaseConnString = "postgres://localhost:5432/postgres?sslmode=disable"
-
 	DefaultBlockStoreType                    = "local"
 	DefaultBlockStoreLocalPath               = "~/lakefs/data"
 	DefaultBlockStoreS3Region                = "us-east-1"
@@ -78,8 +76,6 @@ func setDefaults() {
 	viper.SetDefault("logging.level", DefaultLoggingLevel)
 	viper.SetDefault("logging.output", DefaultLoggingOutput)
 
-	viper.SetDefault("database.connection_string", DefaultDatabaseConnString)
-
 	viper.SetDefault("auth.cache.enabled", DefaultAuthCacheEnabled)
 	viper.SetDefault("auth.cache.size", DefaultAuthCacheSize)
 	viper.SetDefault("auth.cache.ttl", DefaultAuthCacheTTL)

diff --git a/db/migration.go b/db/migration.go
@@ -7,11 +7,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/golang-migrate/migrate/v4/source"
-
 	"github.com/golang-migrate/migrate/v4"
-
 	_ "github.com/golang-migrate/migrate/v4/database/postgres"
+	"github.com/golang-migrate/migrate/v4/source"
 	"github.com/golang-migrate/migrate/v4/source/httpfs"
 	"github.com/rakyll/statik/fs"
 	"github.com/treeverse/lakefs/db/params"
@@ -107,8 +105,11 @@ func getMigrate(params params.Database) (*migrate.Migrate, error) {
 	defer func() {
 		_ = src.Close()
 	}()
-
-	m, err := migrate.NewWithSourceInstance("httpfs", src, params.ConnectionString)
+	connectionString := params.ConnectionString
+	if connectionString == "" {
+		connectionString = "postgres://:/"
+	}
+	m, err := migrate.NewWithSourceInstance("httpfs", src, connectionString)
 	if err != nil {
 		return nil, err
 	}