fixed commands & config

Signed-off-by: Frederic BIDON <fredbi@yahoo.com>

cli/commands.go

@@ -159,6 +159,13 @@ func (c *Command) bindFlagsWithConfig(cfg *viper.Viper) {
 	}
 }
 
+// Execute the command, with a default context.Background().
+//
+// It ensures that all injectables are in the context.
+func (c *Command) Execute() error {
+	return c.ExecuteContext(context.Background())
+}
+
 // ExecuteWithArgs is a convenience wrapper to execute a command with preset args.
 //
 // This is primarily intended for testing commands.
@@ -174,5 +181,7 @@ func (c *Command) ExecuteWithArgs(args ...string) error {
 //
 // It ensures that all injectables are in the context.
 func (c *Command) ExecuteContext(ctx context.Context) error {
-	return c.Command.ExecuteContext(c.injectedContext(ctx))
+	ctx = c.injectedContext(ctx)
+
+	return c.Command.ExecuteContext(ctx)
 }

config/loader.go

@@ -91,7 +91,7 @@ func (l *Loader) LoadForEnv(env string) (*viper.Viper, error) {
 }
 
 func (l *Loader) walkFunc(cfg *viper.Viper) filepath.WalkFunc {
-	return func(pth string, info os.FileInfo, err error) error {
+	return func(pth string, info os.FileInfo, _ error) error {
 		if info.IsDir() {
 			return nil
 		}
@@ -151,11 +151,11 @@ func (l *Loader) parseConfigFromExt(pth, ext string) (map[string]interface{}, er
 	switch ext {
 	case "yaml", "yml":
 		if err = yaml.Unmarshal(buf, &toMerge); err != nil {
-			return nil, err
+			return nil, fmt.Errorf("in file: %s.%s: %w", pth, ext, err)
 		}
 	case "json":
 		if err = json.Unmarshal(buf, &toMerge); err != nil {
-			return nil, err
+			return nil, fmt.Errorf("in file: %s.%s: %w", pth, ext, err)
 		}
 	}
 
@@ -189,13 +189,12 @@ LOOP:
 			}
 
 			if os.IsNotExist(err) {
-				cwd = filepath.Dir(cwd)
-
 				continue
 			}
 
 			return "", err
 		}
+		cwd = filepath.Dir(cwd)
 	}
 
 	if !found {