7 files changed, 162 insertions, 13 deletions

diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/host.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/host.go
new file mode 100644
index 0000000..d7d42db
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/host.go
@@ -0,0 +1,68 @@
+package protocol
+
+import (
+        "strings"
+
+        "github.com/aws/aws-sdk-go/aws/request"
+)
+
+// ValidateEndpointHostHandler is a request handler that will validate the
+// request endpoint's hosts is a valid RFC 3986 host.
+var ValidateEndpointHostHandler = request.NamedHandler{
+        Name: "awssdk.protocol.ValidateEndpointHostHandler",
+        Fn: func(r *request.Request) {
+                err := ValidateEndpointHost(r.Operation.Name, r.HTTPRequest.URL.Host)
+                if err != nil {
+                        r.Error = err
+                }
+        },
+}
+
+// ValidateEndpointHost validates that the host string passed in is a valid RFC
+// 3986 host. Returns error if the host is not valid.
+func ValidateEndpointHost(opName, host string) error {
+        paramErrs := request.ErrInvalidParams{Context: opName}
+        labels := strings.Split(host, ".")
+
+        for i, label := range labels {
+                if i == len(labels)-1 && len(label) == 0 {
+                        // Allow trailing dot for FQDN hosts.
+                        continue
+                }
+
+                if !ValidHostLabel(label) {
+                        paramErrs.Add(request.NewErrParamFormat(
+                                "endpoint host label", "[a-zA-Z0-9-]{1,63}", label))
+                }
+        }
+
+        if len(host) > 255 {
+                paramErrs.Add(request.NewErrParamMaxLen(
+                        "endpoint host", 255, host,
+                ))
+        }
+
+        if paramErrs.Len() > 0 {
+                return paramErrs
+        }
+        return nil
+}
+
+// ValidHostLabel returns if the label is a valid RFC 3986 host label.
+func ValidHostLabel(label string) bool {
+        if l := len(label); l == 0 || l > 63 {
+                return false
+        }
+        for _, r := range label {
+                switch {
+                case r >= '0' && r <= '9':
+                case r >= 'A' && r <= 'Z':
+                case r >= 'a' && r <= 'z':
+                case r == '-':
+                default:
+                        return false
+                }
+        }
+
+        return true
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/host_prefix.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/host_prefix.go
new file mode 100644
index 0000000..915b0fc
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/host_prefix.go
@@ -0,0 +1,54 @@
+package protocol
+
+import (
+        "strings"
+
+        "github.com/aws/aws-sdk-go/aws"
+        "github.com/aws/aws-sdk-go/aws/request"
+)
+
+// HostPrefixHandlerName is the handler name for the host prefix request
+// handler.
+const HostPrefixHandlerName = "awssdk.endpoint.HostPrefixHandler"
+
+// NewHostPrefixHandler constructs a build handler
+func NewHostPrefixHandler(prefix string, labelsFn func() map[string]string) request.NamedHandler {
+        builder := HostPrefixBuilder{
+                Prefix:   prefix,
+                LabelsFn: labelsFn,
+        }
+
+        return request.NamedHandler{
+                Name: HostPrefixHandlerName,
+                Fn:   builder.Build,
+        }
+}
+
+// HostPrefixBuilder provides the request handler to expand and prepend
+// the host prefix into the operation's request endpoint host.
+type HostPrefixBuilder struct {
+        Prefix   string
+        LabelsFn func() map[string]string
+}
+
+// Build updates the passed in Request with the HostPrefix template expanded.
+func (h HostPrefixBuilder) Build(r *request.Request) {
+        if aws.BoolValue(r.Config.DisableEndpointHostPrefix) {
+                return
+        }
+
+        var labels map[string]string
+        if h.LabelsFn != nil {
+                labels = h.LabelsFn()
+        }
+
+        prefix := h.Prefix
+        for name, value := range labels {
+                prefix = strings.Replace(prefix, "{"+name+"}", value, -1)
+        }
+
+        r.HTTPRequest.URL.Host = prefix + r.HTTPRequest.URL.Host
+        if len(r.HTTPRequest.Host) > 0 {
+                r.HTTPRequest.Host = prefix + r.HTTPRequest.Host
+        }
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go
index e0f4d5a..3495c73 100644
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/unmarshal.go
@@ -23,7 +23,11 @@ func Unmarshal(r *request.Request) {
                 decoder := xml.NewDecoder(r.HTTPResponse.Body)
                 err := xmlutil.UnmarshalXML(r.Data, decoder, r.Operation.Name+"Result")
                 if err != nil {
-                        r.Error = awserr.New("SerializationError", "failed decoding Query response", err)
+                        r.Error = awserr.NewRequestFailure(
+                                awserr.New("SerializationError", "failed decoding Query response", err),
+                                r.HTTPResponse.StatusCode,
+                                r.RequestID,
+                        )
                         return
                 }
         }
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 f214296..46d354e 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
@@ -28,7 +28,11 @@ func UnmarshalError(r *request.Request) {
 
         bodyBytes, err := ioutil.ReadAll(r.HTTPResponse.Body)
         if err != nil {
-                r.Error = awserr.New("SerializationError", "failed to read from query HTTP response body", err)
+                r.Error = awserr.NewRequestFailure(
+                        awserr.New("SerializationError", "failed to read from query HTTP response body", err),
+                        r.HTTPResponse.StatusCode,
+                        r.RequestID,
+                )
                 return
         }
 
@@ -61,6 +65,10 @@ func UnmarshalError(r *request.Request) {
         }
 
         // Failed to retrieve any error message from the response body
-        r.Error = awserr.New("SerializationError",
-                "failed to decode query XML error response", decodeErr)
+        r.Error = awserr.NewRequestFailure(
+                awserr.New("SerializationError",
+                        "failed to decode query XML error response", decodeErr),
+                r.HTTPResponse.StatusCode,
+                r.RequestID,
+        )
 }
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 b34f525..b80f84f 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
@@ -155,6 +155,9 @@ func buildHeader(header *http.Header, v reflect.Value, name string, tag reflect.
                 return awserr.New("SerializationError", "failed to encode REST request", err)
         }
 
+        name = strings.TrimSpace(name)
+        str = strings.TrimSpace(str)
+
         header.Add(name, str)
 
         return nil
@@ -170,8 +173,10 @@ func buildHeaderMap(header *http.Header, v reflect.Value, tag reflect.StructTag)
                         return awserr.New("SerializationError", "failed to encode REST request", err)
 
                 }
+                keyStr := strings.TrimSpace(key.String())
+                str = strings.TrimSpace(str)
 
-                header.Add(prefix+key.String(), str)
+                header.Add(prefix+keyStr, str)
         }
         return nil
 }
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go
index 7bdf4c8..b0f4e24 100644
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/restxml/restxml.go
@@ -36,7 +36,11 @@ func Build(r *request.Request) {
                 var buf bytes.Buffer
                 err := xmlutil.BuildXML(r.Params, xml.NewEncoder(&buf))
                 if err != nil {
-                        r.Error = awserr.New("SerializationError", "failed to encode rest XML request", err)
+                        r.Error = awserr.NewRequestFailure(
+                                awserr.New("SerializationError", "failed to encode rest XML request", err),
+                                r.HTTPResponse.StatusCode,
+                                r.RequestID,
+                        )
                         return
                 }
                 r.SetBufferBody(buf.Bytes())
@@ -50,7 +54,11 @@ func Unmarshal(r *request.Request) {
                 decoder := xml.NewDecoder(r.HTTPResponse.Body)
                 err := xmlutil.UnmarshalXML(r.Data, decoder, "")
                 if err != nil {
-                        r.Error = awserr.New("SerializationError", "failed to decode REST XML response", err)
+                        r.Error = awserr.NewRequestFailure(
+                                awserr.New("SerializationError", "failed to decode REST XML response", err),
+                                r.HTTPResponse.StatusCode,
+                                r.RequestID,
+                        )
                         return
                 }
         } else {
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go
index 07764c8..cf981fe 100644
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/build.go
@@ -87,15 +87,13 @@ func (b *xmlBuilder) buildValue(value reflect.Value, current *XMLNode, tag refle
         }
 }
 
-// buildStruct adds a struct and its fields to the current XMLNode. All fields any any nested
+// buildStruct adds a struct and its fields to the current XMLNode. All fields and any nested
 // types are converted to XMLNodes also.
 func (b *xmlBuilder) buildStruct(value reflect.Value, current *XMLNode, tag reflect.StructTag) error {
         if !value.IsValid() {
                 return nil
         }
 
-        fieldAdded := false
-
         // unwrap payloads
         if payload := tag.Get("payload"); payload != "" {
                 field, _ := value.Type().FieldByName(payload)
@@ -123,6 +121,8 @@ func (b *xmlBuilder) buildStruct(value reflect.Value, current *XMLNode, tag refl
                 child.Attr = append(child.Attr, ns)
         }
 
+        var payloadFields, nonPayloadFields int
+
         t := value.Type()
         for i := 0; i < value.NumField(); i++ {
                 member := elemOf(value.Field(i))
@@ -137,8 +137,10 @@ func (b *xmlBuilder) buildStruct(value reflect.Value, current *XMLNode, tag refl
 
                 mTag := field.Tag
                 if mTag.Get("location") != "" { // skip non-body members
+                        nonPayloadFields++
                         continue
                 }
+                payloadFields++
 
                 if protocol.CanSetIdempotencyToken(value.Field(i), field) {
                         token := protocol.GetIdempotencyToken()
@@ -153,11 +155,11 @@ func (b *xmlBuilder) buildStruct(value reflect.Value, current *XMLNode, tag refl
                 if err := b.buildValue(member, child, mTag); err != nil {
                         return err
                 }
-
-                fieldAdded = true
         }
 
-        if fieldAdded { // only append this child if we have one ore more valid members
+        // Only case where the child shape is not added is if the shape only contains
+        // non-payload fields, e.g headers/query.
+        if !(payloadFields == 0 && nonPayloadFields > 0) {
                 current.AddChild(child)
         }