f-46: config: fail loudly on an unreadable config file #46
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
8a04f6f7f6
commit
a220cce77e
2 changed files with 33 additions and 1 deletions
|
|
@ -54,3 +54,29 @@ func TestLoadConfig_ReadsTheTwoBackend(t *testing.T) {
|
||||||
t.Errorf("backend = %q, want two", cfg.DHCP.Backend)
|
t.Errorf("backend = %q, want two", cfg.DHCP.Backend)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestLoadConfig_MalformedFileIsReported(t *testing.T) {
|
||||||
|
path := writeConfig(t, "--\n\ndhcp:\n backend: two\n")
|
||||||
|
|
||||||
|
if _, err := LoadConfig(path); err == nil {
|
||||||
|
t.Fatal("an unparseable config must be reported: silently falling back to defaults would run the wrong dhcp backend")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLoadConfig_TabIndentedFileIsReported(t *testing.T) {
|
||||||
|
path := writeConfig(t, "dhcp:\n\tbackend: two\n")
|
||||||
|
|
||||||
|
if _, err := LoadConfig(path); err == nil {
|
||||||
|
t.Fatal("yaml forbids tabs for indentation: that must surface, not be swallowed")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestLoadConfig_MissingFileStillFallsBackToDefaults(t *testing.T) {
|
||||||
|
cfg, err := LoadConfig(filepath.Join(t.TempDir(), "absent.yml"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("an absent file remains valid, only an unreadable one is an error: %v", err)
|
||||||
|
}
|
||||||
|
if cfg.DHCP.Backend != BackendDnsmasq {
|
||||||
|
t.Errorf("backend = %q, want %q", cfg.DHCP.Backend, BackendDnsmasq)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,10 @@
|
||||||
package configuration
|
package configuration
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
|
||||||
"github.com/spf13/viper"
|
"github.com/spf13/viper"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -86,7 +90,9 @@ func LoadConfig(path string) (*Config, error) {
|
||||||
v.SetDefault("logger.level", "info")
|
v.SetDefault("logger.level", "info")
|
||||||
v.SetDefault("logger.debug", false)
|
v.SetDefault("logger.debug", false)
|
||||||
|
|
||||||
v.ReadInConfig()
|
if err := v.ReadInConfig(); err != nil && !errors.Is(err, os.ErrNotExist) {
|
||||||
|
return nil, fmt.Errorf("read %s: %w", path, err)
|
||||||
|
}
|
||||||
|
|
||||||
var cfg Config
|
var cfg Config
|
||||||
if err := v.Unmarshal(&cfg); err != nil {
|
if err := v.Unmarshal(&cfg); err != nil {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue