aboutsummaryrefslogtreecommitdiffstats
path: root/internal
diff options
context:
space:
mode:
authorEugene Triguba <eugenetriguba@gmail.com>2024-01-07 09:49:45 -0500
committerEugene Triguba <eugenetriguba@gmail.com>2024-01-07 09:49:45 -0500
commit0b427564f7ffe40375f2ef834da67679c272c713 (patch)
tree5977af7eb7bbdb0d853d69d1bd88bd0d592d2113 /internal
parentFix workflow (diff)
downloadcli-0b427564f7ffe40375f2ef834da67679c272c713.zip
Tweak tests
Diffstat (limited to 'internal')
-rw-r--r--internal/configloader/configloader.go14
-rw-r--r--internal/configloader/configloader_test.go102
-rw-r--r--internal/configloader/configloader_unix_test.go19
-rw-r--r--internal/configloader/configloader_windows_test.go20
4 files changed, 88 insertions, 67 deletions
diff --git a/internal/configloader/configloader.go b/internal/configloader/configloader.go
index 4872354..2c8893f 100644
--- a/internal/configloader/configloader.go
+++ b/internal/configloader/configloader.go
@@ -52,10 +52,12 @@ func NewConfig() (*Config, error) {
return nil, err
}
- cfg := Config{}
- _, err = toml.DecodeFile(filePath, &cfg)
- if err != nil {
- return nil, err
+ cfg := Config{MigrationsDir: "migrations"}
+ if !errors.Is(err, errConfigFileNotFound) {
+ _, err = toml.DecodeFile(filePath, &cfg)
+ if err != nil {
+ return nil, err
+ }
}
err = envconfig.Process("", &cfg)
@@ -63,10 +65,6 @@ func NewConfig() (*Config, error) {
return nil, err
}
- if cfg.MigrationsDir == "" {
- cfg.MigrationsDir = "migrations"
- }
-
return &cfg, nil
}
diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go
index 084bb8a..7fb2456 100644
--- a/internal/configloader/configloader_test.go
+++ b/internal/configloader/configloader_test.go
@@ -1,6 +1,7 @@
package configloader_test
import (
+ "fmt"
"os"
"testing"
@@ -10,17 +11,17 @@ import (
)
func TestNewConfigMigrationsDirDefault(t *testing.T) {
+ changeCwd(t, os.TempDir())
+
cfg, err := configloader.NewConfig()
- if err != nil {
- t.Fatalf("%s occurred during new config", err)
- }
+ assert.NilError(t, err)
assert.Equal(t, cfg.MigrationsDir, "migrations")
}
func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) {
expectedCfg := configloader.Config{
- MigrationsDir: "migrations",
+ MigrationsDir: "myfancymigrations",
Connection: configloader.ConnectionConfig{
Host: "testhost",
Port: 1234,
@@ -30,48 +31,87 @@ func TestNewConfigFindsFileAndPopulatesConfigStruct(t *testing.T) {
Driver: "postgres",
},
}
- err := createConfigFile(t, &expectedCfg, "bolt.toml")
- if err != nil {
- t.Fatalf("%s occurred during config file creation", err)
- }
+ createConfigFile(t, &expectedCfg, "bolt.toml")
cfg, err := configloader.NewConfig()
- if err != nil {
- t.Fatalf("%s occurred during new config", err)
- }
-
+ assert.NilError(t, err)
assert.DeepEqual(t, *cfg, expectedCfg)
}
-func createConfigFile(t *testing.T, cfg *configloader.Config, filePath string) error {
- f, err := createTempFile(t, filePath)
- if err != nil {
- return err
+func TestNewConfigCanBeOverridenByEnvVars(t *testing.T) {
+ fileCfg := configloader.Config{
+ MigrationsDir: "cfgmigrations",
+ Connection: configloader.ConnectionConfig{
+ Host: "testhost",
+ Port: 1234,
+ User: "testuser",
+ Password: "testpassword",
+ DBName: "testdb",
+ Driver: "mysql",
+ },
}
+ createConfigFile(t, &fileCfg, "bolt.toml")
- encoder := toml.NewEncoder(f)
- err = encoder.Encode(cfg)
- if err != nil {
- return err
+ envCfg := configloader.Config{
+ MigrationsDir: "envmigrations",
+ Connection: configloader.ConnectionConfig{
+ Host: "envtesthost",
+ Port: 4321,
+ User: "envtestuser",
+ Password: "envtestpassword",
+ DBName: "envtestdb",
+ Driver: "postgres",
+ },
}
+ t.Setenv("BOLT_MIGRATIONS_DIR", envCfg.MigrationsDir)
+ t.Setenv("BOLT_CONNECTION_HOST", envCfg.Connection.Host)
+ t.Setenv("BOLT_CONNECTION_PORT", fmt.Sprintf("%d", envCfg.Connection.Port))
+ t.Setenv("BOLT_CONNECTION_USER", envCfg.Connection.User)
+ t.Setenv("BOLT_CONNECTION_PASSWORD", envCfg.Connection.Password)
+ t.Setenv("BOLT_CONNECTION_DBNAME", envCfg.Connection.DBName)
+ t.Setenv("BOLT_CONNECTION_DRIVER", envCfg.Connection.Driver)
- err = f.Close()
- if err != nil {
- return err
- }
+ cfg, err := configloader.NewConfig()
+ assert.NilError(t, err)
+ assert.DeepEqual(t, *cfg, envCfg)
+}
- return nil
+func createConfigFile(t *testing.T, cfg *configloader.Config, filePath string) {
+ f := createTempFile(t, filePath)
+
+ encoder := toml.NewEncoder(f)
+ err := encoder.Encode(cfg)
+ assert.NilError(t, err)
+
+ err = f.Close()
+ assert.NilError(t, err)
}
-func createTempFile(t *testing.T, filePath string) (*os.File, error) {
+func createTempFile(t *testing.T, filePath string) *os.File {
f, err := os.Create(filePath)
- if err != nil {
- return nil, err
- }
+ assert.NilError(t, err)
t.Cleanup(func() {
- os.Remove(f.Name())
+ err = os.Remove(f.Name())
+ if err != nil {
+ t.Fatal(err)
+ }
})
- return f, nil
+ return f
+}
+
+func changeCwd(t *testing.T, path string) {
+ dir, err := os.Getwd()
+ assert.NilError(t, err)
+
+ err = os.Chdir(path)
+ assert.NilError(t, err)
+
+ t.Cleanup(func() {
+ err = os.Chdir(dir)
+ if err != nil {
+ t.Fatal(err)
+ }
+ })
}
diff --git a/internal/configloader/configloader_unix_test.go b/internal/configloader/configloader_unix_test.go
index f40a6bb..25803d0 100644
--- a/internal/configloader/configloader_unix_test.go
+++ b/internal/configloader/configloader_unix_test.go
@@ -14,23 +14,14 @@ func TestNewConfigUnixSearchesToRootFilePath(t *testing.T) {
expectedCfg := configloader.Config{
MigrationsDir: "differentmigrationsdir",
}
- err := createConfigFile(t, &expectedCfg, "/bolt.toml")
- if err != nil {
- t.Fatal(err)
- }
+ createConfigFile(t, &expectedCfg, "/bolt.toml")
+
homedir, err := os.UserHomeDir()
- if err != nil {
- t.Fatal(err)
- }
- err = os.Chdir(homedir)
- if err != nil {
- t.Fatal(err)
- }
+ assert.NilError(t, err)
+ changeCwd(t, homedir)
cfg, err := configloader.NewConfig()
- if err != nil {
- t.Fatal(err)
- }
+ assert.NilError(t, err)
assert.DeepEqual(t, *cfg, expectedCfg)
}
diff --git a/internal/configloader/configloader_windows_test.go b/internal/configloader/configloader_windows_test.go
index 5b5ed79..763a03e 100644
--- a/internal/configloader/configloader_windows_test.go
+++ b/internal/configloader/configloader_windows_test.go
@@ -16,23 +16,15 @@ func TestNewConfigWindowsSearchesToRootFilePath(t *testing.T) {
MigrationsDir: "differentmigrationsdir",
}
configPath := filepath.Join(os.Getenv("SystemDrive"), "bolt.toml")
- err := createConfigFile(t, &expectedCfg, configPath)
- if err != nil {
- t.Fatal(err)
- }
+ createConfigFile(t, &expectedCfg, configPath)
+ assert.NilError(t, err)
+
homedir, err := os.UserHomeDir()
- if err != nil {
- t.Fatal(err)
- }
- err = os.Chdir(homedir)
- if err != nil {
- t.Fatal(err)
- }
+ assert.NilError(t, err)
+ changeCwd(t, homedir)
cfg, err := configloader.NewConfig()
- if err != nil {
- t.Fatal(err)
- }
+ assert.NilError(t, err)
assert.DeepEqual(t, *cfg, expectedCfg)
}