From 1b13925c267180328db4bbccc88e8bfd7b5fecdb Mon Sep 17 00:00:00 2001 From: Kristina Spring Date: Mon, 28 Sep 2020 15:15:04 -0700 Subject: [PATCH 1/3] simplified attributes --- attributes.go | 45 +++++++++++ token.go | 204 ++------------------------------------------------ 2 files changed, 52 insertions(+), 197 deletions(-) create mode 100644 attributes.go diff --git a/attributes.go b/attributes.go new file mode 100644 index 0000000..0b82fb4 --- /dev/null +++ b/attributes.go @@ -0,0 +1,45 @@ +package bascule + +import ( + "time" +) + +var nilTime = time.Time{} + +type attributes map[string]interface{} + +func (a attributes) Get(key string) (interface{}, bool) { + v, ok := a[key] + return v, ok +} + +//NewAttributes builds an Attributes instance with +//the given map as datasource. Default AttributeOptions are used. +func NewAttributes(m map[string]interface{}) Attributes { + return attributes(m) +} + +// GetNestedAttribute uses multiple keys in order to obtain an attribute. +func GetNestedAttribute(attributes Attributes, keys ...string) (interface{}, bool) { + // need at least one key. + if len(keys) == 0 { + return nil, false + } + + var ( + result interface{} + ok bool + ) + result = attributes + for _, k := range keys { + a, ok := result.(Attributes) + if !ok { + return nil, false + } + result, ok = a.Get(k) + if !ok { + return nil, false + } + } + return result, ok +} diff --git a/token.go b/token.go index 78c621b..2e66154 100644 --- a/token.go +++ b/token.go @@ -3,203 +3,6 @@ // which can be used to validate are also provided. package bascule -import ( - "time" - - "github.com/spf13/cast" - "github.com/spf13/viper" -) - -//Attributes is the interface that wraps methods which dictate how to interact -//with a token's attributes. Getter functions return a boolean as second element -//which indicates that a value of the requested type exists at the given key path. -//Key path separators are configurable through AttributeOptions -type Attributes interface { - Get(key string) (interface{}, bool) - GetBool(key string) (bool, bool) - GetDuration(key string) (time.Duration, bool) - GetFloat64(key string) (float64, bool) - GetInt64(key string) (int64, bool) - GetIntSlice(key string) ([]int, bool) - GetString(key string) (string, bool) - GetStringMap(key string) (map[string]interface{}, bool) - GetStringSlice(key string) ([]string, bool) - GetTime(key string) (time.Time, bool) - IsSet(key string) bool - FullView() map[string]interface{} -} - -var nilTime = time.Time{} - -//AttributesOptions allows customizing Attributes initialization -type AttributesOptions struct { - //KeyDelimiter configures the separator for building key paths - //for the Attributes getter functions. Defaults to '.' - KeyDelimiter string - - //AttributesMap is used as the initial attributes datasource - AttributesMap map[string]interface{} -} - -type attributes struct { - v *viper.Viper - - //Note: having m is superfluous given v. However, it's a caching - //optimization for FullView() since v.AllSettings() is a relatively - //expensive operation - m map[string]interface{} -} - -func (a *attributes) Get(key string) (interface{}, bool) { - if !a.v.IsSet(key) { - return nil, false - } - - return a.v.Get(key), true -} - -func (a *attributes) GetBool(key string) (bool, bool) { - if !a.v.IsSet(key) { - return false, false - } - v, err := cast.ToBoolE(a.v.Get(key)) - if err != nil { - return false, false - } - return v, true -} - -func (a *attributes) GetDuration(key string) (time.Duration, bool) { - if !a.v.IsSet(key) { - return 0, false - } - v, err := cast.ToDurationE(a.v.Get(key)) - if err != nil { - return 0, false - } - - return v, true -} -func (a *attributes) GetFloat64(key string) (float64, bool) { - if !a.v.IsSet(key) { - return 0, false - } - v, err := cast.ToFloat64E(a.v.Get(key)) - if err != nil { - return 0, false - } - - return v, true -} - -func (a *attributes) GetInt64(key string) (int64, bool) { - if !a.v.IsSet(key) { - return 0, false - } - v, err := cast.ToInt64E(a.v.Get(key)) - if err != nil { - return 0, false - } - return v, true -} - -func (a *attributes) GetIntSlice(key string) ([]int, bool) { - if !a.v.IsSet(key) { - return nil, false - } - v, err := cast.ToIntSliceE(a.v.Get(key)) - if err != nil { - return nil, false - } - return v, true - -} -func (a *attributes) GetString(key string) (string, bool) { - if !a.v.IsSet(key) { - return "", false - } - v, err := cast.ToStringE(a.v.Get(key)) - if err != nil { - return "", false - } - return v, true -} -func (a *attributes) GetStringMap(key string) (map[string]interface{}, bool) { - if !a.v.IsSet(key) { - return nil, false - } - v, err := cast.ToStringMapE(a.v.Get(key)) - if err != nil { - return nil, false - } - return v, true - -} -func (a *attributes) GetStringSlice(key string) ([]string, bool) { - if !a.v.IsSet(key) { - return nil, false - } - v, err := cast.ToStringSliceE(a.v.Get(key)) - if err != nil { - return nil, false - } - return v, true -} - -func (a *attributes) GetTime(key string) (time.Time, bool) { - if !a.v.IsSet(key) { - return nilTime, false - } - v, err := cast.ToTimeE(a.v.Get(key)) - if err != nil { - return nilTime, false - } - return v, true -} - -func (a *attributes) IsSet(key string) bool { - return a.v.IsSet(key) -} - -func (a *attributes) FullView() map[string]interface{} { - return a.m -} - -//NewAttributes builds an empty Attributes instance. -func NewAttributes() Attributes { - return NewAttributesWithOptions(AttributesOptions{}) -} - -//NewAttributesFromMap builds an Attributes instance with -//the given map as datasource. Default AttributeOptions are used. -func NewAttributesFromMap(m map[string]interface{}) Attributes { - return NewAttributesWithOptions(AttributesOptions{ - AttributesMap: m, - }) -} - -//NewAttributesWithOptions builds an Attributes instance from the given -//options. Zero value options are ok. -func NewAttributesWithOptions(o AttributesOptions) Attributes { - var ( - options []viper.Option - v *viper.Viper - ) - - if o.KeyDelimiter != "" { - options = append(options, viper.KeyDelimiter(o.KeyDelimiter)) - } - - v = viper.NewWithOptions(options...) - - v.MergeConfigMap(o.AttributesMap) - - return &attributes{ - v: v, - m: o.AttributesMap, - } -} - // Token is the behavior supplied by all secure tokens type Token interface { // Type is the custom token type assigned by plugin code @@ -213,6 +16,13 @@ type Token interface { Attributes() Attributes } +//Attributes is the interface that wraps methods which dictate how to interact +//with a token's attributes. Getter functions return a boolean as second element +//which indicates that a value of the requested type exists at the given key path. +type Attributes interface { + Get(key string) (interface{}, bool) +} + // simpleToken is a very basic token type that can serve as the Token for many types of secure pipelines type simpleToken struct { tokenType string From 243a374052186a23a27adeca8dc676f0e045bca9 Mon Sep 17 00:00:00 2001 From: Kristina Spring Date: Mon, 5 Oct 2020 18:00:37 -0700 Subject: [PATCH 2/3] fixed/added tests, fixed func calls to NewAttributes() --- attributes.go | 18 ++- attributes_test.go | 87 +++++++++++++++ basculehttp/enforcer_test.go | 5 +- basculehttp/listener_test.go | 2 +- basculehttp/tokenFactory.go | 13 ++- basculehttp/tokenFactory_test.go | 2 +- checks.go | 49 ++++---- checks_test.go | 57 +++++----- context_test.go | 2 +- go.mod | 11 +- go.sum | 181 ++++++++++++++++++++++++++++++ token_test.go | 184 +------------------------------ validator_test.go | 5 +- 13 files changed, 358 insertions(+), 258 deletions(-) create mode 100644 attributes_test.go diff --git a/attributes.go b/attributes.go index 0b82fb4..7af5b49 100644 --- a/attributes.go +++ b/attributes.go @@ -2,27 +2,29 @@ package bascule import ( "time" + + "github.com/xmidt-org/arrange" ) var nilTime = time.Time{} -type attributes map[string]interface{} +type BasicAttributes map[string]interface{} -func (a attributes) Get(key string) (interface{}, bool) { +func (a BasicAttributes) Get(key string) (interface{}, bool) { v, ok := a[key] return v, ok } //NewAttributes builds an Attributes instance with -//the given map as datasource. Default AttributeOptions are used. +//the given map as datasource. func NewAttributes(m map[string]interface{}) Attributes { - return attributes(m) + return BasicAttributes(m) } // GetNestedAttribute uses multiple keys in order to obtain an attribute. func GetNestedAttribute(attributes Attributes, keys ...string) (interface{}, bool) { // need at least one key. - if len(keys) == 0 { + if keys == nil || len(keys) == 0 { return nil, false } @@ -32,7 +34,11 @@ func GetNestedAttribute(attributes Attributes, keys ...string) (interface{}, boo ) result = attributes for _, k := range keys { - a, ok := result.(Attributes) + var a Attributes + if result == nil { + return nil, false + } + ok = arrange.TryConvert(result, func(attr Attributes) { a = attr }) if !ok { return nil, false } diff --git a/attributes_test.go b/attributes_test.go new file mode 100644 index 0000000..56adfa6 --- /dev/null +++ b/attributes_test.go @@ -0,0 +1,87 @@ +package bascule + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestGet(t *testing.T) { + assert := assert.New(t) + attributes := Attributes(attrs) + + val, ok := attributes.Get("testkey") + assert.Equal("testval", val) + assert.True(ok) + + val, ok = attributes.Get("noval") + assert.Empty(val) + assert.False(ok) + + emptyAttributes := NewAttributes(map[string]interface{}{}) + val, ok = emptyAttributes.Get("test") + assert.Nil(val) + assert.False(ok) +} + +func TestGetNestedAttribute(t *testing.T) { + attributes := NewAttributes(map[string]interface{}{ + "a": map[string]interface{}{"b": map[string]interface{}{"c": "answer"}}, + "one level": "yay", + "bad": nil, + }) + tests := []struct { + description string + keys []string + expectedResult interface{} + expectedOK bool + }{ + // Success test is failing. ): getting nil, false + { + description: "Success", + keys: []string{"a", "b", "c"}, + expectedResult: "answer", + expectedOK: true, + }, + { + description: "Success single key", + keys: []string{"one level"}, + expectedResult: "yay", + expectedOK: true, + }, + { + description: "Success nil", + keys: []string{"bad"}, + expectedResult: nil, + expectedOK: true, + }, + { + description: "Nil Keys Error", + keys: nil, + }, + { + description: "No Keys Error", + keys: []string{}, + }, + { + description: "Non Attribute Value Error", + keys: []string{"one level", "test"}, + }, + { + description: "Nil Attributes Error", + keys: []string{"bad", "more bad"}, + }, + { + description: "Missing Key Error", + keys: []string{"c", "b", "a"}, + }, + } + for _, tc := range tests { + t.Run(tc.description, func(t *testing.T) { + assert := assert.New(t) + val, ok := GetNestedAttribute(attributes, tc.keys...) + assert.Equal(tc.expectedResult, val) + assert.Equal(tc.expectedOK, ok) + }) + } +} diff --git a/basculehttp/enforcer_test.go b/basculehttp/enforcer_test.go index b8d0163..93cf2af 100644 --- a/basculehttp/enforcer_test.go +++ b/basculehttp/enforcer_test.go @@ -24,6 +24,7 @@ func TestEnforcer(t *testing.T) { }), WithEErrorResponseFunc(DefaultOnErrorResponse), ) + emptyAttributes := bascule.NewAttributes(map[string]interface{}{}) tests := []struct { description string enforcer func(http.Handler) http.Handler @@ -36,7 +37,7 @@ func TestEnforcer(t *testing.T) { enforcer: e2, auth: bascule.Authentication{ Authorization: "jwt", - Token: bascule.NewToken("test", "", bascule.NewAttributes()), + Token: bascule.NewToken("test", "", emptyAttributes), }, expectedStatusCode: http.StatusOK, }, @@ -63,7 +64,7 @@ func TestEnforcer(t *testing.T) { enforcer: e2, auth: bascule.Authentication{ Authorization: "jwt", - Token: bascule.NewToken("", "", bascule.NewAttributes()), + Token: bascule.NewToken("", "", emptyAttributes), }, expectedStatusCode: http.StatusForbidden, }, diff --git a/basculehttp/listener_test.go b/basculehttp/listener_test.go index 09eee5f..438ce1e 100644 --- a/basculehttp/listener_test.go +++ b/basculehttp/listener_test.go @@ -35,7 +35,7 @@ func TestListenerDecorator(t *testing.T) { ctx := bascule.WithAuthentication(context.Background(), bascule.Authentication{ Authorization: "jwt", - Token: bascule.NewToken("", "", bascule.NewAttributes()), + Token: bascule.NewToken("", "", bascule.NewAttributes(map[string]interface{}{})), Request: bascule.Request{ URL: u, Method: "get", diff --git a/basculehttp/tokenFactory.go b/basculehttp/tokenFactory.go index 05a29ea..891e510 100644 --- a/basculehttp/tokenFactory.go +++ b/basculehttp/tokenFactory.go @@ -72,7 +72,7 @@ func (btf BasicTokenFactory) ParseAndValidate(ctx context.Context, _ *http.Reque } // "basic" is a placeholder here ... token types won't always map to the // Authorization header. For example, a JWT should have a type of "jwt" or some such, not "bearer" - return bascule.NewToken("basic", principal, bascule.NewAttributes()), nil + return bascule.NewToken("basic", principal, bascule.NewAttributes(map[string]interface{}{})), nil } // NewBasicTokenFactoryFromList takes a list of base64 encoded basic auth keys, @@ -161,12 +161,15 @@ func (btf BearerTokenFactory) ParseAndValidate(ctx context.Context, _ *http.Requ return nil, emperror.WrapWith(err, "failed to get map of claims", "claims struct", claims) } - jwtClaims := bascule.NewAttributesFromMap(claimsMap) - - principal, ok := jwtClaims.GetString(jwtPrincipalKey) + jwtClaims := bascule.NewAttributes(claimsMap) + principalVal, ok := jwtClaims.Get(jwtPrincipalKey) + if !ok { + return nil, emperror.WrapWith(ErrorInvalidPrincipal, "principal value not found", "principal key", jwtPrincipalKey, "jwtClaims", claimsMap) + } + principal, ok := principalVal.(string) if !ok { - return nil, emperror.WrapWith(ErrorInvalidPrincipal, "principal value of proper type not found", "principal", principal, "jwtClaims", claimsMap) + return nil, emperror.WrapWith(ErrorInvalidPrincipal, "principal value not a string", "principal", principalVal) } return bascule.NewToken("jwt", principal, jwtClaims), nil diff --git a/basculehttp/tokenFactory_test.go b/basculehttp/tokenFactory_test.go index 0f52f49..f0b03f9 100644 --- a/basculehttp/tokenFactory_test.go +++ b/basculehttp/tokenFactory_test.go @@ -25,7 +25,7 @@ func TestBasicTokenFactory(t *testing.T) { { description: "Sucess", value: base64.StdEncoding.EncodeToString([]byte("user:pass")), - expectedToken: bascule.NewToken("basic", "user", bascule.NewAttributes()), + expectedToken: bascule.NewToken("basic", "user", bascule.NewAttributes(map[string]interface{}{})), }, { description: "Can't Decode Error", diff --git a/checks.go b/checks.go index c21e849..78820b7 100644 --- a/checks.go +++ b/checks.go @@ -5,9 +5,6 @@ package bascule import ( "context" "errors" - "fmt" - - "github.com/goph/emperror" ) const ( @@ -60,29 +57,29 @@ func CreateNonEmptyPrincipalCheck() ValidatorFunc { // CreateListAttributeCheck returns a Validator that runs checks against the // content found in the key given. It runs every check and returns all errors // it finds. -func CreateListAttributeCheck(key string, checks ...func(context.Context, []interface{}) error) ValidatorFunc { - return func(ctx context.Context, token Token) error { - val, ok := token.Attributes().Get(key) - if !ok { - return fmt.Errorf("couldn't find attribute with key %v", key) - } - strVal, ok := val.([]interface{}) - if !ok { - return fmt.Errorf("unexpected attribute value, expected []interface{} type but received: %T", val) - } - errs := Errors{} - for _, check := range checks { - err := check(ctx, strVal) - if err != nil { - errs = append(errs, err) - } - } - if len(errs) == 0 { - return nil - } - return emperror.Wrap(errs, fmt.Sprintf("attribute checks of key %v failed", key)) - } -} +// func CreateListAttributeCheck(keys []string, checks ...func(context.Context, []interface{}) error) ValidatorFunc { +// return func(ctx context.Context, token Token) error { +// val, ok := token.Attributes().Get(key) +// if !ok { +// return fmt.Errorf("couldn't find attribute with key %v", key) +// } +// strVal, ok := val.([]interface{}) +// if !ok { +// return fmt.Errorf("unexpected attribute value, expected []interface{} type but received: %T", val) +// } +// errs := Errors{} +// for _, check := range checks { +// err := check(ctx, strVal) +// if err != nil { +// errs = append(errs, err) +// } +// } +// if len(errs) == 0 { +// return nil +// } +// return emperror.Wrap(errs, fmt.Sprintf("attribute checks of key %v failed", key)) +// } +// } // NonEmptyStringListCheck checks that the list of values given are a list of // one or more nonempty strings. diff --git a/checks_test.go b/checks_test.go index e1b5290..d3df829 100644 --- a/checks_test.go +++ b/checks_test.go @@ -10,60 +10,63 @@ import ( func TestCreateAllowAllCheck(t *testing.T) { assert := assert.New(t) f := CreateAllowAllCheck() - err := f(context.Background(), NewToken("", "", NewAttributes())) + err := f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{}))) assert.Nil(err) } func TestCreateValidTypeCheck(t *testing.T) { + emptyAttributes := NewAttributes(map[string]interface{}{}) assert := assert.New(t) f := CreateValidTypeCheck([]string{"valid", "type"}) - err := f(context.Background(), NewToken("valid", "", NewAttributes())) + err := f(context.Background(), NewToken("valid", "", emptyAttributes)) assert.Nil(err) - err = f(context.Background(), NewToken("invalid", "", NewAttributes())) + err = f(context.Background(), NewToken("invalid", "", emptyAttributes)) assert.NotNil(err) } func TestCreateNonEmptyTypeCheck(t *testing.T) { + emptyAttributes := NewAttributes(map[string]interface{}{}) assert := assert.New(t) f := CreateNonEmptyTypeCheck() - err := f(context.Background(), NewToken("type", "", NewAttributes())) + err := f(context.Background(), NewToken("type", "", emptyAttributes)) assert.Nil(err) - err = f(context.Background(), NewToken("", "", NewAttributes())) + err = f(context.Background(), NewToken("", "", emptyAttributes)) assert.NotNil(err) } func TestCreateNonEmptyPrincipalCheck(t *testing.T) { + emptyAttributes := NewAttributes(map[string]interface{}{}) assert := assert.New(t) f := CreateNonEmptyPrincipalCheck() - err := f(context.Background(), NewToken("", "principal", NewAttributes())) + err := f(context.Background(), NewToken("", "principal", emptyAttributes)) assert.Nil(err) - err = f(context.Background(), NewToken("", "", NewAttributes())) + err = f(context.Background(), NewToken("", "", emptyAttributes)) assert.NotNil(err) } -func TestCreateListAttributeCheck(t *testing.T) { - assert := assert.New(t) - f := CreateListAttributeCheck("testkey.subkey", NonEmptyStringListCheck) +// func TestCreateListAttributeCheck(t *testing.T) { +// assert := assert.New(t) +// f := CreateListAttributeCheck("testkey.subkey", NonEmptyStringListCheck) - err := f(context.Background(), NewToken("", "", NewAttributesFromMap(map[string]interface{}{ - "testkey": map[string]interface{}{"subkey": []interface{}{"a", "b", "c"}}}))) - assert.Nil(err) +// err := f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{ +// "testkey": map[string]interface{}{"subkey": []interface{}{"a", "b", "c"}}}))) +// assert.Nil(err) - err = f(context.Background(), NewToken("", "", NewAttributes())) - assert.NotNil(err) +// err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{}))) +// assert.NotNil(err) - err = f(context.Background(), NewToken("", "", NewAttributesFromMap(map[string]interface{}{"testkey": ""}))) - assert.NotNil(err) +// err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{"testkey": ""}))) +// assert.NotNil(err) - err = f(context.Background(), NewToken("", "", NewAttributesFromMap(map[string]interface{}{"testkey": map[string]interface{}{ - "subkey": []interface{}{}}}))) - assert.NotNil(err) +// err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{"testkey": map[string]interface{}{ +// "subkey": []interface{}{}}}))) +// assert.NotNil(err) - err = f(context.Background(), NewToken("", "", NewAttributesFromMap(map[string]interface{}{"testkey": map[string]interface{}{ - "subkey": []interface{}{5, 7, 6}}}))) - assert.NotNil(err) +// err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{"testkey": map[string]interface{}{ +// "subkey": []interface{}{5, 7, 6}}}))) +// assert.NotNil(err) - err = f(context.Background(), NewToken("", "", NewAttributesFromMap(map[string]interface{}{"testkey": map[string]interface{}{ - "subkey": []interface{}{""}}}))) - assert.NotNil(err) -} +// err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{"testkey": map[string]interface{}{ +// "subkey": []interface{}{""}}}))) +// assert.NotNil(err) +// } diff --git a/context_test.go b/context_test.go index 6992438..611b4c6 100644 --- a/context_test.go +++ b/context_test.go @@ -17,7 +17,7 @@ func TestContext(t *testing.T) { Token: simpleToken{ tokenType: "test", principal: "test principal", - attributes: NewAttributesFromMap(map[string]interface{}{"testkey": "testval", "attr": 5}), + attributes: NewAttributes(map[string]interface{}{"testkey": "testval", "attr": 5}), }, Request: Request{ URL: u, diff --git a/go.mod b/go.mod index 5cdec1f..f9e40c2 100644 --- a/go.mod +++ b/go.mod @@ -4,16 +4,19 @@ go 1.12 require ( github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 + github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/go-kit/kit v0.8.0 github.com/goph/emperror v0.17.1 - github.com/gorilla/mux v1.7.3 // indirect github.com/jtacoma/uritemplates v1.0.0 // indirect github.com/justinas/alice v1.2.0 // indirect - github.com/pkg/errors v0.8.0 + github.com/pkg/errors v0.8.1 github.com/spf13/cast v1.3.0 - github.com/spf13/viper v1.6.1 - github.com/stretchr/testify v1.3.0 + github.com/spf13/viper v1.7.0 + github.com/stretchr/testify v1.4.0 + github.com/ugorji/go v1.1.4 // indirect + github.com/xmidt-org/arrange v0.1.9 github.com/xmidt-org/webpa-common v1.1.0 + github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect ) diff --git a/go.sum b/go.sum index 5cde5ba..235a256 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,33 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2 h1:koK7z0nSsRiRiBWwa+E714Puh+DO+ZRdIyAXiXzL+lg= github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= github.com/airbrake/gobrake v3.6.1+incompatible/go.mod h1:wM4gu3Cn0W0K7GUuVWnlXZU11AGBXMILnrdOU8Kn00o= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bugsnag/bugsnag-go v1.4.0/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= @@ -18,7 +36,9 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -27,10 +47,12 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= @@ -44,23 +66,57 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/goph/emperror v0.17.1 h1:6lOybhIvG/BB6VGoWfdv30FVZeZFBBZ9VvgzGXLVkyY= github.com/goph/emperror v0.17.1/go.mod h1:+ZbQ+fUNO/6FNiUo0ujtMjhgad9Xa6fQL9KhH4LNHic= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jtacoma/uritemplates v1.0.0 h1:xwx5sBF7pPAb0Uj8lDC1Q/aBPpOFyQza7OC705ZlLCo= github.com/jtacoma/uritemplates v1.0.0/go.mod h1:IhIICdE9OcvgUnGwTtJxgBQ+VrTrti5PcbLVSJianO8= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= @@ -80,20 +136,36 @@ 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/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +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-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= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg= +github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -104,7 +176,10 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rollbar/rollbar-go v1.0.2/go.mod h1:AcFs5f0I+c71bpHlXNNDbOWJiKwjFDtISeXco0L5PKQ= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= @@ -120,59 +195,160 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk= github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= +github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xmidt-org/arrange v0.1.9 h1:MgMCRH7uMg+LZWvuo3c+63UmEV73LRMyrYmm267E8oM= +github.com/xmidt-org/arrange v0.1.9/go.mod h1:PRA8iEZ11L93NsEkDP56x1mZyfDcWxzDULgHj56TaEk= github.com/xmidt-org/webpa-common v1.1.0 h1:JG3lzyV70BpsVvKKvAn+/9uNI0wNW9H1r3qr0M+dQNM= github.com/xmidt-org/webpa-common v1.1.0/go.mod h1:oCpKzOC+9h2vYHVzAU/06tDTQuBN4RZz+rhgIXptpOI= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/dig v1.10.0 h1:yLmDDj9/zuDjv3gz8GQGviXMs9TfysIUMUilCpgzUJY= +go.uber.org/dig v1.10.0/go.mod h1:X34SnWGr8Fyla9zQNO2GSO2D+TIuqB14OS8JhYocIyw= +go.uber.org/fx v1.13.0 h1:39tdAEfvFG6MAM07HYbiJXZFcqQeel0h4n45Hobskuw= +go.uber.org/fx v1.13.0/go.mod h1:bREWhavnedxpJeTq9pQT53BbvwhUv7TcpsOqcH4a+3w= +go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.4.0 h1:f3WCSC2KzAcBXGATIxAB1E2XuCpNU255wNKZ505qi3E= +go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +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/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= 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/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191030062658-86caa796c7ab/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191114200427-caa0b0f7d508/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +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/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -182,6 +358,11 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/token_test.go b/token_test.go index 8654645..ef96077 100644 --- a/token_test.go +++ b/token_test.go @@ -1,14 +1,12 @@ package bascule import ( - "fmt" "testing" - "time" "github.com/stretchr/testify/assert" ) -var attrs = NewAttributesFromMap(map[string]interface{}{"testkey": "testval", "attr": 5}) +var attrs = NewAttributes(map[string]interface{}{"testkey": "testval", "attr": 5}) const ( boolGetter = iota @@ -31,183 +29,3 @@ func TestToken(t *testing.T) { assert.Equal(principal, token.Principal()) assert.Equal(attrs, token.Attributes()) } - -func TestGet(t *testing.T) { - assert := assert.New(t) - attributes := Attributes(attrs) - - val, ok := attributes.Get("testkey") - assert.Equal("testval", val) - assert.True(ok) - - val, ok = attributes.Get("noval") - assert.Empty(val) - assert.False(ok) - - emptyAttributes := NewAttributes() - val, ok = emptyAttributes.Get("test") - assert.Nil(val) - assert.False(ok) -} - -func TestTypedGetters(t *testing.T) { - testCases := []struct { - typeEnum int - name string - key string - v interface{} - }{ - { - typeEnum: boolGetter, - name: "getBool", - v: true, - }, - - { - typeEnum: durationGetter, - name: "getDuration", - v: time.Second * 1, - }, - - { - typeEnum: float64Getter, - name: "getFloat64", - v: 3.14, - }, - { - typeEnum: int64Getter, - name: "getInt64", - v: int64(1 << 40), - }, - { - typeEnum: intSliceGetter, - name: "getIntSlice", - v: []int{1, 2}, - }, - - { - typeEnum: stringGetter, - name: "getString", - v: "string", - }, - - { - typeEnum: stringMapGetter, - name: "getStringMap", - v: map[string]interface{}{"string": "map"}, - }, - - { - typeEnum: stringSliceGetter, - name: "getStringSlice", - v: []string{"string", "slice"}, - }, - - { - typeEnum: timeGetter, - name: "getTime", - v: time.Now(), - }, - } - - var ( - sep = ">" - topKey = "nested" - notFoundKey = "notfound" - badTypeKey = "noneOfTheAboveType" - - topKeyMap = make(map[string]interface{}) - - m = map[string]interface{}{ - badTypeKey: struct{}{}, - topKey: topKeyMap, - } - ) - - //sync test cases and attributes - for i, testCase := range testCases { - topKeyMap[testCase.name] = testCase.v - testCases[i].key = fmt.Sprintf("%s%s%s", topKey, sep, testCase.name) - } - - a := NewAttributesWithOptions(AttributesOptions{ - KeyDelimiter: sep, - AttributesMap: m, - }) - - for _, testCase := range testCases { - t.Run(testCase.name, func(t *testing.T) { - assert := assert.New(t) - switch testCase.typeEnum { - case boolGetter: - _, okNotFound := a.GetBool(notFoundKey) - _, okBadType := a.GetBool(badTypeKey) - fmt.Println(testCase.key) - v, okValid := a.GetBool(testCase.key) - assertAll(assert, assertData{okNotFound, okBadType, okValid, testCase.v, v}) - case durationGetter: - _, okNotFound := a.GetDuration(notFoundKey) - _, okBadType := a.GetDuration(badTypeKey) - v, okValid := a.GetDuration(testCase.key) - assertAll(assert, assertData{okNotFound, okBadType, okValid, testCase.v, v}) - case float64Getter: - _, okNotFound := a.GetFloat64(notFoundKey) - _, okBadType := a.GetFloat64(badTypeKey) - v, okValid := a.GetFloat64(testCase.key) - assertAll(assert, assertData{okNotFound, okBadType, okValid, testCase.v, v}) - case int64Getter: - _, okNotFound := a.GetInt64(notFoundKey) - _, okBadType := a.GetInt64(badTypeKey) - v, okValid := a.GetInt64(testCase.key) - assertAll(assert, assertData{okNotFound, okBadType, okValid, testCase.v, v}) - case intSliceGetter: - _, okNotFound := a.GetIntSlice(notFoundKey) - _, okBadType := a.GetIntSlice(badTypeKey) - v, okValid := a.GetIntSlice(testCase.key) - assertAll(assert, assertData{okNotFound, okBadType, okValid, testCase.v, v}) - case stringGetter: - _, okNotFound := a.GetString(notFoundKey) - _, okBadType := a.GetString(badTypeKey) - v, okValid := a.GetString(testCase.key) - assertAll(assert, assertData{okNotFound, okBadType, okValid, testCase.v, v}) - case stringMapGetter: - _, okNotFound := a.GetStringMap(notFoundKey) - _, okBadType := a.GetStringMap(badTypeKey) - v, okValid := a.GetStringMap(testCase.key) - assertAll(assert, assertData{okNotFound, okBadType, okValid, testCase.v, v}) - case stringSliceGetter: - _, okNotFound := a.GetStringSlice(notFoundKey) - _, okBadType := a.GetStringSlice(badTypeKey) - v, okValid := a.GetStringSlice(testCase.key) - assertAll(assert, assertData{okNotFound, okBadType, okValid, testCase.v, v}) - case timeGetter: - _, okNotFound := a.GetTime(notFoundKey) - _, okBadType := a.GetTime(badTypeKey) - v, okValid := a.GetTime(testCase.key) - assertAll(assert, assertData{okNotFound, okBadType, okValid, testCase.v, v}) - } - }) - } -} - -func TestFullView(t *testing.T) { - m := map[string]interface{}{"k0": 0, "k1": 1} - a := NewAttributesFromMap(m) - assert := assert.New(t) - assert.Equal(m, a.FullView()) -} - -type assertData struct { - okNotFound bool - okBadType bool - okValid bool - expected interface{} - actual interface{} -} - -func assertAll(a *assert.Assertions, d assertData) { - a.False(d.okNotFound) - a.False(d.okBadType) - a.True(d.okValid) - a.Equal(d.expected, d.actual) -} diff --git a/validator_test.go b/validator_test.go index e4c7c58..eb283f9 100644 --- a/validator_test.go +++ b/validator_test.go @@ -8,11 +8,12 @@ import ( ) func TestValidators(t *testing.T) { + emptyAttributes := NewAttributes(map[string]interface{}{}) assert := assert.New(t) validatorList := Validators([]Validator{CreateNonEmptyTypeCheck(), CreateNonEmptyPrincipalCheck()}) - err := validatorList.Check(context.Background(), NewToken("type", "principal", NewAttributes())) + err := validatorList.Check(context.Background(), NewToken("type", "principal", emptyAttributes)) assert.Nil(err) - errs := validatorList.Check(context.Background(), NewToken("", "", NewAttributes())) + errs := validatorList.Check(context.Background(), NewToken("", "", emptyAttributes)) assert.NotNil(errs) _, ok := errs.(Errors) assert.True(ok) From c2dc0551e3c3bbf20d0b21c8df1f73a0daa8ec70 Mon Sep 17 00:00:00 2001 From: Kristina Spring Date: Tue, 6 Oct 2020 12:11:14 -0700 Subject: [PATCH 3/3] fixed functions --- attributes.go | 5 ++++- checks.go | 49 ++++++++++++++++++++++++++----------------------- checks_test.go | 44 ++++++++++++++++++++++++-------------------- go.sum | 1 + 4 files changed, 55 insertions(+), 44 deletions(-) diff --git a/attributes.go b/attributes.go index 7af5b49..9e436cf 100644 --- a/attributes.go +++ b/attributes.go @@ -38,7 +38,10 @@ func GetNestedAttribute(attributes Attributes, keys ...string) (interface{}, boo if result == nil { return nil, false } - ok = arrange.TryConvert(result, func(attr Attributes) { a = attr }) + ok = arrange.TryConvert(result, + func(attr Attributes) { a = attr }, + func(m map[string]interface{}) { a = BasicAttributes(m) }, + ) if !ok { return nil, false } diff --git a/checks.go b/checks.go index 78820b7..a2b0642 100644 --- a/checks.go +++ b/checks.go @@ -5,6 +5,9 @@ package bascule import ( "context" "errors" + "fmt" + + "github.com/goph/emperror" ) const ( @@ -57,29 +60,29 @@ func CreateNonEmptyPrincipalCheck() ValidatorFunc { // CreateListAttributeCheck returns a Validator that runs checks against the // content found in the key given. It runs every check and returns all errors // it finds. -// func CreateListAttributeCheck(keys []string, checks ...func(context.Context, []interface{}) error) ValidatorFunc { -// return func(ctx context.Context, token Token) error { -// val, ok := token.Attributes().Get(key) -// if !ok { -// return fmt.Errorf("couldn't find attribute with key %v", key) -// } -// strVal, ok := val.([]interface{}) -// if !ok { -// return fmt.Errorf("unexpected attribute value, expected []interface{} type but received: %T", val) -// } -// errs := Errors{} -// for _, check := range checks { -// err := check(ctx, strVal) -// if err != nil { -// errs = append(errs, err) -// } -// } -// if len(errs) == 0 { -// return nil -// } -// return emperror.Wrap(errs, fmt.Sprintf("attribute checks of key %v failed", key)) -// } -// } +func CreateListAttributeCheck(keys []string, checks ...func(context.Context, []interface{}) error) ValidatorFunc { + return func(ctx context.Context, token Token) error { + val, ok := GetNestedAttribute(token.Attributes(), keys...) + if !ok { + return fmt.Errorf("couldn't find attribute with keys %v", keys) + } + strVal, ok := val.([]interface{}) + if !ok { + return fmt.Errorf("unexpected attribute value, expected []interface{} type but received: %T", val) + } + errs := Errors{} + for _, check := range checks { + err := check(ctx, strVal) + if err != nil { + errs = append(errs, err) + } + } + if len(errs) == 0 { + return nil + } + return emperror.Wrap(errs, fmt.Sprintf("attribute checks of keys %v failed", keys)) + } +} // NonEmptyStringListCheck checks that the list of values given are a list of // one or more nonempty strings. diff --git a/checks_test.go b/checks_test.go index d3df829..273ab7f 100644 --- a/checks_test.go +++ b/checks_test.go @@ -44,29 +44,33 @@ func TestCreateNonEmptyPrincipalCheck(t *testing.T) { assert.NotNil(err) } -// func TestCreateListAttributeCheck(t *testing.T) { -// assert := assert.New(t) -// f := CreateListAttributeCheck("testkey.subkey", NonEmptyStringListCheck) +func TestCreateListAttributeCheck(t *testing.T) { + assert := assert.New(t) + f := CreateListAttributeCheck([]string{"testkey", "subkey"}, NonEmptyStringListCheck) -// err := f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{ -// "testkey": map[string]interface{}{"subkey": []interface{}{"a", "b", "c"}}}))) -// assert.Nil(err) + err := f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{ + "testkey": map[string]interface{}{"subkey": []interface{}{"a", "b", "c"}}}))) + assert.Nil(err) -// err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{}))) -// assert.NotNil(err) + err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{}))) + assert.NotNil(err) + + err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{"testkey": ""}))) + assert.NotNil(err) -// err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{"testkey": ""}))) -// assert.NotNil(err) + err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{"testkey": map[string]interface{}{ + "subkey": 5555}}))) + assert.NotNil(err) -// err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{"testkey": map[string]interface{}{ -// "subkey": []interface{}{}}}))) -// assert.NotNil(err) + err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{"testkey": map[string]interface{}{ + "subkey": []interface{}{}}}))) + assert.NotNil(err) -// err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{"testkey": map[string]interface{}{ -// "subkey": []interface{}{5, 7, 6}}}))) -// assert.NotNil(err) + err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{"testkey": map[string]interface{}{ + "subkey": []interface{}{5, 7, 6}}}))) + assert.NotNil(err) -// err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{"testkey": map[string]interface{}{ -// "subkey": []interface{}{""}}}))) -// assert.NotNil(err) -// } + err = f(context.Background(), NewToken("", "", NewAttributes(map[string]interface{}{"testkey": map[string]interface{}{ + "subkey": []interface{}{""}}}))) + assert.NotNil(err) +} diff --git a/go.sum b/go.sum index 235a256..7a7d824 100644 --- a/go.sum +++ b/go.sum @@ -162,6 +162,7 @@ github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.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=