Add email config via env vars (#134)

Author: dkhalife

README.md

@@ -74,7 +74,7 @@ Make sure to replace `/path/to/host` with your preferred root directory for conf
 
 In the [config](./config/) directory are a couple of starter configuration files for prod and a dev environments. The server expects a config.yaml in the config directory and will load settings from it when started.
 
-**Note:** You can set `email.password` and `jwt.secret` using environment variables `TW_EMAIL_PASSWORD` and `TW_JWT_SECRET` for improved security and flexibility.
+**Note:** You can set `email.host`, `email.port`, `email.email`, `email.password` and `jwt.secret` using environment variables `TW_EMAIL_HOST`, `TW_EMAIL_PORT`, `TW_EMAIL_SENDER`, `TW_EMAIL_PASSWORD` and `TW_JWT_SECRET` for improved security and flexibility.
 
 The configuration files are yaml mappings with the following values:
 

config/config.go

@@ -60,6 +60,9 @@ func LoadConfig() *Config {
 
 	// Allow values with secrets to be set via environment variables
 	_ = viper.BindEnv("jwt.secret", "TW_JWT_SECRET")
+	_ = viper.BindEnv("email.host", "TW_EMAIL_HOST")
+	_ = viper.BindEnv("email.port", "TW_EMAIL_PORT")
+	_ = viper.BindEnv("email.email", "TW_EMAIL_SENDER")
 	_ = viper.BindEnv("email.password", "TW_EMAIL_PASSWORD")
 
 	err := viper.ReadInConfig()

config/config_test.go

@@ -79,3 +79,41 @@ func TestLoadConfig_PanicOnMissingFile(t *testing.T) {
 		_ = LoadConfig()
 	})
 }
+
+func TestLoadConfig_EmailEnvOverride(t *testing.T) {
+	_ = os.MkdirAll("./config", 0755)
+	f, err := os.Create("./config/config.yaml")
+	assert.NoError(t, err)
+	defer os.Remove("./config/config.yaml")
+	defer f.Close()
+
+	_, err = f.WriteString(`email:
+  host: smtp.example.com
+  port: 25
+  email: test@example.com
+  password: testpass
+server:
+  port: 1234
+jwt:
+  secret: secret
+`)
+	assert.NoError(t, err)
+
+	os.Setenv("TW_EMAIL_HOST", "smtp.override.com")
+	os.Setenv("TW_EMAIL_PORT", "2525")
+	os.Setenv("TW_EMAIL_SENDER", "override@example.com")
+	os.Setenv("TW_EMAIL_PASSWORD", "overridepass")
+
+	viper.Reset()
+	cfg := LoadConfig()
+
+	assert.Equal(t, "smtp.override.com", cfg.EmailConfig.Host)
+	assert.Equal(t, 2525, cfg.EmailConfig.Port)
+	assert.Equal(t, "override@example.com", cfg.EmailConfig.Email)
+	assert.Equal(t, "overridepass", cfg.EmailConfig.Password)
+
+	os.Unsetenv("TW_EMAIL_HOST")
+	os.Unsetenv("TW_EMAIL_PORT")
+	os.Unsetenv("TW_EMAIL_SENDER")
+	os.Unsetenv("TW_EMAIL_PASSWORD")
+}