From b8b23e393dcda33cc98b22f4083977b543861bf2 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sun, 28 Jan 2024 17:29:19 -0500 Subject: Add test for invalid version style in config --- internal/configloader/configloader.go | 16 ++++------------ internal/configloader/configloader_test.go | 13 +++++++++++++ internal/services/migration.go | 5 ++++- 3 files changed, 21 insertions(+), 13 deletions(-) (limited to 'internal') diff --git a/internal/configloader/configloader.go b/internal/configloader/configloader.go index c5aba2d..6155d56 100644 --- a/internal/configloader/configloader.go +++ b/internal/configloader/configloader.go @@ -50,15 +50,7 @@ type Config struct { type MigrationsConfig struct { DirectoryPath string `toml:"directory_path" envconfig:"BOLT_MIGRATIONS_DIR_PATH"` - VersionStyle VersionStyle `toml:"version_style" envconfig:"BOLT_MIGRATIONS_VERSION_STYLE"` -} - -func (mc *MigrationsConfig) Validate() error { - if mc.VersionStyle != VersionStyleSequential && mc.VersionStyle != VersionStyleTimestamp { - return ErrInvalidVersionStyle - } - - return nil + VersionStyle VersionStyle `toml:"version_style" envconfig:"BOLT_MIGRATIONS_VERSION_STYLE"` } type ConnectionConfig struct { @@ -94,9 +86,9 @@ func NewConfig() (*Config, error) { return nil, err } - err = cfg.Migrations.Validate() - if err != nil { - return nil, err + if cfg.Migrations.VersionStyle != VersionStyleSequential && + cfg.Migrations.VersionStyle != VersionStyleTimestamp { + return nil, ErrInvalidVersionStyle } return &cfg, nil diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go index d33a19b..6229cf6 100644 --- a/internal/configloader/configloader_test.go +++ b/internal/configloader/configloader_test.go @@ -20,6 +20,19 @@ func TestNewConfigDefaults(t *testing.T) { assert.Equal(t, cfg.Migrations.VersionStyle, configloader.VersionStyleSequential) } +func TestNewConfigWithInvalidVersionStyle(t *testing.T) { + fileCfg := configloader.Config{ + Migrations: configloader.MigrationsConfig{ + DirectoryPath: "myfancymigrations", + VersionStyle: "invalid", + }, + } + bolttest.CreateConfigFile(t, &fileCfg, "bolt.toml") + + _, err := configloader.NewConfig() + assert.ErrorIs(t, err, configloader.ErrInvalidVersionStyle) +} + func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) { expectedCfg := configloader.Config{ Migrations: configloader.MigrationsConfig{ diff --git a/internal/services/migration.go b/internal/services/migration.go index 91921bc..6836980 100644 --- a/internal/services/migration.go +++ b/internal/services/migration.go @@ -198,7 +198,10 @@ func (ms *MigrationService) RevertMigration(migration *models.Migration) error { return nil } -func (ms *MigrationService) CreateMigration(versionStyle configloader.VersionStyle, message string) error { +func (ms *MigrationService) CreateMigration( + versionStyle configloader.VersionStyle, + message string, +) error { var migration *models.Migration if versionStyle == configloader.VersionStyleTimestamp { -- cgit v1.2.3