diff --git a/cmd/go_migrate/main.go b/cmd/go_migrate/main.go index 6b94d33..c69c726 100644 --- a/cmd/go_migrate/main.go +++ b/cmd/go_migrate/main.go @@ -27,7 +27,7 @@ func main() { ctxSource, cancel := context.WithTimeout(context.Background(), 20*time.Second) defer cancel() - sourcePool, err := db.Connect(ctxSource, config.App.FromDb.Url) + sourcePool, err := db.Connect(ctxSource, config.App.SourceDbUrl) defer db.Close(sourcePool) if err != nil { log.Fatal(err) @@ -37,7 +37,7 @@ func main() { ctxTarget, cancel := context.WithTimeout(context.Background(), 20*time.Second) defer cancel() - targetPool, err := db.Connect(ctxTarget, config.App.ToDb.Url) + targetPool, err := db.Connect(ctxTarget, config.App.TargetDbUrl) defer db.Close(targetPool) if err != nil { log.Fatal(err) diff --git a/internal/app/config/main.go b/internal/app/config/main.go index ca849e8..94e751d 100644 --- a/internal/app/config/main.go +++ b/internal/app/config/main.go @@ -7,13 +7,9 @@ import ( log "github.com/sirupsen/logrus" ) -type dbConfig struct { - Url string -} - type appConfig struct { - FromDb dbConfig - ToDb dbConfig + SourceDbUrl string + TargetDbUrl string } func loadEnv() { @@ -26,23 +22,19 @@ func loadEnv() { func getAppConfig() appConfig { loadEnv() - fromDbUrl := os.Getenv("PG_FROM_DB_URL") - if fromDbUrl == "" { - log.Fatal("PG_FROM_DB_URL environment variable not set") + sourceDbUrl := os.Getenv("SOURCE_DB_URL") + if sourceDbUrl == "" { + log.Fatal("SOURCE_DB_URL environment variable not set") } - toDbUrl := os.Getenv("PG_TO_DB_URL") - if toDbUrl == "" { - log.Fatal("PG_TO_DB_URL environment variable not set") + targetDbUrl := os.Getenv("TARGET_DB_URL") + if targetDbUrl == "" { + log.Fatal("TARGET_DB_URL environment variable not set") } return appConfig{ - FromDb: dbConfig{ - Url: fromDbUrl, - }, - ToDb: dbConfig{ - Url: toDbUrl, - }, + SourceDbUrl: sourceDbUrl, + TargetDbUrl: targetDbUrl, } }