fixup! Testing...

ammario · ammario · commit 790afa3aa440 · 2023-03-30T02:18:46.000Z
diff --git a/cli/clibase/cmd_test.go b/cli/clibase/cmd_test.go
@@ -3,6 +3,7 @@ package clibase_test
 import (
 	"bytes"
 	"context"
+	"fmt"
 	"strings"
 	"testing"
 
@@ -550,3 +551,46 @@ func TestCommand_EmptySlice(t *testing.T) {
 	err = inv.Run()
 	require.NoError(t, err)
 }
+
+func TestCommand_DefaultsOverride(t *testing.T) {
+	t.Parallel()
+
+	var got string
+	cmd := &clibase.Cmd{
+		Options: clibase.OptionSet{
+			{
+				Name:    "url",
+				Flag:    "url",
+				Default: "def.com",
+				Env:     "URL",
+				Value:   clibase.StringOf(&got),
+			},
+		},
+		Handler: (func(i *clibase.Invocation) error {
+			_, _ = fmt.Fprintf(i.Stdout, "%s", got)
+			return nil
+		}),
+	}
+
+	// Base case
+	inv := cmd.Invoke()
+	stdio := fakeIO(inv)
+	err := inv.Run()
+	require.NoError(t, err)
+	require.Equal(t, "def.com", stdio.Stdout.String())
+
+	// Flag overrides
+	inv = cmd.Invoke("--url", "good.com")
+	stdio = fakeIO(inv)
+	err = inv.Run()
+	require.NoError(t, err)
+	require.Equal(t, "good.com", stdio.Stdout.String())
+
+	// Env overrides
+	inv = cmd.Invoke()
+	inv.Environ.Set("URL", "good.com")
+	stdio = fakeIO(inv)
+	err = inv.Run()
+	require.NoError(t, err)
+	require.Equal(t, "good.com", stdio.Stdout.String())
+}
diff --git a/cli/clibase/option.go b/cli/clibase/option.go
@@ -117,7 +117,7 @@ func (s *OptionSet) ParseEnv(vs []EnvVar) error {
 		envs[v.Name] = v.Value
 	}
 
-	for _, opt := range *s {
+	for i, opt := range *s {
 		if opt.Env == "" {
 			continue
 		}
@@ -136,6 +136,7 @@ func (s *OptionSet) ParseEnv(vs []EnvVar) error {
 		}
 
 		opt.envChanged = true
+		(*s)[i] = opt
 		if err := opt.Value.Set(envVal); err != nil {
 			merr = multierror.Append(
 				merr, xerrors.Errorf("parse %q: %w", opt.Name, err),

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func (s *OptionSet) ParseEnv(vs []EnvVar) error {`
`117`	`117`	`envs[v.Name] = v.Value`
`118`	`118`	`}`
`119`	`119`
`120`		`- for _, opt := range *s {`
	`120`	`+ for i, opt := range *s {`
`121`	`121`	`if opt.Env == "" {`
`122`	`122`	`continue`
`123`	`123`	`}`
`@@ -136,6 +136,7 @@ func (s *OptionSet) ParseEnv(vs []EnvVar) error {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`opt.envChanged = true`
	`139`	`+ (*s)[i] = opt`
`139`	`140`	`if err := opt.Value.Set(envVal); err != nil {`
`140`	`141`	`merr = multierror.Append(`
`141`	`142`	`merr, xerrors.Errorf("parse %q: %w", opt.Name, err),`