From 34702d3802c8eb08cf4440c0cbb939b1db45168d Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 13 Jan 2024 21:47:26 -0500 Subject: Update configuration format and env names --- internal/repositories/migration_fs_repo.go | 11 ++++++----- internal/repositories/migration_fs_repo_test.go | 16 +++++++++++----- 2 files changed, 17 insertions(+), 10 deletions(-) (limited to 'internal/repositories') diff --git a/internal/repositories/migration_fs_repo.go b/internal/repositories/migration_fs_repo.go index 1bec146..5478b5c 100644 --- a/internal/repositories/migration_fs_repo.go +++ b/internal/repositories/migration_fs_repo.go @@ -7,6 +7,7 @@ import ( "path/filepath" "strings" + "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/models" ) @@ -25,20 +26,20 @@ type MigrationFsRepo struct { migrationsDirPath string } -func NewMigrationFsRepo(migrationsDirPath string) (*MigrationFsRepo, error) { - fileInfo, err := os.Stat(migrationsDirPath) +func NewMigrationFsRepo(migrationsConfig *configloader.MigrationsConfig) (*MigrationFsRepo, error) { + fileInfo, err := os.Stat(migrationsConfig.DirectoryPath) if errors.Is(err, os.ErrNotExist) { - err = os.MkdirAll(migrationsDirPath, 0755) + err = os.MkdirAll(migrationsConfig.DirectoryPath, 0755) if err != nil { return nil, err } } else if err != nil { return nil, err } else if err == nil && !fileInfo.IsDir() { - return nil, &ErrIsNotDir{path: migrationsDirPath} + return nil, &ErrIsNotDir{path: migrationsConfig.DirectoryPath} } - return &MigrationFsRepo{migrationsDirPath: migrationsDirPath}, nil + return &MigrationFsRepo{migrationsDirPath: migrationsConfig.DirectoryPath}, nil } func (mr *MigrationFsRepo) Create(migration *models.Migration) error { diff --git a/internal/repositories/migration_fs_repo_test.go b/internal/repositories/migration_fs_repo_test.go index bb12097..8fdcd8f 100644 --- a/internal/repositories/migration_fs_repo_test.go +++ b/internal/repositories/migration_fs_repo_test.go @@ -7,6 +7,7 @@ import ( "testing" "time" + "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/models" "github.com/eugenetriguba/bolt/internal/repositories" "gotest.tools/v3/assert" @@ -20,8 +21,9 @@ func assertFileExists(t *testing.T, path string) { func TestNewMigrationFsRepoCreatesDirIfNotExists(t *testing.T) { tempDir := t.TempDir() migrationsDir := filepath.Join(tempDir, "migrations") + migrationsConfig := configloader.MigrationsConfig{DirectoryPath: migrationsDir} - _, err := repositories.NewMigrationFsRepo(migrationsDir) + _, err := repositories.NewMigrationFsRepo(&migrationsConfig) assert.NilError(t, err) assertFileExists(t, migrationsDir) @@ -30,16 +32,18 @@ func TestNewMigrationFsRepoCreatesDirIfNotExists(t *testing.T) { func TestNewMigrationFsRepoMigrationDirIsFile(t *testing.T) { tempDir := t.TempDir() migrationsDir := filepath.Join(tempDir, "migrations") + migrationsConfig := configloader.MigrationsConfig{DirectoryPath: migrationsDir} _, err := os.Create(migrationsDir) assert.NilError(t, err) - _, err = repositories.NewMigrationFsRepo(migrationsDir) + _, err = repositories.NewMigrationFsRepo(&migrationsConfig) assert.ErrorContains(t, err, "is not a directory") } func TestMigrationFsRepoCreate(t *testing.T) { tempDir := t.TempDir() - repo, err := repositories.NewMigrationFsRepo(tempDir) + migrationsConfig := configloader.MigrationsConfig{DirectoryPath: tempDir} + repo, err := repositories.NewMigrationFsRepo(&migrationsConfig) assert.NilError(t, err) migration := models.NewMigration(time.Now(), "add users table") @@ -54,7 +58,8 @@ func TestMigrationFsRepoCreate(t *testing.T) { func TestMigrationFsRepoReadUpgradeAndDowngradeScript(t *testing.T) { tempDir := t.TempDir() - repo, err := repositories.NewMigrationFsRepo(tempDir) + migrationsConfig := configloader.MigrationsConfig{DirectoryPath: tempDir} + repo, err := repositories.NewMigrationFsRepo(&migrationsConfig) assert.NilError(t, err) migration := models.NewMigration(time.Now(), "add users table") @@ -85,7 +90,8 @@ func TestMigrationFsRepoReadUpgradeAndDowngradeScript(t *testing.T) { func TestMigrationFsRepo_List(t *testing.T) { tempDir := t.TempDir() - repo, err := repositories.NewMigrationFsRepo(tempDir) + migrationsConfig := configloader.MigrationsConfig{DirectoryPath: tempDir} + repo, err := repositories.NewMigrationFsRepo(&migrationsConfig) assert.NilError(t, err) migration1 := models.NewMigration( -- cgit v1.2.3