fix(config): Prevent loading malformed yaml

rabbitstack · rabbitstack · commit c78eb4b89f18 · 2024-10-17T18:55:44.000+02:00
If the YAML config contains malformed content the
error is ignored silently. To prevent this, we
only proceed with default settings loading if the
config file doesn't exist. On the contrary, the
error is raised.
diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go
@@ -180,7 +180,7 @@ func (f *App) Run(args []string) error {
 	}
 
 	log.Infof("bootstrapping with pid %d. Version: %s", os.Getpid(), version.Get())
-	log.Infof("configuration dump %s", cfg.Print())
+	log.Infof("rendering config flags... %s", cfg.Print())
 
 	// build the filter from the CLI argument. If we got
 	// a valid expression the filter is attached to the
diff --git a/internal/bootstrap/config.go b/internal/bootstrap/config.go
@@ -22,28 +22,33 @@ import (
 	"github.com/rabbitstack/fibratus/pkg/config"
 	"github.com/rabbitstack/fibratus/pkg/util/log"
 	"github.com/sirupsen/logrus"
+	"os"
 )
 
 // InitConfigAndLogger initializes the configuration and sets up the logger.
 // We allow continuing with the initialization process even if the config file
 // loading fails. In this situation, the default config flag values are used
 // to tweak any of the internal behaviours.
 func InitConfigAndLogger(cfg *config.Config) error {
-	isLoaded := cfg.TryLoadFile(cfg.File()) == nil
+	err := cfg.TryLoadFile(cfg.File())
+	notExists := os.IsNotExist(err)
+	if err != nil && !notExists {
+		return err
+	}
 	if err := cfg.Init(); err != nil {
 		return err
 	}
-	if isLoaded {
+	if err == nil {
 		if err := cfg.Validate(); err != nil {
 			return err
 		}
 	}
 	if err := log.InitFromConfig(cfg.Log, "fibratus.log"); err != nil {
 		return err
 	}
-	if !isLoaded {
-		logrus.Warnf("unable to load configuration "+
-			"from %s file. Falling back to default "+
+	if notExists {
+		logrus.Infof("configuration file "+
+			"%s not found. Continuing with default "+
 			"settings...", cfg.File())
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ func (f *App) Run(args []string) error {`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`log.Infof("bootstrapping with pid %d. Version: %s", os.Getpid(), version.Get())`
`183`		`- log.Infof("configuration dump %s", cfg.Print())`
	`183`	`+ log.Infof("rendering config flags... %s", cfg.Print())`
`184`	`184`
`185`	`185`	`// build the filter from the CLI argument. If we got`
`186`	`186`	`// a valid expression the filter is attached to the`