Merge 'v1.5.2' into master

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
 }