diff options
| author | Eugene Triguba <eugenetriguba@gmail.com> | 2025-07-19 17:40:13 -0400 |
|---|---|---|
| committer | Eugene Triguba <eugenetriguba@gmail.com> | 2025-07-19 17:40:13 -0400 |
| commit | d2a6ba3ff629587646eeb7741ded30f78a52f446 (patch) | |
| tree | 8f9d8c0ffd5d71d92f0337d4b7f021784566455a | |
| parent | Tidy up the test.sh tool script (diff) | |
| download | cli-d2a6ba3ff629587646eeb7741ded30f78a52f446.zip | |
Replace envconfig with envelope
| -rw-r--r-- | go.mod | 8 | ||||
| -rw-r--r-- | go.sum | 8 | ||||
| -rw-r--r-- | internal/bolttest/db.go | 2 | ||||
| -rw-r--r-- | internal/bolttest/env.go | 2 | ||||
| -rw-r--r-- | internal/bolttest/fs.go | 2 | ||||
| -rw-r--r-- | internal/configloader/configloader.go | 33 | ||||
| -rw-r--r-- | internal/configloader/configloader_test.go | 4 | ||||
| -rw-r--r-- | internal/models/migration_test.go | 2 | ||||
| -rw-r--r-- | internal/output/console_test.go | 2 | ||||
| -rw-r--r-- | internal/repositories/migration_db_repo_mssql_test.go | 2 | ||||
| -rw-r--r-- | internal/repositories/migration_db_repo_postgresql_test.go | 2 | ||||
| -rw-r--r-- | internal/repositories/migration_db_repo_test.go | 2 | ||||
| -rw-r--r-- | internal/repositories/migration_fs_repo_test.go | 2 | ||||
| -rw-r--r-- | internal/services/migration_test.go | 4 | ||||
| -rw-r--r-- | internal/sqlparse/sqlparse_test.go | 4 | ||||
| -rw-r--r-- | internal/storage/db_test.go | 2 | ||||
| -rw-r--r-- | internal/storage/mssql_test.go | 2 | ||||
| -rw-r--r-- | internal/storage/mysql_test.go | 2 | ||||
| -rw-r--r-- | internal/storage/postgresql_test.go | 2 | ||||
| -rw-r--r-- | internal/storage/sqlite3_test.go | 2 |
20 files changed, 49 insertions, 40 deletions
@@ -1,14 +1,16 @@ module github.com/eugenetriguba/bolt -go 1.21.6 +go 1.23.0 + +toolchain go1.24.4 require ( + git.sr.ht/~eugenetriguba/checkmate v0.3.3 + git.sr.ht/~eugenetriguba/envelope v0.2.0 github.com/BurntSushi/toml v1.3.2 - github.com/eugenetriguba/checkmate v0.3.2 github.com/go-sql-driver/mysql v1.8.0 github.com/google/subcommands v1.2.0 github.com/jackc/pgx/v5 v5.5.5 - github.com/kelseyhightower/envconfig v1.4.0 github.com/mattn/go-sqlite3 v1.14.22 github.com/microsoft/go-mssqldb v1.7.0 ) @@ -1,5 +1,9 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +git.sr.ht/~eugenetriguba/checkmate v0.3.3 h1:5qEwiDLRVcaI4Z5LRpUQYz0CIsSA9OuWxFB9GBDRMrk= +git.sr.ht/~eugenetriguba/checkmate v0.3.3/go.mod h1:Pxv1PKcBSbOqmoEOZxOBJVv9dHUGU+zcwuwfnGqZEQk= +git.sr.ht/~eugenetriguba/envelope v0.2.0 h1:+vq3MENb2Xo1K7D/jZJcOHB9dBTbdHOEvzKoRtWyQpc= +git.sr.ht/~eugenetriguba/envelope v0.2.0/go.mod h1:DcP27+64+elmsPbHqA90L/z3zkiyguRAk3wfKVBtnA8= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 h1:lGlwhPtrX6EVml1hO0ivjkUxsSyl4dsiw9qcA1k/3IQ= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1/go.mod h1:RKUqNu35KJYcVG/fqTRqmuXJZYNhYkBrnC/hX7yGbTA= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 h1:sO0/P7g68FrryJzljemN+6GTssUXdANk6aJ7T1ZxnsQ= @@ -17,8 +21,6 @@ github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbi github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/eugenetriguba/checkmate v0.3.2 h1:vcALwpLLpt0FBxckjuobNFYtBLtlCT2p55Xk4p0SAhk= -github.com/eugenetriguba/checkmate v0.3.2/go.mod h1:IY38Cl4zlNI1dg+wcDYwrbWZfJ9i2/ouWf8C0N8c/do= github.com/go-sql-driver/mysql v1.8.0 h1:UtktXaU2Nb64z/pLiGIxY4431SJ4/dR5cjMmlVHgnT4= github.com/go-sql-driver/mysql v1.8.0/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw= @@ -41,8 +43,6 @@ github.com/jackc/pgx/v5 v5.5.5 h1:amBjrZVmksIdNjxGW/IiIMzxMKZFelXbUoPNb+8sjQw= github.com/jackc/pgx/v5 v5.5.5/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A= github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= -github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= -github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= diff --git a/internal/bolttest/db.go b/internal/bolttest/db.go index 2d21762..743b8fc 100644 --- a/internal/bolttest/db.go +++ b/internal/bolttest/db.go @@ -6,9 +6,9 @@ import ( "os" "testing" + "git.sr.ht/~eugenetriguba/checkmate/assert" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/storage" - "github.com/eugenetriguba/checkmate/assert" ) func NewTestDB(t *testing.T) storage.DB { diff --git a/internal/bolttest/env.go b/internal/bolttest/env.go index 8f0ad63..7295158 100644 --- a/internal/bolttest/env.go +++ b/internal/bolttest/env.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/eugenetriguba/checkmate/assert" + "git.sr.ht/~eugenetriguba/checkmate/assert" ) func UnsetEnv(t *testing.T, key string) { diff --git a/internal/bolttest/fs.go b/internal/bolttest/fs.go index 36078f4..a230f8a 100644 --- a/internal/bolttest/fs.go +++ b/internal/bolttest/fs.go @@ -4,9 +4,9 @@ import ( "os" "testing" + "git.sr.ht/~eugenetriguba/checkmate/assert" "github.com/BurntSushi/toml" "github.com/eugenetriguba/bolt/internal/configloader" - "github.com/eugenetriguba/checkmate/assert" ) func CreateConfigFile(t *testing.T, cfg *configloader.Config, filePath string) { diff --git a/internal/configloader/configloader.go b/internal/configloader/configloader.go index 0f724a6..842dcfb 100644 --- a/internal/configloader/configloader.go +++ b/internal/configloader/configloader.go @@ -13,10 +13,11 @@ import ( "fmt" "os" "path/filepath" + "reflect" "runtime" + "git.sr.ht/~eugenetriguba/envelope" "github.com/BurntSushi/toml" - "github.com/kelseyhightower/envconfig" ) type VersionStyle string @@ -41,26 +42,32 @@ var ( // This can come from the TOML file or environment variables, // with environment variables taking precedence. type Config struct { - Migrations MigrationsConfig `toml:"migrations"` + Migrations MigrationsConfig `toml:"migrations" env:"BOLT_MIGRATIONS"` // Information related to how to connect to the database // that is desired to run migrations against. - Connection ConnectionConfig `toml:"database"` + Connection ConnectionConfig `toml:"database" env:"BOLT_DB"` } type MigrationsConfig struct { - DirectoryPath string `toml:"directory_path" envconfig:"BOLT_MIGRATIONS_DIR_PATH"` - VersionStyle VersionStyle `toml:"version_style" envconfig:"BOLT_MIGRATIONS_VERSION_STYLE"` + DirectoryPath string `toml:"directory_path" env:"DIR_PATH"` + VersionStyle VersionStyle `toml:"version_style" env:"VERSION_STYLE"` } type ConnectionConfig struct { - Host string `toml:"host" envconfig:"BOLT_DB_HOST"` - Port string `toml:"port" envconfig:"BOLT_DB_PORT"` - User string `toml:"user" envconfig:"BOLT_DB_USER"` - Password string `toml:"password" envconfig:"BOLT_DB_PASSWORD"` - DBName string `toml:"dbname" envconfig:"BOLT_DB_NAME"` - Driver string `toml:"driver" envconfig:"BOLT_DB_DRIVER"` - MigrationsTable string `toml:"migrations_table" envconfig:"BOLT_DB_MIGRATIONS_TABLE"` + Host string `toml:"host" env:"HOST"` + Port string `toml:"port" env:"PORT"` + User string `toml:"user" env:"USER"` + Password string `toml:"password" env:"PASSWORD"` + DBName string `toml:"dbname" env:"NAME"` + Driver string `toml:"driver" env:"DRIVER"` + MigrationsTable string `toml:"migrations_table" env:"MIGRATIONS_TABLE"` +} + +func init() { + envelope.RegisterTypeParser(reflect.TypeOf(VersionStyleSequential), envelope.TypeParserFunc(func(value string) (any, error) { + return VersionStyle(value), nil + })) } func NewConfig() (*Config, error) { @@ -85,7 +92,7 @@ func NewConfig() (*Config, error) { } } - err = envconfig.Process("", &cfg) + err = envelope.LoadFromEnv(&cfg) if err != nil { return nil, err } diff --git a/internal/configloader/configloader_test.go b/internal/configloader/configloader_test.go index 352f243..f988afb 100644 --- a/internal/configloader/configloader_test.go +++ b/internal/configloader/configloader_test.go @@ -5,10 +5,10 @@ import ( "path/filepath" "testing" + "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.sr.ht/~eugenetriguba/checkmate/check" "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" - "github.com/eugenetriguba/checkmate/assert" - "github.com/eugenetriguba/checkmate/check" ) func TestNewConfigDefaults(t *testing.T) { diff --git a/internal/models/migration_test.go b/internal/models/migration_test.go index 15f3123..75a1ed5 100644 --- a/internal/models/migration_test.go +++ b/internal/models/migration_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" + "git.sr.ht/~eugenetriguba/checkmate/check" "github.com/eugenetriguba/bolt/internal/models" - "github.com/eugenetriguba/checkmate/check" ) func TestNewTimestampMigration(t *testing.T) { diff --git a/internal/output/console_test.go b/internal/output/console_test.go index 492d0a2..ea551da 100644 --- a/internal/output/console_test.go +++ b/internal/output/console_test.go @@ -6,7 +6,7 @@ import ( "io" "testing" - "github.com/eugenetriguba/checkmate/check" + "git.sr.ht/~eugenetriguba/checkmate/check" ) func NewConsoleOutputterWithWriters(stdout io.Writer, stderr io.Writer) ConsoleOutputter { diff --git a/internal/repositories/migration_db_repo_mssql_test.go b/internal/repositories/migration_db_repo_mssql_test.go index 5c79168..bbcb4cf 100644 --- a/internal/repositories/migration_db_repo_mssql_test.go +++ b/internal/repositories/migration_db_repo_mssql_test.go @@ -5,9 +5,9 @@ package repositories_test import ( "testing" + "git.sr.ht/~eugenetriguba/checkmate/assert" "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/repositories" - "github.com/eugenetriguba/checkmate/assert" ) func TestNewMigrationDBRepo_CreatesTableInSchema_MSSQL(t *testing.T) { diff --git a/internal/repositories/migration_db_repo_postgresql_test.go b/internal/repositories/migration_db_repo_postgresql_test.go index 0df9c1d..5b3d462 100644 --- a/internal/repositories/migration_db_repo_postgresql_test.go +++ b/internal/repositories/migration_db_repo_postgresql_test.go @@ -5,9 +5,9 @@ package repositories_test import ( "testing" + "git.sr.ht/~eugenetriguba/checkmate/assert" "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/repositories" - "github.com/eugenetriguba/checkmate/assert" ) func TestNewMigrationDBRepo_CreatesTableInSchema_Postgresql(t *testing.T) { diff --git a/internal/repositories/migration_db_repo_test.go b/internal/repositories/migration_db_repo_test.go index 1163b9c..b30ad91 100644 --- a/internal/repositories/migration_db_repo_test.go +++ b/internal/repositories/migration_db_repo_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" + "git.sr.ht/~eugenetriguba/checkmate/assert" "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/models" "github.com/eugenetriguba/bolt/internal/repositories" - "github.com/eugenetriguba/checkmate/assert" ) func TestNewMigrationDBRepo_CreatesTable(t *testing.T) { diff --git a/internal/repositories/migration_fs_repo_test.go b/internal/repositories/migration_fs_repo_test.go index 938cc2b..be1eb80 100644 --- a/internal/repositories/migration_fs_repo_test.go +++ b/internal/repositories/migration_fs_repo_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" + "git.sr.ht/~eugenetriguba/checkmate/assert" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/models" "github.com/eugenetriguba/bolt/internal/repositories" - "github.com/eugenetriguba/checkmate/assert" ) func assertFileExists(t *testing.T, path string) { diff --git a/internal/services/migration_test.go b/internal/services/migration_test.go index 1cfc3ba..613d545 100644 --- a/internal/services/migration_test.go +++ b/internal/services/migration_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" + "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.sr.ht/~eugenetriguba/checkmate/check" "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/models" "github.com/eugenetriguba/bolt/internal/sqlparse" - "github.com/eugenetriguba/checkmate/assert" - "github.com/eugenetriguba/checkmate/check" ) func TestListMigrations(t *testing.T) { diff --git a/internal/sqlparse/sqlparse_test.go b/internal/sqlparse/sqlparse_test.go index 174b6fc..3faeee2 100644 --- a/internal/sqlparse/sqlparse_test.go +++ b/internal/sqlparse/sqlparse_test.go @@ -7,9 +7,9 @@ import ( "strings" "testing" + "git.sr.ht/~eugenetriguba/checkmate/assert" + "git.sr.ht/~eugenetriguba/checkmate/check" "github.com/eugenetriguba/bolt/internal/sqlparse" - "github.com/eugenetriguba/checkmate/assert" - "github.com/eugenetriguba/checkmate/check" ) func TestSqlParser_Parse(t *testing.T) { diff --git a/internal/storage/db_test.go b/internal/storage/db_test.go index 119f57f..f6baafe 100644 --- a/internal/storage/db_test.go +++ b/internal/storage/db_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" + "git.sr.ht/~eugenetriguba/checkmate/assert" "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/storage" - "github.com/eugenetriguba/checkmate/assert" ) func TestNewDB_Success(t *testing.T) { diff --git a/internal/storage/mssql_test.go b/internal/storage/mssql_test.go index 48a1679..7cd42b3 100644 --- a/internal/storage/mssql_test.go +++ b/internal/storage/mssql_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" + "git.sr.ht/~eugenetriguba/checkmate/assert" "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/storage" - "github.com/eugenetriguba/checkmate/assert" ) func TestMSSQL_ConvertGenericPlaceholders(t *testing.T) { diff --git a/internal/storage/mysql_test.go b/internal/storage/mysql_test.go index b6f48b3..c4b7914 100644 --- a/internal/storage/mysql_test.go +++ b/internal/storage/mysql_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" + "git.sr.ht/~eugenetriguba/checkmate/assert" "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/storage" - "github.com/eugenetriguba/checkmate/assert" ) func TestMySQL_ConvertGenericPlaceholders(t *testing.T) { diff --git a/internal/storage/postgresql_test.go b/internal/storage/postgresql_test.go index d244646..18e28e0 100644 --- a/internal/storage/postgresql_test.go +++ b/internal/storage/postgresql_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" + "git.sr.ht/~eugenetriguba/checkmate/assert" "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/storage" - "github.com/eugenetriguba/checkmate/assert" ) func TestPostgresql_ConvertGenericPlaceholders(t *testing.T) { diff --git a/internal/storage/sqlite3_test.go b/internal/storage/sqlite3_test.go index 69eea38..91065ae 100644 --- a/internal/storage/sqlite3_test.go +++ b/internal/storage/sqlite3_test.go @@ -6,10 +6,10 @@ import ( "database/sql" "testing" + "git.sr.ht/~eugenetriguba/checkmate/assert" "github.com/eugenetriguba/bolt/internal/bolttest" "github.com/eugenetriguba/bolt/internal/configloader" "github.com/eugenetriguba/bolt/internal/storage" - "github.com/eugenetriguba/checkmate/assert" ) func TestSqlite3_ConvertGenericPlaceholders(t *testing.T) { |