Commit515f112

committed

linting

1 parentb9fd441 commit515f112Copy full SHA for 515f112

File tree

+16

-2

lines changed

+16

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ func (i *Validator[T]) UnmarshalJSON(b []byte) error {`
`79`	`79`	`returnjson.Unmarshal(b,i.Value)`
`80`	`80`	`}`
`81`	`81`
`82`		`-func (*Validator[T])IsValidator(){}`
	`82`	`+func (i*Validator[T])Underlying()pflag.Value {returni.Value}`
`83`	`83`
`84`	`84`	`// values.go contains a standard set of value types that can be used as`
`85`	`85`	`// Option Values.`

Lines changed: 2 additions & 1 deletion

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`	`varvalueNode yaml.Node`
`80`	`81`	`ifopt.Value==nil {`
`81`	`82`	`valueNode= yaml.Node{`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ import (`
`29`	`29`	`"time"`
`30`	`30`
`31`	`31`	`"github.com/go-chi/chi/v5"`
	`32`	`+"github.com/spf13/pflag"`
`32`	`33`	`"github.com/stretchr/testify/assert"`
`33`	`34`	`"github.com/stretchr/testify/require"`
`34`	`35`	`"go.uber.org/goleak"`
`@@ -1552,6 +1553,18 @@ func TestServer(t *testing.T) {`
`1552`	`1553`	// ValueSource is not going to be correct on the `want`, so just
`1553`	`1554`	`// match that field.`
`1554`	`1555`	`wantConfig.Options[i].ValueSource=gotConfig.Options[i].ValueSource`
	`1556`	`+`
	`1557`	`+// If there is a wrapped value with a validator, unwrap it.`
	`1558`	`+// The underlying doesn't compare well since it compares go pointers,`
	`1559`	`+// and not the actual value.`
	`1560`	`+ifvalidator,isValidator:=wantConfig.Options[i].Value.(interface{Underlying() pflag.Value });isValidator {`
	`1561`	`+wantConfig.Options[i].Value=validator.Underlying()`
	`1562`	`+}`
	`1563`	`+`
	`1564`	`+ifvalidator,isValidator:=gotConfig.Options[i].Value.(interface{Underlying() pflag.Value });isValidator {`
	`1565`	`+gotConfig.Options[i].Value=validator.Underlying()`
	`1566`	`+}`
	`1567`	`+`
`1555`	`1568`	`assert.Equal(`
`1556`	`1569`	`t,wantConfig.Options[i],`
`1557`	`1570`	`gotConfig.Options[i],`

Comments

(0)