1 files changed, 16 insertions, 4 deletions

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
                 }