From 77b577e991f2293b2c4ed468fbf36ce5b3838d0b Mon Sep 17 00:00:00 2001 From: Ales Pour Date: Tue, 20 Oct 2020 11:14:39 +0200 Subject: [PATCH] fix: proper default 2.x config filename --- cmd/influxd/upgrade/config.go | 2 +- cmd/influxd/upgrade/config_test.go | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/influxd/upgrade/config.go b/cmd/influxd/upgrade/config.go index 90176fcb36b..256429b23bd 100644 --- a/cmd/influxd/upgrade/config.go +++ b/cmd/influxd/upgrade/config.go @@ -83,7 +83,7 @@ func upgradeConfig(configFile string, targetOptions optionsV2, log *zap.Logger) cu.updateV2Config(cTransformed, targetOptions) // save new config - configFileV2 := strings.TrimSuffix(configFile, filepath.Ext(configFile)) + ".toml" + configFileV2 := filepath.Join(filepath.Dir(configFile), "config.toml") configFileV2, err = cu.save(cTransformed, configFileV2) if err != nil { return nil, err diff --git a/cmd/influxd/upgrade/config_test.go b/cmd/influxd/upgrade/config_test.go index 01c02c0cfb4..f9adb1df208 100644 --- a/cmd/influxd/upgrade/config_test.go +++ b/cmd/influxd/upgrade/config_test.go @@ -4,7 +4,6 @@ import ( "io/ioutil" "os" "path/filepath" - "strings" "testing" "github.com/BurntSushi/toml" @@ -80,7 +79,7 @@ func TestConfigUpgrade(t *testing.T) { t.Run(tc.name, func(t *testing.T) { t.Parallel() configFile := testCreateTempFile(t, "influxdb-*.conf", tc.config1x) - configFileV2 := strings.TrimSuffix(configFile, filepath.Ext(configFile)) + ".toml" + configFileV2 := filepath.Join(filepath.Dir(configFile), "config.toml") defer func() { os.Remove(configFile) os.Remove(configFileV2)