Update app config retrieval method (#17)

cmd/api/main.go

@@ -11,30 +11,32 @@ import (
 )
 
 func main() {
+	c := config.GetAppConfig()
+
 	dbConfig := db.PostgresDbConfig{
-		DbHost:           config.Env.DbHost,
-		DbPort:           config.Env.DbPort,
-		DbName:           config.Env.DbName,
-		DbUser:           config.Env.DbUser,
-		DbPassword:       config.Env.DbPassword,
-		DbSslMode:        config.Env.DbSslMode,
-		DbMaxConnections: config.Env.DbMaxConnections,
-		DbMinConnections: config.Env.DbMinConnections,
+		DbHost:           c.DbHost,
+		DbPort:           c.DbPort,
+		DbName:           c.DbName,
+		DbUser:           c.DbUser,
+		DbPassword:       c.DbPassword,
+		DbSslMode:        c.DbSslMode,
+		DbMaxConnections: c.DbMaxConnections,
+		DbMinConnections: c.DbMinConnections,
 	}
 
 	db, err := db.NewPostgresStorage(dbConfig)
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	logger := logger.NewLogger(slog.Level(config.Env.LogLevel))
+	logger := logger.NewLogger(slog.Level(c.LogLevel))
 	apiConfig := &api.ApiConfig{
-		Addr:                     config.Env.Port,
-		JwtSecret:                config.Env.JwtSecret,
-		RequireVerification:      config.Env.RequireVerification,
-		UnauthorizedRequestLimit: config.Env.UnauthorizedRequestLimit,
-		ShortRequestLimit:        config.Env.ShortRequestLimit,
-		LongRequestLimit:         config.Env.LongRequestLimit,
+		Addr:                     c.Port,
+		JwtSecret:                c.JwtSecret,
+		RequireVerification:      c.RequireVerification,
+		UnauthorizedRequestLimit: c.UnauthorizedRequestLimit,
+		ShortRequestLimit:        c.ShortRequestLimit,
+		LongRequestLimit:         c.LongRequestLimit,
 	}
 
 	server := api.NewApiServer(apiConfig, db, logger)

cmd/migrate/main.go

@@ -13,13 +13,15 @@ import (
 )
 
 func main() {
+	c := config.GetAppConfig()
+
 	dbConfig := db.PostgresDbConfig{
-		DbHost:     config.Env.DbHost,
-		DbPort:     config.Env.DbPort,
-		DbName:     config.Env.DbName,
-		DbUser:     config.Env.DbUser,
-		DbPassword: config.Env.DbPassword,
-		DbSslMode:  config.Env.DbSslMode,
+		DbHost:     c.DbHost,
+		DbPort:     c.DbPort,
+		DbName:     c.DbName,
+		DbUser:     c.DbUser,
+		DbPassword: c.DbPassword,
+		DbSslMode:  c.DbSslMode,
 	}
 
 	m, err := migrator.NewPostgresMigrator(
@@ -37,7 +39,7 @@ func main() {
 		}
 		fmt.Printf("successfully ran up migration on db \"%s\"", config.Env.DbName)
 	} else if cmd == "down" {
-		if config.Env.AppEnv == "production" {
+		if c.AppEnv == "production" {
 			log.Fatal("blocking down migrations for prod")
 		}
 

config/config.go

@@ -29,9 +29,7 @@ type Config struct {
 	DbMinConnections int
 }
 
-var Env Config = initConfig()
-
-func initConfig() Config {
+func GetAppConfig() Config {
 	godotenv.Load()
 
 	var appEnv string = getEnv("APP_ENV", "development")