Merge 'v1.5.2' into master

vendor/github.com/stretchr/objx/LICENSE

@@ -1,8 +1,7 @@
-objx - by Mat Ryer and Tyler Bunnell
-
-The MIT License (MIT)
+The MIT License
 
 Copyright (c) 2014 Stretchr, Inc.
+Copyright (c) 2017-2018 objx contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

vendor/github.com/stretchr/objx/accessors.go

@@ -77,13 +77,10 @@ func access(current, selector, value interface{}, isSet, panics bool) interface{
 		index := -1
 		var err error
 
-		// https://github.com/stretchr/objx/issues/12
 		if strings.Contains(thisSel, "[") {
-
 			arrayMatches := arrayAccesRegex.FindStringSubmatch(thisSel)
 
 			if len(arrayMatches) > 0 {
-
 				// Get the key into the map
 				thisSel = arrayMatches[1]
 
@@ -95,7 +92,6 @@ func access(current, selector, value interface{}, isSet, panics bool) interface{
 					// seriously wrong. Panic.
 					panic("objx: Array index is not an integer.  Must use array[int].")
 				}
-
 			}
 		}
 
@@ -110,9 +106,8 @@ func access(current, selector, value interface{}, isSet, panics bool) interface{
 			if len(selSegs) <= 1 && isSet {
 				curMSI[thisSel] = value
 				return nil
-			} else {
-				current = curMSI[thisSel]
 			}
+			current = curMSI[thisSel]
 		default:
 			current = nil
 		}
@@ -140,9 +135,7 @@ func access(current, selector, value interface{}, isSet, panics bool) interface{
 		}
 
 	}
-
 	return current
-
 }
 
 // intFromInterface converts an interface object to the largest
@@ -174,6 +167,5 @@ func intFromInterface(selector interface{}) int {
 	default:
 		panic("objx: array access argument is not an integer type (this should never happen)")
 	}
-
 	return value
 }

vendor/github.com/stretchr/objx/conversions.go

