[BREAKING] Custom Env options moved from GOPASS_CONFIG_CONFIG_KEY_i to GOPASS_CONFIG_KEY_i

As discussed in #2617, this actually reflects the way GIT_CONFIG works

Signed-off-by: Yolan Romailler <[email protected]>

Author: AnomalRoil

docs/config.md

@@ -72,7 +72,7 @@ different configuration sources that take precedence over each other, just like
 * User-wide (aka. global) configuration allows to set per-user settings. This is the closest equivalent to the old gopass configs. Located in `$HOME/.config/gopass/config`
 * Per-store (aka. local) configuration allow to set per-store settings, e.g. read-only. Located in `<STORE_DIR>/config`.
 * Per-store unversioned (aka `config.worktree`) configuration allows to override versioned per-store settings, e.g. disabling read-only. Located in `<STORE_DIR>/config.worktree`
-* Environment variables (or command line flags) override all other values. Read from `GOPASS_CONFIG_CONFIG_KEY_n` and `GOPASS_CONFIG_CONFIG_VALUE_n` up to `GOPASS_CONFIG_CONFIG_COUNT`. Command line flags take precedence over environment variables.
+* Environment variables (or command line flags) override all other values. Read from `GOPASS_CONFIG_KEY_n` and `GOPASS_CONFIG_VALUE_n` up to `GOPASS_CONFIG_COUNT`. Command line flags take precedence over environment variables.
 
 ### Configuration options
 

internal/config/config_test.go

@@ -44,11 +44,11 @@ func TestConfig(t *testing.T) {
 
 func TestEnvConfig(t *testing.T) {
 	envs := map[string]string{
-		"GOPASS_CONFIG_CONFIG_COUNT":   "2",
-		"GOPASS_CONFIG_CONFIG_KEY_0":   "core.autosync",
-		"GOPASS_CONFIG_CONFIG_VALUE_0": "false",
-		"GOPASS_CONFIG_CONFIG_KEY_1":   "show.safecontent",
-		"GOPASS_CONFIG_CONFIG_VALUE_1": "true",
+		"GOPASS_CONFIG_COUNT":   "2",
+		"GOPASS_CONFIG_KEY_0":   "core.autosync",
+		"GOPASS_CONFIG_VALUE_0": "false",
+		"GOPASS_CONFIG_KEY_1":   "show.safecontent",
+		"GOPASS_CONFIG_VALUE_1": "true",
 	}
 	for k, v := range envs {
 		t.Setenv(k, v)
@@ -73,6 +73,10 @@ func TestInvalidEnvConfig(t *testing.T) {
 		"GOPASS_CONFIG__CONFIG_COUNT":   "1",
 		"GOPASS_CONFIG__CONFIG_KEY_0":   "core.autosync",
 		"GOPASS_CONFIG__CONFIG_VALUE_0": "false",
+		// old format
+		"GOPASS_CONFIG_CONFIG_COUNT":   "1",
+		"GOPASS_CONFIG_CONFIG_KEY_0":   "core.autosync",
+		"GOPASS_CONFIG_CONFIG_VALUE_0": "false",
 	}
 	for k, v := range envs {
 		t.Setenv(k, v)
@@ -171,10 +175,10 @@ func TestOptsMigration(t *testing.T) {
 
 	t.Run("env variable are not migrated", func(t *testing.T) {
 		envs := map[string]string{
-			"GOPASS_CONFIG_CONFIG_COUNT":   "1",
-			"GOPASS_CONFIG_CONFIG_KEY_0":   "core.showsafecontent",
-			"GOPASS_CONFIG_CONFIG_VALUE_0": "true",
-			"GOPASS_CONFIG_NO_MIGRATE":     "",
+			"GOPASS_CONFIG_COUNT":      "1",
+			"GOPASS_CONFIG_KEY_0":      "core.showsafecontent",
+			"GOPASS_CONFIG_VALUE_0":    "true",
+			"GOPASS_CONFIG_NO_MIGRATE": "",
 		}
 		for k, v := range envs {
 			t.Setenv(k, v)

pkg/gitconfig/config.go

@@ -368,7 +368,7 @@ func LoadConfig(fn string) (*Config, error) {
 }
 
 // ParseConfig will try to parse a gitconfig from the given io.Reader. It never fails.
-// Invalid configs will be silently rejceted.
+// Invalid configs will be silently rejected.
 func ParseConfig(r io.Reader) *Config {
 	c := &Config{
 		vars: make(map[string][]string, 42),
@@ -396,7 +396,7 @@ func LoadConfigFromEnv(envPrefix string) *Config {
 		noWrites: true,
 	}
 
-	count, err := strconv.Atoi(os.Getenv(envPrefix + "_CONFIG_COUNT"))
+	count, err := strconv.Atoi(os.Getenv(envPrefix + "_COUNT"))
 	if err != nil || count < 1 {
 		return &Config{
 			noWrites: true,
@@ -406,10 +406,10 @@ func LoadConfigFromEnv(envPrefix string) *Config {
 	c.vars = make(map[string][]string, count)
 
 	for i := 0; i < count; i++ {
-		keyVar := fmt.Sprintf("%s%d", envPrefix+"_CONFIG_KEY_", i)
+		keyVar := fmt.Sprintf("%s%d", envPrefix+"_KEY_", i)
 		key := os.Getenv(keyVar)
 
-		valVar := fmt.Sprintf("%s%d", envPrefix+"_CONFIG_VALUE_", i)
+		valVar := fmt.Sprintf("%s%d", envPrefix+"_VALUE_", i)
 		value, found := os.LookupEnv(valVar)
 
 		if key == "" || !found {

pkg/gitconfig/config_test.go

@@ -279,11 +279,11 @@ func TestLoadFromEnv(t *testing.T) {
 
 	i := 0
 	for k, v := range tc {
-		t.Setenv(fmt.Sprintf("%s_CONFIG_KEY_%d", prefix, i), k)
-		t.Setenv(fmt.Sprintf("%s_CONFIG_VALUE_%d", prefix, i), v)
+		t.Setenv(fmt.Sprintf("%s_KEY_%d", prefix, i), k)
+		t.Setenv(fmt.Sprintf("%s_VALUE_%d", prefix, i), v)
 		i++
 	}
-	t.Setenv(fmt.Sprintf("%s_CONFIG_COUNT", prefix), strconv.Itoa(i))
+	t.Setenv(fmt.Sprintf("%s_COUNT", prefix), strconv.Itoa(i))
 
 	cfg := LoadConfigFromEnv(prefix)
 	for k, v := range tc {