Merge pull request #16 from muir/cover4

more coverage

.github/workflows/golangci-lint.yml

@@ -19,6 +19,7 @@ jobs:
           # Optional: golangci-lint command line arguments.
           # args: --issues-exit-code=0
           # args: --out-format checkstyle
+	  args: --go=1.18
 
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true

basic_test.go

@@ -81,16 +81,3 @@ func TestBasicDefaul(t *testing.T) {
 	require.NoError(t, err, "configure")
 	assert.Equal(t, 3+7i, testData.C, "C")
 }
-
-func TestEnvArrayPtr(t *testing.T) {
-	require.NoError(t, os.Setenv("X", "382:32"), "set X")
-	var testData struct {
-		X *[]int `env:"X,split=:"`
-	}
-	registry := NewRegistry()
-	require.NoError(t, registry.Request(&testData), "add model")
-	err := registry.Configure()
-	require.NoError(t, err, "configure")
-	want := []int{382, 32}
-	assert.Equal(t, &want, testData.X, "X")
-}

fill_test.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/go-playground/validator/v10"
 	"github.com/muir/nflex"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -52,7 +53,7 @@ type testDataE struct {
 }
 
 type testDataF struct {
-	V string `nf:"v"`
+	V string `nf:"v" validate:"oneof=foo bar" badmeta:",combine=7" meta:"-"`
 }
 
 var mixedCases = []struct {
@@ -65,7 +66,42 @@ var mixedCases = []struct {
 	files            []string
 	fromRoot         []string
 	registryFromRoot []string
+	validate         bool
+	error            string
 }{
+	{
+		cmd:   "badbool",
+		base:  &struct{ II bool }{II: false},
+		error: "strconv.ParseBool",
+		files: []string{"source.yaml"},
+	},
+	{
+		cmd:      "baduint",
+		base:     &struct{ OO uint }{OO: 0},
+		error:    "strconv.ParseInt",
+		fromRoot: []string{"MM"},
+		files:    []string{"source.yaml"},
+	},
+	{
+		cmd:      "badint",
+		base:     &struct{ OO int }{OO: 0},
+		error:    "strconv.ParseInt",
+		fromRoot: []string{"MM"},
+		files:    []string{"source.yaml"},
+	},
+	{
+		cmd:      "badfloat",
+		base:     &struct{ OO float64 }{OO: 0},
+		error:    "strconv.ParseFloat",
+		fromRoot: []string{"MM"},
+		files:    []string{"source.yaml"},
+	},
+	{
+		cmd:   "badstring",
+		base:  &struct{ MM string }{MM: ""},
+		error: "requested item is not the requested type",
+		files: []string{"source.yaml"},
+	},
 	{
 		cmd:  "empty",
 		base: &testDataA{},
@@ -166,6 +202,36 @@ var mixedCases = []struct {
 		registryFromRoot: []string{"A", "B"},
 		fillers:          "nf",
 		files:            []string{"source7.yaml"},
+		validate:         true,
+	},
+	{
+		cmd:  "meta stops filling",
+		base: &testDataF{},
+		want: &testDataF{
+			V: "",
+		},
+		registryFromRoot: []string{"A", "B"},
+		fillers:          "nf meta",
+		files:            []string{"source7.yaml"},
+	},
+	{
+		cmd:              "validationError",
+		base:             &testDataF{},
+		registryFromRoot: []string{"A"},
+		fromRoot:         []string{"B", "C"},
+		fillers:          "nf",
+		files:            []string{"source7.yaml"},
+		validate:         true,
+		error:            "failed on the 'oneof' tag",
+	},
+	{
+		cmd:              "badMeta",
+		base:             &testDataF{},
+		registryFromRoot: []string{"A"},
+		fromRoot:         []string{"B", "C"},
+		fillers:          "nf badmeta",
+		files:            []string{"source7.yaml"},
+		error:            "strconv.ParseBool",
 	},
 	{
 		cmd: "arrays",
@@ -228,6 +294,7 @@ func TestMetaFirstScalar(t *testing.T) {
 				"flag":    WithFiller("flag", fh),
 				"nf":      WithFiller("nf", NewFileFiller(WithUnmarshalOpts(nflex.WithFS(content)))),
 				"meta":    WithMetaTag("meta"),
+				"badmeta": WithMetaTag("badmeta"),
 				"nfigure": WithFiller("nfigure", nil),
 				"n2":      WithFiller("n2", NewFileFiller(WithUnmarshalOpts(nflex.WithFS(content)))),
 				"n3":      WithFiller("n3", NewFileFiller(WithUnmarshalOpts(nflex.WithFS(content)))),
@@ -250,6 +317,9 @@ func TestMetaFirstScalar(t *testing.T) {
 			if tc.registryFromRoot != nil {
 				args = append(args, FromRoot(tc.registryFromRoot...))
 			}
+			if tc.validate {
+				args = append(args, WithValidate(validator.New()))
+			}
 
 			registry := NewRegistry(args...)
 			files := []string{"source.yaml", "source2.yaml"}
@@ -267,6 +337,12 @@ func TestMetaFirstScalar(t *testing.T) {
 			require.NoError(t, registry.Request(tc.base, requestArgs...), "request")
 			t.Log("About to Configure")
 			err := registry.Configure()
+			if tc.error != "" {
+				if assert.NotNilf(t, err, "expecting error %s", tc.error) {
+					assert.Contains(t, err.Error(), tc.error, "error")
+				}
+				return
+			}
 			require.NoError(t, err, "configure")
 			var want interface{}
 			var got interface{}

flags_test.go

@@ -499,8 +499,6 @@ func pointerToPointerToPonterToFloat64(f float64) ***float64 {
 	return ppp
 }
 
-var argv0 = os.Args[0]
-
 var usageRE = regexp.MustCompile(`\AUsage: \S+ `)
 
 func TestFlags(t *testing.T) {

go.mod

@@ -4,11 +4,15 @@ go 1.16
 
 require (
 	github.com/AlekSi/pointer v1.2.0
+	github.com/elliotchance/phpserialize v1.3.2 // indirect
+	github.com/go-playground/validator/v10 v10.10.1
+	github.com/go-test/deep v1.0.8 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
 	github.com/muir/commonerrors v0.0.2
 	github.com/muir/nflex v0.1.6
 	github.com/muir/nject v0.6.2
 	github.com/muir/reflectutils v0.6.0
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.7.1
+	olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3 // indirect
 )

go.sum

@@ -1,13 +1,32 @@
 github.com/AlekSi/pointer v1.2.0 h1:glcy/gc4h8HnG2Z3ZECSzZ1IX1x2JxRVuDzaJwQE0+w=
 github.com/AlekSi/pointer v1.2.0/go.mod h1:gZGfd3dpW4vEc/UlyfKKi1roIqcCgwOIvb0tSNSBle0=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
+github.com/elliotchance/phpserialize v1.3.2 h1:h0pth0bbCXXIM5fAZ6DJK8ty5wuojHl1CmOsaY7kUTo=
+github.com/elliotchance/phpserialize v1.3.2/go.mod h1:gt7XX9+ETUcLXbtTKEuyrqW3lcLUAeS/AnGZ2e49TZs=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU=
+github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
+github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
+github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
+github.com/go-playground/validator/v10 v10.10.1 h1:uA0+amWMiglNZKZ9FJRKUAe9U3RX91eVn1JYXMWt7ig=
+github.com/go-playground/validator/v10 v10.10.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
+github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
+github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
+github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
 github.com/muir/commonerrors v0.0.2 h1:vT/rSpbvv1jCRW2FIJUq1+WgwrDLJT/SdRwDXIFGGYg=
@@ -19,19 +38,42 @@ github.com/muir/nject v0.6.2/go.mod h1:kOa7nnqqV0tbg2tylEyZ0xtEl4tfC25wow7efbnba
 github.com/muir/reflectutils v0.5.0/go.mod h1:l8W7iTj6zMdmsWcPfsdnaAYLEuipJ7baVROqpfuonIc=
 github.com/muir/reflectutils v0.6.0 h1:jXfbW60Nx+STn78vwUWVCUwInXkqAC5kWS5oeY/xPgM=
 github.com/muir/reflectutils v0.6.0/go.mod h1:l8W7iTj6zMdmsWcPfsdnaAYLEuipJ7baVROqpfuonIc=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
+github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/valyala/fastjson v1.6.3 h1:tAKFnnwmeMGPbwJ7IwxcTPCNr3uIzoIj3/Fh90ra4xc=
 github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
+golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
+golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069 h1:siQdpVirKtzPhKl3lZWozZraCFObP8S1v6PRp0bLrtU=
+golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3 h1:slmdOY3vp8a7KQbHkL+FLbvbkgMqmXojpFUO/jENuqQ=
+olympos.io/encoding/edn v0.0.0-20201019073823-d3554ca0b0a3/go.mod h1:oVgVk4OWVDi43qWBEyGhXgYxt7+ED4iYNpTngSLX2Iw=