From 274a240be5eff0db9539a1230339bee4d775df85 Mon Sep 17 00:00:00 2001 From: venkat k Date: Wed, 29 May 2024 22:20:06 +0530 Subject: [PATCH] fix db connect issue --- capten/common-pkg/postgres/db-init/db_migrate.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/capten/common-pkg/postgres/db-init/db_migrate.go b/capten/common-pkg/postgres/db-init/db_migrate.go index c06029af..5229227a 100644 --- a/capten/common-pkg/postgres/db-init/db_migrate.go +++ b/capten/common-pkg/postgres/db-init/db_migrate.go @@ -28,7 +28,7 @@ const ( var log = logging.NewLogger() type DBConfig struct { - DBAddr string `envconfig:"PG_DB_HOST" required:"true"` + DBHost string `envconfig:"PG_DB_HOST" required:"true"` DBPort string `envconfig:"PG_DB_PORT" default:"5432"` DBName string `envconfig:"PG_DB_NAME" required:"true"` EntityName string `envconfig:"PG_DB_ENTITY_NAME" default:"postgres"` @@ -55,20 +55,17 @@ func RunMigrations(mode Mode) error { } func RunMigrationsWithConfig(conf *DBConfig, mode Mode) error { - dbConnectionString, err := getDbConnectionURLFromDbType(conf, conf.Password) - if err != nil { - return errors.WithMessage(err, "DB connection Url create failed") - } - + dbConnectionString := getDbConnectionURLFromDbType(conf, conf.Password) + log.Infof("DB connection string: %s", dbConnectionString) if err := runMigrations(conf.SourceURI, dbConnectionString, conf.DBName, mode); err != nil { return err } return nil } -func getDbConnectionURLFromDbType(conf *DBConfig, password string) (string, error) { - return fmt.Sprintf("postgres://%s:%s@%s:%v/%s?sslmode=disable", - conf.Username, password, conf.DBAddr, conf.DBPort, conf.DBName), nil +func getDbConnectionURLFromDbType(conf *DBConfig, password string) string { + return fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=disable", + conf.Username, password, conf.DBHost, conf.DBPort, conf.DBName) } func runMigrations(sourceURL, databaseURL, dbName string, mode Mode) (err error) {