From 807f2e062520a31e76dca658b3693f5168613a71 Mon Sep 17 00:00:00 2001 From: Martin Saporiti Date: Wed, 26 Jun 2024 10:33:27 -0300 Subject: [PATCH 1/2] chore: improve database migration --- cmd/migrate/main.go | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/cmd/migrate/main.go b/cmd/migrate/main.go index 6341b7941..fb63ba12c 100644 --- a/cmd/migrate/main.go +++ b/cmd/migrate/main.go @@ -4,26 +4,31 @@ import ( "context" "os" - "github.com/polygonid/sh-id-platform/internal/config" + "github.com/joho/godotenv" "github.com/polygonid/sh-id-platform/internal/db/schema" "github.com/polygonid/sh-id-platform/internal/log" _ "github.com/lib/pq" ) +const IssuerDatabaseUrl = "ISSUER_DATABASE_URL" + func main() { ctx, cancel := context.WithCancel(context.Background()) defer cancel() - cfg, err := config.Load("") - if err != nil { - log.Error(ctx, "cannot load config", "err", err) + if os.Getenv(IssuerDatabaseUrl) == "" { + err := godotenv.Load(".env-issuer") + if err != nil { + log.Error(ctx, "Error loading .env-issuer file") + } } - log.Config(cfg.Log.Level, cfg.Log.Mode, os.Stdout) - log.Debug(ctx, "database", "url", cfg.Database.URL) + databaseUrl := os.Getenv(IssuerDatabaseUrl) + log.Config(log.LevelDebug, log.LevelDebug, os.Stdout) + log.Debug(ctx, "database", "url", databaseUrl) - if err := schema.Migrate(cfg.Database.URL); err != nil { + if err := schema.Migrate(databaseUrl); err != nil { log.Error(ctx, "error migrating database", "err", err) return } From beff4c3d85e21bbb2bacb73d20808d627f503d5b Mon Sep 17 00:00:00 2001 From: Martin Saporiti Date: Wed, 26 Jun 2024 10:35:48 -0300 Subject: [PATCH 2/2] fix: linter --- cmd/migrate/main.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmd/migrate/main.go b/cmd/migrate/main.go index fb63ba12c..e456a9e3e 100644 --- a/cmd/migrate/main.go +++ b/cmd/migrate/main.go @@ -5,12 +5,14 @@ import ( "os" "github.com/joho/godotenv" + "github.com/polygonid/sh-id-platform/internal/db/schema" "github.com/polygonid/sh-id-platform/internal/log" _ "github.com/lib/pq" ) +// IssuerDatabaseUrl is the environment variable for the issuer database URL const IssuerDatabaseUrl = "ISSUER_DATABASE_URL" func main() {