@@ -12,15 +12,11 @@ import (
 // JSON converts the contained object to a JSON string
 // representation
 func (m Map) JSON() (string, error) {
-
 	result, err := json.Marshal(m)
-
 	if err != nil {
 		err = errors.New("objx: JSON encode failed with: " + err.Error())
 	}
-
 	return string(result), err
-
 }
 
 // MustJSON converts the contained object to a JSON string
@@ -36,7 +32,6 @@ func (m Map) MustJSON() string {
 // Base64 converts the contained object to a Base64 string
 // representation of the JSON string representation
 func (m Map) Base64() (string, error) {
-
 	var buf bytes.Buffer
 
 	jsonData, err := m.JSON()
@@ -45,11 +40,13 @@ func (m Map) Base64() (string, error) {
 	}
 
 	encoder := base64.NewEncoder(base64.StdEncoding, &buf)
-	encoder.Write([]byte(jsonData))
-	encoder.Close()
+	_, err = encoder.Write([]byte(jsonData))
+	if err != nil {
+		return "", err
+	}
+	_ = encoder.Close()
 
 	return buf.String(), nil
-
 }
 
 // MustBase64 converts the contained object to a Base64 string
@@ -67,16 +64,13 @@ func (m Map) MustBase64() string {
 // representation of the JSON string representation and signs it
 // using the provided key.
 func (m Map) SignedBase64(key string) (string, error) {
-
 	base64, err := m.Base64()
 	if err != nil {
 		return "", err
 	}
 
 	sig := HashWithKey(base64, key)
-
 	return base64 + SignatureSeparator + sig, nil
-
 }
 
 // MustSignedBase64 converts the contained object to a Base64 string
@@ -98,14 +92,11 @@ func (m Map) MustSignedBase64(key string) string {
 // URLValues creates a url.Values object from an Obj. This
 // function requires that the wrapped object be a map[string]interface{}
 func (m Map) URLValues() url.Values {
-
 	vals := make(url.Values)
-
 	for k, v := range m {
 		//TODO: can this be done without sprintf?
 		vals.Set(k, fmt.Sprintf("%v", v))
 	}
-
 	return vals
 }
 

vendor/github.com/stretchr/objx/doc.go

@@ -1,72 +1,66 @@
-// objx - Go package for dealing with maps, slices, JSON and other data.
-//
-// Overview
-//
-// Objx provides the `objx.Map` type, which is a `map[string]interface{}` that exposes
-// a powerful `Get` method (among others) that allows you to easily and quickly get
-// access to data within the map, without having to worry too much about type assertions,
-// missing data, default values etc.
-//
-// Pattern
-//
-// Objx uses a preditable pattern to make access data from within `map[string]interface{}'s
-// easy.
-//
-// Call one of the `objx.` functions to create your `objx.Map` to get going:
-//
-//     m, err := objx.FromJSON(json)
-//
-// NOTE: Any methods or functions with the `Must` prefix will panic if something goes wrong,
-// the rest will be optimistic and try to figure things out without panicking.
-//
-// Use `Get` to access the value you're interested in.  You can use dot and array
-// notation too:
-//
-//     m.Get("places[0].latlng")
-//
-// Once you have saught the `Value` you're interested in, you can use the `Is*` methods
-// to determine its type.
-//
-//     if m.Get("code").IsStr() { /* ... */ }
-//
-// Or you can just assume the type, and use one of the strong type methods to
-// extract the real value:
-//
-//     m.Get("code").Int()
-//
-// If there's no value there (or if it's the wrong type) then a default value
-// will be returned, or you can be explicit about the default value.
-//
-//     Get("code").Int(-1)
-//
-// If you're dealing with a slice of data as a value, Objx provides many useful
-// methods for iterating, manipulating and selecting that data.  You can find out more
-// by exploring the index below.
-//
-// Reading data
-//
-// A simple example of how to use Objx:
-//
-//     // use MustFromJSON to make an objx.Map from some JSON
-//     m := objx.MustFromJSON(`{"name": "Mat", "age": 30}`)
-//
-//     // get the details
-//     name := m.Get("name").Str()
-//     age := m.Get("age").Int()
-//
-//     // get their nickname (or use their name if they
-//     // don't have one)
-//     nickname := m.Get("nickname").Str(name)
-//
-// Ranging
-//
-// Since `objx.Map` is a `map[string]interface{}` you can treat it as such.  For
-// example, to `range` the data, do what you would expect:
-//
-//     m := objx.MustFromJSON(json)
-//     for key, value := range m {
-//
-//       /* ... do your magic ... */
-//
-//     }
+/*
+Objx - Go package for dealing with maps, slices, JSON and other data.
+
+Overview
+
+Objx provides the `objx.Map` type, which is a `map[string]interface{}` that exposes
+a powerful `Get` method (among others) that allows you to easily and quickly get
+access to data within the map, without having to worry too much about type assertions,
+missing data, default values etc.
+
+Pattern
+
+Objx uses a preditable pattern to make access data from within `map[string]interface{}` easy.
+Call one of the `objx.` functions to create your `objx.Map` to get going:
+
+    m, err := objx.FromJSON(json)
+
+NOTE: Any methods or functions with the `Must` prefix will panic if something goes wrong,
+the rest will be optimistic and try to figure things out without panicking.
+
+Use `Get` to access the value you're interested in.  You can use dot and array
+notation too:
+
+     m.Get("places[0].latlng")
+
+Once you have sought the `Value` you're interested in, you can use the `Is*` methods to determine its type.
+
+     if m.Get("code").IsStr() { // Your code... }
+
+Or you can just assume the type, and use one of the strong type methods to extract the real value:
+
+   m.Get("code").Int()
+
+If there's no value there (or if it's the wrong type) then a default value will be returned,
+or you can be explicit about the default value.
+
+     Get("code").Int(-1)
+
+If you're dealing with a slice of data as a value, Objx provides many useful methods for iterating,
+manipulating and selecting that data.  You can find out more by exploring the index below.
+
+Reading data
+
+A simple example of how to use Objx:
+
+   // Use MustFromJSON to make an objx.Map from some JSON
+   m := objx.MustFromJSON(`{"name": "Mat", "age": 30}`)
+
+   // Get the details
+   name := m.Get("name").Str()
+   age := m.Get("age").Int()
+
+   // Get their nickname (or use their name if they don't have one)
+   nickname := m.Get("nickname").Str(name)
+
+Ranging
+
+Since `objx.Map` is a `map[string]interface{}` you can treat it as such.
+For example, to `range` the data, do what you would expect:
+
+    m := objx.MustFromJSON(json)
+    for key, value := range m {
+      // Your code...
+    }
+*/
 package objx

vendor/github.com/stretchr/objx/map.go

@@ -27,7 +27,7 @@ func (m Map) Value() *Value {
 }
 
 // Nil represents a nil Map.
-var Nil Map = New(nil)
+var Nil = New(nil)
 
 // New creates a new Map containing the map[string]interface{} in the data argument.
 // If the data argument is not a map[string]interface, New attempts to call the
@@ -49,7 +49,7 @@ func New(data interface{}) Map {
 //
 // Panics
 //
-// Panics if any key arugment is non-string or if there are an odd number of arguments.
+// Panics if any key argument is non-string or if there are an odd number of arguments.
 //
 // Example
 //
@@ -60,16 +60,13 @@ func New(data interface{}) Map {
 //     // creates an Map equivalent to
 //     m := objx.New(map[string]interface{}{"name": "Mat", "age": 29, "subobj": map[string]interface{}{"active": true}})
 func MSI(keyAndValuePairs ...interface{}) Map {
-
 	newMap := make(map[string]interface{})
 	keyAndValuePairsLen := len(keyAndValuePairs)
-
 	if keyAndValuePairsLen%2 != 0 {
 		panic("objx: MSI must have an even number of arguments following the 'key, value' pattern.")
 	}
 
 	for i := 0; i < keyAndValuePairsLen; i = i + 2 {
-
 		key := keyAndValuePairs[i]
 		value := keyAndValuePairs[i+1]
 
@@ -78,11 +75,8 @@ func MSI(keyAndValuePairs ...interface{}) Map {
 		if !keyStringOK {
 			panic("objx: MSI must follow 'string, interface{}' pattern.  " + keyString + " is not a valid key.")
 		}
-
 		newMap[keyString] = value
-
 	}
-
 	return New(newMap)
 }
 
@@ -94,11 +88,9 @@ func MSI(keyAndValuePairs ...interface{}) Map {
 // Panics if the JSON is invalid.
 func MustFromJSON(jsonString string) Map {
 	o, err := FromJSON(jsonString)
-
 	if err != nil {
 		panic("objx: MustFromJSON failed with error: " + err.Error())
 	}
-
 	return o
 }
 
@@ -107,16 +99,12 @@ func MustFromJSON(jsonString string) Map {
 //
 // Returns an error if the JSON is invalid.
 func FromJSON(jsonString string) (Map, error) {
-
 	var data interface{}
 	err := json.Unmarshal([]byte(jsonString), &data)
-
 	if err != nil {
 		return Nil, err
 	}
-
 	return New(data), nil
-
 }
 
 // FromBase64 creates a new Obj containing the data specified
@@ -124,14 +112,11 @@ func FromJSON(jsonString string) (Map, error) {
 //
 // The string is an encoded JSON string returned by Base64
 func FromBase64(base64String string) (Map, error) {
-
 	decoder := base64.NewDecoder(base64.StdEncoding, strings.NewReader(base64String))
-
 	decoded, err := ioutil.ReadAll(decoder)
 	if err != nil {
 		return nil, err
 	}
-
 	return FromJSON(string(decoded))
 }
 
@@ -140,13 +125,10 @@ func FromBase64(base64String string) (Map, error) {
 //
 // The string is an encoded JSON string returned by Base64
 func MustFromBase64(base64String string) Map {
-
 	result, err := FromBase64(base64String)
-
 	if err != nil {
 		panic("objx: MustFromBase64 failed with error: " + err.Error())
 	}
-
 	return result
 }
 
@@ -157,14 +139,13 @@ func MustFromBase64(base64String string) Map {
 func FromSignedBase64(base64String, key string) (Map, error) {
 	parts := strings.Split(base64String, SignatureSeparator)
 	if len(parts) != 2 {
-		return nil, errors.New("objx: Signed base64 string is malformed.")
+		return nil, errors.New("objx: Signed base64 string is malformed")
 	}
 
 	sig := HashWithKey(parts[0], key)
 	if parts[1] != sig {
-		return nil, errors.New("objx: Signature for base64 data does not match.")
+		return nil, errors.New("objx: Signature for base64 data does not match")
 	}
-
 	return FromBase64(parts[0])
 }
 
@@ -173,13 +154,10 @@ func FromSignedBase64(base64String, key string) (Map, error) {
 //
 // The string is an encoded JSON string returned by Base64
 func MustFromSignedBase64(base64String, key string) Map {
-
 	result, err := FromSignedBase64(base64String, key)
-
 	if err != nil {
 		panic("objx: MustFromSignedBase64 failed with error: " + err.Error())
 	}
-
 	return result
 }
 
@@ -188,9 +166,7 @@ func MustFromSignedBase64(base64String, key string) Map {
 //
 // For queries with multiple values, the first value is selected.
 func FromURLQuery(query string) (Map, error) {
-
 	vals, err := url.ParseQuery(query)
-
 	if err != nil {
 		return nil, err
 	}
@@ -199,7 +175,6 @@ func FromURLQuery(query string) (Map, error) {
 	for k, vals := range vals {
 		m[k] = vals[0]
 	}
-
 	return New(m), nil
 }
 
@@ -210,13 +185,9 @@ func FromURLQuery(query string) (Map, error) {
 //
 // Panics if it encounters an error
 func MustFromURLQuery(query string) Map {
-
 	o, err := FromURLQuery(query)
-
 	if err != nil {
 		panic("objx: MustFromURLQuery failed with error: " + err.Error())
 	}
-
 	return o
-
 }

vendor/github.com/stretchr/objx/mutations.go

@@ -2,11 +2,10 @@ package objx
 
 // Exclude returns a new Map with the keys in the specified []string
 // excluded.
-func (d Map) Exclude(exclude []string) Map {
-
+func (m Map) Exclude(exclude []string) Map {
 	excluded := make(Map)
-	for k, v := range d {
-		var shouldInclude bool = true
+	for k, v := range m {
+		var shouldInclude = true
 		for _, toExclude := range exclude {
 			if k == toExclude {
 				shouldInclude = false
@@ -17,7 +16,6 @@ func (d Map) Exclude(exclude []string) Map {
 			excluded[k] = v
 		}
 	}
-
 	return excluded
 }
 
@@ -38,19 +36,16 @@ func (m Map) Merge(merge Map) Map {
 	return m.Copy().MergeHere(merge)
 }
 
-// Merge blends the specified map with this map and returns the current map.
+// MergeHere blends the specified map with this map and returns the current map.
 //
-// Keys that appear in both will be selected from the specified map.  The original map
+// Keys that appear in both will be selected from the specified map. The original map
 // will be modified. This method requires that
 // the wrapped object be a map[string]interface{}
 func (m Map) MergeHere(merge Map) Map {
-
 	for k, v := range merge {
 		m[k] = v
 	}
-
 	return m
-
 }
 
 // Transform builds a new Obj giving the transformer a chance
@@ -71,11 +66,9 @@ func (m Map) Transform(transformer func(key string, value interface{}) (string,
 // This method requires that the wrapped object be a map[string]interface{}
 func (m Map) TransformKeys(mapping map[string]string) Map {
 	return m.Transform(func(key string, value interface{}) (string, interface{}) {
-
 		if newKey, ok := mapping[key]; ok {
 			return newKey, value
 		}
-
 		return key, value
 	})
 }

vendor/github.com/stretchr/objx/security.go

@@ -9,6 +9,9 @@ import (
 // key.
 func HashWithKey(data, key string) string {
 	hash := sha1.New()
-	hash.Write([]byte(data + ":" + key))
+	_, err := hash.Write([]byte(data + ":" + key))
+	if err != nil {
+		return ""
+	}
 	return hex.EncodeToString(hash.Sum(nil))
 }

vendor/github.com/stretchr/objx/value.go

@@ -1,5 +1,10 @@
 package objx
 
+import (
+	"fmt"
+	"strconv"
+)
+
 // Value provides methods for extracting interface{} data in various
 // types.
 type Value struct {
@@ -11,3 +16,41 @@ type Value struct {
 func (v *Value) Data() interface{} {
 	return v.data
 }
+
+// String returns the value always as a string
+func (v *Value) String() string {
+	switch {
+	case v.IsStr():
+		return v.Str()
+	case v.IsBool():
+		return strconv.FormatBool(v.Bool())
+	case v.IsFloat32():
+		return strconv.FormatFloat(float64(v.Float32()), 'f', -1, 32)
+	case v.IsFloat64():
+		return strconv.FormatFloat(v.Float64(), 'f', -1, 64)
+	case v.IsInt():
+		return strconv.FormatInt(int64(v.Int()), 10)
+	case v.IsInt():
+		return strconv.FormatInt(int64(v.Int()), 10)
+	case v.IsInt8():
+		return strconv.FormatInt(int64(v.Int8()), 10)
+	case v.IsInt16():
+		return strconv.FormatInt(int64(v.Int16()), 10)
+	case v.IsInt32():
+		return strconv.FormatInt(int64(v.Int32()), 10)
+	case v.IsInt64():
+		return strconv.FormatInt(v.Int64(), 10)
+	case v.IsUint():
+		return strconv.FormatUint(uint64(v.Uint()), 10)
+	case v.IsUint8():
+		return strconv.FormatUint(uint64(v.Uint8()), 10)
+	case v.IsUint16():
+		return strconv.FormatUint(uint64(v.Uint16()), 10)
+	case v.IsUint32():
+		return strconv.FormatUint(uint64(v.Uint32()), 10)
+	case v.IsUint64():
+		return strconv.FormatUint(v.Uint64(), 10)
+	}
+
+	return fmt.Sprintf("%#v", v.Data())
+}