From 87e267974461673b0ab321595ddc6929c174cde6 Mon Sep 17 00:00:00 2001 From: Adam Chalmers Date: Mon, 9 Nov 2020 10:32:47 -0600 Subject: [PATCH] TUN-3516: Better error message when parsing invalid YAML config --- cmd/cloudflared/config/configuration.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/cloudflared/config/configuration.go b/cmd/cloudflared/config/configuration.go index 58f48305..9a6547e1 100644 --- a/cmd/cloudflared/config/configuration.go +++ b/cmd/cloudflared/config/configuration.go @@ -1,7 +1,6 @@ package config import ( - "errors" "fmt" "os" "path/filepath" @@ -9,6 +8,7 @@ import ( "time" homedir "github.com/mitchellh/go-homedir" + "github.com/pkg/errors" "github.com/urfave/cli/v2" "gopkg.in/yaml.v2" @@ -391,7 +391,7 @@ func ReadConfigFile(c *cli.Context, log logger.Service) (*configFileSettings, er } defer file.Close() if err := yaml.NewDecoder(file).Decode(&configuration); err != nil { - return nil, err + return nil, errors.Wrap(err, "error parsing config file at "+configFile) } configuration.sourceFile = configFile return &configuration, nil