fix: proper default 2.x config filename

influxdata · Oct 20, 2020 · 77b577e · 77b577e
1 parent b63bcb4
commit 77b577e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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)