fix: lint errors
This commit was merged in pull request #130.
This commit is contained in:
@@ -23,36 +23,9 @@ type SmtpSettings struct {
|
||||
}
|
||||
|
||||
func NewSettingsFromEnv(env func(string) string) *Settings {
|
||||
|
||||
var smtp *SmtpSettings
|
||||
if env("SMTP_ENABLED") == "true" {
|
||||
smtp = &SmtpSettings{
|
||||
Host: env("SMTP_HOST"),
|
||||
Port: env("SMTP_PORT"),
|
||||
User: env("SMTP_USER"),
|
||||
Pass: env("SMTP_PASS"),
|
||||
FromMail: env("SMTP_FROM_MAIL"),
|
||||
FromName: env("SMTP_FROM_NAME"),
|
||||
}
|
||||
|
||||
if smtp.Host == "" {
|
||||
log.Fatal("SMTP_HOST must be set")
|
||||
}
|
||||
if smtp.Port == "" {
|
||||
log.Fatal("SMTP_PORT must be set")
|
||||
}
|
||||
if smtp.User == "" {
|
||||
log.Fatal("SMTP_USER must be set")
|
||||
}
|
||||
if smtp.Pass == "" {
|
||||
log.Fatal("SMTP_PASS must be set")
|
||||
}
|
||||
if smtp.FromMail == "" {
|
||||
log.Fatal("SMTP_FROM_MAIL must be set")
|
||||
}
|
||||
if smtp.FromName == "" {
|
||||
log.Fatal("SMTP_FROM_NAME must be set")
|
||||
}
|
||||
smtp = getSmtpSettings(env)
|
||||
}
|
||||
|
||||
settings := &Settings{
|
||||
@@ -78,3 +51,35 @@ func NewSettingsFromEnv(env func(string) string) *Settings {
|
||||
|
||||
return settings
|
||||
}
|
||||
|
||||
func getSmtpSettings(env func(string) string) *SmtpSettings {
|
||||
smtp := SmtpSettings{
|
||||
Host: env("SMTP_HOST"),
|
||||
Port: env("SMTP_PORT"),
|
||||
User: env("SMTP_USER"),
|
||||
Pass: env("SMTP_PASS"),
|
||||
FromMail: env("SMTP_FROM_MAIL"),
|
||||
FromName: env("SMTP_FROM_NAME"),
|
||||
}
|
||||
|
||||
if smtp.Host == "" {
|
||||
log.Fatal("SMTP_HOST must be set")
|
||||
}
|
||||
if smtp.Port == "" {
|
||||
log.Fatal("SMTP_PORT must be set")
|
||||
}
|
||||
if smtp.User == "" {
|
||||
log.Fatal("SMTP_USER must be set")
|
||||
}
|
||||
if smtp.Pass == "" {
|
||||
log.Fatal("SMTP_PASS must be set")
|
||||
}
|
||||
if smtp.FromMail == "" {
|
||||
log.Fatal("SMTP_FROM_MAIL must be set")
|
||||
}
|
||||
if smtp.FromName == "" {
|
||||
log.Fatal("SMTP_FROM_NAME must be set")
|
||||
}
|
||||
|
||||
return &smtp
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user