3 files changed, 30 insertions, 9 deletions

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 7091b45..07764c8 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
@@ -13,9 +13,13 @@ import (
         "github.com/aws/aws-sdk-go/private/protocol"
 )
 
-// BuildXML will serialize params into an xml.Encoder.
-// Error will be returned if the serialization of any of the params or nested values fails.
+// BuildXML will serialize params into an xml.Encoder. Error will be returned
+// if the serialization of any of the params or nested values fails.
 func BuildXML(params interface{}, e *xml.Encoder) error {
+        return buildXML(params, e, false)
+}
+
+func buildXML(params interface{}, e *xml.Encoder, sorted bool) error {
         b := xmlBuilder{encoder: e, namespaces: map[string]string{}}
         root := NewXMLElement(xml.Name{})
         if err := b.buildValue(reflect.ValueOf(params), root, ""); err != nil {
@@ -23,7 +27,7 @@ func BuildXML(params interface{}, e *xml.Encoder) error {
         }
         for _, c := range root.Children {
                 for _, v := range c {
-                        return StructToXML(e, v, false)
+                        return StructToXML(e, v, sorted)
                 }
         }
         return nil
@@ -278,8 +282,12 @@ func (b *xmlBuilder) buildScalar(value reflect.Value, current *XMLNode, tag refl
         case float32:
                 str = strconv.FormatFloat(float64(converted), 'f', -1, 32)
         case time.Time:
-                const ISO8601UTC = "2006-01-02T15:04:05Z"
-                str = converted.UTC().Format(ISO8601UTC)
+                format := tag.Get("timestampFormat")
+                if len(format) == 0 {
+                        format = protocol.ISO8601TimeFormatName
+                }
+
+                str = protocol.FormatTime(format, converted)
         default:
                 return fmt.Errorf("unsupported value for param %s: %v (%s)",
                         tag.Get("locationName"), value.Interface(), value.Type().Name())
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go
index 8758462..ff1ef68 100644
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/unmarshal.go
@@ -9,6 +9,8 @@ import (
         "strconv"
         "strings"
         "time"
+
+        "github.com/aws/aws-sdk-go/private/protocol"
 )
 
 // UnmarshalXML deserializes an xml.Decoder into the container v. V
@@ -52,9 +54,15 @@ func parse(r reflect.Value, node *XMLNode, tag reflect.StructTag) error {
         if t == "" {
                 switch rtype.Kind() {
                 case reflect.Struct:
-                        t = "structure"
+                        // also it can't be a time object
+                        if _, ok := r.Interface().(*time.Time); !ok {
+                                t = "structure"
+                        }
                 case reflect.Slice:
-                        t = "list"
+                        // also it can't be a byte slice
+                        if _, ok := r.Interface().([]byte); !ok {
+                                t = "list"
+                        }
                 case reflect.Map:
                         t = "map"
                 }
@@ -247,8 +255,12 @@ func parseScalar(r reflect.Value, node *XMLNode, tag reflect.StructTag) error {
                 }
                 r.Set(reflect.ValueOf(&v))
         case *time.Time:
-                const ISO8601UTC = "2006-01-02T15:04:05Z"
-                t, err := time.Parse(ISO8601UTC, node.Text)
+                format := tag.Get("timestampFormat")
+                if len(format) == 0 {
+                        format = protocol.ISO8601TimeFormatName
+                }
+
+                t, err := protocol.ParseTime(format, node.Text)
                 if err != nil {
                         return err
                 }
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go
index 3e970b6..515ce15 100644
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil/xml_to_struct.go
@@ -29,6 +29,7 @@ func NewXMLElement(name xml.Name) *XMLNode {
 
 // AddChild adds child to the XMLNode.
 func (n *XMLNode) AddChild(child *XMLNode) {
+        child.parent = n
         if _, ok := n.Children[child.Name.Local]; !ok {
                 n.Children[child.Name.Local] = []*XMLNode{}
         }