feat: use postgres

mail/internal/config/env.go

@@ -6,10 +6,17 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"galaxy/postgres"
+	"galaxy/redisconn"
 )
 
 // LoadFromEnv builds Config from environment variables and validates the
-// resulting configuration.
+// resulting configuration. Connection topology for Redis and PostgreSQL is
+// delegated to the shared `pkg/redisconn` and `pkg/postgres` LoadFromEnv
+// helpers — the Redis loader hard-fails on the deprecated
+// `MAIL_REDIS_TLS_ENABLED` / `MAIL_REDIS_USERNAME` env vars; the Postgres
+// loader requires a primary DSN.
 func LoadFromEnv() (Config, error) {
 	cfg := DefaultConfig()
 
@@ -36,24 +43,18 @@ func LoadFromEnv() (Config, error) {
 		return Config{}, err
 	}
 
-	cfg.Redis.Addr = stringEnv(redisAddrEnvVar, cfg.Redis.Addr)
-	cfg.Redis.Username = stringEnv(redisUsernameEnvVar, cfg.Redis.Username)
-	cfg.Redis.Password = stringEnv(redisPasswordEnvVar, cfg.Redis.Password)
-	cfg.Redis.DB, err = intEnv(redisDBEnvVar, cfg.Redis.DB)
-	if err != nil {
-		return Config{}, err
-	}
-	cfg.Redis.TLSEnabled, err = boolEnv(redisTLSEnabledEnvVar, cfg.Redis.TLSEnabled)
-	if err != nil {
-		return Config{}, err
-	}
-	cfg.Redis.OperationTimeout, err = durationEnv(redisOperationTimeoutEnvVar, cfg.Redis.OperationTimeout)
+	redisConn, err := redisconn.LoadFromEnv(envPrefix)
 	if err != nil {
 		return Config{}, err
 	}
+	cfg.Redis.Conn = redisConn
 	cfg.Redis.CommandStream = stringEnv(redisCommandStreamEnvVar, cfg.Redis.CommandStream)
-	cfg.Redis.AttemptScheduleKey = stringEnv(redisAttemptScheduleEnvVar, cfg.Redis.AttemptScheduleKey)
-	cfg.Redis.DeadLetterPrefix = stringEnv(redisDeadLetterPrefixEnvVar, cfg.Redis.DeadLetterPrefix)
+
+	pgConn, err := postgres.LoadFromEnv(envPrefix)
+	if err != nil {
+		return Config{}, err
+	}
+	cfg.Postgres.Conn = pgConn
 
 	cfg.SMTP.Mode = stringEnv(smtpModeEnvVar, cfg.SMTP.Mode)
 	cfg.SMTP.Addr = stringEnv(smtpAddrEnvVar, cfg.SMTP.Addr)
@@ -88,11 +89,15 @@ func LoadFromEnv() (Config, error) {
 	if err != nil {
 		return Config{}, err
 	}
-	cfg.DeliveryTTL, err = durationEnv(deliveryTTLEnvVar, cfg.DeliveryTTL)
+	cfg.Retention.DeliveryRetention, err = durationEnv(deliveryRetentionEnvVar, cfg.Retention.DeliveryRetention)
 	if err != nil {
 		return Config{}, err
 	}
-	cfg.AttemptTTL, err = durationEnv(attemptTTLEnvVar, cfg.AttemptTTL)
+	cfg.Retention.MalformedCommandRetention, err = durationEnv(malformedCommandRetentionEnvVar, cfg.Retention.MalformedCommandRetention)
+	if err != nil {
+		return Config{}, err
+	}
+	cfg.Retention.CleanupInterval, err = durationEnv(cleanupIntervalEnvVar, cfg.Retention.CleanupInterval)
 	if err != nil {
 		return Config{}, err
 	}