1 files changed, 36 insertions, 41 deletions

diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go
index 46d354e..831b011 100644
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal_error.go
@@ -2,73 +2,68 @@ package query
 
 import (
         "encoding/xml"
-        "io/ioutil"
+        "fmt"
 
         "github.com/aws/aws-sdk-go/aws/awserr"
         "github.com/aws/aws-sdk-go/aws/request"
+        "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil"
 )
 
+// UnmarshalErrorHandler is a name request handler to unmarshal request errors
+var UnmarshalErrorHandler = request.NamedHandler{Name: "awssdk.query.UnmarshalError", Fn: UnmarshalError}
+
 type xmlErrorResponse struct {
-        XMLName   xml.Name `xml:"ErrorResponse"`
-        Code      string   `xml:"Error>Code"`
-        Message   string   `xml:"Error>Message"`
-        RequestID string   `xml:"RequestId"`
+        Code      string `xml:"Error>Code"`
+        Message   string `xml:"Error>Message"`
+        RequestID string `xml:"RequestId"`
 }
 
-type xmlServiceUnavailableResponse struct {
-        XMLName xml.Name `xml:"ServiceUnavailableException"`
+type xmlResponseError struct {
+        xmlErrorResponse
 }
 
-// UnmarshalErrorHandler is a name request handler to unmarshal request errors
-var UnmarshalErrorHandler = request.NamedHandler{Name: "awssdk.query.UnmarshalError", Fn: UnmarshalError}
+func (e *xmlResponseError) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
+        const svcUnavailableTagName = "ServiceUnavailableException"
+        const errorResponseTagName = "ErrorResponse"
+
+        switch start.Name.Local {
+        case svcUnavailableTagName:
+                e.Code = svcUnavailableTagName
+                e.Message = "service is unavailable"
+                return d.Skip()
+
+        case errorResponseTagName:
+                return d.DecodeElement(&e.xmlErrorResponse, &start)
+
+        default:
+                return fmt.Errorf("unknown error response tag, %v", start)
+        }
+}
 
 // UnmarshalError unmarshals an error response for an AWS Query service.
 func UnmarshalError(r *request.Request) {
         defer r.HTTPResponse.Body.Close()
 
-        bodyBytes, err := ioutil.ReadAll(r.HTTPResponse.Body)
+        var respErr xmlResponseError
+        err := xmlutil.UnmarshalXMLError(&respErr, r.HTTPResponse.Body)
         if err != nil {
                 r.Error = awserr.NewRequestFailure(
-                        awserr.New("SerializationError", "failed to read from query HTTP response body", err),
+                        awserr.New(request.ErrCodeSerialization,
+                                "failed to unmarshal error message", err),
                         r.HTTPResponse.StatusCode,
                         r.RequestID,
                 )
                 return
         }
 
-        // First check for specific error
-        resp := xmlErrorResponse{}
-        decodeErr := xml.Unmarshal(bodyBytes, &resp)
-        if decodeErr == nil {
-                reqID := resp.RequestID
-                if reqID == "" {
-                        reqID = r.RequestID
-                }
-                r.Error = awserr.NewRequestFailure(
-                        awserr.New(resp.Code, resp.Message, nil),
-                        r.HTTPResponse.StatusCode,
-                        reqID,
-                )
-                return
-        }
-
-        // Check for unhandled error
-        servUnavailResp := xmlServiceUnavailableResponse{}
-        unavailErr := xml.Unmarshal(bodyBytes, &servUnavailResp)
-        if unavailErr == nil {
-                r.Error = awserr.NewRequestFailure(
-                        awserr.New("ServiceUnavailableException", "service is unavailable", nil),
-                        r.HTTPResponse.StatusCode,
-                        r.RequestID,
-                )
-                return
+        reqID := respErr.RequestID
+        if len(reqID) == 0 {
+                reqID = r.RequestID
         }
 
-        // Failed to retrieve any error message from the response body
         r.Error = awserr.NewRequestFailure(
-                awserr.New("SerializationError",
-                        "failed to decode query XML error response", decodeErr),
+                awserr.New(respErr.Code, respErr.Message, nil),
                 r.HTTPResponse.StatusCode,
-                r.RequestID,
+                reqID,
         )
 }