diff --git a/db/postgres.go b/db/postgres.go index b56673f6..f24a4e12 100644 --- a/db/postgres.go +++ b/db/postgres.go @@ -2,6 +2,7 @@ package db import ( "fmt" + "github.com/gravitl/netmaker/servercfg" "os" "strconv" @@ -18,7 +19,7 @@ type postgresConnector struct{} // postgresConnector.connect connects and // initializes a connection to postgres. func (pg *postgresConnector) connect() (*gorm.DB, error) { - pgConf := GetSQLConf() + pgConf := servercfg.GetSQLConf() dsn := fmt.Sprintf( "host=%s port=%d user=%s password=%s dbname=%s sslmode=%s connect_timeout=5", pgConf.Host, @@ -29,27 +30,11 @@ func (pg *postgresConnector) connect() (*gorm.DB, error) { pgConf.SSLMode, ) - db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{ + return gorm.Open(postgres.Open(dsn), &gorm.Config{ Logger: logger.Default.LogMode(logger.Silent), }) - if err != nil { - return nil, err - } - - // ensure netmaker_v1 schema exists. - err = db.Exec("CREATE SCHEMA IF NOT EXISTS netmaker_v1").Error - if err != nil { - return nil, err - } - - // set the netmaker_v1 schema as the default schema. - err = db.Exec("SET search_path TO netmaker_v1").Error - if err != nil { - return nil, err - } - - return db, nil } + func GetSQLConf() config.SQLConfig { var cfg config.SQLConfig cfg.Host = GetSQLHost()