linting

Emyrk · Emyrk · commit 515f11242df8 · 2024-01-16T17:35:33.000-06:00
diff --git a/cli/clibase/values.go b/cli/clibase/values.go
@@ -79,7 +79,7 @@ func (i *Validator[T]) UnmarshalJSON(b []byte) error {
 	return json.Unmarshal(b, i.Value)
 }
 
-func (*Validator[T]) IsValidator() {}
+func (i *Validator[T]) Underlying() pflag.Value { return i.Value }
 
 // values.go contains a standard set of value types that can be used as
 // Option Values.
diff --git a/cli/clibase/yaml.go b/cli/clibase/yaml.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/mitchellh/go-wordwrap"
+	"github.com/spf13/pflag"
 	"golang.org/x/xerrors"
 	"gopkg.in/yaml.v3"
 )
@@ -75,7 +76,7 @@ func (optSet *OptionSet) MarshalYAML() (any, error) {
 			HeadComment: comment,
 		}
 
-		_, isValidator := opt.Value.(interface{ IsValidator() })
+		_, isValidator := opt.Value.(interface{ Underlying() pflag.Value })
 		var valueNode yaml.Node
 		if opt.Value == nil {
 			valueNode = yaml.Node{
diff --git a/cli/server_test.go b/cli/server_test.go
@@ -29,6 +29,7 @@ import (
 	"time"
 
 	"github.com/go-chi/chi/v5"
+	"github.com/spf13/pflag"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/goleak"
@@ -1552,6 +1553,18 @@ func TestServer(t *testing.T) {
 				// ValueSource is not going to be correct on the `want`, so just
 				// match that field.
 				wantConfig.Options[i].ValueSource = gotConfig.Options[i].ValueSource
+
+				// If there is a wrapped value with a validator, unwrap it.
+				// The underlying doesn't compare well since it compares go pointers,
+				// and not the actual value.
+				if validator, isValidator := wantConfig.Options[i].Value.(interface{ Underlying() pflag.Value }); isValidator {
+					wantConfig.Options[i].Value = validator.Underlying()
+				}
+
+				if validator, isValidator := gotConfig.Options[i].Value.(interface{ Underlying() pflag.Value }); isValidator {
+					gotConfig.Options[i].Value = validator.Underlying()
+				}
+
 				assert.Equal(
 					t, wantConfig.Options[i],
 					gotConfig.Options[i],

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ func (i *Validator[T]) UnmarshalJSON(b []byte) error {`
`79`	`79`	`return json.Unmarshal(b, i.Value)`
`80`	`80`	`}`
`81`	`81`
`82`		`-func (*Validator[T]) IsValidator() {}`
	`82`	`+func (i *Validator[T]) Underlying() pflag.Value { return i.Value }`
`83`	`83`
`84`	`84`	`// values.go contains a standard set of value types that can be used as`
`85`	`85`	`// Option Values.`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`"strings"`
`7`	`7`
`8`	`8`	`"github.com/mitchellh/go-wordwrap"`
	`9`	`+ "github.com/spf13/pflag"`
`9`	`10`	`"golang.org/x/xerrors"`
`10`	`11`	`"gopkg.in/yaml.v3"`
`11`	`12`	`)`
`@@ -75,7 +76,7 @@ func (optSet *OptionSet) MarshalYAML() (any, error) {`
`75`	`76`	`HeadComment: comment,`
`76`	`77`	`}`
`77`	`78`
`78`		`- _, isValidator := opt.Value.(interface{ IsValidator() })`
	`79`	`+ _, isValidator := opt.Value.(interface{ Underlying() pflag.Value })`
`79`	`80`	`var valueNode yaml.Node`
`80`	`81`	`if opt.Value == nil {`
`81`	`82`	`valueNode = yaml.Node{`