Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-17 14:37:02 +00:00
Code Releases Activity

config: Allow overrides from the command line

Browse Source 
This patch allows the configuration values to be overridden from the
command-line, with a new -config_overrides flag.

There is a fairly specific use case for this, when editing the
configuration file is not feasible or convenient (e.g. running an
user-supplied configuration in a managed environment).
This commit is contained in:
Alberto Bertogli
2020-05-16 23:22:00 +01:00
parent 7909b479eb
commit 4c28efcb20
6 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
internal/config/config_test.go
View File

@@ -27,7 +27,7 @@ func mustCreateConfig(t *testing.T, contents string) (string, string) {
func TestEmptyConfig(t *testing.T) {
tmpDir, path := mustCreateConfig(t, "")
defer testlib.RemoveIfOk(t, tmpDir)
c, err := Load(path)
c, err := Load(path, "")
if err != nil {
t.Fatalf("error loading empty config: %v", err)
}
@@ -59,12 +59,18 @@ func TestFullConfig(t *testing.T) {
tmpDir, path := mustCreateConfig(t, confStr)
defer testlib.RemoveIfOk(t, tmpDir)
overrideStr := `
hostname: "proust"
submission_address: ":999"
dovecot_auth: true
`
expected := &Config{
Hostname: "joust",
Hostname: "proust",
MaxDataSizeMb: 26,
SmtpAddress: []string{":1234", ":5678"},
SubmissionAddress: []string{":10001", ":10002"},
SubmissionAddress: []string{":999"},
SubmissionOverTlsAddress: []string{"systemd"},
MonitoringAddress: ":1111",
@@ -77,9 +83,11 @@ func TestFullConfig(t *testing.T) {
DropCharacters: ".",
MailLogPath: "<syslog>",
DovecotAuth: true,
}
c, err := Load(path)
c, err := Load(path, overrideStr)
if err != nil {
t.Fatalf("error loading non-existent config: %v", err)
}
@@ -93,7 +101,7 @@ func TestFullConfig(t *testing.T) {
}
func TestErrorLoading(t *testing.T) {
c, err := Load("/does/not/exist")
c, err := Load("/does/not/exist", "")
if err == nil {
t.Fatalf("loaded a non-existent config: %v", c)
}
@@ -104,7 +112,18 @@ func TestBrokenConfig(t *testing.T) {
t, "<invalid> this is not a valid protobuf")
defer testlib.RemoveIfOk(t, tmpDir)
c, err := Load(path)
c, err := Load(path, "")
if err == nil {
t.Fatalf("loaded an invalid config: %v", c)
}
}
func TestBrokenOverride(t *testing.T) {
tmpDir, path := mustCreateConfig(
t, `hostname: "test"`)
defer testlib.RemoveIfOk(t, tmpDir)
c, err := Load(path, "broken override")
if err == nil {
t.Fatalf("loaded an invalid config: %v", c)
}