update vendor and go.modadd_contact_groups

2 files changed, 21 insertions, 11 deletions

diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
index b80f84f..1301b14 100644
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/build.go
@@ -25,6 +25,8 @@ var noEscape [256]bool
 
 var errValueNotSet = fmt.Errorf("value not set")
 
+var byteSliceType = reflect.TypeOf([]byte{})
+
 func init() {
         for i := 0; i < len(noEscape); i++ {
                 // AWS expects every character except these to be escaped
@@ -94,6 +96,14 @@ func buildLocationElements(r *request.Request, v reflect.Value, buildGETQuery bo
                                 continue
                         }
 
+                        // Support the ability to customize values to be marshaled as a
+                        // blob even though they were modeled as a string. Required for S3
+                        // API operations like SSECustomerKey is modeled as stirng but
+                        // required to be base64 encoded in request.
+                        if field.Tag.Get("marshal-as") == "blob" {
+                                m = m.Convert(byteSliceType)
+                        }
+
                         var err error
                         switch field.Tag.Get("location") {
                         case "headers": // header maps
@@ -137,7 +147,7 @@ func buildBody(r *request.Request, v reflect.Value) {
                                         case string:
                                                 r.SetStringBody(reader)
                                         default:
-                                                r.Error = awserr.New("SerializationError",
+                                                r.Error = awserr.New(request.ErrCodeSerialization,
                                                         "failed to encode REST request",
                                                         fmt.Errorf("unknown payload type %s", payload.Type()))
                                         }
@@ -152,7 +162,7 @@ func buildHeader(header *http.Header, v reflect.Value, name string, tag reflect.
         if err == errValueNotSet {
                 return nil
         } else if err != nil {
-                return awserr.New("SerializationError", "failed to encode REST request", err)
+                return awserr.New(request.ErrCodeSerialization, "failed to encode REST request", err)
         }
 
         name = strings.TrimSpace(name)
@@ -170,7 +180,7 @@ func buildHeaderMap(header *http.Header, v reflect.Value, tag reflect.StructTag)
                 if err == errValueNotSet {
                         continue
                 } else if err != nil {
-                        return awserr.New("SerializationError", "failed to encode REST request", err)
+                        return awserr.New(request.ErrCodeSerialization, "failed to encode REST request", err)
 
                 }
                 keyStr := strings.TrimSpace(key.String())
@@ -186,7 +196,7 @@ func buildURI(u *url.URL, v reflect.Value, name string, tag reflect.StructTag) e
         if err == errValueNotSet {
                 return nil
         } else if err != nil {
-                return awserr.New("SerializationError", "failed to encode REST request", err)
+                return awserr.New(request.ErrCodeSerialization, "failed to encode REST request", err)
         }
 
         u.Path = strings.Replace(u.Path, "{"+name+"}", value, -1)
@@ -219,7 +229,7 @@ func buildQueryString(query url.Values, v reflect.Value, name string, tag reflec
                 if err == errValueNotSet {
                         return nil
                 } else if err != nil {
-                        return awserr.New("SerializationError", "failed to encode REST request", err)
+                        return awserr.New(request.ErrCodeSerialization, "failed to encode REST request", err)
                 }
                 query.Set(name, str)
         }
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
index 33fd53b..de02136 100644
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/rest/unmarshal.go
@@ -57,7 +57,7 @@ func unmarshalBody(r *request.Request, v reflect.Value) {
                                                 defer r.HTTPResponse.Body.Close()
                                                 b, err := ioutil.ReadAll(r.HTTPResponse.Body)
                                                 if err != nil {
-                                                        r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
+                                                        r.Error = awserr.New(request.ErrCodeSerialization, "failed to decode REST response", err)
                                                 } else {
                                                         payload.Set(reflect.ValueOf(b))
                                                 }
@@ -65,7 +65,7 @@ func unmarshalBody(r *request.Request, v reflect.Value) {
                                                 defer r.HTTPResponse.Body.Close()
                                                 b, err := ioutil.ReadAll(r.HTTPResponse.Body)
                                                 if err != nil {
-                                                        r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
+                                                        r.Error = awserr.New(request.ErrCodeSerialization, "failed to decode REST response", err)
                                                 } else {
                                                         str := string(b)
                                                         payload.Set(reflect.ValueOf(&str))
@@ -77,7 +77,7 @@ func unmarshalBody(r *request.Request, v reflect.Value) {
                                                 case "io.ReadSeeker":
                                                         b, err := ioutil.ReadAll(r.HTTPResponse.Body)
                                                         if err != nil {
-                                                                r.Error = awserr.New("SerializationError",
+                                                                r.Error = awserr.New(request.ErrCodeSerialization,
                                                                         "failed to read response body", err)
                                                                 return
                                                         }
@@ -85,7 +85,7 @@ func unmarshalBody(r *request.Request, v reflect.Value) {
                                                 default:
                                                         io.Copy(ioutil.Discard, r.HTTPResponse.Body)
                                                         defer r.HTTPResponse.Body.Close()
-                                                        r.Error = awserr.New("SerializationError",
+                                                        r.Error = awserr.New(request.ErrCodeSerialization,
                                                                 "failed to decode REST response",
                                                                 fmt.Errorf("unknown payload type %s", payload.Type()))
                                                 }
@@ -115,14 +115,14 @@ func unmarshalLocationElements(r *request.Request, v reflect.Value) {
                         case "header":
                                 err := unmarshalHeader(m, r.HTTPResponse.Header.Get(name), field.Tag)
                                 if err != nil {
-                                        r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
+                                        r.Error = awserr.New(request.ErrCodeSerialization, "failed to decode REST response", err)
                                         break
                                 }
                         case "headers":
                                 prefix := field.Tag.Get("locationName")
                                 err := unmarshalHeaderMap(m, r.HTTPResponse.Header, prefix)
                                 if err != nil {
-                                        r.Error = awserr.New("SerializationError", "failed to decode REST response", err)
+                                        r.Error = awserr.New(request.ErrCodeSerialization, "failed to decode REST response", err)
                                         break
                                 }
                         }