Fixes after code review

database/migrate.go

@@ -1,15 +1,12 @@
 package database
 
 import (
-	"database/sql"
 	"errors"
 	"fmt"
 
 	"github.com/golang-migrate/migrate/v4"
 	// required by migrate.New... to parse migration files directory
 	_ "github.com/golang-migrate/migrate/v4/source/file"
-
-	migratepg "github.com/golang-migrate/migrate/v4/database/postgres"
 )
 
 // supported migrate operations
@@ -62,35 +59,16 @@ func WithFilesDir(filesDir string) Option {
 
 // NewMigrationRunner creates a new MigrationRunner with the given database connection string (dsn) and options.
 func NewMigrationRunner(dsn string, opts ...Option) (*MigrationRunner, error) {
-	db, err := sql.Open("postgres", dsn)
-	if err != nil {
-		return nil, fmt.Errorf("sql open dsn: %v", err)
-	}
-
-	driver, err := migratepg.WithInstance(db, &migratepg.Config{})
-	if err != nil {
-		return nil, fmt.Errorf("building postgres driver for db migrations: %w", err)
+	runner := &MigrationRunner{
+		filesDir: defaultFilesDir,
+		logger:   &noopLogger{},
 	}
 
-	runner := &MigrationRunner{}
-
 	for _, opt := range opts {
 		opt(runner)
 	}
 
-	if runner.filesDir == "" {
-		runner.filesDir = defaultFilesDir
-	}
-
-	if runner.logger == nil {
-		runner.logger = &noopLogger{}
-	}
-
-	mgr, err := migrate.NewWithDatabaseInstance(
-		"file://"+runner.filesDir,
-		"postgres",
-		driver,
-	)
+	mgr, err := migrate.New("file://"+runner.filesDir, dsn)
 	if err != nil {
 		return nil, fmt.Errorf("creating Migrate object: %w", err)
 	}

database/migration_runner_env.go

@@ -8,19 +8,14 @@ import (
 
 // Constants representing environment variable keys for migration configuration.
 const (
-	envKeyPrefix       = "MIGRATION"
-	envKeyDsn          = "DSN"
-	envKeyOp           = "OPERATION"
-	envKeyForceVersion = "FORCE_VERSION"
-	envKeyFilesDir     = "FILES_DIR"
+	envKeyDsn          = "MIGRATION_DSN"
+	envKeyOp           = "MIGRATION_OPERATION"
+	envKeyForceVersion = "MIGRATION_FORCE_VERSION"
+	envKeyFilesDir     = "MIGRATION_FILES_DIR"
 )
 
-func envKey(key string) string {
-	return fmt.Sprintf("%s_%s", envKeyPrefix, key)
-}
-
 func readForceVersion() (int, error) {
-	forceVersionRaw, ok := os.LookupEnv(envKey(envKeyForceVersion))
+	forceVersionRaw, ok := os.LookupEnv(envKeyForceVersion)
 	if !ok {
 		return 0, nil
 	}
@@ -36,22 +31,22 @@ func readForceVersion() (int, error) {
 // RunMigrationsFromEnv reads migration configuration from environment variables,
 // creates a MigrationRunner, and runs the specified migration operation.
 func RunMigrationsFromEnv(logger logger) error {
-	dsn, ok := os.LookupEnv(envKey(envKeyDsn))
+	dsn, ok := os.LookupEnv(envKeyDsn)
 	if !ok {
-		return fmt.Errorf("missing env: %s", envKey(envKeyDsn))
+		return fmt.Errorf("missing env: %s", envKeyDsn)
 	}
 
-	operation, ok := os.LookupEnv(envKey(envKeyOp))
+	operation, ok := os.LookupEnv(envKeyOp)
 	if !ok {
-		return fmt.Errorf("missing env: %s", envKey(envKeyOp))
+		return fmt.Errorf("missing env: %s", envKeyOp)
 	}
 
 	forceVersion, err := readForceVersion()
 	if err != nil {
 		return fmt.Errorf("read forceVersion: %v", err)
 	}
 
-	filesDir := os.Getenv(envKey(envKeyFilesDir))
+	filesDir := os.Getenv(envKeyFilesDir)
 
 	runner, err := NewMigrationRunner(dsn, WithFilesDir(filesDir), WithLogger(logger))
 	if err != nil {