diff --git a/command/agent/config.go b/command/agent/config.go index e3fb3ae17..8ee166842 100644 --- a/command/agent/config.go +++ b/command/agent/config.go @@ -613,7 +613,7 @@ func LoadConfig(path string) (*Config, error) { if fi.IsDir() { return LoadConfigDir(path) } - return LoadConfigFile(path) + return LoadConfigFile(filepath.Clean(path)) } // LoadConfigString is used to parse a config string diff --git a/command/agent/config_test.go b/command/agent/config_test.go index e342b997b..f89386a95 100644 --- a/command/agent/config_test.go +++ b/command/agent/config_test.go @@ -327,7 +327,7 @@ func TestConfig_LoadConfigsFileOrder(t *testing.T) { config := config1.Merge(config2) if !reflect.DeepEqual(config.Files, expected) { - t.Errorf("Loaded configs don't match\nExpected\n%+vGot\n%+v\n", + t.Errorf("Loaded configs don't match\nwant: %+v\n got: %+v\n", expected, config.Files) } }