From 26825472e674c8826ca4b5fd04c3c8052117d6c1 Mon Sep 17 00:00:00 2001 From: Scott Gregory Date: Sun, 28 Feb 2021 21:58:09 +0000 Subject: [PATCH] CI fixes --- .travis.yml | 8 +--- binder.go | 10 ++--- binder_test.go | 101 +++++++++++++++++++++++-------------------------- go.mod | 1 - go.sum | 4 -- 5 files changed, 54 insertions(+), 70 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb701cd..294607a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,12 +6,8 @@ go: - 1.16.x git: depth: 1 -notifications: - email: false - slack: - secure: qg1KUWFZTGXvPgPiR85XMOi85Uw5q0luEUel0zFWk4UxpFX64khpvvnhFhQCyugZxFyCKwxWXW2oc6gD40X+jCvGYUhBBIl91jabwwR9hZ9ZkmPbkm0/ABVpsOUO9bBnrP4iVWQeyVHw7HdxFenCEA2wtlelSVkj8ItYjo5VnMWiUbl1idUca8KmVVHaKPjU/Fp9xDduisJozFOrbuCnpQUmubko5S3cIN5TsWwBpMMAa2eKSmWrXP9hpP3+znOjbrrJCpEuZbwRUu3JcReogLVbzmvwTNzLYnzoh97/stxzZVxxvM7EI3SBjuVYqFrdHW/3xk+nFBPYfrGsvFoS/yftbeRHj18yYf0GQBqF0/yBTDMet6fBlL92KoG9f2WQF/pqkWo6CdE+yLCKTLPiwQwzlurN6eONsEVrTerlILtxGbcyoRtEvLAvNPj5k0t2iQ322DkqD2vSDkImaItBsFKMXrh1FblTDreeFMOfDZbV2rg1OLInkxcl2PQQZPvSHDK5eQHPReEgU3AHJU/8oKey80x74UcVFL9Ge9DGiCi4Yg9vKWma3crJZtrw0Pkx1NqNMS1RlGNGTkMQH7L7pApcSdBdKWTe4C/sOyC/D4RoSpMHzC2ErLWKNWTTzt4TUoytKDKW331b5cCWKEg3RtAzoWENB2XcgmgVSQQtIY4= -before_script: - - go install github.com/golangci/golangci-lint/cmd/golangci-lint +before_install: + - curl -sSfL https://github.com/raw/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.37.1 script: - golangci-lint run - go test -v -race ./... diff --git a/binder.go b/binder.go index 7be8534..a7b19a3 100644 --- a/binder.go +++ b/binder.go @@ -15,13 +15,13 @@ import ( "github.com/spf13/viper" ) -type Bindr struct { +type Binder struct { log zerolog.Logger } // Bind binds the config tags from the structs and binds flags to the cobra command. func Bind(obj interface{}, cmd *cobra.Command, options ...*Options) error { - p := &Bindr{} + p := &Binder{} if len(options) == 1 { opts := options[0] @@ -34,7 +34,7 @@ func Bind(obj interface{}, cmd *cobra.Command, options ...*Options) error { return p.processFields("", reflect.TypeOf(obj), cmd) } -func (p *Bindr) processFields(prefix string, t reflect.Type, cmd *cobra.Command) error { +func (p *Binder) processFields(prefix string, t reflect.Type, cmd *cobra.Command) error { for i := 0; i < t.NumField(); i++ { err := p.processField(prefix, t.Field(i), cmd) if err != nil { @@ -45,7 +45,7 @@ func (p *Bindr) processFields(prefix string, t reflect.Type, cmd *cobra.Command) return nil } -func (p *Bindr) processField(prefix string, field reflect.StructField, cmd *cobra.Command) error { +func (p *Binder) processField(prefix string, field reflect.StructField, cmd *cobra.Command) error { n := strings.ToLower(field.Name) if prefix != "" { n = fmt.Sprintf("%s.%s", prefix, strings.ToLower(field.Name)) @@ -234,7 +234,7 @@ type JSONStruct struct { BoolArray []bool `json:"boolarray,omitempty"` } -func (p *Bindr) processSlice(n, def, desc string, field reflect.StructField, cmd *cobra.Command) (err error) { +func (p *Binder) processSlice(n, def, desc string, field reflect.StructField, cmd *cobra.Command) (err error) { s := &JSONStruct{} switch field.Type.Elem().Kind() { case reflect.Int: diff --git a/binder_test.go b/binder_test.go index 4ca7397..70f3239 100644 --- a/binder_test.go +++ b/binder_test.go @@ -8,6 +8,8 @@ import ( "github.com/stretchr/testify/assert" ) +const logLevel zerolog.Level = zerolog.Disabled + // Int. type BindIntSetsDefault struct { IntTest int `config:"12,The int to test"` @@ -15,7 +17,7 @@ type BindIntSetsDefault struct { func TestBindIntSetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindIntSetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindIntSetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetInt("inttest") @@ -30,7 +32,7 @@ type BindIntInvalidDefaultReturnsError struct { func TestBindIntInvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindIntInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindIntInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } @@ -42,7 +44,7 @@ type BindStringSetsDefault struct { func TestBindStringSetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindStringSetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindStringSetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetString("stringtest") @@ -58,7 +60,7 @@ type BindFloat64SetsDefault struct { func TestBindFloat64SetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindFloat64SetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindFloat64SetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetFloat64("float64test") @@ -73,7 +75,7 @@ type BindFloat64InvalidDefaultReturnsError struct { func TestBindFloat64InvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindFloat64InvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindFloat64InvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } @@ -85,7 +87,7 @@ type BindFloat32SetsDefault struct { func TestBindFloat32SetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindFloat32SetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindFloat32SetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetFloat32("float32test") @@ -100,7 +102,7 @@ type BindFloat32InvalidDefaultReturnsError struct { func TestBindFloat32InvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindFloat32InvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindFloat32InvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } @@ -112,7 +114,7 @@ type BindInt8SetsDefault struct { func TestBindInt8SetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindInt8SetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindInt8SetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetInt8("int8test") @@ -127,7 +129,7 @@ type BindInt8InvalidDefaultReturnsError struct { func TestBindInt8InvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindInt8InvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindInt8InvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } @@ -139,7 +141,7 @@ type BindInt16SetsDefault struct { func TestBindInt16SetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindInt16SetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindInt16SetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetInt16("int16test") @@ -154,7 +156,7 @@ type BindInt16InvalidDefaultReturnsError struct { func TestBindInt16InvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindInt16InvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindInt16InvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } @@ -166,7 +168,7 @@ type BindInt32SetsDefault struct { func TestBindInt32SetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindInt32SetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindInt32SetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetInt32("int32test") @@ -181,7 +183,7 @@ type BindInt32InvalidDefaultReturnsError struct { func TestBindInt32InvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindInt32InvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindInt32InvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } @@ -193,7 +195,7 @@ type BindInt64SetsDefault struct { func TestBindInt64SetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindInt64SetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindInt64SetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetInt64("int64test") @@ -208,7 +210,7 @@ type BindInt64InvalidDefaultReturnsError struct { func TestBindInt64InvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindInt64InvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindInt64InvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } @@ -220,7 +222,7 @@ type BindBoolSetsDefault struct { func TestBindBoolSetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindBoolSetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindBoolSetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetBool("booltest") @@ -235,7 +237,7 @@ type BindBoolInvalidDefaultReturnsError struct { func TestBindBoolInvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindBoolInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindBoolInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } @@ -247,7 +249,7 @@ type BindIntSliceSetsDefault struct { func TestBindIntSliceSetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindIntSliceSetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindIntSliceSetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetIntSlice("intslicetest") @@ -262,7 +264,7 @@ type BindIntSliceInvalidDefaultReturnsError struct { func TestBindIntSliceInvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindIntSliceInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindIntSliceInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } @@ -274,7 +276,7 @@ type BindStringSliceSetsDefault struct { func TestBindStringSliceSetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindStringSliceSetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindStringSliceSetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetStringSlice("stringslicetest") @@ -289,7 +291,7 @@ type BindStringSliceInvalidDefaultReturnsError struct { func TestBindStringSliceInvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindStringSliceInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindStringSliceInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } @@ -301,7 +303,7 @@ type BindFloat64SliceSetsDefault struct { func TestBindFloat64SliceSetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindFloat64SliceSetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindFloat64SliceSetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetFloat64Slice("float64slicetest") @@ -316,7 +318,7 @@ type BindFloat64SliceInvalidDefaultReturnsError struct { func TestBindFloat64SliceInvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindFloat64SliceInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindFloat64SliceInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } @@ -328,7 +330,7 @@ type BindFloat32SliceSetsDefault struct { func TestBindFloat32SliceSetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindFloat32SliceSetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindFloat32SliceSetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetFloat32Slice("float32slicetest") @@ -343,7 +345,7 @@ type BindFloat32SliceInvalidDefaultReturnsError struct { func TestBindFloat32SliceInvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindFloat32SliceInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindFloat32SliceInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } @@ -355,7 +357,7 @@ type BindInt32SliceSetsDefault struct { func TestBindInt32SliceSetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindInt32SliceSetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindInt32SliceSetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetInt32Slice("int32slicetest") @@ -370,7 +372,7 @@ type BindInt32SliceInvalidDefaultReturnsError struct { func TestBindInt32SliceInvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindInt32SliceInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindInt32SliceInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } @@ -382,7 +384,7 @@ type BindInt64SliceSetsDefault struct { func TestBindInt64SliceSetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindInt64SliceSetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindInt64SliceSetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetInt64Slice("int64slicetest") @@ -397,7 +399,7 @@ type BindInt64SliceInvalidDefaultReturnsError struct { func TestBindInt64SliceInvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindInt64SliceInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindInt64SliceInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } @@ -409,7 +411,7 @@ type BindBoolSliceSetsDefault struct { func TestBindBoolSliceSetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindBoolSliceSetsDefault{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindBoolSliceSetsDefault{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetBoolSlice("boolslicetest") @@ -424,38 +426,27 @@ type BindBoolSliceInvalidDefaultReturnsError struct { func TestBindBoolSliceInvalidDefaultReturnsError(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindBoolSliceInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindBoolSliceInvalidDefaultReturnsError{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } // Tag parsing. type InvalidTagReturnsError1 struct { - TagTest string `config:""` -} - -func TestInvalidTagReturnsError1(t *testing.T) { - cmd := &cobra.Command{} - err := Bind(InvalidTagReturnsError1{}, cmd, &Options{LogLevel: zerolog.Disabled}) - - assert.NotNil(t, err) -} - -type InvalidTagReturnsError2 struct { TagTest string `config:"default"` } -func TestInvalidTagReturnsError2(t *testing.T) { +func TestInvalidTagReturnsError1(t *testing.T) { cmd := &cobra.Command{} - err := Bind(InvalidTagReturnsError2{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(InvalidTagReturnsError1{}, cmd, &Options{LogLevel: logLevel}) assert.NotNil(t, err) } // NestedStruct. type BindNestedStructSetsDefaults struct { - BoolSlice []bool `config:"[true,true,false,true],The NestedStruct to test"` - InnerStruct BindNestedStructInnerSetsDefaults + BoolSlice []bool `config:"[true,true,false,true],The NestedStruct to test"` + InnerStruct BindNestedStructInnerSetsDefaults `config:","` } type BindNestedStructInnerSetsDefaults struct { @@ -464,7 +455,7 @@ type BindNestedStructInnerSetsDefaults struct { func TestBindNestedStructSetsDefault(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindNestedStructSetsDefaults{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindNestedStructSetsDefaults{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) i, err := cmd.Flags().GetString("innerstruct.string") @@ -478,23 +469,25 @@ func TestBindNestedStructSetsDefault(t *testing.T) { // Ignore unexpected +//nolint:structcheck type BindIgnoresUnexportedFields struct { - BoolSlice []bool `config:"[true,true,false,true],A slice full of bools"` + BoolSlice []bool `config:"[true,true,false,true],A slice full of bools"` + //nolint:unused unexported string `config:",Unexported"` } func TestBindIgnoresUnexportedFields(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindIgnoresUnexportedFields{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindIgnoresUnexportedFields{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) j, err := cmd.Flags().GetBoolSlice("boolslice") assert.Equal(t, []bool{true, true, false, true}, j) assert.Nil(t, err) - j, err = cmd.Flags().GetBoolSlice("unexported") - assert.Equal(t, "", j) - assert.Nil(t, err) + s, err := cmd.Flags().GetString("unexported") + assert.Equal(t, "", s) + assert.NotNil(t, err) } // Ignore maps @@ -505,10 +498,10 @@ type BindIgnoresMaps struct { func TestBindIgnoresMaps(t *testing.T) { cmd := &cobra.Command{} - err := Bind(BindIgnoresMaps{}, cmd, &Options{LogLevel: zerolog.Disabled}) + err := Bind(BindIgnoresMaps{}, cmd, &Options{LogLevel: logLevel}) assert.Nil(t, err) j, err := cmd.Flags().GetString("map") assert.Equal(t, "", j) - assert.Nil(t, err) + assert.NotNil(t, err) } diff --git a/go.mod b/go.mod index e5e011a..1d600cd 100644 --- a/go.mod +++ b/go.mod @@ -10,5 +10,4 @@ require ( golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f // indirect golang.org/x/text v0.3.3 // indirect gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/go.sum b/go.sum index 9e4f8db..2675555 100644 --- a/go.sum +++ b/go.sum @@ -118,7 +118,6 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= @@ -249,13 +248,11 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 h1:HyfiK1WMnHj5FXFXatD+Qs1A/xC2Run6RzeW1SyHxpc= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -303,7 +300,6 @@ google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiq google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/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-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=