torjus/dogtamer
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Update config from env

Browse Source
This commit is contained in:
Torjus Håkestad 2021-09-14 23:18:58 +02:00
parent 3c79a1de8c
commit 00f16046e0
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/config.go
View File

@ -43,6 +43,7 @@ func FromReader(r io.Reader) (*Config, error) {
if err := decoder.Decode(&c); err != nil { if err := decoder.Decode(&c); err != nil {
return nil, fmt.Errorf("error parsing config file: %w", err) return nil, fmt.Errorf("error parsing config file: %w", err)
} }
c.UpdateFromEnv()
return &c, c.Verify() return &c, c.Verify()
} }

6
config/config_test.go
View File

@ -98,6 +98,12 @@ func TestConfig(t *testing.T) {
if c.LogLevel != envValues["DOGTAMER_LOGLEVEL"] { if c.LogLevel != envValues["DOGTAMER_LOGLEVEL"] {
t.Errorf("LogLevel has wrong value: %s", c.LogLevel) t.Errorf("LogLevel has wrong value: %s", c.LogLevel)
} }
t.Cleanup(func() {
for value := range envValues {
os.Unsetenv(value)
}
})
}) })
t.Run("TestFromEnvInvalid", func(t *testing.T) { t.Run("TestFromEnvInvalid", func(t *testing.T) {
os.Clearenv() os.Clearenv()