1
0
mirror of https://github.com/rancher/os.git synced 2025-09-24 12:02:31 +00:00

report some more useful cfg validation info when using ros config merge

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-07-17 13:03:50 +10:00
parent cbcdb2628c
commit 7cb46e1919

View File

@@ -225,8 +225,16 @@ func merge(c *cli.Context) error {
} }
if err = config.Merge(bytes); err != nil { if err = config.Merge(bytes); err != nil {
log.Error(err)
validationErrors, err := config.ValidateBytes(bytes)
if err != nil {
log.Fatal(err) log.Fatal(err)
} }
for _, validationError := range validationErrors.Errors() {
log.Error(validationError)
}
log.Fatal("EXITING: Failed to parse configuration")
}
return nil return nil
} }