Cleanup code

ammario · ammario · commit 6b7bb4e84cb1 · 2023-03-29T23:35:24.000Z
diff --git a/cli/clibase/cmd.go b/cli/clibase/cmd.go
@@ -264,14 +264,11 @@ func (i *Invocation) run(state *runState) error {
 
 	// Set defaults for flags that weren't set by the user.
 	skipDefaults := make(map[string]struct{}, len(i.Command.Options))
-	i.parsedFlags.VisitAll(func(f *pflag.Flag) {
-		if !f.Changed {
-			return
-		}
-		skipDefaults[f.Name] = struct{}{}
-	})
 	for _, opt := range i.Command.Options {
-		if opt.envSet {
+		if fl := i.parsedFlags.Lookup(opt.Flag); fl != nil && fl.Changed {
+			skipDefaults[opt.Name] = struct{}{}
+		}
+		if opt.envChanged {
 			skipDefaults[opt.Name] = struct{}{}
 		}
 	}
diff --git a/cli/clibase/option.go b/cli/clibase/option.go
@@ -47,7 +47,7 @@ type Option struct {
 
 	Hidden bool `json:"hidden,omitempty"`
 
-	envSet bool
+	envChanged bool
 }
 
 // OptionSet is a group of options that can be applied to a command.
@@ -135,7 +135,7 @@ func (s *OptionSet) ParseEnv(vs []EnvVar) error {
 			continue
 		}
 
-		opt.envSet = true
+		opt.envChanged = true
 		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
`@@ -47,7 +47,7 @@ type Option struct {`
`47`	`47`
`48`	`48`	Hidden bool `json:"hidden,omitempty"`
`49`	`49`
`50`		`- envSet bool`
	`50`	`+ envChanged bool`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// OptionSet is a group of options that can be applied to a command.`
`@@ -135,7 +135,7 @@ func (s *OptionSet) ParseEnv(vs []EnvVar) error {`
`135`	`135`	`continue`
`136`	`136`	`}`
`137`	`137`
`138`		`- opt.envSet = true`
	`138`	`+ opt.envChanged = true`
`139`	`139`	`if err := opt.Value.Set(envVal); err != nil {`
`140`	`140`	`merr = multierror.Append(`
`141`	`141`	`merr, xerrors.Errorf("parse %q: %w", opt.Name, err),`