76 files changed, 8640 insertions, 1878 deletions

diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/client.go b/vendor/github.com/aws/aws-sdk-go/aws/client/client.go
index 788fe6e..212fe25 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/client/client.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/client/client.go
@@ -15,6 +15,12 @@ type Config struct {
         Endpoint      string
         SigningRegion string
         SigningName   string
+
+        // States that the signing name did not come from a modeled source but
+        // was derived based on other data. Used by service client constructors
+        // to determine if the signin name can be overriden based on metadata the
+        // service has.
+        SigningNameDerived bool
 }
 
 // ConfigProvider provides a generic way for a service client to receive
@@ -85,6 +91,6 @@ func (c *Client) AddDebugHandlers() {
                 return
         }
 
-        c.Handlers.Send.PushFrontNamed(request.NamedHandler{Name: "awssdk.client.LogRequest", Fn: logRequest})
-        c.Handlers.Send.PushBackNamed(request.NamedHandler{Name: "awssdk.client.LogResponse", Fn: logResponse})
+        c.Handlers.Send.PushFrontNamed(LogHTTPRequestHandler)
+        c.Handlers.Send.PushBackNamed(LogHTTPResponseHandler)
 }
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go
index 1313478..a397b0d 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go
@@ -1,11 +1,11 @@
 package client
 
 import (
-        "math/rand"
-        "sync"
+        "strconv"
         "time"
 
         "github.com/aws/aws-sdk-go/aws/request"
+        "github.com/aws/aws-sdk-go/internal/sdkrand"
 )
 
 // DefaultRetryer implements basic retry logic using exponential backoff for
@@ -15,11 +15,11 @@ import (
 // the MaxRetries method:
 //
 //              type retryer struct {
-//      service.DefaultRetryer
+//      client.DefaultRetryer
 //    }
 //
 //    // This implementation always has 100 max retries
-//    func (d retryer) MaxRetries() uint { return 100 }
+//    func (d retryer) MaxRetries() int { return 100 }
 type DefaultRetryer struct {
         NumMaxRetries int
 }
@@ -30,25 +30,27 @@ func (d DefaultRetryer) MaxRetries() int {
         return d.NumMaxRetries
 }
 
-var seededRand = rand.New(&lockedSource{src: rand.NewSource(time.Now().UnixNano())})
-
 // RetryRules returns the delay duration before retrying this request again
 func (d DefaultRetryer) RetryRules(r *request.Request) time.Duration {
         // Set the upper limit of delay in retrying at ~five minutes
         minTime := 30
         throttle := d.shouldThrottle(r)
         if throttle {
+                if delay, ok := getRetryDelay(r); ok {
+                        return delay
+                }
+
                 minTime = 500
         }
 
         retryCount := r.RetryCount
-        if retryCount > 13 {
-                retryCount = 13
-        } else if throttle && retryCount > 8 {
+        if throttle && retryCount > 8 {
                 retryCount = 8
+        } else if retryCount > 13 {
+                retryCount = 13
         }
 
-        delay := (1 << uint(retryCount)) * (seededRand.Intn(minTime) + minTime)
+        delay := (1 << uint(retryCount)) * (sdkrand.SeededRand.Intn(minTime) + minTime)
         return time.Duration(delay) * time.Millisecond
 }
 
@@ -60,7 +62,7 @@ func (d DefaultRetryer) ShouldRetry(r *request.Request) bool {
                 return *r.Retryable
         }
 
-        if r.HTTPResponse.StatusCode >= 500 {
+        if r.HTTPResponse.StatusCode >= 500 && r.HTTPResponse.StatusCode != 501 {
                 return true
         }
         return r.IsErrorRetryable() || d.shouldThrottle(r)
@@ -68,29 +70,47 @@ func (d DefaultRetryer) ShouldRetry(r *request.Request) bool {
 
 // ShouldThrottle returns true if the request should be throttled.
 func (d DefaultRetryer) shouldThrottle(r *request.Request) bool {
-        if r.HTTPResponse.StatusCode == 502 ||
-                r.HTTPResponse.StatusCode == 503 ||
-                r.HTTPResponse.StatusCode == 504 {
-                return true
+        switch r.HTTPResponse.StatusCode {
+        case 429:
+        case 502:
+        case 503:
+        case 504:
+        default:
+                return r.IsErrorThrottle()
         }
-        return r.IsErrorThrottle()
-}
 
-// lockedSource is a thread-safe implementation of rand.Source
-type lockedSource struct {
-        lk  sync.Mutex
-        src rand.Source
+        return true
 }
 
-func (r *lockedSource) Int63() (n int64) {
-        r.lk.Lock()
-        n = r.src.Int63()
-        r.lk.Unlock()
-        return
+// This will look in the Retry-After header, RFC 7231, for how long
+// it will wait before attempting another request
+func getRetryDelay(r *request.Request) (time.Duration, bool) {
+        if !canUseRetryAfterHeader(r) {
+                return 0, false
+        }
+
+        delayStr := r.HTTPResponse.Header.Get("Retry-After")
+        if len(delayStr) == 0 {
+                return 0, false
+        }
+
+        delay, err := strconv.Atoi(delayStr)
+        if err != nil {
+                return 0, false
+        }
+
+        return time.Duration(delay) * time.Second, true
 }
 
-func (r *lockedSource) Seed(seed int64) {
-        r.lk.Lock()
-        r.src.Seed(seed)
-        r.lk.Unlock()
+// Will look at the status code to see if the retry header pertains to
+// the status code.
+func canUseRetryAfterHeader(r *request.Request) bool {
+        switch r.HTTPResponse.StatusCode {
+        case 429:
+        case 503:
+        default:
+                return false
+        }
+
+        return true
 }
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/logger.go b/vendor/github.com/aws/aws-sdk-go/aws/client/logger.go
index 1f39c91..ce9fb89 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/client/logger.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/client/logger.go
@@ -44,22 +44,57 @@ func (reader *teeReaderCloser) Close() error {
         return reader.Source.Close()
 }
 
+// LogHTTPRequestHandler is a SDK request handler to log the HTTP request sent
+// to a service. Will include the HTTP request body if the LogLevel of the
+// request matches LogDebugWithHTTPBody.
+var LogHTTPRequestHandler = request.NamedHandler{
+        Name: "awssdk.client.LogRequest",
+        Fn:   logRequest,
+}
+
 func logRequest(r *request.Request) {
         logBody := r.Config.LogLevel.Matches(aws.LogDebugWithHTTPBody)
-        dumpedBody, err := httputil.DumpRequestOut(r.HTTPRequest, logBody)
+        bodySeekable := aws.IsReaderSeekable(r.Body)
+
+        b, err := httputil.DumpRequestOut(r.HTTPRequest, logBody)
         if err != nil {
-                r.Config.Logger.Log(fmt.Sprintf(logReqErrMsg, r.ClientInfo.ServiceName, r.Operation.Name, err))
+                r.Config.Logger.Log(fmt.Sprintf(logReqErrMsg,
+                        r.ClientInfo.ServiceName, r.Operation.Name, err))
                 return
         }
 
         if logBody {
+                if !bodySeekable {
+                        r.SetReaderBody(aws.ReadSeekCloser(r.HTTPRequest.Body))
+                }
                 // Reset the request body because dumpRequest will re-wrap the r.HTTPRequest's
                 // Body as a NoOpCloser and will not be reset after read by the HTTP
                 // client reader.
                 r.ResetBody()
         }
 
-        r.Config.Logger.Log(fmt.Sprintf(logReqMsg, r.ClientInfo.ServiceName, r.Operation.Name, string(dumpedBody)))
+        r.Config.Logger.Log(fmt.Sprintf(logReqMsg,
+                r.ClientInfo.ServiceName, r.Operation.Name, string(b)))
+}
+
+// LogHTTPRequestHeaderHandler is a SDK request handler to log the HTTP request sent
+// to a service. Will only log the HTTP request's headers. The request payload
+// will not be read.
+var LogHTTPRequestHeaderHandler = request.NamedHandler{
+        Name: "awssdk.client.LogRequestHeader",
+        Fn:   logRequestHeader,
+}
+
+func logRequestHeader(r *request.Request) {
+        b, err := httputil.DumpRequestOut(r.HTTPRequest, false)
+        if err != nil {
+                r.Config.Logger.Log(fmt.Sprintf(logReqErrMsg,
+                        r.ClientInfo.ServiceName, r.Operation.Name, err))
+                return
+        }
+
+        r.Config.Logger.Log(fmt.Sprintf(logReqMsg,
+                r.ClientInfo.ServiceName, r.Operation.Name, string(b)))
 }
 
 const logRespMsg = `DEBUG: Response %s/%s Details:
@@ -72,27 +107,44 @@ const logRespErrMsg = `DEBUG ERROR: Response %s/%s:
 %s
 -----------------------------------------------------`
 
+// LogHTTPResponseHandler is a SDK request handler to log the HTTP response
+// received from a service. Will include the HTTP response body if the LogLevel
+// of the request matches LogDebugWithHTTPBody.
+var LogHTTPResponseHandler = request.NamedHandler{
+        Name: "awssdk.client.LogResponse",
+        Fn:   logResponse,
+}
+
 func logResponse(r *request.Request) {
         lw := &logWriter{r.Config.Logger, bytes.NewBuffer(nil)}
-        r.HTTPResponse.Body = &teeReaderCloser{
-                Reader: io.TeeReader(r.HTTPResponse.Body, lw),
-                Source: r.HTTPResponse.Body,
+
+        logBody := r.Config.LogLevel.Matches(aws.LogDebugWithHTTPBody)
+        if logBody {
+                r.HTTPResponse.Body = &teeReaderCloser{
+                        Reader: io.TeeReader(r.HTTPResponse.Body, lw),
+                        Source: r.HTTPResponse.Body,
+                }
         }
 
         handlerFn := func(req *request.Request) {
-                body, err := httputil.DumpResponse(req.HTTPResponse, false)
+                b, err := httputil.DumpResponse(req.HTTPResponse, false)
                 if err != nil {
-                        lw.Logger.Log(fmt.Sprintf(logRespErrMsg, req.ClientInfo.ServiceName, req.Operation.Name, err))
+                        lw.Logger.Log(fmt.Sprintf(logRespErrMsg,
+                                req.ClientInfo.ServiceName, req.Operation.Name, err))
                         return
                 }
 
-                b, err := ioutil.ReadAll(lw.buf)
-                if err != nil {
-                        lw.Logger.Log(fmt.Sprintf(logRespErrMsg, req.ClientInfo.ServiceName, req.Operation.Name, err))
-                        return
-                }
-                lw.Logger.Log(fmt.Sprintf(logRespMsg, req.ClientInfo.ServiceName, req.Operation.Name, string(body)))
-                if req.Config.LogLevel.Matches(aws.LogDebugWithHTTPBody) {
+                lw.Logger.Log(fmt.Sprintf(logRespMsg,
+                        req.ClientInfo.ServiceName, req.Operation.Name, string(b)))
+
+                if logBody {
+                        b, err := ioutil.ReadAll(lw.buf)
+                        if err != nil {
+                                lw.Logger.Log(fmt.Sprintf(logRespErrMsg,
+                                        req.ClientInfo.ServiceName, req.Operation.Name, err))
+                                return
+                        }
+
                         lw.Logger.Log(string(b))
                 }
         }
@@ -106,3 +158,27 @@ func logResponse(r *request.Request) {
                 Name: handlerName, Fn: handlerFn,
         })
 }
+
+// LogHTTPResponseHeaderHandler is a SDK request handler to log the HTTP
+// response received from a service. Will only log the HTTP response's headers.
+// The response payload will not be read.
+var LogHTTPResponseHeaderHandler = request.NamedHandler{
+        Name: "awssdk.client.LogResponseHeader",
+        Fn:   logResponseHeader,
+}
+
+func logResponseHeader(r *request.Request) {
+        if r.Config.Logger == nil {
+                return
+        }
+
+        b, err := httputil.DumpResponse(r.HTTPResponse, false)
+        if err != nil {
+                r.Config.Logger.Log(fmt.Sprintf(logRespErrMsg,
+                        r.ClientInfo.ServiceName, r.Operation.Name, err))
+                return
+        }
+
+        r.Config.Logger.Log(fmt.Sprintf(logRespMsg,
+                r.ClientInfo.ServiceName, r.Operation.Name, string(b)))
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go b/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
index 4778056..920e9fd 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
@@ -3,6 +3,7 @@ package metadata
 // ClientInfo wraps immutable data from the client.Client structure.
 type ClientInfo struct {
         ServiceName   string
+        ServiceID     string
         APIVersion    string
         Endpoint      string
         SigningName   string
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/config.go b/vendor/github.com/aws/aws-sdk-go/aws/config.go
index d1f31f1..5421b5d 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/config.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/config.go
@@ -95,7 +95,7 @@ type Config struct {
         // recoverable failures.
         //
         // When nil or the value does not implement the request.Retryer interface,
-        // the request.DefaultRetryer will be used.
+        // the client.DefaultRetryer will be used.
         //
         // When both Retryer and MaxRetries are non-nil, the former is used and
         // the latter ignored.
@@ -151,6 +151,15 @@ type Config struct {
         // with accelerate.
         S3UseAccelerate *bool
 
+        // S3DisableContentMD5Validation config option is temporarily disabled,
+        // For S3 GetObject API calls, #1837.
+        //
+        // Set this to `true` to disable the S3 service client from automatically
+        // adding the ContentMD5 to S3 Object Put and Upload API calls. This option
+        // will also disable the SDK from performing object ContentMD5 validation
+        // on GetObject API calls.
+        S3DisableContentMD5Validation *bool
+
         // Set this to `true` to disable the EC2Metadata client from overriding the
         // default http.Client's Timeout. This is helpful if you do not want the
         // EC2Metadata client to create a new http.Client. This options is only
@@ -168,7 +177,7 @@ type Config struct {
         //
         EC2MetadataDisableTimeoutOverride *bool
 
-        // Instructs the endpiont to be generated for a service client to
+        // Instructs the endpoint to be generated for a service client to
         // be the dual stack endpoint. The dual stack endpoint will support
         // both IPv4 and IPv6 addressing.
         //
@@ -336,6 +345,15 @@ func (c *Config) WithS3Disable100Continue(disable bool) *Config {
 func (c *Config) WithS3UseAccelerate(enable bool) *Config {
         c.S3UseAccelerate = &enable
         return c
+
+}
+
+// WithS3DisableContentMD5Validation sets a config
+// S3DisableContentMD5Validation value returning a Config pointer for chaining.
+func (c *Config) WithS3DisableContentMD5Validation(enable bool) *Config {
+        c.S3DisableContentMD5Validation = &enable
+        return c
+
 }
 
 // WithUseDualStack sets a config UseDualStack value returning a Config
@@ -435,6 +453,10 @@ func mergeInConfig(dst *Config, other *Config) {
                 dst.S3UseAccelerate = other.S3UseAccelerate
         }
 
+        if other.S3DisableContentMD5Validation != nil {
+                dst.S3DisableContentMD5Validation = other.S3DisableContentMD5Validation
+        }
+
         if other.UseDualStack != nil {
                 dst.UseDualStack = other.UseDualStack
         }
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/context_1_6.go b/vendor/github.com/aws/aws-sdk-go/aws/context_1_6.go
index e8cf93d..8fdda53 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/context_1_6.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/context_1_6.go
@@ -4,9 +4,9 @@ package aws
 
 import "time"
 
-// An emptyCtx is a copy of the the Go 1.7 context.emptyCtx type. This
-// is copied to provide a 1.6 and 1.5 safe version of context that is compatible
-// with Go 1.7's Context.
+// An emptyCtx is a copy of the Go 1.7 context.emptyCtx type. This is copied to
+// provide a 1.6 and 1.5 safe version of context that is compatible with Go
+// 1.7's Context.
 //
 // An emptyCtx is never canceled, has no values, and has no deadline. It is not
 // struct{}, since vars of this type must have distinct addresses.
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/convert_types.go b/vendor/github.com/aws/aws-sdk-go/aws/convert_types.go
index 3b73a7d..ff5d58e 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/convert_types.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/convert_types.go
@@ -311,6 +311,24 @@ func TimeValue(v *time.Time) time.Time {
         return time.Time{}
 }
 
+// SecondsTimeValue converts an int64 pointer to a time.Time value
+// representing seconds since Epoch or time.Time{} if the pointer is nil.
+func SecondsTimeValue(v *int64) time.Time {
+        if v != nil {
+                return time.Unix((*v / 1000), 0)
+        }
+        return time.Time{}
+}
+
+// MillisecondsTimeValue converts an int64 pointer to a time.Time value
+// representing milliseconds sinch Epoch or time.Time{} if the pointer is nil.
+func MillisecondsTimeValue(v *int64) time.Time {
+        if v != nil {
+                return time.Unix(0, (*v * 1000000))
+        }
+        return time.Time{}
+}
+
 // TimeUnixMilli returns a Unix timestamp in milliseconds from "January 1, 1970 UTC".
 // The result is undefined if the Unix time cannot be represented by an int64.
 // Which includes calling TimeUnixMilli on a zero Time is undefined.
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go
index 495e3ef..cfcddf3 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go
@@ -3,12 +3,10 @@ package corehandlers
 import (
         "bytes"
         "fmt"
-        "io"
         "io/ioutil"
         "net/http"
         "net/url"
         "regexp"
-        "runtime"
         "strconv"
         "time"
 
@@ -36,18 +34,13 @@ var BuildContentLengthHandler = request.NamedHandler{Name: "core.BuildContentLen
         if slength := r.HTTPRequest.Header.Get("Content-Length"); slength != "" {
                 length, _ = strconv.ParseInt(slength, 10, 64)
         } else {
-                switch body := r.Body.(type) {
-                case nil:
-                        length = 0
-                case lener:
-                        length = int64(body.Len())
-                case io.Seeker:
-                        r.BodyStart, _ = body.Seek(0, 1)
-                        end, _ := body.Seek(0, 2)
-                        body.Seek(r.BodyStart, 0) // make sure to seek back to original location
-                        length = end - r.BodyStart
-                default:
-                        panic("Cannot get length of body, must provide `ContentLength`")
+                if r.Body != nil {
+                        var err error
+                        length, err = aws.SeekerLen(r.Body)
+                        if err != nil {
+                                r.Error = awserr.New(request.ErrCodeSerialization, "failed to get request body's length", err)
+                                return
+                        }
                 }
         }
 
@@ -60,13 +53,6 @@ var BuildContentLengthHandler = request.NamedHandler{Name: "core.BuildContentLen
         }
 }}
 
-// SDKVersionUserAgentHandler is a request handler for adding the SDK Version to the user agent.
-var SDKVersionUserAgentHandler = request.NamedHandler{
-        Name: "core.SDKVersionUserAgentHandler",
-        Fn: request.MakeAddToUserAgentHandler(aws.SDKName, aws.SDKVersion,
-                runtime.Version(), runtime.GOOS, runtime.GOARCH),
-}
-
 var reStatusCode = regexp.MustCompile(`^(\d{3})`)
 
 // ValidateReqSigHandler is a request handler to ensure that the request's
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/user_agent.go b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/user_agent.go
new file mode 100644
index 0000000..a15f496
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/corehandlers/user_agent.go
@@ -0,0 +1,37 @@
+package corehandlers
+
+import (
+        "os"
+        "runtime"
+
+        "github.com/aws/aws-sdk-go/aws"
+        "github.com/aws/aws-sdk-go/aws/request"
+)
+
+// SDKVersionUserAgentHandler is a request handler for adding the SDK Version
+// to the user agent.
+var SDKVersionUserAgentHandler = request.NamedHandler{
+        Name: "core.SDKVersionUserAgentHandler",
+        Fn: request.MakeAddToUserAgentHandler(aws.SDKName, aws.SDKVersion,
+                runtime.Version(), runtime.GOOS, runtime.GOARCH),
+}
+
+const execEnvVar = `AWS_EXECUTION_ENV`
+const execEnvUAKey = `exec_env`
+
+// AddHostExecEnvUserAgentHander is a request handler appending the SDK's
+// execution environment to the user agent.
+//
+// If the environment variable AWS_EXECUTION_ENV is set, its value will be
+// appended to the user agent string.
+var AddHostExecEnvUserAgentHander = request.NamedHandler{
+        Name: "core.AddHostExecEnvUserAgentHander",
+        Fn: func(r *request.Request) {
+                v := os.Getenv(execEnvVar)
+                if len(v) == 0 {
+                        return
+                }
+
+                request.AddToUserAgent(r, execEnvUAKey+"/"+v)
+        },
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
index 42416fc..ed08699 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials.go
@@ -178,7 +178,8 @@ func (e *Expiry) IsExpired() bool {
 type Credentials struct {
         creds        Value
         forceRefresh bool
-        m            sync.Mutex
+
+        m sync.RWMutex
 
         provider Provider
 }
@@ -201,6 +202,17 @@ func NewCredentials(provider Provider) *Credentials {
 // If Credentials.Expire() was called the credentials Value will be force
 // expired, and the next call to Get() will cause them to be refreshed.
 func (c *Credentials) Get() (Value, error) {
+        // Check the cached credentials first with just the read lock.
+        c.m.RLock()
+        if !c.isExpired() {
+                creds := c.creds
+                c.m.RUnlock()
+                return creds, nil
+        }
+        c.m.RUnlock()
+
+        // Credentials are expired need to retrieve the credentials taking the full
+        // lock.
         c.m.Lock()
         defer c.m.Unlock()
 
@@ -234,8 +246,8 @@ func (c *Credentials) Expire() {
 // If the Credentials were forced to be expired with Expire() this will
 // reflect that override.
 func (c *Credentials) IsExpired() bool {
-        c.m.Lock()
-        defer c.m.Unlock()
+        c.m.RLock()
+        defer c.m.RUnlock()
 
         return c.isExpired()
 }
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go
index c397495..0ed791b 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go
@@ -4,7 +4,6 @@ import (
         "bufio"
         "encoding/json"
         "fmt"
-        "path"
         "strings"
         "time"
 
@@ -12,6 +11,7 @@ import (
         "github.com/aws/aws-sdk-go/aws/client"
         "github.com/aws/aws-sdk-go/aws/credentials"
         "github.com/aws/aws-sdk-go/aws/ec2metadata"
+        "github.com/aws/aws-sdk-go/internal/sdkuri"
 )
 
 // ProviderName provides a name of EC2Role provider
@@ -125,7 +125,7 @@ type ec2RoleCredRespBody struct {
         Message string
 }
 
-const iamSecurityCredsPath = "/iam/security-credentials"
+const iamSecurityCredsPath = "iam/security-credentials/"
 
 // requestCredList requests a list of credentials from the EC2 service.
 // If there are no credentials, or there is an error making or receiving the request
@@ -153,7 +153,7 @@ func requestCredList(client *ec2metadata.EC2Metadata) ([]string, error) {
 // If the credentials cannot be found, or there is an error reading the response
 // and error will be returned.
 func requestCred(client *ec2metadata.EC2Metadata, credsName string) (ec2RoleCredRespBody, error) {
-        resp, err := client.GetMetadata(path.Join(iamSecurityCredsPath, credsName))
+        resp, err := client.GetMetadata(sdkuri.PathJoin(iamSecurityCredsPath, credsName))
         if err != nil {
                 return ec2RoleCredRespBody{},
                         awserr.New("EC2RoleRequestError",
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/csm/doc.go b/vendor/github.com/aws/aws-sdk-go/aws/csm/doc.go
new file mode 100644
index 0000000..152d785
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/csm/doc.go
@@ -0,0 +1,46 @@
+// Package csm provides Client Side Monitoring (CSM) which enables sending metrics
+// via UDP connection. Using the Start function will enable the reporting of
+// metrics on a given port. If Start is called, with different parameters, again,
+// a panic will occur.
+//
+// Pause can be called to pause any metrics publishing on a given port. Sessions
+// that have had their handlers modified via InjectHandlers may still be used.
+// However, the handlers will act as a no-op meaning no metrics will be published.
+//
+//      Example:
+//              r, err := csm.Start("clientID", ":31000")
+//              if err != nil {
+//                      panic(fmt.Errorf("failed starting CSM:  %v", err))
+//              }
+//
+//              sess, err := session.NewSession(&aws.Config{})
+//              if err != nil {
+//                      panic(fmt.Errorf("failed loading session: %v", err))
+//              }
+//
+//              r.InjectHandlers(&sess.Handlers)
+//
+//              client := s3.New(sess)
+//              resp, err := client.GetObject(&s3.GetObjectInput{
+//                      Bucket: aws.String("bucket"),
+//                      Key: aws.String("key"),
+//              })
+//
+//              // Will pause monitoring
+//              r.Pause()
+//              resp, err = client.GetObject(&s3.GetObjectInput{
+//                      Bucket: aws.String("bucket"),
+//                      Key: aws.String("key"),
+//              })
+//
+//              // Resume monitoring
+//              r.Continue()
+//
+// Start returns a Reporter that is used to enable or disable monitoring. If
+// access to the Reporter is required later, calling Get will return the Reporter
+// singleton.
+//
+//      Example:
+//              r := csm.Get()
+//              r.Continue()
+package csm
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/csm/enable.go b/vendor/github.com/aws/aws-sdk-go/aws/csm/enable.go
new file mode 100644
index 0000000..2f0c6ea
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/csm/enable.go
@@ -0,0 +1,67 @@
+package csm
+
+import (
+        "fmt"
+        "sync"
+)
+
+var (
+        lock sync.Mutex
+)
+
+// Client side metric handler names
+const (
+        APICallMetricHandlerName        = "awscsm.SendAPICallMetric"
+        APICallAttemptMetricHandlerName = "awscsm.SendAPICallAttemptMetric"
+)
+
+// Start will start the a long running go routine to capture
+// client side metrics. Calling start multiple time will only
+// start the metric listener once and will panic if a different
+// client ID or port is passed in.
+//
+//      Example:
+//              r, err := csm.Start("clientID", "127.0.0.1:8094")
+//              if err != nil {
+//                      panic(fmt.Errorf("expected no error, but received %v", err))
+//              }
+//              sess := session.NewSession()
+//              r.InjectHandlers(sess.Handlers)
+//
+//              svc := s3.New(sess)
+//              out, err := svc.GetObject(&s3.GetObjectInput{
+//                      Bucket: aws.String("bucket"),
+//                      Key: aws.String("key"),
+//              })
+func Start(clientID string, url string) (*Reporter, error) {
+        lock.Lock()
+        defer lock.Unlock()
+
+        if sender == nil {
+                sender = newReporter(clientID, url)
+        } else {
+                if sender.clientID != clientID {
+                        panic(fmt.Errorf("inconsistent client IDs. %q was expected, but received %q", sender.clientID, clientID))
+                }
+
+                if sender.url != url {
+                        panic(fmt.Errorf("inconsistent URLs. %q was expected, but received %q", sender.url, url))
+                }
+        }
+
+        if err := connect(url); err != nil {
+                sender = nil
+                return nil, err
+        }
+
+        return sender, nil
+}
+
+// Get will return a reporter if one exists, if one does not exist, nil will
+// be returned.
+func Get() *Reporter {
+        lock.Lock()
+        defer lock.Unlock()
+
+        return sender
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/csm/metric.go b/vendor/github.com/aws/aws-sdk-go/aws/csm/metric.go
new file mode 100644
index 0000000..4b0d630
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/csm/metric.go
@@ -0,0 +1,51 @@
+package csm
+
+import (
+        "strconv"
+        "time"
+)
+
+type metricTime time.Time
+
+func (t metricTime) MarshalJSON() ([]byte, error) {
+        ns := time.Duration(time.Time(t).UnixNano())
+        return []byte(strconv.FormatInt(int64(ns/time.Millisecond), 10)), nil
+}
+
+type metric struct {
+        ClientID  *string     `json:"ClientId,omitempty"`
+        API       *string     `json:"Api,omitempty"`
+        Service   *string     `json:"Service,omitempty"`
+        Timestamp *metricTime `json:"Timestamp,omitempty"`
+        Type      *string     `json:"Type,omitempty"`
+        Version   *int        `json:"Version,omitempty"`
+
+        AttemptCount *int `json:"AttemptCount,omitempty"`
+        Latency      *int `json:"Latency,omitempty"`
+
+        Fqdn           *string `json:"Fqdn,omitempty"`
+        UserAgent      *string `json:"UserAgent,omitempty"`
+        AttemptLatency *int    `json:"AttemptLatency,omitempty"`
+
+        SessionToken   *string `json:"SessionToken,omitempty"`
+        Region         *string `json:"Region,omitempty"`
+        AccessKey      *string `json:"AccessKey,omitempty"`
+        HTTPStatusCode *int    `json:"HttpStatusCode,omitempty"`
+        XAmzID2        *string `json:"XAmzId2,omitempty"`
+        XAmzRequestID  *string `json:"XAmznRequestId,omitempty"`
+
+        AWSException        *string `json:"AwsException,omitempty"`
+        AWSExceptionMessage *string `json:"AwsExceptionMessage,omitempty"`
+        SDKException        *string `json:"SdkException,omitempty"`
+        SDKExceptionMessage *string `json:"SdkExceptionMessage,omitempty"`
+
+        DestinationIP    *string `json:"DestinationIp,omitempty"`
+        ConnectionReused *int    `json:"ConnectionReused,omitempty"`
+
+        AcquireConnectionLatency *int `json:"AcquireConnectionLatency,omitempty"`
+        ConnectLatency           *int `json:"ConnectLatency,omitempty"`
+        RequestLatency           *int `json:"RequestLatency,omitempty"`
+        DNSLatency               *int `json:"DnsLatency,omitempty"`
+        TCPLatency               *int `json:"TcpLatency,omitempty"`
+        SSLLatency               *int `json:"SslLatency,omitempty"`
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/csm/metric_chan.go b/vendor/github.com/aws/aws-sdk-go/aws/csm/metric_chan.go
new file mode 100644
index 0000000..514fc37
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/csm/metric_chan.go
@@ -0,0 +1,54 @@
+package csm
+
+import (
+        "sync/atomic"
+)
+
+const (
+        runningEnum = iota
+        pausedEnum
+)
+
+var (
+        // MetricsChannelSize of metrics to hold in the channel
+        MetricsChannelSize = 100
+)
+
+type metricChan struct {
+        ch     chan metric
+        paused int64
+}
+
+func newMetricChan(size int) metricChan {
+        return metricChan{
+                ch: make(chan metric, size),
+        }
+}
+
+func (ch *metricChan) Pause() {
+        atomic.StoreInt64(&ch.paused, pausedEnum)
+}
+
+func (ch *metricChan) Continue() {
+        atomic.StoreInt64(&ch.paused, runningEnum)
+}
+
+func (ch *metricChan) IsPaused() bool {
+        v := atomic.LoadInt64(&ch.paused)
+        return v == pausedEnum
+}
+
+// Push will push metrics to the metric channel if the channel
+// is not paused
+func (ch *metricChan) Push(m metric) bool {
+        if ch.IsPaused() {
+                return false
+        }
+
+        select {
+        case ch.ch <- m:
+                return true
+        default:
+                return false
+        }
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/csm/reporter.go b/vendor/github.com/aws/aws-sdk-go/aws/csm/reporter.go
new file mode 100644
index 0000000..11082e5
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/aws/csm/reporter.go
@@ -0,0 +1,231 @@
+package csm
+
+import (
+        "encoding/json"
+        "net"
+        "time"
+
+        "github.com/aws/aws-sdk-go/aws"
+        "github.com/aws/aws-sdk-go/aws/awserr"
+        "github.com/aws/aws-sdk-go/aws/request"
+)
+
+const (
+        // DefaultPort is used when no port is specified
+        DefaultPort = "31000"
+)
+
+// Reporter will gather metrics of API requests made and
+// send those metrics to the CSM endpoint.
+type Reporter struct {
+        clientID  string
+        url       string
+        conn      net.Conn
+        metricsCh metricChan
+        done      chan struct{}
+}
+
+var (
+        sender *Reporter
+)
+
+func connect(url string) error {
+        const network = "udp"
+        if err := sender.connect(network, url); err != nil {
+                return err
+        }
+
+        if sender.done == nil {
+                sender.done = make(chan struct{})
+                go sender.start()
+        }
+
+        return nil
+}
+
+func newReporter(clientID, url string) *Reporter {
+        return &Reporter{
+                clientID:  clientID,
+                url:       url,
+                metricsCh: newMetricChan(MetricsChannelSize),
+        }
+}
+
+func (rep *Reporter) sendAPICallAttemptMetric(r *request.Request) {
+        if rep == nil {
+                return
+        }
+
+        now := time.Now()
+        creds, _ := r.Config.Credentials.Get()
+
+        m := metric{
+                ClientID:  aws.String(rep.clientID),
+                API:       aws.String(r.Operation.Name),
+                Service:   aws.String(r.ClientInfo.ServiceID),
+                Timestamp: (*metricTime)(&now),
+                UserAgent: aws.String(r.HTTPRequest.Header.Get("User-Agent")),
+                Region:    r.Config.Region,
+                Type:      aws.String("ApiCallAttempt"),
+                Version:   aws.Int(1),
+
+                XAmzRequestID: aws.String(r.RequestID),
+
+                AttemptCount:   aws.Int(r.RetryCount + 1),
+                AttemptLatency: aws.Int(int(now.Sub(r.AttemptTime).Nanoseconds() / int64(time.Millisecond))),
+                AccessKey:      aws.String(creds.AccessKeyID),
+        }
+
+        if r.HTTPResponse != nil {
+                m.HTTPStatusCode = aws.Int(r.HTTPResponse.StatusCode)
+        }
+
+        if r.Error != nil {
+                if awserr, ok := r.Error.(awserr.Error); ok {
+                        setError(&m, awserr)
+                }
+        }
+
+        rep.metricsCh.Push(m)
+}
+
+func setError(m *metric, err awserr.Error) {
+        msg := err.Error()
+        code := err.Code()
+
+        switch code {
+        case "RequestError",
+                "SerializationError",
+                request.CanceledErrorCode:
+                m.SDKException = &code
+                m.SDKExceptionMessage = &msg
+        default:
+                m.AWSException = &code
+                m.AWSExceptionMessage = &msg
+        }
+}
+
+func (rep *Reporter) sendAPICallMetric(r *request.Request) {
+        if rep == nil {
+                return
+        }
+
+        now := time.Now()
+        m := metric{
+                ClientID:      aws.String(rep.clientID),
+                API:           aws.String(r.Operation.Name),
+                Service:       aws.String(r.ClientInfo.ServiceID),
+                Timestamp:     (*metricTime)(&now),
+                Type:          aws.String("ApiCall"),
+                AttemptCount:  aws.Int(r.RetryCount + 1),
+                Latency:       aws.Int(int(time.Now().Sub(r.Time) / time.Millisecond)),
+                XAmzRequestID: aws.String(r.RequestID),
+        }
+
+        // TODO: Probably want to figure something out for logging dropped
+        // metrics
+        rep.metricsCh.Push(m)
+}
+
+func (rep *Reporter) connect(network, url string) error {
+        if rep.conn != nil {
+                rep.conn.Close()
+        }
+
+        conn, err := net.Dial(network, url)
+        if err != nil {
+                return awserr.New("UDPError", "Could not connect", err)
+        }
+
+        rep.conn = conn
+
+        return nil
+}
+
+func (rep *Reporter) close() {
+        if rep.done != nil {
+                close(rep.done)
+        }
+
+        rep.metricsCh.Pause()
+}
+
+func (rep *Reporter) start() {
+        defer func() {
+                rep.metricsCh.Pause()
+        }()
+
+        for {
+                select {
+                case <-rep.done:
+                        rep.done = nil
+                        return
+                case m := <-rep.metricsCh.ch:
+                        // TODO: What to do with this error? Probably should just log
+                        b, err := json.Marshal(m)
+                        if err != nil {
+                                continue
+                        }
+
+                        rep.conn.Write(b)
+                }
+        }
+}
+
+// Pause will pause the metric channel preventing any new metrics from
+// being added.
+func (rep *Reporter) Pause() {
+        lock.Lock()
+        defer lock.Unlock()
+
+        if rep == nil {
+                return
+        }
+
+        rep.close()
+}
+
+// Continue will reopen the metric channel and allow for monitoring
+// to be resumed.
+func (rep *Reporter) Continue() {
+        lock.Lock()
+        defer lock.Unlock()
+        if rep == nil {
+                return
+        }
+
+        if !rep.metricsCh.IsPaused() {
+                return
+        }
+
+        rep.metricsCh.Continue()
+}
+
+// InjectHandlers will will enable client side metrics and inject the proper
+// handlers to handle how metrics are sent.
+//
+//      Example:
+//              // Start must be called in order to inject the correct handlers
+//              r, err := csm.Start("clientID", "127.0.0.1:8094")
+//              if err != nil {
+//                      panic(fmt.Errorf("expected no error, but received %v", err))
+//              }
+//
+//              sess := session.NewSession()
+//              r.InjectHandlers(&sess.Handlers)
+//
+//              // create a new service client with our client side metric session
+//              svc := s3.New(sess)
+func (rep *Reporter) InjectHandlers(handlers *request.Handlers) {
+        if rep == nil {
+                return
+        }
+
+        apiCallHandler := request.NamedHandler{Name: APICallMetricHandlerName, Fn: rep.sendAPICallMetric}
+        apiCallAttemptHandler := request.NamedHandler{Name: APICallAttemptMetricHandlerName, Fn: rep.sendAPICallAttemptMetric}
+
+        handlers.Complete.PushFrontNamed(apiCallHandler)
+        handlers.Complete.PushFrontNamed(apiCallAttemptHandler)
+
+        handlers.AfterRetry.PushFrontNamed(apiCallAttemptHandler)
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
index 07afe3b..5040a2f 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go
@@ -9,6 +9,7 @@ package defaults
 
 import (
         "fmt"
+        "net"
         "net/http"
         "net/url"
         "os"
@@ -72,6 +73,7 @@ func Handlers() request.Handlers {
         handlers.Validate.PushBackNamed(corehandlers.ValidateEndpointHandler)
         handlers.Validate.AfterEachFn = request.HandlerListStopOnError
         handlers.Build.PushBackNamed(corehandlers.SDKVersionUserAgentHandler)
+        handlers.Build.PushBackNamed(corehandlers.AddHostExecEnvUserAgentHander)
         handlers.Build.AfterEachFn = request.HandlerListStopOnError
         handlers.Sign.PushBackNamed(corehandlers.BuildContentLengthHandler)
         handlers.Send.PushBackNamed(corehandlers.ValidateReqSigHandler)
@@ -90,14 +92,25 @@ func Handlers() request.Handlers {
 func CredChain(cfg *aws.Config, handlers request.Handlers) *credentials.Credentials {
         return credentials.NewCredentials(&credentials.ChainProvider{
                 VerboseErrors: aws.BoolValue(cfg.CredentialsChainVerboseErrors),
-                Providers: []credentials.Provider{
-                        &credentials.EnvProvider{},
-                        &credentials.SharedCredentialsProvider{Filename: "", Profile: ""},
-                        RemoteCredProvider(*cfg, handlers),
-                },
+                Providers:     CredProviders(cfg, handlers),
         })
 }
 
+// CredProviders returns the slice of providers used in
+// the default credential chain.
+//
+// For applications that need to use some other provider (for example use
+// different  environment variables for legacy reasons) but still fall back
+// on the default chain of providers. This allows that default chaint to be
+// automatically updated
+func CredProviders(cfg *aws.Config, handlers request.Handlers) []credentials.Provider {
+        return []credentials.Provider{
+                &credentials.EnvProvider{},
+                &credentials.SharedCredentialsProvider{Filename: "", Profile: ""},
+                RemoteCredProvider(*cfg, handlers),
+        }
+}
+
 const (
         httpProviderEnvVar     = "AWS_CONTAINER_CREDENTIALS_FULL_URI"
         ecsCredsProviderEnvVar = "AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"
@@ -118,14 +131,43 @@ func RemoteCredProvider(cfg aws.Config, handlers request.Handlers) credentials.P
         return ec2RoleProvider(cfg, handlers)
 }
 
+var lookupHostFn = net.LookupHost
+
+func isLoopbackHost(host string) (bool, error) {
+        ip := net.ParseIP(host)
+        if ip != nil {
+                return ip.IsLoopback(), nil
+        }
+
+        // Host is not an ip, perform lookup
+        addrs, err := lookupHostFn(host)
+        if err != nil {
+                return false, err
+        }
+        for _, addr := range addrs {
+                if !net.ParseIP(addr).IsLoopback() {
+                        return false, nil
+                }
+        }
+
+        return true, nil
+}
+
 func localHTTPCredProvider(cfg aws.Config, handlers request.Handlers, u string) credentials.Provider {
         var errMsg string
 
         parsed, err := url.Parse(u)
         if err != nil {
                 errMsg = fmt.Sprintf("invalid URL, %v", err)
-        } else if host := aws.URLHostname(parsed); !(host == "localhost" || host == "127.0.0.1") {
-                errMsg = fmt.Sprintf("invalid host address, %q, only localhost and 127.0.0.1 are valid.", host)
+        } else {
+                host := aws.URLHostname(parsed)
+                if len(host) == 0 {
+                        errMsg = "unable to parse host from local HTTP cred provider URL"
+                } else if isLoopback, loopbackErr := isLoopbackHost(host); loopbackErr != nil {
+                        errMsg = fmt.Sprintf("failed to resolve host %q, %v", host, loopbackErr)
+                } else if !isLoopback {
+                        errMsg = fmt.Sprintf("invalid endpoint host, %q, only loopback hosts are allowed.", host)
+                }
         }
 
         if len(errMsg) > 0 {
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
index 984407a..c215cd3 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go
@@ -4,12 +4,12 @@ import (
         "encoding/json"
         "fmt"
         "net/http"
-        "path"
         "strings"
         "time"
 
         "github.com/aws/aws-sdk-go/aws/awserr"
         "github.com/aws/aws-sdk-go/aws/request"
+        "github.com/aws/aws-sdk-go/internal/sdkuri"
 )
 
 // GetMetadata uses the path provided to request information from the EC2
@@ -19,7 +19,7 @@ func (c *EC2Metadata) GetMetadata(p string) (string, error) {
         op := &request.Operation{
                 Name:       "GetMetadata",
                 HTTPMethod: "GET",
-                HTTPPath:   path.Join("/", "meta-data", p),
+                HTTPPath:   sdkuri.PathJoin("/meta-data", p),
         }
 
         output := &metadataOutput{}
@@ -35,7 +35,7 @@ func (c *EC2Metadata) GetUserData() (string, error) {
         op := &request.Operation{
                 Name:       "GetUserData",
                 HTTPMethod: "GET",
-                HTTPPath:   path.Join("/", "user-data"),
+                HTTPPath:   "/user-data",
         }
 
         output := &metadataOutput{}
@@ -56,7 +56,7 @@ func (c *EC2Metadata) GetDynamicData(p string) (string, error) {
         op := &request.Operation{
                 Name:       "GetDynamicData",
                 HTTPMethod: "GET",
-                HTTPPath:   path.Join("/", "dynamic", p),
+                HTTPPath:   sdkuri.PathJoin("/dynamic", p),
         }
 
         output := &metadataOutput{}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go
index 5b4379d..ef5f732 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go
@@ -1,5 +1,10 @@
 // Package ec2metadata provides the client for making API calls to the
 // EC2 Metadata service.
+//
+// This package's client can be disabled completely by setting the environment
+// variable "AWS_EC2_METADATA_DISABLED=true". This environment variable set to
+// true instructs the SDK to disable the EC2 Metadata client. The client cannot
+// be used while the environemnt variable is set to true, (case insensitive).
 package ec2metadata
 
 import (
@@ -7,17 +12,21 @@ import (
         "errors"
         "io"
         "net/http"
+        "os"
+        "strings"
         "time"
 
         "github.com/aws/aws-sdk-go/aws"
         "github.com/aws/aws-sdk-go/aws/awserr"
         "github.com/aws/aws-sdk-go/aws/client"
         "github.com/aws/aws-sdk-go/aws/client/metadata"
+        "github.com/aws/aws-sdk-go/aws/corehandlers"
         "github.com/aws/aws-sdk-go/aws/request"
 )
 
 // ServiceName is the name of the service.
 const ServiceName = "ec2metadata"
+const disableServiceEnvVar = "AWS_EC2_METADATA_DISABLED"
 
 // A EC2Metadata is an EC2 Metadata service Client.
 type EC2Metadata struct {
@@ -75,6 +84,21 @@ func NewClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio
         svc.Handlers.Validate.Clear()
         svc.Handlers.Validate.PushBack(validateEndpointHandler)
 
+        // Disable the EC2 Metadata service if the environment variable is set.
+        // This shortcirctes the service's functionality to always fail to send
+        // requests.
+        if strings.ToLower(os.Getenv(disableServiceEnvVar)) == "true" {
+                svc.Handlers.Send.SwapNamed(request.NamedHandler{
+                        Name: corehandlers.SendHandler.Name,
+                        Fn: func(r *request.Request) {
+                                r.Error = awserr.New(
+                                        request.CanceledErrorCode,
+                                        "EC2 IMDS access disabled via "+disableServiceEnvVar+" env var",
+                                        nil)
+                        },
+                })
+        }
+
         // Add additional options to the service config
         for _, option := range opts {
                 option(svc.Client)
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
index d6d87e4..8e823be 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
@@ -24,6 +24,7 @@ const (
         EuCentral1RegionID   = "eu-central-1"   // EU (Frankfurt).
         EuWest1RegionID      = "eu-west-1"      // EU (Ireland).
         EuWest2RegionID      = "eu-west-2"      // EU (London).
+        EuWest3RegionID      = "eu-west-3"      // EU (Paris).
         SaEast1RegionID      = "sa-east-1"      // South America (Sao Paulo).
         UsEast1RegionID      = "us-east-1"      // US East (N. Virginia).
         UsEast2RegionID      = "us-east-2"      // US East (Ohio).
@@ -33,7 +34,8 @@ const (
 
 // AWS China partition's regions.
 const (
-        CnNorth1RegionID = "cn-north-1" // China (Beijing).
+        CnNorth1RegionID     = "cn-north-1"     // China (Beijing).
+        CnNorthwest1RegionID = "cn-northwest-1" // China (Ningxia).
 )
 
 // AWS GovCloud (US) partition's regions.
@@ -43,18 +45,26 @@ const (
 
 // Service identifiers
 const (
+        A4bServiceID                          = "a4b"                          // A4b.
         AcmServiceID                          = "acm"                          // Acm.
+        AcmPcaServiceID                       = "acm-pca"                      // AcmPca.
+        ApiMediatailorServiceID               = "api.mediatailor"              // ApiMediatailor.
+        ApiPricingServiceID                   = "api.pricing"                  // ApiPricing.
         ApigatewayServiceID                   = "apigateway"                   // Apigateway.
         ApplicationAutoscalingServiceID       = "application-autoscaling"      // ApplicationAutoscaling.
         Appstream2ServiceID                   = "appstream2"                   // Appstream2.
         AthenaServiceID                       = "athena"                       // Athena.
         AutoscalingServiceID                  = "autoscaling"                  // Autoscaling.
+        AutoscalingPlansServiceID             = "autoscaling-plans"            // AutoscalingPlans.
         BatchServiceID                        = "batch"                        // Batch.
         BudgetsServiceID                      = "budgets"                      // Budgets.
+        CeServiceID                           = "ce"                           // Ce.
+        Cloud9ServiceID                       = "cloud9"                       // Cloud9.
         ClouddirectoryServiceID               = "clouddirectory"               // Clouddirectory.
         CloudformationServiceID               = "cloudformation"               // Cloudformation.
         CloudfrontServiceID                   = "cloudfront"                   // Cloudfront.
         CloudhsmServiceID                     = "cloudhsm"                     // Cloudhsm.
+        Cloudhsmv2ServiceID                   = "cloudhsmv2"                   // Cloudhsmv2.
         CloudsearchServiceID                  = "cloudsearch"                  // Cloudsearch.
         CloudtrailServiceID                   = "cloudtrail"                   // Cloudtrail.
         CodebuildServiceID                    = "codebuild"                    // Codebuild.
@@ -65,9 +75,11 @@ const (
         CognitoIdentityServiceID              = "cognito-identity"             // CognitoIdentity.
         CognitoIdpServiceID                   = "cognito-idp"                  // CognitoIdp.
         CognitoSyncServiceID                  = "cognito-sync"                 // CognitoSync.
+        ComprehendServiceID                   = "comprehend"                   // Comprehend.
         ConfigServiceID                       = "config"                       // Config.
         CurServiceID                          = "cur"                          // Cur.
         DatapipelineServiceID                 = "datapipeline"                 // Datapipeline.
+        DaxServiceID                          = "dax"                          // Dax.
         DevicefarmServiceID                   = "devicefarm"                   // Devicefarm.
         DirectconnectServiceID                = "directconnect"                // Directconnect.
         DiscoveryServiceID                    = "discovery"                    // Discovery.
@@ -89,8 +101,12 @@ const (
         EsServiceID                           = "es"                           // Es.
         EventsServiceID                       = "events"                       // Events.
         FirehoseServiceID                     = "firehose"                     // Firehose.
+        FmsServiceID                          = "fms"                          // Fms.
         GameliftServiceID                     = "gamelift"                     // Gamelift.
         GlacierServiceID                      = "glacier"                      // Glacier.
+        GlueServiceID                         = "glue"                         // Glue.
+        GreengrassServiceID                   = "greengrass"                   // Greengrass.
+        GuarddutyServiceID                    = "guardduty"                    // Guardduty.
         HealthServiceID                       = "health"                       // Health.
         IamServiceID                          = "iam"                          // Iam.
         ImportexportServiceID                 = "importexport"                 // Importexport.
@@ -98,17 +114,24 @@ const (
         IotServiceID                          = "iot"                          // Iot.
         KinesisServiceID                      = "kinesis"                      // Kinesis.
         KinesisanalyticsServiceID             = "kinesisanalytics"             // Kinesisanalytics.
+        KinesisvideoServiceID                 = "kinesisvideo"                 // Kinesisvideo.
         KmsServiceID                          = "kms"                          // Kms.
         LambdaServiceID                       = "lambda"                       // Lambda.
         LightsailServiceID                    = "lightsail"                    // Lightsail.
         LogsServiceID                         = "logs"                         // Logs.
         MachinelearningServiceID              = "machinelearning"              // Machinelearning.
         MarketplacecommerceanalyticsServiceID = "marketplacecommerceanalytics" // Marketplacecommerceanalytics.
+        MediaconvertServiceID                 = "mediaconvert"                 // Mediaconvert.
+        MedialiveServiceID                    = "medialive"                    // Medialive.
+        MediapackageServiceID                 = "mediapackage"                 // Mediapackage.
+        MediastoreServiceID                   = "mediastore"                   // Mediastore.
         MeteringMarketplaceServiceID          = "metering.marketplace"         // MeteringMarketplace.
+        MghServiceID                          = "mgh"                          // Mgh.
         MobileanalyticsServiceID              = "mobileanalytics"              // Mobileanalytics.
         ModelsLexServiceID                    = "models.lex"                   // ModelsLex.
         MonitoringServiceID                   = "monitoring"                   // Monitoring.
         MturkRequesterServiceID               = "mturk-requester"              // MturkRequester.
+        NeptuneServiceID                      = "neptune"                      // Neptune.
         OpsworksServiceID                     = "opsworks"                     // Opsworks.
         OpsworksCmServiceID                   = "opsworks-cm"                  // OpsworksCm.
         OrganizationsServiceID                = "organizations"                // Organizations.
@@ -117,12 +140,18 @@ const (
         RdsServiceID                          = "rds"                          // Rds.
         RedshiftServiceID                     = "redshift"                     // Redshift.
         RekognitionServiceID                  = "rekognition"                  // Rekognition.
+        ResourceGroupsServiceID               = "resource-groups"              // ResourceGroups.
         Route53ServiceID                      = "route53"                      // Route53.
         Route53domainsServiceID               = "route53domains"               // Route53domains.
         RuntimeLexServiceID                   = "runtime.lex"                  // RuntimeLex.
+        RuntimeSagemakerServiceID             = "runtime.sagemaker"            // RuntimeSagemaker.
         S3ServiceID                           = "s3"                           // S3.
+        SagemakerServiceID                    = "sagemaker"                    // Sagemaker.
         SdbServiceID                          = "sdb"                          // Sdb.
+        SecretsmanagerServiceID               = "secretsmanager"               // Secretsmanager.
+        ServerlessrepoServiceID               = "serverlessrepo"               // Serverlessrepo.
         ServicecatalogServiceID               = "servicecatalog"               // Servicecatalog.
+        ServicediscoveryServiceID             = "servicediscovery"             // Servicediscovery.
         ShieldServiceID                       = "shield"                       // Shield.
         SmsServiceID                          = "sms"                          // Sms.
         SnowballServiceID                     = "snowball"                     // Snowball.
@@ -136,9 +165,11 @@ const (
         SupportServiceID                      = "support"                      // Support.
         SwfServiceID                          = "swf"                          // Swf.
         TaggingServiceID                      = "tagging"                      // Tagging.
+        TranslateServiceID                    = "translate"                    // Translate.
         WafServiceID                          = "waf"                          // Waf.
         WafRegionalServiceID                  = "waf-regional"                 // WafRegional.
         WorkdocsServiceID                     = "workdocs"                     // Workdocs.
+        WorkmailServiceID                     = "workmail"                     // Workmail.
         WorkspacesServiceID                   = "workspaces"                   // Workspaces.
         XrayServiceID                         = "xray"                         // Xray.
 )
@@ -216,6 +247,9 @@ var awsPartition = partition{
                 "eu-west-2": region{
                         Description: "EU (London)",
                 },
+                "eu-west-3": region{
+                        Description: "EU (Paris)",
+                },
                 "sa-east-1": region{
                         Description: "South America (Sao Paulo)",
                 },
@@ -233,6 +267,12 @@ var awsPartition = partition{
                 },
         },
         Services: services{
+                "a4b": service{
+
+                        Endpoints: endpoints{
+                                "us-east-1": endpoint{},
+                        },
+                },
                 "acm": service{
 
                         Endpoints: endpoints{
@@ -245,6 +285,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -252,6 +293,43 @@ var awsPartition = partition{
                                 "us-west-2":      endpoint{},
                         },
                 },
+                "acm-pca": service{
+                        Defaults: endpoint{
+                                Protocols: []string{"https"},
+                        },
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
+                "api.mediatailor": service{
+
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                        },
+                },
+                "api.pricing": service{
+                        Defaults: endpoint{
+                                CredentialScope: credentialScope{
+                                        Service: "pricing",
+                                },
+                        },
+                        Endpoints: endpoints{
+                                "ap-south-1": endpoint{},
+                                "us-east-1":  endpoint{},
+                        },
+                },
                 "apigateway": service{
 
                         Endpoints: endpoints{
@@ -260,9 +338,12 @@ var awsPartition = partition{
                                 "ap-south-1":     endpoint{},
                                 "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
+                                "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
                                 "us-west-1":      endpoint{},
@@ -287,6 +368,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -311,9 +393,14 @@ var awsPartition = partition{
                 "athena": service{
 
                         Endpoints: endpoints{
-                                "us-east-1": endpoint{},
-                                "us-east-2": endpoint{},
-                                "us-west-2": endpoint{},
+                                "ap-northeast-1": endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-2":      endpoint{},
                         },
                 },
                 "autoscaling": service{
@@ -330,6 +417,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -337,12 +425,38 @@ var awsPartition = partition{
                                 "us-west-2":      endpoint{},
                         },
                 },
+                "autoscaling-plans": service{
+                        Defaults: endpoint{
+                                Hostname:  "autoscaling.{region}.amazonaws.com",
+                                Protocols: []string{"http", "https"},
+                                CredentialScope: credentialScope{
+                                        Service: "autoscaling-plans",
+                                },
+                        },
+                        Endpoints: endpoints{
+                                "ap-southeast-1": endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
                 "batch": service{
 
                         Endpoints: endpoints{
-                                "eu-west-1": endpoint{},
-                                "us-east-1": endpoint{},
-                                "us-west-2": endpoint{},
+                                "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
+                                "us-west-2":      endpoint{},
                         },
                 },
                 "budgets": service{
@@ -358,11 +472,35 @@ var awsPartition = partition{
                                 },
                         },
                 },
+                "ce": service{
+                        PartitionEndpoint: "aws-global",
+                        IsRegionalized:    boxedFalse,
+
+                        Endpoints: endpoints{
+                                "aws-global": endpoint{
+                                        Hostname: "ce.us-east-1.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "us-east-1",
+                                        },
+                                },
+                        },
+                },
+                "cloud9": service{
+
+                        Endpoints: endpoints{
+                                "ap-southeast-1": endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
                 "clouddirectory": service{
 
                         Endpoints: endpoints{
                                 "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
+                                "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
                                 "us-east-1":      endpoint{},
@@ -382,6 +520,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -418,6 +557,27 @@ var awsPartition = partition{
                                 "us-west-2":      endpoint{},
                         },
                 },
+                "cloudhsmv2": service{
+                        Defaults: endpoint{
+                                CredentialScope: credentialScope{
+                                        Service: "cloudhsm",
+                                },
+                        },
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
                 "cloudsearch": service{
 
                         Endpoints: endpoints{
@@ -445,6 +605,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -456,25 +617,63 @@ var awsPartition = partition{
 
                         Endpoints: endpoints{
                                 "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
                                 "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
+                                "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
-                                "us-east-2":      endpoint{},
-                                "us-west-2":      endpoint{},
+                                "us-east-1-fips": endpoint{
+                                        Hostname: "codebuild-fips.us-east-1.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "us-east-1",
+                                        },
+                                },
+                                "us-east-2": endpoint{},
+                                "us-east-2-fips": endpoint{
+                                        Hostname: "codebuild-fips.us-east-2.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "us-east-2",
+                                        },
+                                },
+                                "us-west-1": endpoint{},
+                                "us-west-1-fips": endpoint{
+                                        Hostname: "codebuild-fips.us-west-1.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "us-west-1",
+                                        },
+                                },
+                                "us-west-2": endpoint{},
+                                "us-west-2-fips": endpoint{
+                                        Hostname: "codebuild-fips.us-west-2.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "us-west-2",
+                                        },
+                                },
                         },
                 },
                 "codecommit": service{
 
                         Endpoints: endpoints{
                                 "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
                                 "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
+                                "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
                                 "us-west-2":      endpoint{},
                         },
                 },
@@ -490,6 +689,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -501,23 +701,37 @@ var awsPartition = partition{
 
                         Endpoints: endpoints{
                                 "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
                                 "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
                                 "us-west-2":      endpoint{},
                         },
                 },
                 "codestar": service{
 
                         Endpoints: endpoints{
-                                "eu-west-1": endpoint{},
-                                "us-east-1": endpoint{},
-                                "us-east-2": endpoint{},
-                                "us-west-2": endpoint{},
+                                "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
+                                "us-west-2":      endpoint{},
                         },
                 },
                 "cognito-identity": service{
@@ -526,6 +740,7 @@ var awsPartition = partition{
                                 "ap-northeast-1": endpoint{},
                                 "ap-northeast-2": endpoint{},
                                 "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
@@ -541,6 +756,7 @@ var awsPartition = partition{
                                 "ap-northeast-1": endpoint{},
                                 "ap-northeast-2": endpoint{},
                                 "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
@@ -556,6 +772,7 @@ var awsPartition = partition{
                                 "ap-northeast-1": endpoint{},
                                 "ap-northeast-2": endpoint{},
                                 "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
@@ -565,6 +782,17 @@ var awsPartition = partition{
                                 "us-west-2":      endpoint{},
                         },
                 },
+                "comprehend": service{
+                        Defaults: endpoint{
+                                Protocols: []string{"https"},
+                        },
+                        Endpoints: endpoints{
+                                "eu-west-1": endpoint{},
+                                "us-east-1": endpoint{},
+                                "us-east-2": endpoint{},
+                                "us-west-2": endpoint{},
+                        },
+                },
                 "config": service{
 
                         Endpoints: endpoints{
@@ -577,6 +805,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -600,6 +829,21 @@ var awsPartition = partition{
                                 "us-west-2":      endpoint{},
                         },
                 },
+                "dax": service{
+
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "sa-east-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
                 "devicefarm": service{
 
                         Endpoints: endpoints{
@@ -618,6 +862,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -643,6 +888,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -655,14 +901,17 @@ var awsPartition = partition{
                         Endpoints: endpoints{
                                 "ap-northeast-1": endpoint{},
                                 "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
                                 "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
                                 "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
                                 "us-west-2":      endpoint{},
                         },
                 },
@@ -680,6 +929,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "local": endpoint{
                                         Hostname:  "localhost:8000",
                                         Protocols: []string{"http"},
@@ -708,6 +958,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -730,12 +981,16 @@ var awsPartition = partition{
 
                         Endpoints: endpoints{
                                 "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
                                 "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
                                 "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
+                                "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
                                 "us-west-1":      endpoint{},
@@ -746,12 +1001,16 @@ var awsPartition = partition{
 
                         Endpoints: endpoints{
                                 "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
                                 "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
                                 "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
+                                "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
                                 "us-west-1":      endpoint{},
@@ -770,6 +1029,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -789,6 +1049,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -799,16 +1060,19 @@ var awsPartition = partition{
                 "elasticfilesystem": service{
 
                         Endpoints: endpoints{
+                                "ap-northeast-2": endpoint{},
                                 "ap-southeast-2": endpoint{},
+                                "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
                                 "us-west-2":      endpoint{},
                         },
                 },
                 "elasticloadbalancing": service{
                         Defaults: endpoint{
-                                Protocols: []string{"http", "https"},
+                                Protocols: []string{"https"},
                         },
                         Endpoints: endpoints{
                                 "ap-northeast-1": endpoint{},
@@ -820,6 +1084,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -844,6 +1109,7 @@ var awsPartition = partition{
                                 },
                                 "eu-west-1": endpoint{},
                                 "eu-west-2": endpoint{},
+                                "eu-west-3": endpoint{},
                                 "sa-east-1": endpoint{},
                                 "us-east-1": endpoint{
                                         SSLCommonName: "{service}.{region}.{dnsSuffix}",
@@ -896,6 +1162,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -915,6 +1182,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -925,6 +1193,24 @@ var awsPartition = partition{
                 "firehose": service{
 
                         Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
+                "fms": service{
+                        Defaults: endpoint{
+                                Protocols: []string{"https"},
+                        },
+                        Endpoints: endpoints{
                                 "eu-west-1": endpoint{},
                                 "us-east-1": endpoint{},
                                 "us-west-2": endpoint{},
@@ -937,10 +1223,15 @@ var awsPartition = partition{
                                 "ap-northeast-2": endpoint{},
                                 "ap-south-1":     endpoint{},
                                 "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
                                 "us-west-2":      endpoint{},
                         },
                 },
@@ -952,11 +1243,65 @@ var awsPartition = partition{
                                 "ap-northeast-1": endpoint{},
                                 "ap-northeast-2": endpoint{},
                                 "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
                                 "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
+                "glue": service{
+
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
+                "greengrass": service{
+                        IsRegionalized: boxedTrue,
+                        Defaults: endpoint{
+                                Protocols: []string{"https"},
+                        },
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
+                "guardduty": service{
+                        IsRegionalized: boxedTrue,
+                        Defaults: endpoint{
+                                Protocols: []string{"https"},
+                        },
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
+                                "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
                                 "us-west-1":      endpoint{},
@@ -1004,8 +1349,11 @@ var awsPartition = partition{
                                 "ap-northeast-2": endpoint{},
                                 "ap-south-1":     endpoint{},
                                 "ap-southeast-2": endpoint{},
+                                "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
                                 "us-west-2":      endpoint{},
                         },
                 },
@@ -1018,6 +1366,7 @@ var awsPartition = partition{
                         Endpoints: endpoints{
                                 "ap-northeast-1": endpoint{},
                                 "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
                                 "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
                                 "eu-central-1":   endpoint{},
@@ -1040,6 +1389,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -1055,6 +1405,16 @@ var awsPartition = partition{
                                 "us-west-2": endpoint{},
                         },
                 },
+                "kinesisvideo": service{
+
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
                 "kms": service{
 
                         Endpoints: endpoints{
@@ -1067,6 +1427,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -1082,9 +1443,12 @@ var awsPartition = partition{
                                 "ap-south-1":     endpoint{},
                                 "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
+                                "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
                                 "us-west-1":      endpoint{},
@@ -1095,12 +1459,15 @@ var awsPartition = partition{
 
                         Endpoints: endpoints{
                                 "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
                                 "ap-south-1":     endpoint{},
                                 "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
                                 "us-west-2":      endpoint{},
@@ -1118,6 +1485,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -1138,6 +1506,65 @@ var awsPartition = partition{
                                 "us-east-1": endpoint{},
                         },
                 },
+                "mediaconvert": service{
+
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
+                                "sa-east-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
+                "medialive": service{
+
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "sa-east-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
+                "mediapackage": service{
+
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "eu-west-3":      endpoint{},
+                                "sa-east-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
+                "mediastore": service{
+
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
                 "metering.marketplace": service{
                         Defaults: endpoint{
                                 CredentialScope: credentialScope{
@@ -1154,6 +1581,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -1161,6 +1589,12 @@ var awsPartition = partition{
                                 "us-west-2":      endpoint{},
                         },
                 },
+                "mgh": service{
+
+                        Endpoints: endpoints{
+                                "us-west-2": endpoint{},
+                        },
+                },
                 "mobileanalytics": service{
 
                         Endpoints: endpoints{
@@ -1174,7 +1608,9 @@ var awsPartition = partition{
                                 },
                         },
                         Endpoints: endpoints{
+                                "eu-west-1": endpoint{},
                                 "us-east-1": endpoint{},
+                                "us-west-2": endpoint{},
                         },
                 },
                 "monitoring": service{
@@ -1191,6 +1627,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -1208,6 +1645,35 @@ var awsPartition = partition{
                                 "us-east-1": endpoint{},
                         },
                 },
+                "neptune": service{
+
+                        Endpoints: endpoints{
+                                "eu-west-1": endpoint{
+                                        Hostname: "rds.eu-west-1.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "eu-west-1",
+                                        },
+                                },
+                                "us-east-1": endpoint{
+                                        Hostname: "rds.us-east-1.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "us-east-1",
+                                        },
+                                },
+                                "us-east-2": endpoint{
+                                        Hostname: "rds.us-east-2.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "us-east-2",
+                                        },
+                                },
+                                "us-west-2": endpoint{
+                                        Hostname: "rds.us-west-2.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "us-west-2",
+                                        },
+                                },
+                        },
+                },
                 "opsworks": service{
 
                         Endpoints: endpoints{
@@ -1216,9 +1682,11 @@ var awsPartition = partition{
                                 "ap-south-1":     endpoint{},
                                 "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -1229,9 +1697,15 @@ var awsPartition = partition{
                 "opsworks-cm": service{
 
                         Endpoints: endpoints{
-                                "eu-west-1": endpoint{},
-                                "us-east-1": endpoint{},
-                                "us-west-2": endpoint{},
+                                "ap-northeast-1": endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
+                                "us-west-2":      endpoint{},
                         },
                 },
                 "organizations": service{
@@ -1260,10 +1734,21 @@ var awsPartition = partition{
                 "polly": service{
 
                         Endpoints: endpoints{
-                                "eu-west-1": endpoint{},
-                                "us-east-1": endpoint{},
-                                "us-east-2": endpoint{},
-                                "us-west-2": endpoint{},
+                                "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
+                                "sa-east-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
+                                "us-west-2":      endpoint{},
                         },
                 },
                 "rds": service{
@@ -1278,6 +1763,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1": endpoint{
                                         SSLCommonName: "{service}.{dnsSuffix}",
@@ -1299,6 +1785,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -1309,9 +1796,31 @@ var awsPartition = partition{
                 "rekognition": service{
 
                         Endpoints: endpoints{
-                                "eu-west-1": endpoint{},
-                                "us-east-1": endpoint{},
-                                "us-west-2": endpoint{},
+                                "ap-northeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
+                "resource-groups": service{
+
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
+                                "sa-east-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
+                                "us-west-2":      endpoint{},
                         },
                 },
                 "route53": service{
@@ -1340,7 +1849,19 @@ var awsPartition = partition{
                                 },
                         },
                         Endpoints: endpoints{
+                                "eu-west-1": endpoint{},
                                 "us-east-1": endpoint{},
+                                "us-west-2": endpoint{},
+                        },
+                },
+                "runtime.sagemaker": service{
+
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-2":      endpoint{},
                         },
                 },
                 "s3": service{
@@ -1355,26 +1876,27 @@ var awsPartition = partition{
                         },
                         Endpoints: endpoints{
                                 "ap-northeast-1": endpoint{
-                                        Hostname:          "s3-ap-northeast-1.amazonaws.com",
+                                        Hostname:          "s3.ap-northeast-1.amazonaws.com",
                                         SignatureVersions: []string{"s3", "s3v4"},
                                 },
                                 "ap-northeast-2": endpoint{},
                                 "ap-south-1":     endpoint{},
                                 "ap-southeast-1": endpoint{
-                                        Hostname:          "s3-ap-southeast-1.amazonaws.com",
+                                        Hostname:          "s3.ap-southeast-1.amazonaws.com",
                                         SignatureVersions: []string{"s3", "s3v4"},
                                 },
                                 "ap-southeast-2": endpoint{
-                                        Hostname:          "s3-ap-southeast-2.amazonaws.com",
+                                        Hostname:          "s3.ap-southeast-2.amazonaws.com",
                                         SignatureVersions: []string{"s3", "s3v4"},
                                 },
                                 "ca-central-1": endpoint{},
                                 "eu-central-1": endpoint{},
                                 "eu-west-1": endpoint{
-                                        Hostname:          "s3-eu-west-1.amazonaws.com",
+                                        Hostname:          "s3.eu-west-1.amazonaws.com",
                                         SignatureVersions: []string{"s3", "s3v4"},
                                 },
                                 "eu-west-2": endpoint{},
+                                "eu-west-3": endpoint{},
                                 "s3-external-1": endpoint{
                                         Hostname:          "s3-external-1.amazonaws.com",
                                         SignatureVersions: []string{"s3", "s3v4"},
@@ -1383,7 +1905,7 @@ var awsPartition = partition{
                                         },
                                 },
                                 "sa-east-1": endpoint{
-                                        Hostname:          "s3-sa-east-1.amazonaws.com",
+                                        Hostname:          "s3.sa-east-1.amazonaws.com",
                                         SignatureVersions: []string{"s3", "s3v4"},
                                 },
                                 "us-east-1": endpoint{
@@ -1392,15 +1914,26 @@ var awsPartition = partition{
                                 },
                                 "us-east-2": endpoint{},
                                 "us-west-1": endpoint{
-                                        Hostname:          "s3-us-west-1.amazonaws.com",
+                                        Hostname:          "s3.us-west-1.amazonaws.com",
                                         SignatureVersions: []string{"s3", "s3v4"},
                                 },
                                 "us-west-2": endpoint{
-                                        Hostname:          "s3-us-west-2.amazonaws.com",
+                                        Hostname:          "s3.us-west-2.amazonaws.com",
                                         SignatureVersions: []string{"s3", "s3v4"},
                                 },
                         },
                 },
+                "sagemaker": service{
+
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
                 "sdb": service{
                         Defaults: endpoint{
                                 Protocols:         []string{"http", "https"},
@@ -1419,21 +1952,104 @@ var awsPartition = partition{
                                 "us-west-2": endpoint{},
                         },
                 },
+                "secretsmanager": service{
+
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
+                                "eu-central-1":   endpoint{},
+                                "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
+                                "sa-east-1":      endpoint{},
+                                "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
+                                "us-west-2":      endpoint{},
+                        },
+                },
+                "serverlessrepo": service{
+                        Defaults: endpoint{
+                                Protocols: []string{"https"},
+                        },
+                        Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{
+                                        Protocols: []string{"https"},
+                                },
+                                "ap-northeast-2": endpoint{
+                                        Protocols: []string{"https"},
+                                },
+                                "ap-south-1": endpoint{
+                                        Protocols: []string{"https"},
+                                },
+                                "ap-southeast-1": endpoint{
+                                        Protocols: []string{"https"},
+                                },
+                                "ap-southeast-2": endpoint{
+                                        Protocols: []string{"https"},
+                                },
+                                "ca-central-1": endpoint{
+                                        Protocols: []string{"https"},
+                                },
+                                "eu-central-1": endpoint{
+                                        Protocols: []string{"https"},
+                                },
+                                "eu-west-1": endpoint{
+                                        Protocols: []string{"https"},
+                                },
+                                "eu-west-2": endpoint{
+                                        Protocols: []string{"https"},
+                                },
+                                "sa-east-1": endpoint{
+                                        Protocols: []string{"https"},
+                                },
+                                "us-east-1": endpoint{
+                                        Protocols: []string{"https"},
+                                },
+                                "us-east-2": endpoint{
+                                        Protocols: []string{"https"},
+                                },
+                                "us-west-1": endpoint{
+                                        Protocols: []string{"https"},
+                                },
+                                "us-west-2": endpoint{
+                                        Protocols: []string{"https"},
+                                },
+                        },
+                },
                 "servicecatalog": service{
 
                         Endpoints: endpoints{
                                 "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
                                 "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
                                 "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
+                                "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
                                 "us-west-2":      endpoint{},
                         },
                 },
+                "servicediscovery": service{
+
+                        Endpoints: endpoints{
+                                "eu-west-1": endpoint{},
+                                "us-east-1": endpoint{},
+                                "us-east-2": endpoint{},
+                                "us-west-1": endpoint{},
+                                "us-west-2": endpoint{},
+                        },
+                },
                 "shield": service{
                         IsRegionalized: boxedFalse,
                         Defaults: endpoint{
@@ -1447,19 +2063,36 @@ var awsPartition = partition{
                 "sms": service{
 
                         Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
+                                "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
+                                "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
+                                "us-west-2":      endpoint{},
                         },
                 },
                 "snowball": service{
 
                         Endpoints: endpoints{
+                                "ap-northeast-1": endpoint{},
                                 "ap-south-1":     endpoint{},
+                                "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
+                                "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
                                 "us-west-1":      endpoint{},
@@ -1480,6 +2113,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -1502,7 +2136,32 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
-                                "sa-east-1":      endpoint{},
+                                "eu-west-3":      endpoint{},
+                                "fips-us-east-1": endpoint{
+                                        Hostname: "sqs-fips.us-east-1.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "us-east-1",
+                                        },
+                                },
+                                "fips-us-east-2": endpoint{
+                                        Hostname: "sqs-fips.us-east-2.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "us-east-2",
+                                        },
+                                },
+                                "fips-us-west-1": endpoint{
+                                        Hostname: "sqs-fips.us-west-1.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "us-west-1",
+                                        },
+                                },
+                                "fips-us-west-2": endpoint{
+                                        Hostname: "sqs-fips.us-west-2.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "us-west-2",
+                                        },
+                                },
+                                "sa-east-1": endpoint{},
                                 "us-east-1": endpoint{
                                         SSLCommonName: "queue.{dnsSuffix}",
                                 },
@@ -1523,6 +2182,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -1534,10 +2194,16 @@ var awsPartition = partition{
 
                         Endpoints: endpoints{
                                 "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
+                                "ap-southeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
                                 "us-west-2":      endpoint{},
                         },
                 },
@@ -1553,6 +2219,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -1577,6 +2244,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "local": endpoint{
                                         Hostname:  "localhost:8000",
                                         Protocols: []string{"http"},
@@ -1615,6 +2283,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-1-fips": endpoint{
@@ -1664,6 +2333,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -1683,6 +2353,7 @@ var awsPartition = partition{
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "eu-west-2":      endpoint{},
+                                "eu-west-3":      endpoint{},
                                 "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-east-2":      endpoint{},
@@ -1690,6 +2361,17 @@ var awsPartition = partition{
                                 "us-west-2":      endpoint{},
                         },
                 },
+                "translate": service{
+                        Defaults: endpoint{
+                                Protocols: []string{"https"},
+                        },
+                        Endpoints: endpoints{
+                                "eu-west-1": endpoint{},
+                                "us-east-1": endpoint{},
+                                "us-east-2": endpoint{},
+                                "us-west-2": endpoint{},
+                        },
+                },
                 "waf": service{
                         PartitionEndpoint: "aws-global",
                         IsRegionalized:    boxedFalse,
@@ -1707,8 +2389,12 @@ var awsPartition = partition{
 
                         Endpoints: endpoints{
                                 "ap-northeast-1": endpoint{},
+                                "ap-southeast-2": endpoint{},
+                                "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
                                 "us-east-1":      endpoint{},
+                                "us-east-2":      endpoint{},
+                                "us-west-1":      endpoint{},
                                 "us-west-2":      endpoint{},
                         },
                 },
@@ -1723,14 +2409,28 @@ var awsPartition = partition{
                                 "us-west-2":      endpoint{},
                         },
                 },
+                "workmail": service{
+                        Defaults: endpoint{
+                                Protocols: []string{"https"},
+                        },
+                        Endpoints: endpoints{
+                                "eu-west-1": endpoint{},
+                                "us-east-1": endpoint{},
+                                "us-west-2": endpoint{},
+                        },
+                },
                 "workspaces": service{
 
                         Endpoints: endpoints{
                                 "ap-northeast-1": endpoint{},
+                                "ap-northeast-2": endpoint{},
                                 "ap-southeast-1": endpoint{},
                                 "ap-southeast-2": endpoint{},
+                                "ca-central-1":   endpoint{},
                                 "eu-central-1":   endpoint{},
                                 "eu-west-1":      endpoint{},
+                                "eu-west-2":      endpoint{},
+                                "sa-east-1":      endpoint{},
                                 "us-east-1":      endpoint{},
                                 "us-west-2":      endpoint{},
                         },
@@ -1781,44 +2481,86 @@ var awscnPartition = partition{
                 "cn-north-1": region{
                         Description: "China (Beijing)",
                 },
+                "cn-northwest-1": region{
+                        Description: "China (Ningxia)",
+                },
         },
         Services: services{
+                "apigateway": service{
+
+                        Endpoints: endpoints{
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
+                        },
+                },
+                "application-autoscaling": service{
+                        Defaults: endpoint{
+                                Hostname:  "autoscaling.{region}.amazonaws.com",
+                                Protocols: []string{"http", "https"},
+                                CredentialScope: credentialScope{
+                                        Service: "application-autoscaling",
+                                },
+                        },
+                        Endpoints: endpoints{
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
+                        },
+                },
                 "autoscaling": service{
                         Defaults: endpoint{
                                 Protocols: []string{"http", "https"},
                         },
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "cloudformation": service{
 
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "cloudtrail": service{
 
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "codedeploy": service{
 
                         Endpoints: endpoints{
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
+                        },
+                },
+                "cognito-identity": service{
+
+                        Endpoints: endpoints{
                                 "cn-north-1": endpoint{},
                         },
                 },
                 "config": service{
 
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "directconnect": service{
 
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
+                        },
+                },
+                "ds": service{
+
+                        Endpoints: endpoints{
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "dynamodb": service{
@@ -1826,7 +2568,8 @@ var awscnPartition = partition{
                                 Protocols: []string{"http", "https"},
                         },
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "ec2": service{
@@ -1834,7 +2577,8 @@ var awscnPartition = partition{
                                 Protocols: []string{"http", "https"},
                         },
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "ec2metadata": service{
@@ -1848,24 +2592,41 @@ var awscnPartition = partition{
                                 },
                         },
                 },
+                "ecr": service{
+
+                        Endpoints: endpoints{
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
+                        },
+                },
+                "ecs": service{
+
+                        Endpoints: endpoints{
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
+                        },
+                },
                 "elasticache": service{
 
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "elasticbeanstalk": service{
 
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "elasticloadbalancing": service{
                         Defaults: endpoint{
-                                Protocols: []string{"http", "https"},
+                                Protocols: []string{"https"},
                         },
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "elasticmapreduce": service{
@@ -1873,13 +2634,21 @@ var awscnPartition = partition{
                                 Protocols: []string{"http", "https"},
                         },
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
+                        },
+                },
+                "es": service{
+
+                        Endpoints: endpoints{
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "events": service{
 
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "glacier": service{
@@ -1887,7 +2656,8 @@ var awscnPartition = partition{
                                 Protocols: []string{"http", "https"},
                         },
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "iam": service{
@@ -1903,16 +2673,35 @@ var awscnPartition = partition{
                                 },
                         },
                 },
+                "iot": service{
+                        Defaults: endpoint{
+                                CredentialScope: credentialScope{
+                                        Service: "execute-api",
+                                },
+                        },
+                        Endpoints: endpoints{
+                                "cn-north-1": endpoint{},
+                        },
+                },
                 "kinesis": service{
 
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
+                        },
+                },
+                "lambda": service{
+
+                        Endpoints: endpoints{
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "logs": service{
 
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "monitoring": service{
@@ -1920,19 +2709,22 @@ var awscnPartition = partition{
                                 Protocols: []string{"http", "https"},
                         },
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "rds": service{
 
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "redshift": service{
 
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "s3": service{
@@ -1941,6 +2733,20 @@ var awscnPartition = partition{
                                 SignatureVersions: []string{"s3v4"},
                         },
                         Endpoints: endpoints{
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
+                        },
+                },
+                "sms": service{
+
+                        Endpoints: endpoints{
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
+                        },
+                },
+                "snowball": service{
+
+                        Endpoints: endpoints{
                                 "cn-north-1": endpoint{},
                         },
                 },
@@ -1949,7 +2755,8 @@ var awscnPartition = partition{
                                 Protocols: []string{"http", "https"},
                         },
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "sqs": service{
@@ -1958,7 +2765,15 @@ var awscnPartition = partition{
                                 Protocols:     []string{"http", "https"},
                         },
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
+                        },
+                },
+                "ssm": service{
+
+                        Endpoints: endpoints{
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "storagegateway": service{
@@ -1975,25 +2790,29 @@ var awscnPartition = partition{
                                 },
                         },
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "sts": service{
 
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "swf": service{
 
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
                 "tagging": service{
 
                         Endpoints: endpoints{
-                                "cn-north-1": endpoint{},
+                                "cn-north-1":     endpoint{},
+                                "cn-northwest-1": endpoint{},
                         },
                 },
         },
@@ -2025,6 +2844,18 @@ var awsusgovPartition = partition{
                 },
         },
         Services: services{
+                "acm": service{
+
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
+                "apigateway": service{
+
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
                 "autoscaling": service{
 
                         Endpoints: endpoints{
@@ -2045,6 +2876,16 @@ var awsusgovPartition = partition{
                                 "us-gov-west-1": endpoint{},
                         },
                 },
+                "cloudhsmv2": service{
+                        Defaults: endpoint{
+                                CredentialScope: credentialScope{
+                                        Service: "cloudhsm",
+                                },
+                        },
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
                 "cloudtrail": service{
 
                         Endpoints: endpoints{
@@ -2069,10 +2910,22 @@ var awsusgovPartition = partition{
                                 "us-gov-west-1": endpoint{},
                         },
                 },
+                "dms": service{
+
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
                 "dynamodb": service{
 
                         Endpoints: endpoints{
                                 "us-gov-west-1": endpoint{},
+                                "us-gov-west-1-fips": endpoint{
+                                        Hostname: "dynamodb.us-gov-west-1.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "us-gov-west-1",
+                                        },
+                                },
                         },
                 },
                 "ec2": service{
@@ -2092,12 +2945,30 @@ var awsusgovPartition = partition{
                                 },
                         },
                 },
+                "ecr": service{
+
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
+                "ecs": service{
+
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
                 "elasticache": service{
 
                         Endpoints: endpoints{
                                 "us-gov-west-1": endpoint{},
                         },
                 },
+                "elasticbeanstalk": service{
+
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
                 "elasticloadbalancing": service{
 
                         Endpoints: endpoints{
@@ -2114,6 +2985,12 @@ var awsusgovPartition = partition{
                                 },
                         },
                 },
+                "es": service{
+
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
                 "events": service{
 
                         Endpoints: endpoints{
@@ -2141,6 +3018,12 @@ var awsusgovPartition = partition{
                                 },
                         },
                 },
+                "inspector": service{
+
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
                 "kinesis": service{
 
                         Endpoints: endpoints{
@@ -2165,12 +3048,28 @@ var awsusgovPartition = partition{
                                 "us-gov-west-1": endpoint{},
                         },
                 },
+                "metering.marketplace": service{
+                        Defaults: endpoint{
+                                CredentialScope: credentialScope{
+                                        Service: "aws-marketplace",
+                                },
+                        },
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
                 "monitoring": service{
 
                         Endpoints: endpoints{
                                 "us-gov-west-1": endpoint{},
                         },
                 },
+                "polly": service{
+
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
                 "rds": service{
 
                         Endpoints: endpoints{
@@ -2183,6 +3082,12 @@ var awsusgovPartition = partition{
                                 "us-gov-west-1": endpoint{},
                         },
                 },
+                "rekognition": service{
+
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
                 "s3": service{
                         Defaults: endpoint{
                                 SignatureVersions: []string{"s3", "s3v4"},
@@ -2195,11 +3100,17 @@ var awsusgovPartition = partition{
                                         },
                                 },
                                 "us-gov-west-1": endpoint{
-                                        Hostname:  "s3-us-gov-west-1.amazonaws.com",
+                                        Hostname:  "s3.us-gov-west-1.amazonaws.com",
                                         Protocols: []string{"http", "https"},
                                 },
                         },
                 },
+                "sms": service{
+
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
                 "snowball": service{
 
                         Endpoints: endpoints{
@@ -2223,6 +3134,18 @@ var awsusgovPartition = partition{
                                 },
                         },
                 },
+                "ssm": service{
+
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
+                "storagegateway": service{
+
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
                 "streams.dynamodb": service{
                         Defaults: endpoint{
                                 CredentialScope: credentialScope{
@@ -2231,6 +3154,12 @@ var awsusgovPartition = partition{
                         },
                         Endpoints: endpoints{
                                 "us-gov-west-1": endpoint{},
+                                "us-gov-west-1-fips": endpoint{
+                                        Hostname: "dynamodb.us-gov-west-1.amazonaws.com",
+                                        CredentialScope: credentialScope{
+                                                Region: "us-gov-west-1",
+                                        },
+                                },
                         },
                 },
                 "sts": service{
@@ -2245,5 +3174,19 @@ var awsusgovPartition = partition{
                                 "us-gov-west-1": endpoint{},
                         },
                 },
+                "tagging": service{
+
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
+                "translate": service{
+                        Defaults: endpoint{
+                                Protocols: []string{"https"},
+                        },
+                        Endpoints: endpoints{
+                                "us-gov-west-1": endpoint{},
+                        },
+                },
         },
 }
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/doc.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/doc.go
index a0e9bc4..84316b9 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/doc.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/doc.go
@@ -21,12 +21,12 @@
 //     partitions := resolver.(endpoints.EnumPartitions).Partitions()
 //
 //     for _, p := range partitions {
-//         fmt.Println("Regions for", p.Name)
+//         fmt.Println("Regions for", p.ID())
 //         for id, _ := range p.Regions() {
 //             fmt.Println("*", id)
 //         }
 //
-//         fmt.Println("Services for", p.Name)
+//         fmt.Println("Services for", p.ID())
 //         for id, _ := range p.Services() {
 //             fmt.Println("*", id)
 //         }
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints.go
index 9c3eedb..e29c095 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/endpoints.go
@@ -206,10 +206,11 @@ func (p Partition) EndpointFor(service, region string, opts ...func(*Options)) (
 // enumerating over the regions in a partition.
 func (p Partition) Regions() map[string]Region {
         rs := map[string]Region{}
-        for id := range p.p.Regions {
+        for id, r := range p.p.Regions {
                 rs[id] = Region{
-                        id: id,
-                        p:  p.p,
+                        id:   id,
+                        desc: r.Description,
+                        p:    p.p,
                 }
         }
 
@@ -240,6 +241,10 @@ type Region struct {
 // ID returns the region's identifier.
 func (r Region) ID() string { return r.id }
 
+// Description returns the region's description. The region description
+// is free text, it can be empty, and it may change between SDK releases.
+func (r Region) Description() string { return r.desc }
+
 // ResolveEndpoint resolves an endpoint from the context of the region given
 // a service. See Partition.EndpointFor for usage and errors that can be returned.
 func (r Region) ResolveEndpoint(service string, opts ...func(*Options)) (ResolvedEndpoint, error) {
@@ -284,10 +289,11 @@ func (s Service) ResolveEndpoint(region string, opts ...func(*Options)) (Resolve
 func (s Service) Regions() map[string]Region {
         rs := map[string]Region{}
         for id := range s.p.Services[s.id].Endpoints {
-                if _, ok := s.p.Regions[id]; ok {
+                if r, ok := s.p.Regions[id]; ok {
                         rs[id] = Region{
-                                id: id,
-                                p:  s.p,
+                                id:   id,
+                                desc: r.Description,
+                                p:    s.p,
                         }
                 }
         }
@@ -347,6 +353,10 @@ type ResolvedEndpoint struct {
         // The service name that should be used for signing requests.
         SigningName string
 
+        // States that the signing name for this endpoint was derived from metadata
+        // passed in, but was not explicitly modeled.
+        SigningNameDerived bool
+
         // The signing method that should be used for signing requests.
         SigningMethod string
 }
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/v3model.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/v3model.go
index 13d968a..ff6f76d 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/v3model.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/v3model.go
@@ -226,16 +226,20 @@ func (e endpoint) resolve(service, region, dnsSuffix string, defs []endpoint, op
         if len(signingRegion) == 0 {
                 signingRegion = region
         }
+
         signingName := e.CredentialScope.Service
+        var signingNameDerived bool
         if len(signingName) == 0 {
                 signingName = service
+                signingNameDerived = true
         }
 
         return ResolvedEndpoint{
-                URL:           u,
-                SigningRegion: signingRegion,
-                SigningName:   signingName,
-                SigningMethod: getByPriority(e.SignatureVersions, signerPriority, defaultSigner),
+                URL:                u,
+                SigningRegion:      signingRegion,
+                SigningName:        signingName,
+                SigningNameDerived: signingNameDerived,
+                SigningMethod:      getByPriority(e.SignatureVersions, signerPriority, defaultSigner),
         }
 }
 
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/logger.go b/vendor/github.com/aws/aws-sdk-go/aws/logger.go
index db87188..6ed15b2 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/logger.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/logger.go
@@ -26,14 +26,14 @@ func (l *LogLevelType) Value() LogLevelType {
 
 // Matches returns true if the v LogLevel is enabled by this LogLevel. Should be
 // used with logging sub levels. Is safe to use on nil value LogLevelTypes. If
-// LogLevel is nill, will default to LogOff comparison.
+// LogLevel is nil, will default to LogOff comparison.
 func (l *LogLevelType) Matches(v LogLevelType) bool {
         c := l.Value()
         return c&v == v
 }
 
 // AtLeast returns true if this LogLevel is at least high enough to satisfies v.
-// Is safe to use on nil value LogLevelTypes. If LogLevel is nill, will default
+// Is safe to use on nil value LogLevelTypes. If LogLevel is nil, will default
 // to LogOff comparison.
 func (l *LogLevelType) AtLeast(v LogLevelType) bool {
         c := l.Value()
@@ -71,6 +71,12 @@ const (
         // LogDebugWithRequestErrors states the SDK should log when service requests fail
         // to build, send, validate, or unmarshal.
         LogDebugWithRequestErrors
+
+        // LogDebugWithEventStreamBody states the SDK should log EventStream
+        // request and response bodys. This should be used to log the EventStream
+        // wire unmarshaled message content of requests and responses made while
+        // using the SDK Will also enable LogDebug.
+        LogDebugWithEventStreamBody
 )
 
 // A Logger is a minimalistic interface for the SDK to log messages to. Should
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go b/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go
index 802ac88..605a72d 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/handlers.go
@@ -14,6 +14,7 @@ type Handlers struct {
         Send             HandlerList
         ValidateResponse HandlerList
         Unmarshal        HandlerList
+        UnmarshalStream  HandlerList
         UnmarshalMeta    HandlerList
         UnmarshalError   HandlerList
         Retry            HandlerList
@@ -30,6 +31,7 @@ func (h *Handlers) Copy() Handlers {
                 Send:             h.Send.copy(),
                 ValidateResponse: h.ValidateResponse.copy(),
                 Unmarshal:        h.Unmarshal.copy(),
+                UnmarshalStream:  h.UnmarshalStream.copy(),
                 UnmarshalError:   h.UnmarshalError.copy(),
                 UnmarshalMeta:    h.UnmarshalMeta.copy(),
                 Retry:            h.Retry.copy(),
@@ -45,6 +47,7 @@ func (h *Handlers) Clear() {
         h.Send.Clear()
         h.Sign.Clear()
         h.Unmarshal.Clear()
+        h.UnmarshalStream.Clear()
         h.UnmarshalMeta.Clear()
         h.UnmarshalError.Clear()
         h.ValidateResponse.Clear()
@@ -172,6 +175,21 @@ func (l *HandlerList) SwapNamed(n NamedHandler) (swapped bool) {
         return swapped
 }
 
+// Swap will swap out all handlers matching the name passed in. The matched
+// handlers will be swapped in. True is returned if the handlers were swapped.
+func (l *HandlerList) Swap(name string, replace NamedHandler) bool {
+        var swapped bool
+
+        for i := 0; i < len(l.list); i++ {
+                if l.list[i].Name == name {
+                        l.list[i] = replace
+                        swapped = true
+                }
+        }
+
+        return swapped
+}
+
 // SetBackNamed will replace the named handler if it exists in the handler list.
 // If the handler does not exist the handler will be added to the end of the list.
 func (l *HandlerList) SetBackNamed(n NamedHandler) {
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/offset_reader.go b/vendor/github.com/aws/aws-sdk-go/aws/request/offset_reader.go
index 02f07f4..b0c2ef4 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/offset_reader.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/offset_reader.go
@@ -3,6 +3,8 @@ package request
 import (
         "io"
         "sync"
+
+        "github.com/aws/aws-sdk-go/internal/sdkio"
 )
 
 // offsetReader is a thread-safe io.ReadCloser to prevent racing
@@ -15,7 +17,7 @@ type offsetReader struct {
 
 func newOffsetReader(buf io.ReadSeeker, offset int64) *offsetReader {
         reader := &offsetReader{}
-        buf.Seek(offset, 0)
+        buf.Seek(offset, sdkio.SeekStart)
 
         reader.buf = buf
         return reader
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go
index 299dc37..75f0fe0 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/request.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go
@@ -14,6 +14,7 @@ import (
         "github.com/aws/aws-sdk-go/aws"
         "github.com/aws/aws-sdk-go/aws/awserr"
         "github.com/aws/aws-sdk-go/aws/client/metadata"
+        "github.com/aws/aws-sdk-go/internal/sdkio"
 )
 
 const (
@@ -24,10 +25,14 @@ const (
         // ErrCodeRead is an error that is returned during HTTP reads.
         ErrCodeRead = "ReadError"
 
-        // ErrCodeResponseTimeout is the connection timeout error that is recieved
+        // ErrCodeResponseTimeout is the connection timeout error that is received
         // during body reads.
         ErrCodeResponseTimeout = "ResponseTimeout"
 
+        // ErrCodeInvalidPresignExpire is returned when the expire time provided to
+        // presign is invalid
+        ErrCodeInvalidPresignExpire = "InvalidPresignExpireError"
+
         // CanceledErrorCode is the error code that will be returned by an
         // API request that was canceled. Requests given a aws.Context may
         // return this error when canceled.
@@ -41,8 +46,8 @@ type Request struct {
         Handlers   Handlers
 
         Retryer
+        AttemptTime            time.Time
         Time                   time.Time
-        ExpireTime             time.Duration
         Operation              *Operation
         HTTPRequest            *http.Request
         HTTPResponse           *http.Response
@@ -60,6 +65,11 @@ type Request struct {
         LastSignedAt           time.Time
         DisableFollowRedirects bool
 
+        // A value greater than 0 instructs the request to be signed as Presigned URL
+        // You should not set this field directly. Instead use Request's
+        // Presign or PresignRequest methods.
+        ExpireTime time.Duration
+
         context aws.Context
 
         built bool
@@ -104,12 +114,15 @@ func New(cfg aws.Config, clientInfo metadata.ClientInfo, handlers Handlers,
                 err = awserr.New("InvalidEndpointURL", "invalid endpoint uri", err)
         }
 
+        SanitizeHostForHeader(httpReq)
+
         r := &Request{
                 Config:     cfg,
                 ClientInfo: clientInfo,
                 Handlers:   handlers.Copy(),
 
                 Retryer:     retryer,
+                AttemptTime: time.Now(),
                 Time:        time.Now(),
                 ExpireTime:  0,
                 Operation:   operation,
@@ -214,6 +227,9 @@ func (r *Request) SetContext(ctx aws.Context) {
 
 // WillRetry returns if the request's can be retried.
 func (r *Request) WillRetry() bool {
+        if !aws.IsReaderSeekable(r.Body) && r.HTTPRequest.Body != NoBody {
+                return false
+        }
         return r.Error != nil && aws.BoolValue(r.Retryable) && r.RetryCount < r.MaxRetries()
 }
 
@@ -245,39 +261,70 @@ func (r *Request) SetStringBody(s string) {
 // SetReaderBody will set the request's body reader.
 func (r *Request) SetReaderBody(reader io.ReadSeeker) {
         r.Body = reader
+        r.BodyStart, _ = reader.Seek(0, sdkio.SeekCurrent) // Get the Bodies current offset.
         r.ResetBody()
 }
 
 // Presign returns the request's signed URL. Error will be returned
 // if the signing fails.
-func (r *Request) Presign(expireTime time.Duration) (string, error) {
-        r.ExpireTime = expireTime
+//
+// It is invalid to create a presigned URL with a expire duration 0 or less. An
+// error is returned if expire duration is 0 or less.
+func (r *Request) Presign(expire time.Duration) (string, error) {
+        r = r.copy()
+
+        // Presign requires all headers be hoisted. There is no way to retrieve
+        // the signed headers not hoisted without this. Making the presigned URL
+        // useless.
         r.NotHoist = false
 
+        u, _, err := getPresignedURL(r, expire)
+        return u, err
+}
+
+// PresignRequest behaves just like presign, with the addition of returning a
+// set of headers that were signed.
+//
+// It is invalid to create a presigned URL with a expire duration 0 or less. An
+// error is returned if expire duration is 0 or less.
+//
+// Returns the URL string for the API operation with signature in the query string,
+// and the HTTP headers that were included in the signature. These headers must
+// be included in any HTTP request made with the presigned URL.
+//
+// To prevent hoisting any headers to the query string set NotHoist to true on
+// this Request value prior to calling PresignRequest.
+func (r *Request) PresignRequest(expire time.Duration) (string, http.Header, error) {
+        r = r.copy()
+        return getPresignedURL(r, expire)
+}
+
+// IsPresigned returns true if the request represents a presigned API url.
+func (r *Request) IsPresigned() bool {
+        return r.ExpireTime != 0
+}
+
+func getPresignedURL(r *Request, expire time.Duration) (string, http.Header, error) {
+        if expire <= 0 {
+                return "", nil, awserr.New(
+                        ErrCodeInvalidPresignExpire,
+                        "presigned URL requires an expire duration greater than 0",
+                        nil,
+                )
+        }
+
+        r.ExpireTime = expire
+
         if r.Operation.BeforePresignFn != nil {
-                r = r.copy()
-                err := r.Operation.BeforePresignFn(r)
-                if err != nil {
-                        return "", err
+                if err := r.Operation.BeforePresignFn(r); err != nil {
+                        return "", nil, err
                 }
         }
 
-        r.Sign()
-        if r.Error != nil {
-                return "", r.Error
+        if err := r.Sign(); err != nil {
+                return "", nil, err
         }
-        return r.HTTPRequest.URL.String(), nil
-}
 
-// PresignRequest behaves just like presign, but hoists all headers and signs them.
-// Also returns the signed hash back to the user
-func (r *Request) PresignRequest(expireTime time.Duration) (string, http.Header, error) {
-        r.ExpireTime = expireTime
-        r.NotHoist = true
-        r.Sign()
-        if r.Error != nil {
-                return "", nil, r.Error
-        }
         return r.HTTPRequest.URL.String(), r.SignedHeaderVals, nil
 }
 
@@ -297,7 +344,7 @@ func debugLogReqError(r *Request, stage string, retrying bool, err error) {
 
 // Build will build the request's object so it can be signed and sent
 // to the service. Build will also validate all the request's parameters.
-// Anny additional build Handlers set on this request will be run
+// Any additional build Handlers set on this request will be run
 // in the order they were set.
 //
 // The request will only be built once. Multiple calls to build will have
@@ -323,9 +370,9 @@ func (r *Request) Build() error {
         return r.Error
 }
 
-// Sign will sign the request returning error if errors are encountered.
+// Sign will sign the request, returning error if errors are encountered.
 //
-// Send will build the request prior to signing. All Sign Handlers will
+// Sign will build the request prior to signing. All Sign Handlers will
 // be executed in the order they were set.
 func (r *Request) Sign() error {
         r.Build()
@@ -358,7 +405,7 @@ func (r *Request) getNextRequestBody() (io.ReadCloser, error) {
         // of the SDK if they used that field.
         //
         // Related golang/go#18257
-        l, err := computeBodyLength(r.Body)
+        l, err := aws.SeekerLen(r.Body)
         if err != nil {
                 return nil, awserr.New(ErrCodeSerialization, "failed to compute request body size", err)
         }
@@ -376,7 +423,8 @@ func (r *Request) getNextRequestBody() (io.ReadCloser, error) {
                 // Transfer-Encoding: chunked bodies for these methods.
                 //
                 // This would only happen if a aws.ReaderSeekerCloser was used with
-                // a io.Reader that was not also an io.Seeker.
+                // a io.Reader that was not also an io.Seeker, or did not implement
+                // Len() method.
                 switch r.Operation.HTTPMethod {
                 case "GET", "HEAD", "DELETE":
                         body = NoBody
@@ -388,49 +436,13 @@ func (r *Request) getNextRequestBody() (io.ReadCloser, error) {
         return body, nil
 }
 
-// Attempts to compute the length of the body of the reader using the
-// io.Seeker interface. If the value is not seekable because of being
-// a ReaderSeekerCloser without an unerlying Seeker -1 will be returned.
-// If no error occurs the length of the body will be returned.
-func computeBodyLength(r io.ReadSeeker) (int64, error) {
-        seekable := true
-        // Determine if the seeker is actually seekable. ReaderSeekerCloser
-        // hides the fact that a io.Readers might not actually be seekable.
-        switch v := r.(type) {
-        case aws.ReaderSeekerCloser:
-                seekable = v.IsSeeker()
-        case *aws.ReaderSeekerCloser:
-                seekable = v.IsSeeker()
-        }
-        if !seekable {
-                return -1, nil
-        }
-
-        curOffset, err := r.Seek(0, 1)
-        if err != nil {
-                return 0, err
-        }
-
-        endOffset, err := r.Seek(0, 2)
-        if err != nil {
-                return 0, err
-        }
-
-        _, err = r.Seek(curOffset, 0)
-        if err != nil {
-                return 0, err
-        }
-
-        return endOffset - curOffset, nil
-}
-
 // GetBody will return an io.ReadSeeker of the Request's underlying
 // input body with a concurrency safe wrapper.
 func (r *Request) GetBody() io.ReadSeeker {
         return r.safeBody
 }
 
-// Send will send the request returning error if errors are encountered.
+// Send will send the request, returning error if errors are encountered.
 //
 // Send will sign the request prior to sending. All Send Handlers will
 // be executed in the order they were set.
@@ -451,6 +463,7 @@ func (r *Request) Send() error {
         }()
 
         for {
+                r.AttemptTime = time.Now()
                 if aws.BoolValue(r.Retryable) {
                         if r.Config.LogLevel.Matches(aws.LogDebugWithRequestRetries) {
                                 r.Config.Logger.Log(fmt.Sprintf("DEBUG: Retrying Request %s/%s, attempt %d",
@@ -573,3 +586,72 @@ func shouldRetryCancel(r *Request) bool {
                         errStr != "net/http: request canceled while waiting for connection")
 
 }
+
+// SanitizeHostForHeader removes default port from host and updates request.Host
+func SanitizeHostForHeader(r *http.Request) {
+        host := getHost(r)
+        port := portOnly(host)
+        if port != "" && isDefaultPort(r.URL.Scheme, port) {
+                r.Host = stripPort(host)
+        }
+}
+
+// Returns host from request
+func getHost(r *http.Request) string {
+        if r.Host != "" {
+                return r.Host
+        }
+
+        return r.URL.Host
+}
+
+// Hostname returns u.Host, without any port number.
+//
+// If Host is an IPv6 literal with a port number, Hostname returns the
+// IPv6 literal without the square brackets. IPv6 literals may include
+// a zone identifier.
+//
+// Copied from the Go 1.8 standard library (net/url)
+func stripPort(hostport string) string {
+        colon := strings.IndexByte(hostport, ':')
+        if colon == -1 {
+                return hostport
+        }
+        if i := strings.IndexByte(hostport, ']'); i != -1 {
+                return strings.TrimPrefix(hostport[:i], "[")
+        }
+        return hostport[:colon]
+}
+
+// Port returns the port part of u.Host, without the leading colon.
+// If u.Host doesn't contain a port, Port returns an empty string.
+//
+// Copied from the Go 1.8 standard library (net/url)
+func portOnly(hostport string) string {
+        colon := strings.IndexByte(hostport, ':')
+        if colon == -1 {
+                return ""
+        }
+        if i := strings.Index(hostport, "]:"); i != -1 {
+                return hostport[i+len("]:"):]
+        }
+        if strings.Contains(hostport, "]") {
+                return ""
+        }
+        return hostport[colon+len(":"):]
+}
+
+// Returns true if the specified URI is using the standard port
+// (i.e. port 80 for HTTP URIs or 443 for HTTPS URIs)
+func isDefaultPort(scheme, port string) bool {
+        if port == "" {
+                return true
+        }
+
+        lowerCaseScheme := strings.ToLower(scheme)
+        if (lowerCaseScheme == "http" && port == "80") || (lowerCaseScheme == "https" && port == "443") {
+                return true
+        }
+
+        return false
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request_1_7.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request_1_7.go
index 869b97a..e36e468 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/request_1_7.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/request_1_7.go
@@ -21,7 +21,7 @@ func (noBody) WriteTo(io.Writer) (int64, error) { return 0, nil }
 var NoBody = noBody{}
 
 // ResetBody rewinds the request body back to its starting position, and
-// set's the HTTP Request body reference. When the body is read prior
+// sets the HTTP Request body reference. When the body is read prior
 // to being sent in the HTTP request it will need to be rewound.
 //
 // ResetBody will automatically be called by the SDK's build handler, but if
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request_1_8.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request_1_8.go
index c32fc69..7c6a800 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/request_1_8.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/request_1_8.go
@@ -11,7 +11,7 @@ import (
 var NoBody = http.NoBody
 
 // ResetBody rewinds the request body back to its starting position, and
-// set's the HTTP Request body reference. When the body is read prior
+// sets the HTTP Request body reference. When the body is read prior
 // to being sent in the HTTP request it will need to be rewound.
 //
 // ResetBody will automatically be called by the SDK's build handler, but if
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
index 59de673..a633ed5 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination.go
@@ -35,8 +35,12 @@ type Pagination struct {
         // NewRequest should always be built from the same API operations. It is
         // undefined if different API operations are returned on subsequent calls.
         NewRequest func() (*Request, error)
+        // EndPageOnSameToken, when enabled, will allow the paginator to stop on
+        // token that are the same as its previous tokens.
+        EndPageOnSameToken bool
 
         started    bool
+        prevTokens []interface{}
         nextTokens []interface{}
 
         err     error
@@ -49,7 +53,15 @@ type Pagination struct {
 //
 // Will always return true if Next has not been called yet.
 func (p *Pagination) HasNextPage() bool {
-        return !(p.started && len(p.nextTokens) == 0)
+        if !p.started {
+                return true
+        }
+
+        hasNextPage := len(p.nextTokens) != 0
+        if p.EndPageOnSameToken {
+                return hasNextPage && !awsutil.DeepEqual(p.nextTokens, p.prevTokens)
+        }
+        return hasNextPage
 }
 
 // Err returns the error Pagination encountered when retrieving the next page.
@@ -96,6 +108,7 @@ func (p *Pagination) Next() bool {
                 return false
         }
 
+        p.prevTokens = p.nextTokens
         p.nextTokens = req.nextPageTokens()
         p.curPage = req.Data
 
@@ -142,13 +155,28 @@ func (r *Request) nextPageTokens() []interface{} {
         tokens := []interface{}{}
         tokenAdded := false
         for _, outToken := range r.Operation.OutputTokens {
-                v, _ := awsutil.ValuesAtPath(r.Data, outToken)
-                if len(v) > 0 {
-                        tokens = append(tokens, v[0])
-                        tokenAdded = true
-                } else {
+                vs, _ := awsutil.ValuesAtPath(r.Data, outToken)
+                if len(vs) == 0 {
                         tokens = append(tokens, nil)
+                        continue
+                }
+                v := vs[0]
+
+                switch tv := v.(type) {
+                case *string:
+                        if len(aws.StringValue(tv)) == 0 {
+                                tokens = append(tokens, nil)
+                                continue
+                        }
+                case string:
+                        if len(tv) == 0 {
+                                tokens = append(tokens, nil)
+                                continue
+                        }
                 }
+
+                tokenAdded = true
+                tokens = append(tokens, v)
         }
         if !tokenAdded {
                 return nil
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go
index 8d369c1..7d52702 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go
@@ -8,7 +8,7 @@ import (
 )
 
 // Retryer is an interface to control retry logic for a given service.
-// The default implementation used by most services is the service.DefaultRetryer
+// The default implementation used by most services is the client.DefaultRetryer
 // structure, which contains basic retry logic using exponential backoff.
 type Retryer interface {
         RetryRules(*Request) time.Duration
@@ -70,8 +70,8 @@ func isCodeExpiredCreds(code string) bool {
 }
 
 var validParentCodes = map[string]struct{}{
-        ErrCodeSerialization: struct{}{},
-        ErrCodeRead:          struct{}{},
+        ErrCodeSerialization: {},
+        ErrCodeRead:          {},
 }
 
 type temporaryError interface {
@@ -97,7 +97,7 @@ func isNestedErrorRetryable(parentErr awserr.Error) bool {
         }
 
         if t, ok := err.(temporaryError); ok {
-                return t.Temporary()
+                return t.Temporary() || isErrConnectionReset(err)
         }
 
         return isErrConnectionReset(err)
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/validation.go b/vendor/github.com/aws/aws-sdk-go/aws/request/validation.go
index 2520286..4012462 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/validation.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/validation.go
@@ -220,7 +220,7 @@ type ErrParamMinLen struct {
 func NewErrParamMinLen(field string, min int) *ErrParamMinLen {
         return &ErrParamMinLen{
                 errInvalidParam: errInvalidParam{
-                        code:  ParamMinValueErrCode,
+                        code:  ParamMinLenErrCode,
                         field: field,
                         msg:   fmt.Sprintf("minimum field size of %v", min),
                 },
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/waiter.go b/vendor/github.com/aws/aws-sdk-go/aws/request/waiter.go
index 22d2f80..4601f88 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/request/waiter.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/request/waiter.go
@@ -79,8 +79,9 @@ type Waiter struct {
         MaxAttempts int
         Delay       WaiterDelay
 
-        RequestOptions []Option
-        NewRequest     func([]Option) (*Request, error)
+        RequestOptions   []Option
+        NewRequest       func([]Option) (*Request, error)
+        SleepWithContext func(aws.Context, time.Duration) error
 }
 
 // ApplyOptions updates the waiter with the list of waiter options provided.
@@ -195,8 +196,15 @@ func (w Waiter) WaitWithContext(ctx aws.Context) error {
                 if sleepFn := req.Config.SleepDelay; sleepFn != nil {
                         // Support SleepDelay for backwards compatibility and testing
                         sleepFn(delay)
-                } else if err := aws.SleepWithContext(ctx, delay); err != nil {
-                        return awserr.New(CanceledErrorCode, "waiter context canceled", err)
+                } else {
+                        sleepCtxFn := w.SleepWithContext
+                        if sleepCtxFn == nil {
+                                sleepCtxFn = aws.SleepWithContext
+                        }
+
+                        if err := sleepCtxFn(ctx, delay); err != nil {
+                                return awserr.New(CanceledErrorCode, "waiter context canceled", err)
+                        }
                 }
         }
 
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/session/doc.go b/vendor/github.com/aws/aws-sdk-go/aws/session/doc.go
index ea7b886..98d420f 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/session/doc.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/session/doc.go
@@ -128,7 +128,7 @@ read. The Session will be created from configuration values from the shared
 credentials file (~/.aws/credentials) over those in the shared config file (~/.aws/config).
 
 Credentials are the values the SDK should use for authenticating requests with
-AWS Services. They arfrom a configuration file will need to include both
+AWS Services. They are from a configuration file will need to include both
 aws_access_key_id and aws_secret_access_key must be provided together in the
 same file to be considered valid. The values will be ignored if not a complete
 group. aws_session_token is an optional field that can be provided if both of
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/session/env_config.go b/vendor/github.com/aws/aws-sdk-go/aws/session/env_config.go
index 7357e54..82e04d7 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/session/env_config.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/session/env_config.go
@@ -5,8 +5,12 @@ import (
         "strconv"
 
         "github.com/aws/aws-sdk-go/aws/credentials"
+        "github.com/aws/aws-sdk-go/aws/defaults"
 )
 
+// EnvProviderName provides a name of the provider when config is loaded from environment.
+const EnvProviderName = "EnvConfigCredentials"
+
 // envConfig is a collection of environment values the SDK will read
 // setup config from. All environment values are optional. But some values
 // such as credentials require multiple values to be complete or the values
@@ -76,7 +80,7 @@ type envConfig struct {
         SharedConfigFile string
 
         // Sets the path to a custom Credentials Authroity (CA) Bundle PEM file
-        // that the SDK will use instead of the the system's root CA bundle.
+        // that the SDK will use instead of the system's root CA bundle.
         // Only use this if you want to configure the SDK to use a custom set
         // of CAs.
         //
@@ -92,9 +96,23 @@ type envConfig struct {
         //
         //  AWS_CA_BUNDLE=$HOME/my_custom_ca_bundle
         CustomCABundle string
+
+        csmEnabled  string
+        CSMEnabled  bool
+        CSMPort     string
+        CSMClientID string
 }
 
 var (
+        csmEnabledEnvKey = []string{
+                "AWS_CSM_ENABLED",
+        }
+        csmPortEnvKey = []string{
+                "AWS_CSM_PORT",
+        }
+        csmClientIDEnvKey = []string{
+                "AWS_CSM_CLIENT_ID",
+        }
         credAccessEnvKey = []string{
                 "AWS_ACCESS_KEY_ID",
                 "AWS_ACCESS_KEY",
@@ -153,11 +171,17 @@ func envConfigLoad(enableSharedConfig bool) envConfig {
         setFromEnvVal(&cfg.Creds.SecretAccessKey, credSecretEnvKey)
         setFromEnvVal(&cfg.Creds.SessionToken, credSessionEnvKey)
 
+        // CSM environment variables
+        setFromEnvVal(&cfg.csmEnabled, csmEnabledEnvKey)
+        setFromEnvVal(&cfg.CSMPort, csmPortEnvKey)
+        setFromEnvVal(&cfg.CSMClientID, csmClientIDEnvKey)
+        cfg.CSMEnabled = len(cfg.csmEnabled) > 0
+
         // Require logical grouping of credentials
         if len(cfg.Creds.AccessKeyID) == 0 || len(cfg.Creds.SecretAccessKey) == 0 {
                 cfg.Creds = credentials.Value{}
         } else {
-                cfg.Creds.ProviderName = "EnvConfigCredentials"
+                cfg.Creds.ProviderName = EnvProviderName
         }
 
         regionKeys := regionEnvKeys
@@ -173,6 +197,13 @@ func envConfigLoad(enableSharedConfig bool) envConfig {
         setFromEnvVal(&cfg.SharedCredentialsFile, sharedCredsFileEnvKey)
         setFromEnvVal(&cfg.SharedConfigFile, sharedConfigFileEnvKey)
 
+        if len(cfg.SharedCredentialsFile) == 0 {
+                cfg.SharedCredentialsFile = defaults.SharedCredentialsFilename()
+        }
+        if len(cfg.SharedConfigFile) == 0 {
+                cfg.SharedConfigFile = defaults.SharedConfigFilename()
+        }
+
         cfg.CustomCABundle = os.Getenv("AWS_CA_BUNDLE")
 
         return cfg
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/session/session.go b/vendor/github.com/aws/aws-sdk-go/aws/session/session.go
index 9f75d5a..51f3055 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/session/session.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/session/session.go
@@ -15,6 +15,7 @@ import (
         "github.com/aws/aws-sdk-go/aws/corehandlers"
         "github.com/aws/aws-sdk-go/aws/credentials"
         "github.com/aws/aws-sdk-go/aws/credentials/stscreds"
+        "github.com/aws/aws-sdk-go/aws/csm"
         "github.com/aws/aws-sdk-go/aws/defaults"
         "github.com/aws/aws-sdk-go/aws/endpoints"
         "github.com/aws/aws-sdk-go/aws/request"
@@ -26,7 +27,7 @@ import (
 // Sessions are safe to create service clients concurrently, but it is not safe
 // to mutate the Session concurrently.
 //
-// The Session satisfies the service client's client.ClientConfigProvider.
+// The Session satisfies the service client's client.ConfigProvider.
 type Session struct {
         Config   *aws.Config
         Handlers request.Handlers
@@ -58,7 +59,12 @@ func New(cfgs ...*aws.Config) *Session {
         envCfg := loadEnvConfig()
 
         if envCfg.EnableSharedConfig {
-                s, err := newSession(Options{}, envCfg, cfgs...)
+                var cfg aws.Config
+                cfg.MergeIn(cfgs...)
+                s, err := NewSessionWithOptions(Options{
+                        Config:            cfg,
+                        SharedConfigState: SharedConfigEnable,
+                })
                 if err != nil {
                         // Old session.New expected all errors to be discovered when
                         // a request is made, and would report the errors then. This
@@ -76,10 +82,16 @@ func New(cfgs ...*aws.Config) *Session {
                                 r.Error = err
                         })
                 }
+
                 return s
         }
 
-        return deprecatedNewSession(cfgs...)
+        s := deprecatedNewSession(cfgs...)
+        if envCfg.CSMEnabled {
+                enableCSM(&s.Handlers, envCfg.CSMClientID, envCfg.CSMPort, s.Config.Logger)
+        }
+
+        return s
 }
 
 // NewSession returns a new Session created from SDK defaults, config files,
@@ -243,13 +255,6 @@ func NewSessionWithOptions(opts Options) (*Session, error) {
                 envCfg.EnableSharedConfig = true
         }
 
-        if len(envCfg.SharedCredentialsFile) == 0 {
-                envCfg.SharedCredentialsFile = defaults.SharedCredentialsFilename()
-        }
-        if len(envCfg.SharedConfigFile) == 0 {
-                envCfg.SharedConfigFile = defaults.SharedConfigFilename()
-        }
-
         // Only use AWS_CA_BUNDLE if session option is not provided.
         if len(envCfg.CustomCABundle) != 0 && opts.CustomCABundle == nil {
                 f, err := os.Open(envCfg.CustomCABundle)
@@ -302,10 +307,22 @@ func deprecatedNewSession(cfgs ...*aws.Config) *Session {
         }
 
         initHandlers(s)
-
         return s
 }
 
+func enableCSM(handlers *request.Handlers, clientID string, port string, logger aws.Logger) {
+        logger.Log("Enabling CSM")
+        if len(port) == 0 {
+                port = csm.DefaultPort
+        }
+
+        r, err := csm.Start(clientID, "127.0.0.1:"+port)
+        if err != nil {
+                return
+        }
+        r.InjectHandlers(handlers)
+}
+
 func newSession(opts Options, envCfg envConfig, cfgs ...*aws.Config) (*Session, error) {
         cfg := defaults.Config()
         handlers := defaults.Handlers()
@@ -345,6 +362,9 @@ func newSession(opts Options, envCfg envConfig, cfgs ...*aws.Config) (*Session,
         }
 
         initHandlers(s)
+        if envCfg.CSMEnabled {
+                enableCSM(&s.Handlers, envCfg.CSMClientID, envCfg.CSMPort, s.Config.Logger)
+        }
 
         // Setup HTTP client with custom cert bundle if enabled
         if opts.CustomCABundle != nil {
@@ -573,11 +593,12 @@ func (s *Session) clientConfigWithErr(serviceName string, cfgs ...*aws.Config) (
         }
 
         return client.Config{
-                Config:        s.Config,
-                Handlers:      s.Handlers,
-                Endpoint:      resolved.URL,
-                SigningRegion: resolved.SigningRegion,
-                SigningName:   resolved.SigningName,
+                Config:             s.Config,
+                Handlers:           s.Handlers,
+                Endpoint:           resolved.URL,
+                SigningRegion:      resolved.SigningRegion,
+                SigningNameDerived: resolved.SigningNameDerived,
+                SigningName:        resolved.SigningName,
         }, err
 }
 
@@ -597,10 +618,11 @@ func (s *Session) ClientConfigNoResolveEndpoint(cfgs ...*aws.Config) client.Conf
         }
 
         return client.Config{
-                Config:        s.Config,
-                Handlers:      s.Handlers,
-                Endpoint:      resolved.URL,
-                SigningRegion: resolved.SigningRegion,
-                SigningName:   resolved.SigningName,
+                Config:             s.Config,
+                Handlers:           s.Handlers,
+                Endpoint:           resolved.URL,
+                SigningRegion:      resolved.SigningRegion,
+                SigningNameDerived: resolved.SigningNameDerived,
+                SigningName:        resolved.SigningName,
         }
 }
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/v4.go b/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/v4.go
index 434ac87..8aa0681 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/v4.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/signer/v4/v4.go
@@ -45,7 +45,7 @@
 // If signing a request intended for HTTP2 server, and you're using Go 1.6.2
 // through 1.7.4 you should use the URL.RawPath as the pre-escaped form of the
 // request URL. https://github.com/golang/go/issues/16847 points to a bug in
-// Go pre 1.8 that failes to make HTTP2 requests using absolute URL in the HTTP
+// Go pre 1.8 that fails to make HTTP2 requests using absolute URL in the HTTP
 // message. URL.Opaque generally will force Go to make requests with absolute URL.
 // URL.RawPath does not do this, but RawPath must be a valid escaping of Path
 // or url.EscapedPath will ignore the RawPath escaping.
@@ -55,7 +55,6 @@
 package v4
 
 import (
-        "bytes"
         "crypto/hmac"
         "crypto/sha256"
         "encoding/hex"
@@ -72,6 +71,7 @@ import (
         "github.com/aws/aws-sdk-go/aws"
         "github.com/aws/aws-sdk-go/aws/credentials"
         "github.com/aws/aws-sdk-go/aws/request"
+        "github.com/aws/aws-sdk-go/internal/sdkio"
         "github.com/aws/aws-sdk-go/private/protocol/rest"
 )
 
@@ -98,25 +98,25 @@ var ignoredHeaders = rules{
 var requiredSignedHeaders = rules{
         whitelist{
                 mapRule{
-                        "Cache-Control":                                               struct{}{},
-                        "Content-Disposition":                                         struct{}{},
-                        "Content-Encoding":                                            struct{}{},
-                        "Content-Language":                                            struct{}{},
-                        "Content-Md5":                                                 struct{}{},
-                        "Content-Type":                                                struct{}{},
-                        "Expires":                                                     struct{}{},
-                        "If-Match":                                                    struct{}{},
-                        "If-Modified-Since":                                           struct{}{},
-                        "If-None-Match":                                               struct{}{},
-                        "If-Unmodified-Since":                                         struct{}{},
-                        "Range":                                                       struct{}{},
-                        "X-Amz-Acl":                                                   struct{}{},
-                        "X-Amz-Copy-Source":                                           struct{}{},
-                        "X-Amz-Copy-Source-If-Match":                                  struct{}{},
-                        "X-Amz-Copy-Source-If-Modified-Since":                         struct{}{},
-                        "X-Amz-Copy-Source-If-None-Match":                             struct{}{},
-                        "X-Amz-Copy-Source-If-Unmodified-Since":                       struct{}{},
-                        "X-Amz-Copy-Source-Range":                                     struct{}{},
+                        "Cache-Control":                         struct{}{},
+                        "Content-Disposition":                   struct{}{},
+                        "Content-Encoding":                      struct{}{},
+                        "Content-Language":                      struct{}{},
+                        "Content-Md5":                           struct{}{},
+                        "Content-Type":                          struct{}{},
+                        "Expires":                               struct{}{},
+                        "If-Match":                              struct{}{},
+                        "If-Modified-Since":                     struct{}{},
+                        "If-None-Match":                         struct{}{},
+                        "If-Unmodified-Since":                   struct{}{},
+                        "Range":                                 struct{}{},
+                        "X-Amz-Acl":                             struct{}{},
+                        "X-Amz-Copy-Source":                     struct{}{},
+                        "X-Amz-Copy-Source-If-Match":            struct{}{},
+                        "X-Amz-Copy-Source-If-Modified-Since":   struct{}{},
+                        "X-Amz-Copy-Source-If-None-Match":       struct{}{},
+                        "X-Amz-Copy-Source-If-Unmodified-Since": struct{}{},
+                        "X-Amz-Copy-Source-Range":               struct{}{},
                         "X-Amz-Copy-Source-Server-Side-Encryption-Customer-Algorithm": struct{}{},
                         "X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key":       struct{}{},
                         "X-Amz-Copy-Source-Server-Side-Encryption-Customer-Key-Md5":   struct{}{},
@@ -135,6 +135,7 @@ var requiredSignedHeaders = rules{
                         "X-Amz-Server-Side-Encryption-Customer-Key-Md5":               struct{}{},
                         "X-Amz-Storage-Class":                                         struct{}{},
                         "X-Amz-Website-Redirect-Location":                             struct{}{},
+                        "X-Amz-Content-Sha256":                                        struct{}{},
                 },
         },
         patterns{"X-Amz-Meta-"},
@@ -269,7 +270,7 @@ type signingCtx struct {
 // "X-Amz-Content-Sha256" header with a precomputed value. The signer will
 // only compute the hash if the request header value is empty.
 func (v4 Signer) Sign(r *http.Request, body io.ReadSeeker, service, region string, signTime time.Time) (http.Header, error) {
-        return v4.signWithBody(r, body, service, region, 0, signTime)
+        return v4.signWithBody(r, body, service, region, 0, false, signTime)
 }
 
 // Presign signs AWS v4 requests with the provided body, service name, region
@@ -303,10 +304,10 @@ func (v4 Signer) Sign(r *http.Request, body io.ReadSeeker, service, region strin
 // presigned request's signature you can set the "X-Amz-Content-Sha256"
 // HTTP header and that will be included in the request's signature.
 func (v4 Signer) Presign(r *http.Request, body io.ReadSeeker, service, region string, exp time.Duration, signTime time.Time) (http.Header, error) {
-        return v4.signWithBody(r, body, service, region, exp, signTime)
+        return v4.signWithBody(r, body, service, region, exp, true, signTime)
 }
 
-func (v4 Signer) signWithBody(r *http.Request, body io.ReadSeeker, service, region string, exp time.Duration, signTime time.Time) (http.Header, error) {
+func (v4 Signer) signWithBody(r *http.Request, body io.ReadSeeker, service, region string, exp time.Duration, isPresign bool, signTime time.Time) (http.Header, error) {
         currentTimeFn := v4.currentTimeFn
         if currentTimeFn == nil {
                 currentTimeFn = time.Now
@@ -318,7 +319,7 @@ func (v4 Signer) signWithBody(r *http.Request, body io.ReadSeeker, service, regi
                 Query:                  r.URL.Query(),
                 Time:                   signTime,
                 ExpireTime:             exp,
-                isPresign:              exp != 0,
+                isPresign:              isPresign,
                 ServiceName:            service,
                 Region:                 region,
                 DisableURIPathEscaping: v4.DisableURIPathEscaping,
@@ -340,8 +341,11 @@ func (v4 Signer) signWithBody(r *http.Request, body io.ReadSeeker, service, regi
                 return http.Header{}, err
         }
 
+        ctx.sanitizeHostForHeader()
         ctx.assignAmzQueryValues()
-        ctx.build(v4.DisableHeaderHoisting)
+        if err := ctx.build(v4.DisableHeaderHoisting); err != nil {
+                return nil, err
+        }
 
         // If the request is not presigned the body should be attached to it. This
         // prevents the confusion of wanting to send a signed request without
@@ -364,6 +368,10 @@ func (v4 Signer) signWithBody(r *http.Request, body io.ReadSeeker, service, regi
         return ctx.SignedHeaderVals, nil
 }
 
+func (ctx *signingCtx) sanitizeHostForHeader() {
+        request.SanitizeHostForHeader(ctx.Request)
+}
+
 func (ctx *signingCtx) handlePresignRemoval() {
         if !ctx.isPresign {
                 return
@@ -402,7 +410,7 @@ var SignRequestHandler = request.NamedHandler{
 }
 
 // SignSDKRequest signs an AWS request with the V4 signature. This
-// request handler is bested used only with the SDK's built in service client's
+// request handler should only be used with the SDK's built in service client's
 // API operation requests.
 //
 // This function should not be used on its on its own, but in conjunction with
@@ -468,7 +476,7 @@ func signSDKRequestWithCurrTime(req *request.Request, curTimeFn func() time.Time
         }
 
         signedHeaders, err := v4.signWithBody(req.HTTPRequest, req.GetBody(),
-                name, region, req.ExpireTime, signingTime,
+                name, region, req.ExpireTime, req.ExpireTime > 0, signingTime,
         )
         if err != nil {
                 req.Error = err
@@ -499,10 +507,14 @@ func (v4 *Signer) logSigningInfo(ctx *signingCtx) {
         v4.Logger.Log(msg)
 }
 
-func (ctx *signingCtx) build(disableHeaderHoisting bool) {
+func (ctx *signingCtx) build(disableHeaderHoisting bool) error {
         ctx.buildTime()             // no depends
         ctx.buildCredentialString() // no depends
 
+        if err := ctx.buildBodyDigest(); err != nil {
+                return err
+        }
+
         unsignedHeaders := ctx.Request.Header
         if ctx.isPresign {
                 if !disableHeaderHoisting {
@@ -514,7 +526,6 @@ func (ctx *signingCtx) build(disableHeaderHoisting bool) {
                 }
         }
 
-        ctx.buildBodyDigest()
         ctx.buildCanonicalHeaders(ignoredHeaders, unsignedHeaders)
         ctx.buildCanonicalString() // depends on canon headers / signed headers
         ctx.buildStringToSign()    // depends on canon string
@@ -530,6 +541,8 @@ func (ctx *signingCtx) build(disableHeaderHoisting bool) {
                 }
                 ctx.Request.Header.Set("Authorization", strings.Join(parts, ", "))
         }
+
+        return nil
 }
 
 func (ctx *signingCtx) buildTime() {
@@ -604,14 +617,18 @@ func (ctx *signingCtx) buildCanonicalHeaders(r rule, header http.Header) {
         headerValues := make([]string, len(headers))
         for i, k := range headers {
                 if k == "host" {
-                        headerValues[i] = "host:" + ctx.Request.URL.Host
+                        if ctx.Request.Host != "" {
+                                headerValues[i] = "host:" + ctx.Request.Host
+                        } else {
+                                headerValues[i] = "host:" + ctx.Request.URL.Host
+                        }
                 } else {
                         headerValues[i] = k + ":" +
                                 strings.Join(ctx.SignedHeaderVals[k], ",")
                 }
         }
-
-        ctx.canonicalHeaders = strings.Join(stripExcessSpaces(headerValues), "\n")
+        stripExcessSpaces(headerValues)
+        ctx.canonicalHeaders = strings.Join(headerValues, "\n")
 }
 
 func (ctx *signingCtx) buildCanonicalString() {
@@ -652,21 +669,34 @@ func (ctx *signingCtx) buildSignature() {
         ctx.signature = hex.EncodeToString(signature)
 }
 
-func (ctx *signingCtx) buildBodyDigest() {
+func (ctx *signingCtx) buildBodyDigest() error {
         hash := ctx.Request.Header.Get("X-Amz-Content-Sha256")
         if hash == "" {
-                if ctx.unsignedPayload || (ctx.isPresign && ctx.ServiceName == "s3") {
+                includeSHA256Header := ctx.unsignedPayload ||
+                        ctx.ServiceName == "s3" ||
+                        ctx.ServiceName == "glacier"
+
+                s3Presign := ctx.isPresign && ctx.ServiceName == "s3"
+
+                if ctx.unsignedPayload || s3Presign {
                         hash = "UNSIGNED-PAYLOAD"
+                        includeSHA256Header = !s3Presign
                 } else if ctx.Body == nil {
                         hash = emptyStringSHA256
                 } else {
+                        if !aws.IsReaderSeekable(ctx.Body) {
+                                return fmt.Errorf("cannot use unseekable request body %T, for signed request with body", ctx.Body)
+                        }
                         hash = hex.EncodeToString(makeSha256Reader(ctx.Body))
                 }
-                if ctx.unsignedPayload || ctx.ServiceName == "s3" || ctx.ServiceName == "glacier" {
+
+                if includeSHA256Header {
                         ctx.Request.Header.Set("X-Amz-Content-Sha256", hash)
                 }
         }
         ctx.bodyDigest = hash
+
+        return nil
 }
 
 // isRequestSigned returns if the request is currently signed or presigned
@@ -706,56 +736,53 @@ func makeSha256(data []byte) []byte {
 
 func makeSha256Reader(reader io.ReadSeeker) []byte {
         hash := sha256.New()
-        start, _ := reader.Seek(0, 1)
-        defer reader.Seek(start, 0)
+        start, _ := reader.Seek(0, sdkio.SeekCurrent)
+        defer reader.Seek(start, sdkio.SeekStart)
 
         io.Copy(hash, reader)
         return hash.Sum(nil)
 }
 
-const doubleSpaces = "  "
-
-var doubleSpaceBytes = []byte(doubleSpaces)
+const doubleSpace = "  "
 
-func stripExcessSpaces(headerVals []string) []string {
-        vals := make([]string, len(headerVals))
-        for i, str := range headerVals {
-                // Trim leading and trailing spaces
-                trimmed := strings.TrimSpace(str)
+// stripExcessSpaces will rewrite the passed in slice's string values to not
+// contain muliple side-by-side spaces.
+func stripExcessSpaces(vals []string) {
+        var j, k, l, m, spaces int
+        for i, str := range vals {
+                // Trim trailing spaces
+                for j = len(str) - 1; j >= 0 && str[j] == ' '; j-- {
+                }
 
-                idx := strings.Index(trimmed, doubleSpaces)
-                var buf []byte
-                for idx > -1 {
-                        // Multiple adjacent spaces found
-                        if buf == nil {
-                                // first time create the buffer
-                                buf = []byte(trimmed)
-                        }
+                // Trim leading spaces
+                for k = 0; k < j && str[k] == ' '; k++ {
+                }
+                str = str[k : j+1]
 
-                        stripToIdx := -1
-                        for j := idx + 1; j < len(buf); j++ {
-                                if buf[j] != ' ' {
-                                        buf = append(buf[:idx+1], buf[j:]...)
-                                        stripToIdx = j
-                                        break
-                                }
-                        }
+                // Strip multiple spaces.
+                j = strings.Index(str, doubleSpace)
+                if j < 0 {
+                        vals[i] = str
+                        continue
+                }
 
-                        if stripToIdx >= 0 {
-                                idx = bytes.Index(buf[stripToIdx:], doubleSpaceBytes)
-                                if idx >= 0 {
-                                        idx += stripToIdx
+                buf := []byte(str)
+                for k, m, l = j, j, len(buf); k < l; k++ {
+                        if buf[k] == ' ' {
+                                if spaces == 0 {
+                                        // First space.
+                                        buf[m] = buf[k]
+                                        m++
                                 }
+                                spaces++
                         } else {
-                                idx = -1
+                                // End of multiple spaces.
+                                spaces = 0
+                                buf[m] = buf[k]
+                                m++
                         }
                 }
 
-                if buf != nil {
-                        vals[i] = string(buf)
-                } else {
-                        vals[i] = trimmed
-                }
+                vals[i] = string(buf[:m])
         }
-        return vals
 }
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/types.go b/vendor/github.com/aws/aws-sdk-go/aws/types.go
index 0e2d864..8b6f234 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/types.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/types.go
@@ -3,6 +3,8 @@ package aws
 import (
         "io"
         "sync"
+
+        "github.com/aws/aws-sdk-go/internal/sdkio"
 )
 
 // ReadSeekCloser wraps a io.Reader returning a ReaderSeekerCloser. Should
@@ -22,6 +24,22 @@ type ReaderSeekerCloser struct {
         r io.Reader
 }
 
+// IsReaderSeekable returns if the underlying reader type can be seeked. A
+// io.Reader might not actually be seekable if it is the ReaderSeekerCloser
+// type.
+func IsReaderSeekable(r io.Reader) bool {
+        switch v := r.(type) {
+        case ReaderSeekerCloser:
+                return v.IsSeeker()
+        case *ReaderSeekerCloser:
+                return v.IsSeeker()
+        case io.ReadSeeker:
+                return true
+        default:
+                return false
+        }
+}
+
 // Read reads from the reader up to size of p. The number of bytes read, and
 // error if it occurred will be returned.
 //
@@ -56,6 +74,71 @@ func (r ReaderSeekerCloser) IsSeeker() bool {
         return ok
 }
 
+// HasLen returns the length of the underlying reader if the value implements
+// the Len() int method.
+func (r ReaderSeekerCloser) HasLen() (int, bool) {
+        type lenner interface {
+                Len() int
+        }
+
+        if lr, ok := r.r.(lenner); ok {
+                return lr.Len(), true
+        }
+
+        return 0, false
+}
+
+// GetLen returns the length of the bytes remaining in the underlying reader.
+// Checks first for Len(), then io.Seeker to determine the size of the
+// underlying reader.
+//
+// Will return -1 if the length cannot be determined.
+func (r ReaderSeekerCloser) GetLen() (int64, error) {
+        if l, ok := r.HasLen(); ok {
+                return int64(l), nil
+        }
+
+        if s, ok := r.r.(io.Seeker); ok {
+                return seekerLen(s)
+        }
+
+        return -1, nil
+}
+
+// SeekerLen attempts to get the number of bytes remaining at the seeker's
+// current position.  Returns the number of bytes remaining or error.
+func SeekerLen(s io.Seeker) (int64, error) {
+        // Determine if the seeker is actually seekable. ReaderSeekerCloser
+        // hides the fact that a io.Readers might not actually be seekable.
+        switch v := s.(type) {
+        case ReaderSeekerCloser:
+                return v.GetLen()
+        case *ReaderSeekerCloser:
+                return v.GetLen()
+        }
+
+        return seekerLen(s)
+}
+
+func seekerLen(s io.Seeker) (int64, error) {
+        curOffset, err := s.Seek(0, sdkio.SeekCurrent)
+        if err != nil {
+                return 0, err
+        }
+
+        endOffset, err := s.Seek(0, sdkio.SeekEnd)
+        if err != nil {
+                return 0, err
+        }
+
+        _, err = s.Seek(curOffset, sdkio.SeekStart)
+        if err != nil {
+                return 0, err
+        }
+
+        return endOffset - curOffset, nil
+}
+
 // Close closes the ReaderSeekerCloser.
 //
 // If the ReaderSeekerCloser is not an io.Closer nothing will be done.
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go
index bbf4c2f..c4d155c 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/version.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/version.go
@@ -5,4 +5,4 @@ package aws
 const SDKName = "aws-sdk-go"
 
 // SDKVersion is the version of this SDK
-const SDKVersion = "1.8.34"
+const SDKVersion = "1.14.31"
diff --git a/vendor/github.com/aws/aws-sdk-go/internal/sdkio/io_go1.6.go b/vendor/github.com/aws/aws-sdk-go/internal/sdkio/io_go1.6.go
new file mode 100644
index 0000000..5aa9137
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/internal/sdkio/io_go1.6.go
@@ -0,0 +1,10 @@
+// +build !go1.7
+
+package sdkio
+
+// Copy of Go 1.7 io package's Seeker constants.
+const (
+        SeekStart   = 0 // seek relative to the origin of the file
+        SeekCurrent = 1 // seek relative to the current offset
+        SeekEnd     = 2 // seek relative to the end
+)
diff --git a/vendor/github.com/aws/aws-sdk-go/internal/sdkio/io_go1.7.go b/vendor/github.com/aws/aws-sdk-go/internal/sdkio/io_go1.7.go
new file mode 100644
index 0000000..e5f0056
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/internal/sdkio/io_go1.7.go
@@ -0,0 +1,12 @@
+// +build go1.7
+
+package sdkio
+
+import "io"
+
+// Alias for Go 1.7 io package Seeker constants
+const (
+        SeekStart   = io.SeekStart   // seek relative to the origin of the file
+        SeekCurrent = io.SeekCurrent // seek relative to the current offset
+        SeekEnd     = io.SeekEnd     // seek relative to the end
+)
diff --git a/vendor/github.com/aws/aws-sdk-go/internal/sdkrand/locked_source.go b/vendor/github.com/aws/aws-sdk-go/internal/sdkrand/locked_source.go
new file mode 100644
index 0000000..0c9802d
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/internal/sdkrand/locked_source.go
@@ -0,0 +1,29 @@
+package sdkrand
+
+import (
+        "math/rand"
+        "sync"
+        "time"
+)
+
+// lockedSource is a thread-safe implementation of rand.Source
+type lockedSource struct {
+        lk  sync.Mutex
+        src rand.Source
+}
+
+func (r *lockedSource) Int63() (n int64) {
+        r.lk.Lock()
+        n = r.src.Int63()
+        r.lk.Unlock()
+        return
+}
+
+func (r *lockedSource) Seed(seed int64) {
+        r.lk.Lock()
+        r.src.Seed(seed)
+        r.lk.Unlock()
+}
+
+// SeededRand is a new RNG using a thread safe implementation of rand.Source
+var SeededRand = rand.New(&lockedSource{src: rand.NewSource(time.Now().UnixNano())})
diff --git a/vendor/github.com/aws/aws-sdk-go/internal/sdkuri/path.go b/vendor/github.com/aws/aws-sdk-go/internal/sdkuri/path.go
new file mode 100644
index 0000000..38ea61a
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/internal/sdkuri/path.go
@@ -0,0 +1,23 @@
+package sdkuri
+
+import (
+        "path"
+        "strings"
+)
+
+// PathJoin will join the elements of the path delimited by the "/"
+// character. Similar to path.Join with the exception the trailing "/"
+// character is preserved if present.
+func PathJoin(elems ...string) string {
+        if len(elems) == 0 {
+                return ""
+        }
+
+        hasTrailing := strings.HasSuffix(elems[len(elems)-1], "/")
+        str := path.Join(elems...)
+        if hasTrailing && str != "/" {
+                str += "/"
+        }
+
+        return str
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/debug.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/debug.go
new file mode 100644
index 0000000..ecc7bf8
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/debug.go
@@ -0,0 +1,144 @@
+package eventstream
+
+import (
+        "bytes"
+        "encoding/base64"
+        "encoding/json"
+        "fmt"
+        "strconv"
+)
+
+type decodedMessage struct {
+        rawMessage
+        Headers decodedHeaders `json:"headers"`
+}
+type jsonMessage struct {
+        Length     json.Number    `json:"total_length"`
+        HeadersLen json.Number    `json:"headers_length"`
+        PreludeCRC json.Number    `json:"prelude_crc"`
+        Headers    decodedHeaders `json:"headers"`
+        Payload    []byte         `json:"payload"`
+        CRC        json.Number    `json:"message_crc"`
+}
+
+func (d *decodedMessage) UnmarshalJSON(b []byte) (err error) {
+        var jsonMsg jsonMessage
+        if err = json.Unmarshal(b, &jsonMsg); err != nil {
+                return err
+        }
+
+        d.Length, err = numAsUint32(jsonMsg.Length)
+        if err != nil {
+                return err
+        }
+        d.HeadersLen, err = numAsUint32(jsonMsg.HeadersLen)
+        if err != nil {
+                return err
+        }
+        d.PreludeCRC, err = numAsUint32(jsonMsg.PreludeCRC)
+        if err != nil {
+                return err
+        }
+        d.Headers = jsonMsg.Headers
+        d.Payload = jsonMsg.Payload
+        d.CRC, err = numAsUint32(jsonMsg.CRC)
+        if err != nil {
+                return err
+        }
+
+        return nil
+}
+
+func (d *decodedMessage) MarshalJSON() ([]byte, error) {
+        jsonMsg := jsonMessage{
+                Length:     json.Number(strconv.Itoa(int(d.Length))),
+                HeadersLen: json.Number(strconv.Itoa(int(d.HeadersLen))),
+                PreludeCRC: json.Number(strconv.Itoa(int(d.PreludeCRC))),
+                Headers:    d.Headers,
+                Payload:    d.Payload,
+                CRC:        json.Number(strconv.Itoa(int(d.CRC))),
+        }
+
+        return json.Marshal(jsonMsg)
+}
+
+func numAsUint32(n json.Number) (uint32, error) {
+        v, err := n.Int64()
+        if err != nil {
+                return 0, fmt.Errorf("failed to get int64 json number, %v", err)
+        }
+
+        return uint32(v), nil
+}
+
+func (d decodedMessage) Message() Message {
+        return Message{
+                Headers: Headers(d.Headers),
+                Payload: d.Payload,
+        }
+}
+
+type decodedHeaders Headers
+
+func (hs *decodedHeaders) UnmarshalJSON(b []byte) error {
+        var jsonHeaders []struct {
+                Name  string      `json:"name"`
+                Type  valueType   `json:"type"`
+                Value interface{} `json:"value"`
+        }
+
+        decoder := json.NewDecoder(bytes.NewReader(b))
+        decoder.UseNumber()
+        if err := decoder.Decode(&jsonHeaders); err != nil {
+                return err
+        }
+
+        var headers Headers
+        for _, h := range jsonHeaders {
+                value, err := valueFromType(h.Type, h.Value)
+                if err != nil {
+                        return err
+                }
+                headers.Set(h.Name, value)
+        }
+        (*hs) = decodedHeaders(headers)
+
+        return nil
+}
+
+func valueFromType(typ valueType, val interface{}) (Value, error) {
+        switch typ {
+        case trueValueType:
+                return BoolValue(true), nil
+        case falseValueType:
+                return BoolValue(false), nil
+        case int8ValueType:
+                v, err := val.(json.Number).Int64()
+                return Int8Value(int8(v)), err
+        case int16ValueType:
+                v, err := val.(json.Number).Int64()
+                return Int16Value(int16(v)), err
+        case int32ValueType:
+                v, err := val.(json.Number).Int64()
+                return Int32Value(int32(v)), err
+        case int64ValueType:
+                v, err := val.(json.Number).Int64()
+                return Int64Value(v), err
+        case bytesValueType:
+                v, err := base64.StdEncoding.DecodeString(val.(string))
+                return BytesValue(v), err
+        case stringValueType:
+                v, err := base64.StdEncoding.DecodeString(val.(string))
+                return StringValue(string(v)), err
+        case timestampValueType:
+                v, err := val.(json.Number).Int64()
+                return TimestampValue(timeFromEpochMilli(v)), err
+        case uuidValueType:
+                v, err := base64.StdEncoding.DecodeString(val.(string))
+                var tv UUIDValue
+                copy(tv[:], v)
+                return tv, err
+        default:
+                panic(fmt.Sprintf("unknown type, %s, %T", typ.String(), val))
+        }
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/decode.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/decode.go
new file mode 100644
index 0000000..4b972b2
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/decode.go
@@ -0,0 +1,199 @@
+package eventstream
+
+import (
+        "bytes"
+        "encoding/binary"
+        "encoding/hex"
+        "encoding/json"
+        "fmt"
+        "hash"
+        "hash/crc32"
+        "io"
+
+        "github.com/aws/aws-sdk-go/aws"
+)
+
+// Decoder provides decoding of an Event Stream messages.
+type Decoder struct {
+        r      io.Reader
+        logger aws.Logger
+}
+
+// NewDecoder initializes and returns a Decoder for decoding event
+// stream messages from the reader provided.
+func NewDecoder(r io.Reader) *Decoder {
+        return &Decoder{
+                r: r,
+        }
+}
+
+// Decode attempts to decode a single message from the event stream reader.
+// Will return the event stream message, or error if Decode fails to read
+// the message from the stream.
+func (d *Decoder) Decode(payloadBuf []byte) (m Message, err error) {
+        reader := d.r
+        if d.logger != nil {
+                debugMsgBuf := bytes.NewBuffer(nil)
+                reader = io.TeeReader(reader, debugMsgBuf)
+                defer func() {
+                        logMessageDecode(d.logger, debugMsgBuf, m, err)
+                }()
+        }
+
+        crc := crc32.New(crc32IEEETable)
+        hashReader := io.TeeReader(reader, crc)
+
+        prelude, err := decodePrelude(hashReader, crc)
+        if err != nil {
+                return Message{}, err
+        }
+
+        if prelude.HeadersLen > 0 {
+                lr := io.LimitReader(hashReader, int64(prelude.HeadersLen))
+                m.Headers, err = decodeHeaders(lr)
+                if err != nil {
+                        return Message{}, err
+                }
+        }
+
+        if payloadLen := prelude.PayloadLen(); payloadLen > 0 {
+                buf, err := decodePayload(payloadBuf, io.LimitReader(hashReader, int64(payloadLen)))
+                if err != nil {
+                        return Message{}, err
+                }
+                m.Payload = buf
+        }
+
+        msgCRC := crc.Sum32()
+        if err := validateCRC(reader, msgCRC); err != nil {
+                return Message{}, err
+        }
+
+        return m, nil
+}
+
+// UseLogger specifies the Logger that that the decoder should use to log the
+// message decode to.
+func (d *Decoder) UseLogger(logger aws.Logger) {
+        d.logger = logger
+}
+
+func logMessageDecode(logger aws.Logger, msgBuf *bytes.Buffer, msg Message, decodeErr error) {
+        w := bytes.NewBuffer(nil)
+        defer func() { logger.Log(w.String()) }()
+
+        fmt.Fprintf(w, "Raw message:\n%s\n",
+                hex.Dump(msgBuf.Bytes()))
+
+        if decodeErr != nil {
+                fmt.Fprintf(w, "Decode error: %v\n", decodeErr)
+                return
+        }
+
+        rawMsg, err := msg.rawMessage()
+        if err != nil {
+                fmt.Fprintf(w, "failed to create raw message, %v\n", err)
+                return
+        }
+
+        decodedMsg := decodedMessage{
+                rawMessage: rawMsg,
+                Headers:    decodedHeaders(msg.Headers),
+        }
+
+        fmt.Fprintf(w, "Decoded message:\n")
+        encoder := json.NewEncoder(w)
+        if err := encoder.Encode(decodedMsg); err != nil {
+                fmt.Fprintf(w, "failed to generate decoded message, %v\n", err)
+        }
+}
+
+func decodePrelude(r io.Reader, crc hash.Hash32) (messagePrelude, error) {
+        var p messagePrelude
+
+        var err error
+        p.Length, err = decodeUint32(r)
+        if err != nil {
+                return messagePrelude{}, err
+        }
+
+        p.HeadersLen, err = decodeUint32(r)
+        if err != nil {
+                return messagePrelude{}, err
+        }
+
+        if err := p.ValidateLens(); err != nil {
+                return messagePrelude{}, err
+        }
+
+        preludeCRC := crc.Sum32()
+        if err := validateCRC(r, preludeCRC); err != nil {
+                return messagePrelude{}, err
+        }
+
+        p.PreludeCRC = preludeCRC
+
+        return p, nil
+}
+
+func decodePayload(buf []byte, r io.Reader) ([]byte, error) {
+        w := bytes.NewBuffer(buf[0:0])
+
+        _, err := io.Copy(w, r)
+        return w.Bytes(), err
+}
+
+func decodeUint8(r io.Reader) (uint8, error) {
+        type byteReader interface {
+                ReadByte() (byte, error)
+        }
+
+        if br, ok := r.(byteReader); ok {
+                v, err := br.ReadByte()
+                return uint8(v), err
+        }
+
+        var b [1]byte
+        _, err := io.ReadFull(r, b[:])
+        return uint8(b[0]), err
+}
+func decodeUint16(r io.Reader) (uint16, error) {
+        var b [2]byte
+        bs := b[:]
+        _, err := io.ReadFull(r, bs)
+        if err != nil {
+                return 0, err
+        }
+        return binary.BigEndian.Uint16(bs), nil
+}
+func decodeUint32(r io.Reader) (uint32, error) {
+        var b [4]byte
+        bs := b[:]
+        _, err := io.ReadFull(r, bs)
+        if err != nil {
+                return 0, err
+        }
+        return binary.BigEndian.Uint32(bs), nil
+}
+func decodeUint64(r io.Reader) (uint64, error) {
+        var b [8]byte
+        bs := b[:]
+        _, err := io.ReadFull(r, bs)
+        if err != nil {
+                return 0, err
+        }
+        return binary.BigEndian.Uint64(bs), nil
+}
+
+func validateCRC(r io.Reader, expect uint32) error {
+        msgCRC, err := decodeUint32(r)
+        if err != nil {
+                return err
+        }
+
+        if msgCRC != expect {
+                return ChecksumError{}
+        }
+
+        return nil
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/encode.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/encode.go
new file mode 100644
index 0000000..150a609
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/encode.go
@@ -0,0 +1,114 @@
+package eventstream
+
+import (
+        "bytes"
+        "encoding/binary"
+        "hash"
+        "hash/crc32"
+        "io"
+)
+
+// Encoder provides EventStream message encoding.
+type Encoder struct {
+        w io.Writer
+
+        headersBuf *bytes.Buffer
+}
+
+// NewEncoder initializes and returns an Encoder to encode Event Stream
+// messages to an io.Writer.
+func NewEncoder(w io.Writer) *Encoder {
+        return &Encoder{
+                w:          w,
+                headersBuf: bytes.NewBuffer(nil),
+        }
+}
+
+// Encode encodes a single EventStream message to the io.Writer the Encoder
+// was created with. An error is returned if writing the message fails.
+func (e *Encoder) Encode(msg Message) error {
+        e.headersBuf.Reset()
+
+        err := encodeHeaders(e.headersBuf, msg.Headers)
+        if err != nil {
+                return err
+        }
+
+        crc := crc32.New(crc32IEEETable)
+        hashWriter := io.MultiWriter(e.w, crc)
+
+        headersLen := uint32(e.headersBuf.Len())
+        payloadLen := uint32(len(msg.Payload))
+
+        if err := encodePrelude(hashWriter, crc, headersLen, payloadLen); err != nil {
+                return err
+        }
+
+        if headersLen > 0 {
+                if _, err := io.Copy(hashWriter, e.headersBuf); err != nil {
+                        return err
+                }
+        }
+
+        if payloadLen > 0 {
+                if _, err := hashWriter.Write(msg.Payload); err != nil {
+                        return err
+                }
+        }
+
+        msgCRC := crc.Sum32()
+        return binary.Write(e.w, binary.BigEndian, msgCRC)
+}
+
+func encodePrelude(w io.Writer, crc hash.Hash32, headersLen, payloadLen uint32) error {
+        p := messagePrelude{
+                Length:     minMsgLen + headersLen + payloadLen,
+                HeadersLen: headersLen,
+        }
+        if err := p.ValidateLens(); err != nil {
+                return err
+        }
+
+        err := binaryWriteFields(w, binary.BigEndian,
+                p.Length,
+                p.HeadersLen,
+        )
+        if err != nil {
+                return err
+        }
+
+        p.PreludeCRC = crc.Sum32()
+        err = binary.Write(w, binary.BigEndian, p.PreludeCRC)
+        if err != nil {
+                return err
+        }
+
+        return nil
+}
+
+func encodeHeaders(w io.Writer, headers Headers) error {
+        for _, h := range headers {
+                hn := headerName{
+                        Len: uint8(len(h.Name)),
+                }
+                copy(hn.Name[:hn.Len], h.Name)
+                if err := hn.encode(w); err != nil {
+                        return err
+                }
+
+                if err := h.Value.encode(w); err != nil {
+                        return err
+                }
+        }
+
+        return nil
+}
+
+func binaryWriteFields(w io.Writer, order binary.ByteOrder, vs ...interface{}) error {
+        for _, v := range vs {
+                if err := binary.Write(w, order, v); err != nil {
+                        return err
+                }
+        }
+        return nil
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/error.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/error.go
new file mode 100644
index 0000000..5481ef3
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/error.go
@@ -0,0 +1,23 @@
+package eventstream
+
+import "fmt"
+
+// LengthError provides the error for items being larger than a maximum length.
+type LengthError struct {
+        Part  string
+        Want  int
+        Have  int
+        Value interface{}
+}
+
+func (e LengthError) Error() string {
+        return fmt.Sprintf("%s length invalid, %d/%d, %v",
+                e.Part, e.Want, e.Have, e.Value)
+}
+
+// ChecksumError provides the error for message checksum invalidation errors.
+type ChecksumError struct{}
+
+func (e ChecksumError) Error() string {
+        return "message checksum mismatch"
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi/api.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi/api.go
new file mode 100644
index 0000000..97937c8
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi/api.go
@@ -0,0 +1,196 @@
+package eventstreamapi
+
+import (
+        "fmt"
+        "io"
+
+        "github.com/aws/aws-sdk-go/aws"
+        "github.com/aws/aws-sdk-go/private/protocol"
+        "github.com/aws/aws-sdk-go/private/protocol/eventstream"
+)
+
+// Unmarshaler provides the interface for unmarshaling a EventStream
+// message into a SDK type.
+type Unmarshaler interface {
+        UnmarshalEvent(protocol.PayloadUnmarshaler, eventstream.Message) error
+}
+
+// EventStream headers with specific meaning to async API functionality.
+const (
+        MessageTypeHeader    = `:message-type` // Identifies type of message.
+        EventMessageType     = `event`
+        ErrorMessageType     = `error`
+        ExceptionMessageType = `exception`
+
+        // Message Events
+        EventTypeHeader = `:event-type` // Identifies message event type e.g. "Stats".
+
+        // Message Error
+        ErrorCodeHeader    = `:error-code`
+        ErrorMessageHeader = `:error-message`
+
+        // Message Exception
+        ExceptionTypeHeader = `:exception-type`
+)
+
+// EventReader provides reading from the EventStream of an reader.
+type EventReader struct {
+        reader  io.ReadCloser
+        decoder *eventstream.Decoder
+
+        unmarshalerForEventType func(string) (Unmarshaler, error)
+        payloadUnmarshaler      protocol.PayloadUnmarshaler
+
+        payloadBuf []byte
+}
+
+// NewEventReader returns a EventReader built from the reader and unmarshaler
+// provided.  Use ReadStream method to start reading from the EventStream.
+func NewEventReader(
+        reader io.ReadCloser,
+        payloadUnmarshaler protocol.PayloadUnmarshaler,
+        unmarshalerForEventType func(string) (Unmarshaler, error),
+) *EventReader {
+        return &EventReader{
+                reader:                  reader,
+                decoder:                 eventstream.NewDecoder(reader),
+                payloadUnmarshaler:      payloadUnmarshaler,
+                unmarshalerForEventType: unmarshalerForEventType,
+                payloadBuf:              make([]byte, 10*1024),
+        }
+}
+
+// UseLogger instructs the EventReader to use the logger and log level
+// specified.
+func (r *EventReader) UseLogger(logger aws.Logger, logLevel aws.LogLevelType) {
+        if logger != nil && logLevel.Matches(aws.LogDebugWithEventStreamBody) {
+                r.decoder.UseLogger(logger)
+        }
+}
+
+// ReadEvent attempts to read a message from the EventStream and return the
+// unmarshaled event value that the message is for.
+//
+// For EventStream API errors check if the returned error satisfies the
+// awserr.Error interface to get the error's Code and Message components.
+//
+// EventUnmarshalers called with EventStream messages must take copies of the
+// message's Payload. The payload will is reused between events read.
+func (r *EventReader) ReadEvent() (event interface{}, err error) {
+        msg, err := r.decoder.Decode(r.payloadBuf)
+        if err != nil {
+                return nil, err
+        }
+        defer func() {
+                // Reclaim payload buffer for next message read.
+                r.payloadBuf = msg.Payload[0:0]
+        }()
+
+        typ, err := GetHeaderString(msg, MessageTypeHeader)
+        if err != nil {
+                return nil, err
+        }
+
+        switch typ {
+        case EventMessageType:
+                return r.unmarshalEventMessage(msg)
+        case ExceptionMessageType:
+                err = r.unmarshalEventException(msg)
+                return nil, err
+        case ErrorMessageType:
+                return nil, r.unmarshalErrorMessage(msg)
+        default:
+                return nil, fmt.Errorf("unknown eventstream message type, %v", typ)
+        }
+}
+
+func (r *EventReader) unmarshalEventMessage(
+        msg eventstream.Message,
+) (event interface{}, err error) {
+        eventType, err := GetHeaderString(msg, EventTypeHeader)
+        if err != nil {
+                return nil, err
+        }
+
+        ev, err := r.unmarshalerForEventType(eventType)
+        if err != nil {
+                return nil, err
+        }
+
+        err = ev.UnmarshalEvent(r.payloadUnmarshaler, msg)
+        if err != nil {
+                return nil, err
+        }
+
+        return ev, nil
+}
+
+func (r *EventReader) unmarshalEventException(
+        msg eventstream.Message,
+) (err error) {
+        eventType, err := GetHeaderString(msg, ExceptionTypeHeader)
+        if err != nil {
+                return err
+        }
+
+        ev, err := r.unmarshalerForEventType(eventType)
+        if err != nil {
+                return err
+        }
+
+        err = ev.UnmarshalEvent(r.payloadUnmarshaler, msg)
+        if err != nil {
+                return err
+        }
+
+        var ok bool
+        err, ok = ev.(error)
+        if !ok {
+                err = messageError{
+                        code: "SerializationError",
+                        msg: fmt.Sprintf(
+                                "event stream exception %s mapped to non-error %T, %v",
+                                eventType, ev, ev,
+                        ),
+                }
+        }
+
+        return err
+}
+
+func (r *EventReader) unmarshalErrorMessage(msg eventstream.Message) (err error) {
+        var msgErr messageError
+
+        msgErr.code, err = GetHeaderString(msg, ErrorCodeHeader)
+        if err != nil {
+                return err
+        }
+
+        msgErr.msg, err = GetHeaderString(msg, ErrorMessageHeader)
+        if err != nil {
+                return err
+        }
+
+        return msgErr
+}
+
+// Close closes the EventReader's EventStream reader.
+func (r *EventReader) Close() error {
+        return r.reader.Close()
+}
+
+// GetHeaderString returns the value of the header as a string. If the header
+// is not set or the value is not a string an error will be returned.
+func GetHeaderString(msg eventstream.Message, headerName string) (string, error) {
+        headerVal := msg.Headers.Get(headerName)
+        if headerVal == nil {
+                return "", fmt.Errorf("error header %s not present", headerName)
+        }
+
+        v, ok := headerVal.Get().(string)
+        if !ok {
+                return "", fmt.Errorf("error header value is not a string, %T", headerVal)
+        }
+
+        return v, nil
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi/error.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi/error.go
new file mode 100644
index 0000000..5ea5a98
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi/error.go
@@ -0,0 +1,24 @@
+package eventstreamapi
+
+import "fmt"
+
+type messageError struct {
+        code string
+        msg  string
+}
+
+func (e messageError) Code() string {
+        return e.code
+}
+
+func (e messageError) Message() string {
+        return e.msg
+}
+
+func (e messageError) Error() string {
+        return fmt.Sprintf("%s: %s", e.code, e.msg)
+}
+
+func (e messageError) OrigErr() error {
+        return nil
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/header.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/header.go
new file mode 100644
index 0000000..3b44dde
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/header.go
@@ -0,0 +1,166 @@
+package eventstream
+
+import (
+        "encoding/binary"
+        "fmt"
+        "io"
+)
+
+// Headers are a collection of EventStream header values.
+type Headers []Header
+
+// Header is a single EventStream Key Value header pair.
+type Header struct {
+        Name  string
+        Value Value
+}
+
+// Set associates the name with a value. If the header name already exists in
+// the Headers the value will be replaced with the new one.
+func (hs *Headers) Set(name string, value Value) {
+        var i int
+        for ; i < len(*hs); i++ {
+                if (*hs)[i].Name == name {
+                        (*hs)[i].Value = value
+                        return
+                }
+        }
+
+        *hs = append(*hs, Header{
+                Name: name, Value: value,
+        })
+}
+
+// Get returns the Value associated with the header. Nil is returned if the
+// value does not exist.
+func (hs Headers) Get(name string) Value {
+        for i := 0; i < len(hs); i++ {
+                if h := hs[i]; h.Name == name {
+                        return h.Value
+                }
+        }
+        return nil
+}
+
+// Del deletes the value in the Headers if it exists.
+func (hs *Headers) Del(name string) {
+        for i := 0; i < len(*hs); i++ {
+                if (*hs)[i].Name == name {
+                        copy((*hs)[i:], (*hs)[i+1:])
+                        (*hs) = (*hs)[:len(*hs)-1]
+                }
+        }
+}
+
+func decodeHeaders(r io.Reader) (Headers, error) {
+        hs := Headers{}
+
+        for {
+                name, err := decodeHeaderName(r)
+                if err != nil {
+                        if err == io.EOF {
+                                // EOF while getting header name means no more headers
+                                break
+                        }
+                        return nil, err
+                }
+
+                value, err := decodeHeaderValue(r)
+                if err != nil {
+                        return nil, err
+                }
+
+                hs.Set(name, value)
+        }
+
+        return hs, nil
+}
+
+func decodeHeaderName(r io.Reader) (string, error) {
+        var n headerName
+
+        var err error
+        n.Len, err = decodeUint8(r)
+        if err != nil {
+                return "", err
+        }
+
+        name := n.Name[:n.Len]
+        if _, err := io.ReadFull(r, name); err != nil {
+                return "", err
+        }
+
+        return string(name), nil
+}
+
+func decodeHeaderValue(r io.Reader) (Value, error) {
+        var raw rawValue
+
+        typ, err := decodeUint8(r)
+        if err != nil {
+                return nil, err
+        }
+        raw.Type = valueType(typ)
+
+        var v Value
+
+        switch raw.Type {
+        case trueValueType:
+                v = BoolValue(true)
+        case falseValueType:
+                v = BoolValue(false)
+        case int8ValueType:
+                var tv Int8Value
+                err = tv.decode(r)
+                v = tv
+        case int16ValueType:
+                var tv Int16Value
+                err = tv.decode(r)
+                v = tv
+        case int32ValueType:
+                var tv Int32Value
+                err = tv.decode(r)
+                v = tv
+        case int64ValueType:
+                var tv Int64Value
+                err = tv.decode(r)
+                v = tv
+        case bytesValueType:
+                var tv BytesValue
+                err = tv.decode(r)
+                v = tv
+        case stringValueType:
+                var tv StringValue
+                err = tv.decode(r)
+                v = tv
+        case timestampValueType:
+                var tv TimestampValue
+                err = tv.decode(r)
+                v = tv
+        case uuidValueType:
+                var tv UUIDValue
+                err = tv.decode(r)
+                v = tv
+        default:
+                panic(fmt.Sprintf("unknown value type %d", raw.Type))
+        }
+
+        // Error could be EOF, let caller deal with it
+        return v, err
+}
+
+const maxHeaderNameLen = 255
+
+type headerName struct {
+        Len  uint8
+        Name [maxHeaderNameLen]byte
+}
+
+func (v headerName) encode(w io.Writer) error {
+        if err := binary.Write(w, binary.BigEndian, v.Len); err != nil {
+                return err
+        }
+
+        _, err := w.Write(v.Name[:v.Len])
+        return err
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/header_value.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/header_value.go
new file mode 100644
index 0000000..e3fc076
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/header_value.go
@@ -0,0 +1,501 @@
+package eventstream
+
+import (
+        "encoding/base64"
+        "encoding/binary"
+        "fmt"
+        "io"
+        "strconv"
+        "time"
+)
+
+const maxHeaderValueLen = 1<<15 - 1 // 2^15-1 or 32KB - 1
+
+// valueType is the EventStream header value type.
+type valueType uint8
+
+// Header value types
+const (
+        trueValueType valueType = iota
+        falseValueType
+        int8ValueType  // Byte
+        int16ValueType // Short
+        int32ValueType // Integer
+        int64ValueType // Long
+        bytesValueType
+        stringValueType
+        timestampValueType
+        uuidValueType
+)
+
+func (t valueType) String() string {
+        switch t {
+        case trueValueType:
+                return "bool"
+        case falseValueType:
+                return "bool"
+        case int8ValueType:
+                return "int8"
+        case int16ValueType:
+                return "int16"
+        case int32ValueType:
+                return "int32"
+        case int64ValueType:
+                return "int64"
+        case bytesValueType:
+                return "byte_array"
+        case stringValueType:
+                return "string"
+        case timestampValueType:
+                return "timestamp"
+        case uuidValueType:
+                return "uuid"
+        default:
+                return fmt.Sprintf("unknown value type %d", uint8(t))
+        }
+}
+
+type rawValue struct {
+        Type  valueType
+        Len   uint16 // Only set for variable length slices
+        Value []byte // byte representation of value, BigEndian encoding.
+}
+
+func (r rawValue) encodeScalar(w io.Writer, v interface{}) error {
+        return binaryWriteFields(w, binary.BigEndian,
+                r.Type,
+                v,
+        )
+}
+
+func (r rawValue) encodeFixedSlice(w io.Writer, v []byte) error {
+        binary.Write(w, binary.BigEndian, r.Type)
+
+        _, err := w.Write(v)
+        return err
+}
+
+func (r rawValue) encodeBytes(w io.Writer, v []byte) error {
+        if len(v) > maxHeaderValueLen {
+                return LengthError{
+                        Part: "header value",
+                        Want: maxHeaderValueLen, Have: len(v),
+                        Value: v,
+                }
+        }
+        r.Len = uint16(len(v))
+
+        err := binaryWriteFields(w, binary.BigEndian,
+                r.Type,
+                r.Len,
+        )
+        if err != nil {
+                return err
+        }
+
+        _, err = w.Write(v)
+        return err
+}
+
+func (r rawValue) encodeString(w io.Writer, v string) error {
+        if len(v) > maxHeaderValueLen {
+                return LengthError{
+                        Part: "header value",
+                        Want: maxHeaderValueLen, Have: len(v),
+                        Value: v,
+                }
+        }
+        r.Len = uint16(len(v))
+
+        type stringWriter interface {
+                WriteString(string) (int, error)
+        }
+
+        err := binaryWriteFields(w, binary.BigEndian,
+                r.Type,
+                r.Len,
+        )
+        if err != nil {
+                return err
+        }
+
+        if sw, ok := w.(stringWriter); ok {
+                _, err = sw.WriteString(v)
+        } else {
+                _, err = w.Write([]byte(v))
+        }
+
+        return err
+}
+
+func decodeFixedBytesValue(r io.Reader, buf []byte) error {
+        _, err := io.ReadFull(r, buf)
+        return err
+}
+
+func decodeBytesValue(r io.Reader) ([]byte, error) {
+        var raw rawValue
+        var err error
+        raw.Len, err = decodeUint16(r)
+        if err != nil {
+                return nil, err
+        }
+
+        buf := make([]byte, raw.Len)
+        _, err = io.ReadFull(r, buf)
+        if err != nil {
+                return nil, err
+        }
+
+        return buf, nil
+}
+
+func decodeStringValue(r io.Reader) (string, error) {
+        v, err := decodeBytesValue(r)
+        return string(v), err
+}
+
+// Value represents the abstract header value.
+type Value interface {
+        Get() interface{}
+        String() string
+        valueType() valueType
+        encode(io.Writer) error
+}
+
+// An BoolValue provides eventstream encoding, and representation
+// of a Go bool value.
+type BoolValue bool
+
+// Get returns the underlying type
+func (v BoolValue) Get() interface{} {
+        return bool(v)
+}
+
+// valueType returns the EventStream header value type value.
+func (v BoolValue) valueType() valueType {
+        if v {
+                return trueValueType
+        }
+        return falseValueType
+}
+
+func (v BoolValue) String() string {
+        return strconv.FormatBool(bool(v))
+}
+
+// encode encodes the BoolValue into an eventstream binary value
+// representation.
+func (v BoolValue) encode(w io.Writer) error {
+        return binary.Write(w, binary.BigEndian, v.valueType())
+}
+
+// An Int8Value provides eventstream encoding, and representation of a Go
+// int8 value.
+type Int8Value int8
+
+// Get returns the underlying value.
+func (v Int8Value) Get() interface{} {
+        return int8(v)
+}
+
+// valueType returns the EventStream header value type value.
+func (Int8Value) valueType() valueType {
+        return int8ValueType
+}
+
+func (v Int8Value) String() string {
+        return fmt.Sprintf("0x%02x", int8(v))
+}
+
+// encode encodes the Int8Value into an eventstream binary value
+// representation.
+func (v Int8Value) encode(w io.Writer) error {
+        raw := rawValue{
+                Type: v.valueType(),
+        }
+
+        return raw.encodeScalar(w, v)
+}
+
+func (v *Int8Value) decode(r io.Reader) error {
+        n, err := decodeUint8(r)
+        if err != nil {
+                return err
+        }
+
+        *v = Int8Value(n)
+        return nil
+}
+
+// An Int16Value provides eventstream encoding, and representation of a Go
+// int16 value.
+type Int16Value int16
+
+// Get returns the underlying value.
+func (v Int16Value) Get() interface{} {
+        return int16(v)
+}
+
+// valueType returns the EventStream header value type value.
+func (Int16Value) valueType() valueType {
+        return int16ValueType
+}
+
+func (v Int16Value) String() string {
+        return fmt.Sprintf("0x%04x", int16(v))
+}
+
+// encode encodes the Int16Value into an eventstream binary value
+// representation.
+func (v Int16Value) encode(w io.Writer) error {
+        raw := rawValue{
+                Type: v.valueType(),
+        }
+        return raw.encodeScalar(w, v)
+}
+
+func (v *Int16Value) decode(r io.Reader) error {
+        n, err := decodeUint16(r)
+        if err != nil {
+                return err
+        }
+
+        *v = Int16Value(n)
+        return nil
+}
+
+// An Int32Value provides eventstream encoding, and representation of a Go
+// int32 value.
+type Int32Value int32
+
+// Get returns the underlying value.
+func (v Int32Value) Get() interface{} {
+        return int32(v)
+}
+
+// valueType returns the EventStream header value type value.
+func (Int32Value) valueType() valueType {
+        return int32ValueType
+}
+
+func (v Int32Value) String() string {
+        return fmt.Sprintf("0x%08x", int32(v))
+}
+
+// encode encodes the Int32Value into an eventstream binary value
+// representation.
+func (v Int32Value) encode(w io.Writer) error {
+        raw := rawValue{
+                Type: v.valueType(),
+        }
+        return raw.encodeScalar(w, v)
+}
+
+func (v *Int32Value) decode(r io.Reader) error {
+        n, err := decodeUint32(r)
+        if err != nil {
+                return err
+        }
+
+        *v = Int32Value(n)
+        return nil
+}
+
+// An Int64Value provides eventstream encoding, and representation of a Go
+// int64 value.
+type Int64Value int64
+
+// Get returns the underlying value.
+func (v Int64Value) Get() interface{} {
+        return int64(v)
+}
+
+// valueType returns the EventStream header value type value.
+func (Int64Value) valueType() valueType {
+        return int64ValueType
+}
+
+func (v Int64Value) String() string {
+        return fmt.Sprintf("0x%016x", int64(v))
+}
+
+// encode encodes the Int64Value into an eventstream binary value
+// representation.
+func (v Int64Value) encode(w io.Writer) error {
+        raw := rawValue{
+                Type: v.valueType(),
+        }
+        return raw.encodeScalar(w, v)
+}
+
+func (v *Int64Value) decode(r io.Reader) error {
+        n, err := decodeUint64(r)
+        if err != nil {
+                return err
+        }
+
+        *v = Int64Value(n)
+        return nil
+}
+
+// An BytesValue provides eventstream encoding, and representation of a Go
+// byte slice.
+type BytesValue []byte
+
+// Get returns the underlying value.
+func (v BytesValue) Get() interface{} {
+        return []byte(v)
+}
+
+// valueType returns the EventStream header value type value.
+func (BytesValue) valueType() valueType {
+        return bytesValueType
+}
+
+func (v BytesValue) String() string {
+        return base64.StdEncoding.EncodeToString([]byte(v))
+}
+
+// encode encodes the BytesValue into an eventstream binary value
+// representation.
+func (v BytesValue) encode(w io.Writer) error {
+        raw := rawValue{
+                Type: v.valueType(),
+        }
+
+        return raw.encodeBytes(w, []byte(v))
+}
+
+func (v *BytesValue) decode(r io.Reader) error {
+        buf, err := decodeBytesValue(r)
+        if err != nil {
+                return err
+        }
+
+        *v = BytesValue(buf)
+        return nil
+}
+
+// An StringValue provides eventstream encoding, and representation of a Go
+// string.
+type StringValue string
+
+// Get returns the underlying value.
+func (v StringValue) Get() interface{} {
+        return string(v)
+}
+
+// valueType returns the EventStream header value type value.
+func (StringValue) valueType() valueType {
+        return stringValueType
+}
+
+func (v StringValue) String() string {
+        return string(v)
+}
+
+// encode encodes the StringValue into an eventstream binary value
+// representation.
+func (v StringValue) encode(w io.Writer) error {
+        raw := rawValue{
+                Type: v.valueType(),
+        }
+
+        return raw.encodeString(w, string(v))
+}
+
+func (v *StringValue) decode(r io.Reader) error {
+        s, err := decodeStringValue(r)
+        if err != nil {
+                return err
+        }
+
+        *v = StringValue(s)
+        return nil
+}
+
+// An TimestampValue provides eventstream encoding, and representation of a Go
+// timestamp.
+type TimestampValue time.Time
+
+// Get returns the underlying value.
+func (v TimestampValue) Get() interface{} {
+        return time.Time(v)
+}
+
+// valueType returns the EventStream header value type value.
+func (TimestampValue) valueType() valueType {
+        return timestampValueType
+}
+
+func (v TimestampValue) epochMilli() int64 {
+        nano := time.Time(v).UnixNano()
+        msec := nano / int64(time.Millisecond)
+        return msec
+}
+
+func (v TimestampValue) String() string {
+        msec := v.epochMilli()
+        return strconv.FormatInt(msec, 10)
+}
+
+// encode encodes the TimestampValue into an eventstream binary value
+// representation.
+func (v TimestampValue) encode(w io.Writer) error {
+        raw := rawValue{
+                Type: v.valueType(),
+        }
+
+        msec := v.epochMilli()
+        return raw.encodeScalar(w, msec)
+}
+
+func (v *TimestampValue) decode(r io.Reader) error {
+        n, err := decodeUint64(r)
+        if err != nil {
+                return err
+        }
+
+        *v = TimestampValue(timeFromEpochMilli(int64(n)))
+        return nil
+}
+
+func timeFromEpochMilli(t int64) time.Time {
+        secs := t / 1e3
+        msec := t % 1e3
+        return time.Unix(secs, msec*int64(time.Millisecond)).UTC()
+}
+
+// An UUIDValue provides eventstream encoding, and representation of a UUID
+// value.
+type UUIDValue [16]byte
+
+// Get returns the underlying value.
+func (v UUIDValue) Get() interface{} {
+        return v[:]
+}
+
+// valueType returns the EventStream header value type value.
+func (UUIDValue) valueType() valueType {
+        return uuidValueType
+}
+
+func (v UUIDValue) String() string {
+        return fmt.Sprintf(`%X-%X-%X-%X-%X`, v[0:4], v[4:6], v[6:8], v[8:10], v[10:])
+}
+
+// encode encodes the UUIDValue into an eventstream binary value
+// representation.
+func (v UUIDValue) encode(w io.Writer) error {
+        raw := rawValue{
+                Type: v.valueType(),
+        }
+
+        return raw.encodeFixedSlice(w, v[:])
+}
+
+func (v *UUIDValue) decode(r io.Reader) error {
+        tv := (*v)[:]
+        return decodeFixedBytesValue(r, tv)
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/message.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/message.go
new file mode 100644
index 0000000..2dc012a
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/eventstream/message.go
@@ -0,0 +1,103 @@
+package eventstream
+
+import (
+        "bytes"
+        "encoding/binary"
+        "hash/crc32"
+)
+
+const preludeLen = 8
+const preludeCRCLen = 4
+const msgCRCLen = 4
+const minMsgLen = preludeLen + preludeCRCLen + msgCRCLen
+const maxPayloadLen = 1024 * 1024 * 16 // 16MB
+const maxHeadersLen = 1024 * 128       // 128KB
+const maxMsgLen = minMsgLen + maxHeadersLen + maxPayloadLen
+
+var crc32IEEETable = crc32.MakeTable(crc32.IEEE)
+
+// A Message provides the eventstream message representation.
+type Message struct {
+        Headers Headers
+        Payload []byte
+}
+
+func (m *Message) rawMessage() (rawMessage, error) {
+        var raw rawMessage
+
+        if len(m.Headers) > 0 {
+                var headers bytes.Buffer
+                if err := encodeHeaders(&headers, m.Headers); err != nil {
+                        return rawMessage{}, err
+                }
+                raw.Headers = headers.Bytes()
+                raw.HeadersLen = uint32(len(raw.Headers))
+        }
+
+        raw.Length = raw.HeadersLen + uint32(len(m.Payload)) + minMsgLen
+
+        hash := crc32.New(crc32IEEETable)
+        binaryWriteFields(hash, binary.BigEndian, raw.Length, raw.HeadersLen)
+        raw.PreludeCRC = hash.Sum32()
+
+        binaryWriteFields(hash, binary.BigEndian, raw.PreludeCRC)
+
+        if raw.HeadersLen > 0 {
+                hash.Write(raw.Headers)
+        }
+
+        // Read payload bytes and update hash for it as well.
+        if len(m.Payload) > 0 {
+                raw.Payload = m.Payload
+                hash.Write(raw.Payload)
+        }
+
+        raw.CRC = hash.Sum32()
+
+        return raw, nil
+}
+
+type messagePrelude struct {
+        Length     uint32
+        HeadersLen uint32
+        PreludeCRC uint32
+}
+
+func (p messagePrelude) PayloadLen() uint32 {
+        return p.Length - p.HeadersLen - minMsgLen
+}
+
+func (p messagePrelude) ValidateLens() error {
+        if p.Length == 0 || p.Length > maxMsgLen {
+                return LengthError{
+                        Part: "message prelude",
+                        Want: maxMsgLen,
+                        Have: int(p.Length),
+                }
+        }
+        if p.HeadersLen > maxHeadersLen {
+                return LengthError{
+                        Part: "message headers",
+                        Want: maxHeadersLen,
+                        Have: int(p.HeadersLen),
+                }
+        }
+        if payloadLen := p.PayloadLen(); payloadLen > maxPayloadLen {
+                return LengthError{
+                        Part: "message payload",
+                        Want: maxPayloadLen,
+                        Have: int(payloadLen),
+                }
+        }
+
+        return nil
+}
+
+type rawMessage struct {
+        messagePrelude
+
+        Headers []byte
+        Payload []byte
+
+        CRC uint32
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonvalue.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonvalue.go
new file mode 100644
index 0000000..776d110
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/jsonvalue.go
@@ -0,0 +1,76 @@
+package protocol
+
+import (
+        "encoding/base64"
+        "encoding/json"
+        "fmt"
+        "strconv"
+
+        "github.com/aws/aws-sdk-go/aws"
+)
+
+// EscapeMode is the mode that should be use for escaping a value
+type EscapeMode uint
+
+// The modes for escaping a value before it is marshaled, and unmarshaled.
+const (
+        NoEscape EscapeMode = iota
+        Base64Escape
+        QuotedEscape
+)
+
+// EncodeJSONValue marshals the value into a JSON string, and optionally base64
+// encodes the string before returning it.
+//
+// Will panic if the escape mode is unknown.
+func EncodeJSONValue(v aws.JSONValue, escape EscapeMode) (string, error) {
+        b, err := json.Marshal(v)
+        if err != nil {
+                return "", err
+        }
+
+        switch escape {
+        case NoEscape:
+                return string(b), nil
+        case Base64Escape:
+                return base64.StdEncoding.EncodeToString(b), nil
+        case QuotedEscape:
+                return strconv.Quote(string(b)), nil
+        }
+
+        panic(fmt.Sprintf("EncodeJSONValue called with unknown EscapeMode, %v", escape))
+}
+
+// DecodeJSONValue will attempt to decode the string input as a JSONValue.
+// Optionally decoding base64 the value first before JSON unmarshaling.
+//
+// Will panic if the escape mode is unknown.
+func DecodeJSONValue(v string, escape EscapeMode) (aws.JSONValue, error) {
+        var b []byte
+        var err error
+
+        switch escape {
+        case NoEscape:
+                b = []byte(v)
+        case Base64Escape:
+                b, err = base64.StdEncoding.DecodeString(v)
+        case QuotedEscape:
+                var u string
+                u, err = strconv.Unquote(v)
+                b = []byte(u)
+        default:
+                panic(fmt.Sprintf("DecodeJSONValue called with unknown EscapeMode, %v", escape))
+        }
+
+        if err != nil {
+                return nil, err
+        }
+
+        m := aws.JSONValue{}
+        err = json.Unmarshal(b, &m)
+        if err != nil {
+                return nil, err
+        }
+
+        return m, nil
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/payload.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/payload.go
new file mode 100644
index 0000000..e21614a
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/payload.go
@@ -0,0 +1,81 @@
+package protocol
+
+import (
+        "io"
+        "io/ioutil"
+        "net/http"
+
+        "github.com/aws/aws-sdk-go/aws"
+        "github.com/aws/aws-sdk-go/aws/client/metadata"
+        "github.com/aws/aws-sdk-go/aws/request"
+)
+
+// PayloadUnmarshaler provides the interface for unmarshaling a payload's
+// reader into a SDK shape.
+type PayloadUnmarshaler interface {
+        UnmarshalPayload(io.Reader, interface{}) error
+}
+
+// HandlerPayloadUnmarshal implements the PayloadUnmarshaler from a
+// HandlerList. This provides the support for unmarshaling a payload reader to
+// a shape without needing a SDK request first.
+type HandlerPayloadUnmarshal struct {
+        Unmarshalers request.HandlerList
+}
+
+// UnmarshalPayload unmarshals the io.Reader payload into the SDK shape using
+// the Unmarshalers HandlerList provided. Returns an error if unable
+// unmarshaling fails.
+func (h HandlerPayloadUnmarshal) UnmarshalPayload(r io.Reader, v interface{}) error {
+        req := &request.Request{
+                HTTPRequest: &http.Request{},
+                HTTPResponse: &http.Response{
+                        StatusCode: 200,
+                        Header:     http.Header{},
+                        Body:       ioutil.NopCloser(r),
+                },
+                Data: v,
+        }
+
+        h.Unmarshalers.Run(req)
+
+        return req.Error
+}
+
+// PayloadMarshaler provides the interface for marshaling a SDK shape into and
+// io.Writer.
+type PayloadMarshaler interface {
+        MarshalPayload(io.Writer, interface{}) error
+}
+
+// HandlerPayloadMarshal implements the PayloadMarshaler from a HandlerList.
+// This provides support for marshaling a SDK shape into an io.Writer without
+// needing a SDK request first.
+type HandlerPayloadMarshal struct {
+        Marshalers request.HandlerList
+}
+
+// MarshalPayload marshals the SDK shape into the io.Writer using the
+// Marshalers HandlerList provided. Returns an error if unable if marshal
+// fails.
+func (h HandlerPayloadMarshal) MarshalPayload(w io.Writer, v interface{}) error {
+        req := request.New(
+                aws.Config{},
+                metadata.ClientInfo{},
+                request.Handlers{},
+                nil,
+                &request.Operation{HTTPMethod: "GET"},
+                v,
+                nil,
+        )
+
+        h.Marshalers.Run(req)
+
+        if req.Error != nil {
+                return req.Error
+        }
+
+        io.Copy(w, req.GetBody())
+
+        return nil
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go
index 18169f0..60e5b09 100644
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/build.go
@@ -25,7 +25,7 @@ func Build(r *request.Request) {
                 return
         }
 
-        if r.ExpireTime == 0 {
+        if !r.IsPresigned() {
                 r.HTTPRequest.Method = "POST"
                 r.HTTPRequest.Header.Set("Content-Type", "application/x-www-form-urlencoded; charset=utf-8")
                 r.SetBufferBody([]byte(body.Encode()))
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go
index 524ca95..75866d0 100644
--- a/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/query/queryutil/queryutil.go
@@ -121,6 +121,10 @@ func (q *queryParser) parseList(v url.Values, value reflect.Value, prefix string
                 return nil
         }
 
+        if _, ok := value.Interface().([]byte); ok {
+                return q.parseScalar(v, value, prefix, tag)
+        }
+
         // check for unflattened list member
         if !q.isEC2 && tag.Get("flattened") == "" {
                 if listName := tag.Get("locationNameList"); listName == "" {
@@ -229,7 +233,12 @@ func (q *queryParser) parseScalar(v url.Values, r reflect.Value, name string, ta
                 v.Set(name, strconv.FormatFloat(float64(value), 'f', -1, 32))
         case time.Time:
                 const ISO8601UTC = "2006-01-02T15:04:05Z"
-                v.Set(name, value.UTC().Format(ISO8601UTC))
+                format := tag.Get("timestampFormat")
+                if len(format) == 0 {
+                        format = protocol.ISO8601TimeFormatName
+                }
+
+                v.Set(name, protocol.FormatTime(format, value))
         default:
                 return fmt.Errorf("unsupported value for param %s: %v (%s)", name, r.Interface(), r.Type().Name())
         }
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 7161835..b34f525 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
@@ -4,7 +4,6 @@ package rest
 import (
         "bytes"
         "encoding/base64"
-        "encoding/json"
         "fmt"
         "io"
         "net/http"
@@ -18,11 +17,9 @@ import (
         "github.com/aws/aws-sdk-go/aws"
         "github.com/aws/aws-sdk-go/aws/awserr"
         "github.com/aws/aws-sdk-go/aws/request"
+        "github.com/aws/aws-sdk-go/private/protocol"
 )
 
-// RFC822 returns an RFC822 formatted timestamp for AWS protocols
-const RFC822 = "Mon, 2 Jan 2006 15:04:05 GMT"
-
 // Whether the byte value can be sent without escaping in AWS URLs
 var noEscape [256]bool
 
@@ -252,13 +249,12 @@ func EscapePath(path string, encodeSep bool) string {
         return buf.String()
 }
 
-func convertType(v reflect.Value, tag reflect.StructTag) (string, error) {
+func convertType(v reflect.Value, tag reflect.StructTag) (str string, err error) {
         v = reflect.Indirect(v)
         if !v.IsValid() {
                 return "", errValueNotSet
         }
 
-        var str string
         switch value := v.Interface().(type) {
         case string:
                 str = value
@@ -271,19 +267,28 @@ func convertType(v reflect.Value, tag reflect.StructTag) (string, error) {
         case float64:
                 str = strconv.FormatFloat(value, 'f', -1, 64)
         case time.Time:
-                str = value.UTC().Format(RFC822)
+                format := tag.Get("timestampFormat")
+                if len(format) == 0 {
+                        format = protocol.RFC822TimeFormatName
+                        if tag.Get("location") == "querystring" {
+                                format = protocol.ISO8601TimeFormatName
+                        }
+                }
+                str = protocol.FormatTime(format, value)
         case aws.JSONValue:
-                b, err := json.Marshal(value)
-                if err != nil {
-                        return "", err
+                if len(value) == 0 {
+                        return "", errValueNotSet
                 }
+                escaping := protocol.NoEscape
                 if tag.Get("location") == "header" {
-                        str = base64.StdEncoding.EncodeToString(b)
-                } else {
-                        str = string(b)
+                        escaping = protocol.Base64Escape
+                }
+                str, err = protocol.EncodeJSONValue(value, escaping)
+                if err != nil {
+                        return "", fmt.Errorf("unable to encode JSONValue, %v", err)
                 }
         default:
-                err := fmt.Errorf("Unsupported value for param %v (%s)", v.Interface(), v.Type())
+                err := fmt.Errorf("unsupported value for param %v (%s)", v.Interface(), v.Type())
                 return "", err
         }
         return str, nil
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 7a779ee..33fd53b 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
@@ -3,7 +3,6 @@ package rest
 import (
         "bytes"
         "encoding/base64"
-        "encoding/json"
         "fmt"
         "io"
         "io/ioutil"
@@ -16,6 +15,7 @@ import (
         "github.com/aws/aws-sdk-go/aws"
         "github.com/aws/aws-sdk-go/aws/awserr"
         "github.com/aws/aws-sdk-go/aws/request"
+        "github.com/aws/aws-sdk-go/private/protocol"
 )
 
 // UnmarshalHandler is a named request handler for unmarshaling rest protocol requests
@@ -198,23 +198,21 @@ func unmarshalHeader(v reflect.Value, header string, tag reflect.StructTag) erro
                 }
                 v.Set(reflect.ValueOf(&f))
         case *time.Time:
-                t, err := time.Parse(RFC822, header)
+                format := tag.Get("timestampFormat")
+                if len(format) == 0 {
+                        format = protocol.RFC822TimeFormatName
+                }
+                t, err := protocol.ParseTime(format, header)
                 if err != nil {
                         return err
                 }
                 v.Set(reflect.ValueOf(&t))
         case aws.JSONValue:
-                b := []byte(header)
-                var err error
+                escaping := protocol.NoEscape
                 if tag.Get("location") == "header" {
-                        b, err = base64.StdEncoding.DecodeString(header)
-                        if err != nil {
-                                return err
-                        }
+                        escaping = protocol.Base64Escape
                 }
-
-                m := aws.JSONValue{}
-                err = json.Unmarshal(b, &m)
+                m, err := protocol.DecodeJSONValue(header, escaping)
                 if err != nil {
                         return err
                 }
diff --git a/vendor/github.com/aws/aws-sdk-go/private/protocol/timestamp.go b/vendor/github.com/aws/aws-sdk-go/private/protocol/timestamp.go
new file mode 100644
index 0000000..b7ed6c6
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/private/protocol/timestamp.go
@@ -0,0 +1,72 @@
+package protocol
+
+import (
+        "strconv"
+        "time"
+)
+
+// Names of time formats supported by the SDK
+const (
+        RFC822TimeFormatName  = "rfc822"
+        ISO8601TimeFormatName = "iso8601"
+        UnixTimeFormatName    = "unixTimestamp"
+)
+
+// Time formats supported by the SDK
+const (
+        // RFC 7231#section-7.1.1.1 timetamp format. e.g Tue, 29 Apr 2014 18:30:38 GMT
+        RFC822TimeFormat = "Mon, 2 Jan 2006 15:04:05 GMT"
+
+        // RFC3339 a subset of the ISO8601 timestamp format. e.g 2014-04-29T18:30:38Z
+        ISO8601TimeFormat = "2006-01-02T15:04:05Z"
+)
+
+// IsKnownTimestampFormat returns if the timestamp format name
+// is know to the SDK's protocols.
+func IsKnownTimestampFormat(name string) bool {
+        switch name {
+        case RFC822TimeFormatName:
+                fallthrough
+        case ISO8601TimeFormatName:
+                fallthrough
+        case UnixTimeFormatName:
+                return true
+        default:
+                return false
+        }
+}
+
+// FormatTime returns a string value of the time.
+func FormatTime(name string, t time.Time) string {
+        t = t.UTC()
+
+        switch name {
+        case RFC822TimeFormatName:
+                return t.Format(RFC822TimeFormat)
+        case ISO8601TimeFormatName:
+                return t.Format(ISO8601TimeFormat)
+        case UnixTimeFormatName:
+                return strconv.FormatInt(t.Unix(), 10)
+        default:
+                panic("unknown timestamp format name, " + name)
+        }
+}
+
+// ParseTime attempts to parse the time given the format. Returns
+// the time if it was able to be parsed, and fails otherwise.
+func ParseTime(formatName, value string) (time.Time, error) {
+        switch formatName {
+        case RFC822TimeFormatName:
+                return time.Parse(RFC822TimeFormat, value)
+        case ISO8601TimeFormatName:
+                return time.Parse(ISO8601TimeFormat, value)
+        case UnixTimeFormatName:
+                v, err := strconv.ParseFloat(value, 64)
+                if err != nil {
+                        return time.Time{}, err
+                }
+                return time.Unix(int64(v), 0), nil
+        default:
+                panic("unknown timestamp format name, " + formatName)
+        }
+}
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{}
         }
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/api.go b/vendor/github.com/aws/aws-sdk-go/service/s3/api.go
index 52ac02c..0e999ca 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/api.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/s3/api.go
@@ -3,14 +3,22 @@
 package s3
 
 import (
+        "bytes"
         "fmt"
         "io"
+        "sync"
+        "sync/atomic"
         "time"
 
         "github.com/aws/aws-sdk-go/aws"
+        "github.com/aws/aws-sdk-go/aws/awserr"
         "github.com/aws/aws-sdk-go/aws/awsutil"
+        "github.com/aws/aws-sdk-go/aws/client"
         "github.com/aws/aws-sdk-go/aws/request"
         "github.com/aws/aws-sdk-go/private/protocol"
+        "github.com/aws/aws-sdk-go/private/protocol/eventstream"
+        "github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi"
+        "github.com/aws/aws-sdk-go/private/protocol/rest"
         "github.com/aws/aws-sdk-go/private/protocol/restxml"
 )
 
@@ -18,19 +26,18 @@ const opAbortMultipartUpload = "AbortMultipartUpload"
 
 // AbortMultipartUploadRequest generates a "aws/request.Request" representing the
 // client's request for the AbortMultipartUpload operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See AbortMultipartUpload for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the AbortMultipartUpload method directly
-// instead.
+// See AbortMultipartUpload for more information on using the AbortMultipartUpload
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the AbortMultipartUploadRequest method.
 //    req, resp := client.AbortMultipartUploadRequest(params)
@@ -40,7 +47,7 @@ const opAbortMultipartUpload = "AbortMultipartUpload"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AbortMultipartUpload
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AbortMultipartUpload
 func (c *S3) AbortMultipartUploadRequest(input *AbortMultipartUploadInput) (req *request.Request, output *AbortMultipartUploadOutput) {
         op := &request.Operation{
                 Name:       opAbortMultipartUpload,
@@ -76,7 +83,7 @@ func (c *S3) AbortMultipartUploadRequest(input *AbortMultipartUploadInput) (req
 //   * ErrCodeNoSuchUpload "NoSuchUpload"
 //   The specified multipart upload does not exist.
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AbortMultipartUpload
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AbortMultipartUpload
 func (c *S3) AbortMultipartUpload(input *AbortMultipartUploadInput) (*AbortMultipartUploadOutput, error) {
         req, out := c.AbortMultipartUploadRequest(input)
         return out, req.Send()
@@ -102,19 +109,18 @@ const opCompleteMultipartUpload = "CompleteMultipartUpload"
 
 // CompleteMultipartUploadRequest generates a "aws/request.Request" representing the
 // client's request for the CompleteMultipartUpload operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See CompleteMultipartUpload for usage and error information.
+// See CompleteMultipartUpload for more information on using the CompleteMultipartUpload
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the CompleteMultipartUpload method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the CompleteMultipartUploadRequest method.
 //    req, resp := client.CompleteMultipartUploadRequest(params)
@@ -124,7 +130,7 @@ const opCompleteMultipartUpload = "CompleteMultipartUpload"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompleteMultipartUpload
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompleteMultipartUpload
 func (c *S3) CompleteMultipartUploadRequest(input *CompleteMultipartUploadInput) (req *request.Request, output *CompleteMultipartUploadOutput) {
         op := &request.Operation{
                 Name:       opCompleteMultipartUpload,
@@ -151,7 +157,7 @@ func (c *S3) CompleteMultipartUploadRequest(input *CompleteMultipartUploadInput)
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation CompleteMultipartUpload for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompleteMultipartUpload
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompleteMultipartUpload
 func (c *S3) CompleteMultipartUpload(input *CompleteMultipartUploadInput) (*CompleteMultipartUploadOutput, error) {
         req, out := c.CompleteMultipartUploadRequest(input)
         return out, req.Send()
@@ -177,19 +183,18 @@ const opCopyObject = "CopyObject"
 
 // CopyObjectRequest generates a "aws/request.Request" representing the
 // client's request for the CopyObject operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See CopyObject for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the CopyObject method directly
-// instead.
+// See CopyObject for more information on using the CopyObject
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the CopyObjectRequest method.
 //    req, resp := client.CopyObjectRequest(params)
@@ -199,7 +204,7 @@ const opCopyObject = "CopyObject"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyObject
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyObject
 func (c *S3) CopyObjectRequest(input *CopyObjectInput) (req *request.Request, output *CopyObjectOutput) {
         op := &request.Operation{
                 Name:       opCopyObject,
@@ -232,7 +237,7 @@ func (c *S3) CopyObjectRequest(input *CopyObjectInput) (req *request.Request, ou
 //   The source object of the COPY operation is not in the active tier and is
 //   only stored in Amazon Glacier.
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyObject
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyObject
 func (c *S3) CopyObject(input *CopyObjectInput) (*CopyObjectOutput, error) {
         req, out := c.CopyObjectRequest(input)
         return out, req.Send()
@@ -258,19 +263,18 @@ const opCreateBucket = "CreateBucket"
 
 // CreateBucketRequest generates a "aws/request.Request" representing the
 // client's request for the CreateBucket operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See CreateBucket for usage and error information.
+// See CreateBucket for more information on using the CreateBucket
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the CreateBucket method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the CreateBucketRequest method.
 //    req, resp := client.CreateBucketRequest(params)
@@ -280,7 +284,7 @@ const opCreateBucket = "CreateBucket"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateBucket
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateBucket
 func (c *S3) CreateBucketRequest(input *CreateBucketInput) (req *request.Request, output *CreateBucketOutput) {
         op := &request.Operation{
                 Name:       opCreateBucket,
@@ -315,7 +319,7 @@ func (c *S3) CreateBucketRequest(input *CreateBucketInput) (req *request.Request
 //
 //   * ErrCodeBucketAlreadyOwnedByYou "BucketAlreadyOwnedByYou"
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateBucket
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateBucket
 func (c *S3) CreateBucket(input *CreateBucketInput) (*CreateBucketOutput, error) {
         req, out := c.CreateBucketRequest(input)
         return out, req.Send()
@@ -341,19 +345,18 @@ const opCreateMultipartUpload = "CreateMultipartUpload"
 
 // CreateMultipartUploadRequest generates a "aws/request.Request" representing the
 // client's request for the CreateMultipartUpload operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See CreateMultipartUpload for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the CreateMultipartUpload method directly
-// instead.
+// See CreateMultipartUpload for more information on using the CreateMultipartUpload
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the CreateMultipartUploadRequest method.
 //    req, resp := client.CreateMultipartUploadRequest(params)
@@ -363,7 +366,7 @@ const opCreateMultipartUpload = "CreateMultipartUpload"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateMultipartUpload
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateMultipartUpload
 func (c *S3) CreateMultipartUploadRequest(input *CreateMultipartUploadInput) (req *request.Request, output *CreateMultipartUploadOutput) {
         op := &request.Operation{
                 Name:       opCreateMultipartUpload,
@@ -396,7 +399,7 @@ func (c *S3) CreateMultipartUploadRequest(input *CreateMultipartUploadInput) (re
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation CreateMultipartUpload for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateMultipartUpload
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateMultipartUpload
 func (c *S3) CreateMultipartUpload(input *CreateMultipartUploadInput) (*CreateMultipartUploadOutput, error) {
         req, out := c.CreateMultipartUploadRequest(input)
         return out, req.Send()
@@ -422,19 +425,18 @@ const opDeleteBucket = "DeleteBucket"
 
 // DeleteBucketRequest generates a "aws/request.Request" representing the
 // client's request for the DeleteBucket operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See DeleteBucket for usage and error information.
+// See DeleteBucket for more information on using the DeleteBucket
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DeleteBucket method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the DeleteBucketRequest method.
 //    req, resp := client.DeleteBucketRequest(params)
@@ -444,7 +446,7 @@ const opDeleteBucket = "DeleteBucket"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucket
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucket
 func (c *S3) DeleteBucketRequest(input *DeleteBucketInput) (req *request.Request, output *DeleteBucketOutput) {
         op := &request.Operation{
                 Name:       opDeleteBucket,
@@ -474,7 +476,7 @@ func (c *S3) DeleteBucketRequest(input *DeleteBucketInput) (req *request.Request
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation DeleteBucket for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucket
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucket
 func (c *S3) DeleteBucket(input *DeleteBucketInput) (*DeleteBucketOutput, error) {
         req, out := c.DeleteBucketRequest(input)
         return out, req.Send()
@@ -500,19 +502,18 @@ const opDeleteBucketAnalyticsConfiguration = "DeleteBucketAnalyticsConfiguration
 
 // DeleteBucketAnalyticsConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the DeleteBucketAnalyticsConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See DeleteBucketAnalyticsConfiguration for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DeleteBucketAnalyticsConfiguration method directly
-// instead.
+// See DeleteBucketAnalyticsConfiguration for more information on using the DeleteBucketAnalyticsConfiguration
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the DeleteBucketAnalyticsConfigurationRequest method.
 //    req, resp := client.DeleteBucketAnalyticsConfigurationRequest(params)
@@ -522,7 +523,7 @@ const opDeleteBucketAnalyticsConfiguration = "DeleteBucketAnalyticsConfiguration
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketAnalyticsConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketAnalyticsConfiguration
 func (c *S3) DeleteBucketAnalyticsConfigurationRequest(input *DeleteBucketAnalyticsConfigurationInput) (req *request.Request, output *DeleteBucketAnalyticsConfigurationOutput) {
         op := &request.Operation{
                 Name:       opDeleteBucketAnalyticsConfiguration,
@@ -552,7 +553,7 @@ func (c *S3) DeleteBucketAnalyticsConfigurationRequest(input *DeleteBucketAnalyt
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation DeleteBucketAnalyticsConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketAnalyticsConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketAnalyticsConfiguration
 func (c *S3) DeleteBucketAnalyticsConfiguration(input *DeleteBucketAnalyticsConfigurationInput) (*DeleteBucketAnalyticsConfigurationOutput, error) {
         req, out := c.DeleteBucketAnalyticsConfigurationRequest(input)
         return out, req.Send()
@@ -578,19 +579,18 @@ const opDeleteBucketCors = "DeleteBucketCors"
 
 // DeleteBucketCorsRequest generates a "aws/request.Request" representing the
 // client's request for the DeleteBucketCors operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See DeleteBucketCors for usage and error information.
+// See DeleteBucketCors for more information on using the DeleteBucketCors
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DeleteBucketCors method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the DeleteBucketCorsRequest method.
 //    req, resp := client.DeleteBucketCorsRequest(params)
@@ -600,7 +600,7 @@ const opDeleteBucketCors = "DeleteBucketCors"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketCors
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketCors
 func (c *S3) DeleteBucketCorsRequest(input *DeleteBucketCorsInput) (req *request.Request, output *DeleteBucketCorsOutput) {
         op := &request.Operation{
                 Name:       opDeleteBucketCors,
@@ -629,7 +629,7 @@ func (c *S3) DeleteBucketCorsRequest(input *DeleteBucketCorsInput) (req *request
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation DeleteBucketCors for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketCors
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketCors
 func (c *S3) DeleteBucketCors(input *DeleteBucketCorsInput) (*DeleteBucketCorsOutput, error) {
         req, out := c.DeleteBucketCorsRequest(input)
         return out, req.Send()
@@ -651,23 +651,98 @@ func (c *S3) DeleteBucketCorsWithContext(ctx aws.Context, input *DeleteBucketCor
         return out, req.Send()
 }
 
+const opDeleteBucketEncryption = "DeleteBucketEncryption"
+
+// DeleteBucketEncryptionRequest generates a "aws/request.Request" representing the
+// client's request for the DeleteBucketEncryption operation. The "output" return
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
+//
+// See DeleteBucketEncryption for more information on using the DeleteBucketEncryption
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
+//
+//
+//    // Example sending a request using the DeleteBucketEncryptionRequest method.
+//    req, resp := client.DeleteBucketEncryptionRequest(params)
+//
+//    err := req.Send()
+//    if err == nil { // resp is now filled
+//        fmt.Println(resp)
+//    }
+//
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketEncryption
+func (c *S3) DeleteBucketEncryptionRequest(input *DeleteBucketEncryptionInput) (req *request.Request, output *DeleteBucketEncryptionOutput) {
+        op := &request.Operation{
+                Name:       opDeleteBucketEncryption,
+                HTTPMethod: "DELETE",
+                HTTPPath:   "/{Bucket}?encryption",
+        }
+
+        if input == nil {
+                input = &DeleteBucketEncryptionInput{}
+        }
+
+        output = &DeleteBucketEncryptionOutput{}
+        req = c.newRequest(op, input, output)
+        req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
+        req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
+        return
+}
+
+// DeleteBucketEncryption API operation for Amazon Simple Storage Service.
+//
+// Deletes the server-side encryption configuration from the bucket.
+//
+// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
+// with awserr.Error's Code and Message methods to get detailed information about
+// the error.
+//
+// See the AWS API reference guide for Amazon Simple Storage Service's
+// API operation DeleteBucketEncryption for usage and error information.
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketEncryption
+func (c *S3) DeleteBucketEncryption(input *DeleteBucketEncryptionInput) (*DeleteBucketEncryptionOutput, error) {
+        req, out := c.DeleteBucketEncryptionRequest(input)
+        return out, req.Send()
+}
+
+// DeleteBucketEncryptionWithContext is the same as DeleteBucketEncryption with the addition of
+// the ability to pass a context and additional request options.
+//
+// See DeleteBucketEncryption for details on how to use this API operation.
+//
+// The context must be non-nil and will be used for request cancellation. If
+// the context is nil a panic will occur. In the future the SDK may create
+// sub-contexts for http.Requests. See https://golang.org/pkg/context/
+// for more information on using Contexts.
+func (c *S3) DeleteBucketEncryptionWithContext(ctx aws.Context, input *DeleteBucketEncryptionInput, opts ...request.Option) (*DeleteBucketEncryptionOutput, error) {
+        req, out := c.DeleteBucketEncryptionRequest(input)
+        req.SetContext(ctx)
+        req.ApplyOptions(opts...)
+        return out, req.Send()
+}
+
 const opDeleteBucketInventoryConfiguration = "DeleteBucketInventoryConfiguration"
 
 // DeleteBucketInventoryConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the DeleteBucketInventoryConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See DeleteBucketInventoryConfiguration for usage and error information.
+// See DeleteBucketInventoryConfiguration for more information on using the DeleteBucketInventoryConfiguration
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DeleteBucketInventoryConfiguration method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the DeleteBucketInventoryConfigurationRequest method.
 //    req, resp := client.DeleteBucketInventoryConfigurationRequest(params)
@@ -677,7 +752,7 @@ const opDeleteBucketInventoryConfiguration = "DeleteBucketInventoryConfiguration
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketInventoryConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketInventoryConfiguration
 func (c *S3) DeleteBucketInventoryConfigurationRequest(input *DeleteBucketInventoryConfigurationInput) (req *request.Request, output *DeleteBucketInventoryConfigurationOutput) {
         op := &request.Operation{
                 Name:       opDeleteBucketInventoryConfiguration,
@@ -707,7 +782,7 @@ func (c *S3) DeleteBucketInventoryConfigurationRequest(input *DeleteBucketInvent
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation DeleteBucketInventoryConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketInventoryConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketInventoryConfiguration
 func (c *S3) DeleteBucketInventoryConfiguration(input *DeleteBucketInventoryConfigurationInput) (*DeleteBucketInventoryConfigurationOutput, error) {
         req, out := c.DeleteBucketInventoryConfigurationRequest(input)
         return out, req.Send()
@@ -733,19 +808,18 @@ const opDeleteBucketLifecycle = "DeleteBucketLifecycle"
 
 // DeleteBucketLifecycleRequest generates a "aws/request.Request" representing the
 // client's request for the DeleteBucketLifecycle operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See DeleteBucketLifecycle for usage and error information.
+// See DeleteBucketLifecycle for more information on using the DeleteBucketLifecycle
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DeleteBucketLifecycle method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the DeleteBucketLifecycleRequest method.
 //    req, resp := client.DeleteBucketLifecycleRequest(params)
@@ -755,7 +829,7 @@ const opDeleteBucketLifecycle = "DeleteBucketLifecycle"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketLifecycle
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketLifecycle
 func (c *S3) DeleteBucketLifecycleRequest(input *DeleteBucketLifecycleInput) (req *request.Request, output *DeleteBucketLifecycleOutput) {
         op := &request.Operation{
                 Name:       opDeleteBucketLifecycle,
@@ -784,7 +858,7 @@ func (c *S3) DeleteBucketLifecycleRequest(input *DeleteBucketLifecycleInput) (re
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation DeleteBucketLifecycle for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketLifecycle
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketLifecycle
 func (c *S3) DeleteBucketLifecycle(input *DeleteBucketLifecycleInput) (*DeleteBucketLifecycleOutput, error) {
         req, out := c.DeleteBucketLifecycleRequest(input)
         return out, req.Send()
@@ -810,19 +884,18 @@ const opDeleteBucketMetricsConfiguration = "DeleteBucketMetricsConfiguration"
 
 // DeleteBucketMetricsConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the DeleteBucketMetricsConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See DeleteBucketMetricsConfiguration for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DeleteBucketMetricsConfiguration method directly
-// instead.
+// See DeleteBucketMetricsConfiguration for more information on using the DeleteBucketMetricsConfiguration
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the DeleteBucketMetricsConfigurationRequest method.
 //    req, resp := client.DeleteBucketMetricsConfigurationRequest(params)
@@ -832,7 +905,7 @@ const opDeleteBucketMetricsConfiguration = "DeleteBucketMetricsConfiguration"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketMetricsConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketMetricsConfiguration
 func (c *S3) DeleteBucketMetricsConfigurationRequest(input *DeleteBucketMetricsConfigurationInput) (req *request.Request, output *DeleteBucketMetricsConfigurationOutput) {
         op := &request.Operation{
                 Name:       opDeleteBucketMetricsConfiguration,
@@ -862,7 +935,7 @@ func (c *S3) DeleteBucketMetricsConfigurationRequest(input *DeleteBucketMetricsC
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation DeleteBucketMetricsConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketMetricsConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketMetricsConfiguration
 func (c *S3) DeleteBucketMetricsConfiguration(input *DeleteBucketMetricsConfigurationInput) (*DeleteBucketMetricsConfigurationOutput, error) {
         req, out := c.DeleteBucketMetricsConfigurationRequest(input)
         return out, req.Send()
@@ -888,19 +961,18 @@ const opDeleteBucketPolicy = "DeleteBucketPolicy"
 
 // DeleteBucketPolicyRequest generates a "aws/request.Request" representing the
 // client's request for the DeleteBucketPolicy operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See DeleteBucketPolicy for usage and error information.
+// See DeleteBucketPolicy for more information on using the DeleteBucketPolicy
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DeleteBucketPolicy method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the DeleteBucketPolicyRequest method.
 //    req, resp := client.DeleteBucketPolicyRequest(params)
@@ -910,7 +982,7 @@ const opDeleteBucketPolicy = "DeleteBucketPolicy"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketPolicy
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketPolicy
 func (c *S3) DeleteBucketPolicyRequest(input *DeleteBucketPolicyInput) (req *request.Request, output *DeleteBucketPolicyOutput) {
         op := &request.Operation{
                 Name:       opDeleteBucketPolicy,
@@ -939,7 +1011,7 @@ func (c *S3) DeleteBucketPolicyRequest(input *DeleteBucketPolicyInput) (req *req
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation DeleteBucketPolicy for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketPolicy
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketPolicy
 func (c *S3) DeleteBucketPolicy(input *DeleteBucketPolicyInput) (*DeleteBucketPolicyOutput, error) {
         req, out := c.DeleteBucketPolicyRequest(input)
         return out, req.Send()
@@ -965,19 +1037,18 @@ const opDeleteBucketReplication = "DeleteBucketReplication"
 
 // DeleteBucketReplicationRequest generates a "aws/request.Request" representing the
 // client's request for the DeleteBucketReplication operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See DeleteBucketReplication for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DeleteBucketReplication method directly
-// instead.
+// See DeleteBucketReplication for more information on using the DeleteBucketReplication
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the DeleteBucketReplicationRequest method.
 //    req, resp := client.DeleteBucketReplicationRequest(params)
@@ -987,7 +1058,7 @@ const opDeleteBucketReplication = "DeleteBucketReplication"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketReplication
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketReplication
 func (c *S3) DeleteBucketReplicationRequest(input *DeleteBucketReplicationInput) (req *request.Request, output *DeleteBucketReplicationOutput) {
         op := &request.Operation{
                 Name:       opDeleteBucketReplication,
@@ -1016,7 +1087,7 @@ func (c *S3) DeleteBucketReplicationRequest(input *DeleteBucketReplicationInput)
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation DeleteBucketReplication for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketReplication
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketReplication
 func (c *S3) DeleteBucketReplication(input *DeleteBucketReplicationInput) (*DeleteBucketReplicationOutput, error) {
         req, out := c.DeleteBucketReplicationRequest(input)
         return out, req.Send()
@@ -1042,19 +1113,18 @@ const opDeleteBucketTagging = "DeleteBucketTagging"
 
 // DeleteBucketTaggingRequest generates a "aws/request.Request" representing the
 // client's request for the DeleteBucketTagging operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See DeleteBucketTagging for usage and error information.
+// See DeleteBucketTagging for more information on using the DeleteBucketTagging
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DeleteBucketTagging method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the DeleteBucketTaggingRequest method.
 //    req, resp := client.DeleteBucketTaggingRequest(params)
@@ -1064,7 +1134,7 @@ const opDeleteBucketTagging = "DeleteBucketTagging"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketTagging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketTagging
 func (c *S3) DeleteBucketTaggingRequest(input *DeleteBucketTaggingInput) (req *request.Request, output *DeleteBucketTaggingOutput) {
         op := &request.Operation{
                 Name:       opDeleteBucketTagging,
@@ -1093,7 +1163,7 @@ func (c *S3) DeleteBucketTaggingRequest(input *DeleteBucketTaggingInput) (req *r
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation DeleteBucketTagging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketTagging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketTagging
 func (c *S3) DeleteBucketTagging(input *DeleteBucketTaggingInput) (*DeleteBucketTaggingOutput, error) {
         req, out := c.DeleteBucketTaggingRequest(input)
         return out, req.Send()
@@ -1119,19 +1189,18 @@ const opDeleteBucketWebsite = "DeleteBucketWebsite"
 
 // DeleteBucketWebsiteRequest generates a "aws/request.Request" representing the
 // client's request for the DeleteBucketWebsite operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See DeleteBucketWebsite for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DeleteBucketWebsite method directly
-// instead.
+// See DeleteBucketWebsite for more information on using the DeleteBucketWebsite
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the DeleteBucketWebsiteRequest method.
 //    req, resp := client.DeleteBucketWebsiteRequest(params)
@@ -1141,7 +1210,7 @@ const opDeleteBucketWebsite = "DeleteBucketWebsite"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketWebsite
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketWebsite
 func (c *S3) DeleteBucketWebsiteRequest(input *DeleteBucketWebsiteInput) (req *request.Request, output *DeleteBucketWebsiteOutput) {
         op := &request.Operation{
                 Name:       opDeleteBucketWebsite,
@@ -1170,7 +1239,7 @@ func (c *S3) DeleteBucketWebsiteRequest(input *DeleteBucketWebsiteInput) (req *r
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation DeleteBucketWebsite for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketWebsite
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketWebsite
 func (c *S3) DeleteBucketWebsite(input *DeleteBucketWebsiteInput) (*DeleteBucketWebsiteOutput, error) {
         req, out := c.DeleteBucketWebsiteRequest(input)
         return out, req.Send()
@@ -1196,19 +1265,18 @@ const opDeleteObject = "DeleteObject"
 
 // DeleteObjectRequest generates a "aws/request.Request" representing the
 // client's request for the DeleteObject operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See DeleteObject for usage and error information.
+// See DeleteObject for more information on using the DeleteObject
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DeleteObject method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the DeleteObjectRequest method.
 //    req, resp := client.DeleteObjectRequest(params)
@@ -1218,7 +1286,7 @@ const opDeleteObject = "DeleteObject"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObject
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObject
 func (c *S3) DeleteObjectRequest(input *DeleteObjectInput) (req *request.Request, output *DeleteObjectOutput) {
         op := &request.Operation{
                 Name:       opDeleteObject,
@@ -1247,7 +1315,7 @@ func (c *S3) DeleteObjectRequest(input *DeleteObjectInput) (req *request.Request
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation DeleteObject for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObject
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObject
 func (c *S3) DeleteObject(input *DeleteObjectInput) (*DeleteObjectOutput, error) {
         req, out := c.DeleteObjectRequest(input)
         return out, req.Send()
@@ -1273,19 +1341,18 @@ const opDeleteObjectTagging = "DeleteObjectTagging"
 
 // DeleteObjectTaggingRequest generates a "aws/request.Request" representing the
 // client's request for the DeleteObjectTagging operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See DeleteObjectTagging for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DeleteObjectTagging method directly
-// instead.
+// See DeleteObjectTagging for more information on using the DeleteObjectTagging
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the DeleteObjectTaggingRequest method.
 //    req, resp := client.DeleteObjectTaggingRequest(params)
@@ -1295,7 +1362,7 @@ const opDeleteObjectTagging = "DeleteObjectTagging"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectTagging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectTagging
 func (c *S3) DeleteObjectTaggingRequest(input *DeleteObjectTaggingInput) (req *request.Request, output *DeleteObjectTaggingOutput) {
         op := &request.Operation{
                 Name:       opDeleteObjectTagging,
@@ -1322,7 +1389,7 @@ func (c *S3) DeleteObjectTaggingRequest(input *DeleteObjectTaggingInput) (req *r
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation DeleteObjectTagging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectTagging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectTagging
 func (c *S3) DeleteObjectTagging(input *DeleteObjectTaggingInput) (*DeleteObjectTaggingOutput, error) {
         req, out := c.DeleteObjectTaggingRequest(input)
         return out, req.Send()
@@ -1348,19 +1415,18 @@ const opDeleteObjects = "DeleteObjects"
 
 // DeleteObjectsRequest generates a "aws/request.Request" representing the
 // client's request for the DeleteObjects operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See DeleteObjects for usage and error information.
+// See DeleteObjects for more information on using the DeleteObjects
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DeleteObjects method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the DeleteObjectsRequest method.
 //    req, resp := client.DeleteObjectsRequest(params)
@@ -1370,7 +1436,7 @@ const opDeleteObjects = "DeleteObjects"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjects
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjects
 func (c *S3) DeleteObjectsRequest(input *DeleteObjectsInput) (req *request.Request, output *DeleteObjectsOutput) {
         op := &request.Operation{
                 Name:       opDeleteObjects,
@@ -1398,7 +1464,7 @@ func (c *S3) DeleteObjectsRequest(input *DeleteObjectsInput) (req *request.Reque
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation DeleteObjects for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjects
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjects
 func (c *S3) DeleteObjects(input *DeleteObjectsInput) (*DeleteObjectsOutput, error) {
         req, out := c.DeleteObjectsRequest(input)
         return out, req.Send()
@@ -1424,19 +1490,18 @@ const opGetBucketAccelerateConfiguration = "GetBucketAccelerateConfiguration"
 
 // GetBucketAccelerateConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketAccelerateConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See GetBucketAccelerateConfiguration for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketAccelerateConfiguration method directly
-// instead.
+// See GetBucketAccelerateConfiguration for more information on using the GetBucketAccelerateConfiguration
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketAccelerateConfigurationRequest method.
 //    req, resp := client.GetBucketAccelerateConfigurationRequest(params)
@@ -1446,7 +1511,7 @@ const opGetBucketAccelerateConfiguration = "GetBucketAccelerateConfiguration"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAccelerateConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAccelerateConfiguration
 func (c *S3) GetBucketAccelerateConfigurationRequest(input *GetBucketAccelerateConfigurationInput) (req *request.Request, output *GetBucketAccelerateConfigurationOutput) {
         op := &request.Operation{
                 Name:       opGetBucketAccelerateConfiguration,
@@ -1473,7 +1538,7 @@ func (c *S3) GetBucketAccelerateConfigurationRequest(input *GetBucketAccelerateC
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketAccelerateConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAccelerateConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAccelerateConfiguration
 func (c *S3) GetBucketAccelerateConfiguration(input *GetBucketAccelerateConfigurationInput) (*GetBucketAccelerateConfigurationOutput, error) {
         req, out := c.GetBucketAccelerateConfigurationRequest(input)
         return out, req.Send()
@@ -1499,19 +1564,18 @@ const opGetBucketAcl = "GetBucketAcl"
 
 // GetBucketAclRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketAcl operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See GetBucketAcl for usage and error information.
+// See GetBucketAcl for more information on using the GetBucketAcl
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketAcl method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketAclRequest method.
 //    req, resp := client.GetBucketAclRequest(params)
@@ -1521,7 +1585,7 @@ const opGetBucketAcl = "GetBucketAcl"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAcl
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAcl
 func (c *S3) GetBucketAclRequest(input *GetBucketAclInput) (req *request.Request, output *GetBucketAclOutput) {
         op := &request.Operation{
                 Name:       opGetBucketAcl,
@@ -1548,7 +1612,7 @@ func (c *S3) GetBucketAclRequest(input *GetBucketAclInput) (req *request.Request
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketAcl for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAcl
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAcl
 func (c *S3) GetBucketAcl(input *GetBucketAclInput) (*GetBucketAclOutput, error) {
         req, out := c.GetBucketAclRequest(input)
         return out, req.Send()
@@ -1574,19 +1638,18 @@ const opGetBucketAnalyticsConfiguration = "GetBucketAnalyticsConfiguration"
 
 // GetBucketAnalyticsConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketAnalyticsConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See GetBucketAnalyticsConfiguration for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketAnalyticsConfiguration method directly
-// instead.
+// See GetBucketAnalyticsConfiguration for more information on using the GetBucketAnalyticsConfiguration
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketAnalyticsConfigurationRequest method.
 //    req, resp := client.GetBucketAnalyticsConfigurationRequest(params)
@@ -1596,7 +1659,7 @@ const opGetBucketAnalyticsConfiguration = "GetBucketAnalyticsConfiguration"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAnalyticsConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAnalyticsConfiguration
 func (c *S3) GetBucketAnalyticsConfigurationRequest(input *GetBucketAnalyticsConfigurationInput) (req *request.Request, output *GetBucketAnalyticsConfigurationOutput) {
         op := &request.Operation{
                 Name:       opGetBucketAnalyticsConfiguration,
@@ -1624,7 +1687,7 @@ func (c *S3) GetBucketAnalyticsConfigurationRequest(input *GetBucketAnalyticsCon
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketAnalyticsConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAnalyticsConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAnalyticsConfiguration
 func (c *S3) GetBucketAnalyticsConfiguration(input *GetBucketAnalyticsConfigurationInput) (*GetBucketAnalyticsConfigurationOutput, error) {
         req, out := c.GetBucketAnalyticsConfigurationRequest(input)
         return out, req.Send()
@@ -1650,19 +1713,18 @@ const opGetBucketCors = "GetBucketCors"
 
 // GetBucketCorsRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketCors operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See GetBucketCors for usage and error information.
+// See GetBucketCors for more information on using the GetBucketCors
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketCors method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketCorsRequest method.
 //    req, resp := client.GetBucketCorsRequest(params)
@@ -1672,7 +1734,7 @@ const opGetBucketCors = "GetBucketCors"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketCors
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketCors
 func (c *S3) GetBucketCorsRequest(input *GetBucketCorsInput) (req *request.Request, output *GetBucketCorsOutput) {
         op := &request.Operation{
                 Name:       opGetBucketCors,
@@ -1699,7 +1761,7 @@ func (c *S3) GetBucketCorsRequest(input *GetBucketCorsInput) (req *request.Reque
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketCors for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketCors
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketCors
 func (c *S3) GetBucketCors(input *GetBucketCorsInput) (*GetBucketCorsOutput, error) {
         req, out := c.GetBucketCorsRequest(input)
         return out, req.Send()
@@ -1721,23 +1783,96 @@ func (c *S3) GetBucketCorsWithContext(ctx aws.Context, input *GetBucketCorsInput
         return out, req.Send()
 }
 
+const opGetBucketEncryption = "GetBucketEncryption"
+
+// GetBucketEncryptionRequest generates a "aws/request.Request" representing the
+// client's request for the GetBucketEncryption operation. The "output" return
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
+//
+// See GetBucketEncryption for more information on using the GetBucketEncryption
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
+//
+//
+//    // Example sending a request using the GetBucketEncryptionRequest method.
+//    req, resp := client.GetBucketEncryptionRequest(params)
+//
+//    err := req.Send()
+//    if err == nil { // resp is now filled
+//        fmt.Println(resp)
+//    }
+//
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketEncryption
+func (c *S3) GetBucketEncryptionRequest(input *GetBucketEncryptionInput) (req *request.Request, output *GetBucketEncryptionOutput) {
+        op := &request.Operation{
+                Name:       opGetBucketEncryption,
+                HTTPMethod: "GET",
+                HTTPPath:   "/{Bucket}?encryption",
+        }
+
+        if input == nil {
+                input = &GetBucketEncryptionInput{}
+        }
+
+        output = &GetBucketEncryptionOutput{}
+        req = c.newRequest(op, input, output)
+        return
+}
+
+// GetBucketEncryption API operation for Amazon Simple Storage Service.
+//
+// Returns the server-side encryption configuration of a bucket.
+//
+// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
+// with awserr.Error's Code and Message methods to get detailed information about
+// the error.
+//
+// See the AWS API reference guide for Amazon Simple Storage Service's
+// API operation GetBucketEncryption for usage and error information.
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketEncryption
+func (c *S3) GetBucketEncryption(input *GetBucketEncryptionInput) (*GetBucketEncryptionOutput, error) {
+        req, out := c.GetBucketEncryptionRequest(input)
+        return out, req.Send()
+}
+
+// GetBucketEncryptionWithContext is the same as GetBucketEncryption with the addition of
+// the ability to pass a context and additional request options.
+//
+// See GetBucketEncryption for details on how to use this API operation.
+//
+// The context must be non-nil and will be used for request cancellation. If
+// the context is nil a panic will occur. In the future the SDK may create
+// sub-contexts for http.Requests. See https://golang.org/pkg/context/
+// for more information on using Contexts.
+func (c *S3) GetBucketEncryptionWithContext(ctx aws.Context, input *GetBucketEncryptionInput, opts ...request.Option) (*GetBucketEncryptionOutput, error) {
+        req, out := c.GetBucketEncryptionRequest(input)
+        req.SetContext(ctx)
+        req.ApplyOptions(opts...)
+        return out, req.Send()
+}
+
 const opGetBucketInventoryConfiguration = "GetBucketInventoryConfiguration"
 
 // GetBucketInventoryConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketInventoryConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See GetBucketInventoryConfiguration for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketInventoryConfiguration method directly
-// instead.
+// See GetBucketInventoryConfiguration for more information on using the GetBucketInventoryConfiguration
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketInventoryConfigurationRequest method.
 //    req, resp := client.GetBucketInventoryConfigurationRequest(params)
@@ -1747,7 +1882,7 @@ const opGetBucketInventoryConfiguration = "GetBucketInventoryConfiguration"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketInventoryConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketInventoryConfiguration
 func (c *S3) GetBucketInventoryConfigurationRequest(input *GetBucketInventoryConfigurationInput) (req *request.Request, output *GetBucketInventoryConfigurationOutput) {
         op := &request.Operation{
                 Name:       opGetBucketInventoryConfiguration,
@@ -1775,7 +1910,7 @@ func (c *S3) GetBucketInventoryConfigurationRequest(input *GetBucketInventoryCon
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketInventoryConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketInventoryConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketInventoryConfiguration
 func (c *S3) GetBucketInventoryConfiguration(input *GetBucketInventoryConfigurationInput) (*GetBucketInventoryConfigurationOutput, error) {
         req, out := c.GetBucketInventoryConfigurationRequest(input)
         return out, req.Send()
@@ -1801,19 +1936,18 @@ const opGetBucketLifecycle = "GetBucketLifecycle"
 
 // GetBucketLifecycleRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketLifecycle operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See GetBucketLifecycle for usage and error information.
+// See GetBucketLifecycle for more information on using the GetBucketLifecycle
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketLifecycle method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketLifecycleRequest method.
 //    req, resp := client.GetBucketLifecycleRequest(params)
@@ -1823,7 +1957,7 @@ const opGetBucketLifecycle = "GetBucketLifecycle"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycle
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycle
 func (c *S3) GetBucketLifecycleRequest(input *GetBucketLifecycleInput) (req *request.Request, output *GetBucketLifecycleOutput) {
         if c.Client.Config.Logger != nil {
                 c.Client.Config.Logger.Log("This operation, GetBucketLifecycle, has been deprecated")
@@ -1853,7 +1987,7 @@ func (c *S3) GetBucketLifecycleRequest(input *GetBucketLifecycleInput) (req *req
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketLifecycle for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycle
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycle
 func (c *S3) GetBucketLifecycle(input *GetBucketLifecycleInput) (*GetBucketLifecycleOutput, error) {
         req, out := c.GetBucketLifecycleRequest(input)
         return out, req.Send()
@@ -1879,19 +2013,18 @@ const opGetBucketLifecycleConfiguration = "GetBucketLifecycleConfiguration"
 
 // GetBucketLifecycleConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketLifecycleConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See GetBucketLifecycleConfiguration for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketLifecycleConfiguration method directly
-// instead.
+// See GetBucketLifecycleConfiguration for more information on using the GetBucketLifecycleConfiguration
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketLifecycleConfigurationRequest method.
 //    req, resp := client.GetBucketLifecycleConfigurationRequest(params)
@@ -1901,7 +2034,7 @@ const opGetBucketLifecycleConfiguration = "GetBucketLifecycleConfiguration"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycleConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycleConfiguration
 func (c *S3) GetBucketLifecycleConfigurationRequest(input *GetBucketLifecycleConfigurationInput) (req *request.Request, output *GetBucketLifecycleConfigurationOutput) {
         op := &request.Operation{
                 Name:       opGetBucketLifecycleConfiguration,
@@ -1928,7 +2061,7 @@ func (c *S3) GetBucketLifecycleConfigurationRequest(input *GetBucketLifecycleCon
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketLifecycleConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycleConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycleConfiguration
 func (c *S3) GetBucketLifecycleConfiguration(input *GetBucketLifecycleConfigurationInput) (*GetBucketLifecycleConfigurationOutput, error) {
         req, out := c.GetBucketLifecycleConfigurationRequest(input)
         return out, req.Send()
@@ -1954,19 +2087,18 @@ const opGetBucketLocation = "GetBucketLocation"
 
 // GetBucketLocationRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketLocation operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See GetBucketLocation for usage and error information.
+// See GetBucketLocation for more information on using the GetBucketLocation
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketLocation method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketLocationRequest method.
 //    req, resp := client.GetBucketLocationRequest(params)
@@ -1976,7 +2108,7 @@ const opGetBucketLocation = "GetBucketLocation"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLocation
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLocation
 func (c *S3) GetBucketLocationRequest(input *GetBucketLocationInput) (req *request.Request, output *GetBucketLocationOutput) {
         op := &request.Operation{
                 Name:       opGetBucketLocation,
@@ -2003,7 +2135,7 @@ func (c *S3) GetBucketLocationRequest(input *GetBucketLocationInput) (req *reque
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketLocation for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLocation
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLocation
 func (c *S3) GetBucketLocation(input *GetBucketLocationInput) (*GetBucketLocationOutput, error) {
         req, out := c.GetBucketLocationRequest(input)
         return out, req.Send()
@@ -2029,19 +2161,18 @@ const opGetBucketLogging = "GetBucketLogging"
 
 // GetBucketLoggingRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketLogging operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See GetBucketLogging for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketLogging method directly
-// instead.
+// See GetBucketLogging for more information on using the GetBucketLogging
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketLoggingRequest method.
 //    req, resp := client.GetBucketLoggingRequest(params)
@@ -2051,7 +2182,7 @@ const opGetBucketLogging = "GetBucketLogging"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLogging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLogging
 func (c *S3) GetBucketLoggingRequest(input *GetBucketLoggingInput) (req *request.Request, output *GetBucketLoggingOutput) {
         op := &request.Operation{
                 Name:       opGetBucketLogging,
@@ -2079,7 +2210,7 @@ func (c *S3) GetBucketLoggingRequest(input *GetBucketLoggingInput) (req *request
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketLogging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLogging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLogging
 func (c *S3) GetBucketLogging(input *GetBucketLoggingInput) (*GetBucketLoggingOutput, error) {
         req, out := c.GetBucketLoggingRequest(input)
         return out, req.Send()
@@ -2105,19 +2236,18 @@ const opGetBucketMetricsConfiguration = "GetBucketMetricsConfiguration"
 
 // GetBucketMetricsConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketMetricsConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See GetBucketMetricsConfiguration for usage and error information.
+// See GetBucketMetricsConfiguration for more information on using the GetBucketMetricsConfiguration
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketMetricsConfiguration method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketMetricsConfigurationRequest method.
 //    req, resp := client.GetBucketMetricsConfigurationRequest(params)
@@ -2127,7 +2257,7 @@ const opGetBucketMetricsConfiguration = "GetBucketMetricsConfiguration"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketMetricsConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketMetricsConfiguration
 func (c *S3) GetBucketMetricsConfigurationRequest(input *GetBucketMetricsConfigurationInput) (req *request.Request, output *GetBucketMetricsConfigurationOutput) {
         op := &request.Operation{
                 Name:       opGetBucketMetricsConfiguration,
@@ -2155,7 +2285,7 @@ func (c *S3) GetBucketMetricsConfigurationRequest(input *GetBucketMetricsConfigu
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketMetricsConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketMetricsConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketMetricsConfiguration
 func (c *S3) GetBucketMetricsConfiguration(input *GetBucketMetricsConfigurationInput) (*GetBucketMetricsConfigurationOutput, error) {
         req, out := c.GetBucketMetricsConfigurationRequest(input)
         return out, req.Send()
@@ -2181,19 +2311,18 @@ const opGetBucketNotification = "GetBucketNotification"
 
 // GetBucketNotificationRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketNotification operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See GetBucketNotification for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketNotification method directly
-// instead.
+// See GetBucketNotification for more information on using the GetBucketNotification
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketNotificationRequest method.
 //    req, resp := client.GetBucketNotificationRequest(params)
@@ -2203,7 +2332,7 @@ const opGetBucketNotification = "GetBucketNotification"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotification
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotification
 func (c *S3) GetBucketNotificationRequest(input *GetBucketNotificationConfigurationRequest) (req *request.Request, output *NotificationConfigurationDeprecated) {
         if c.Client.Config.Logger != nil {
                 c.Client.Config.Logger.Log("This operation, GetBucketNotification, has been deprecated")
@@ -2233,7 +2362,7 @@ func (c *S3) GetBucketNotificationRequest(input *GetBucketNotificationConfigurat
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketNotification for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotification
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotification
 func (c *S3) GetBucketNotification(input *GetBucketNotificationConfigurationRequest) (*NotificationConfigurationDeprecated, error) {
         req, out := c.GetBucketNotificationRequest(input)
         return out, req.Send()
@@ -2259,19 +2388,18 @@ const opGetBucketNotificationConfiguration = "GetBucketNotificationConfiguration
 
 // GetBucketNotificationConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketNotificationConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See GetBucketNotificationConfiguration for usage and error information.
+// See GetBucketNotificationConfiguration for more information on using the GetBucketNotificationConfiguration
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketNotificationConfiguration method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketNotificationConfigurationRequest method.
 //    req, resp := client.GetBucketNotificationConfigurationRequest(params)
@@ -2281,7 +2409,7 @@ const opGetBucketNotificationConfiguration = "GetBucketNotificationConfiguration
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotificationConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotificationConfiguration
 func (c *S3) GetBucketNotificationConfigurationRequest(input *GetBucketNotificationConfigurationRequest) (req *request.Request, output *NotificationConfiguration) {
         op := &request.Operation{
                 Name:       opGetBucketNotificationConfiguration,
@@ -2308,7 +2436,7 @@ func (c *S3) GetBucketNotificationConfigurationRequest(input *GetBucketNotificat
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketNotificationConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotificationConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotificationConfiguration
 func (c *S3) GetBucketNotificationConfiguration(input *GetBucketNotificationConfigurationRequest) (*NotificationConfiguration, error) {
         req, out := c.GetBucketNotificationConfigurationRequest(input)
         return out, req.Send()
@@ -2334,19 +2462,18 @@ const opGetBucketPolicy = "GetBucketPolicy"
 
 // GetBucketPolicyRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketPolicy operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See GetBucketPolicy for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketPolicy method directly
-// instead.
+// See GetBucketPolicy for more information on using the GetBucketPolicy
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketPolicyRequest method.
 //    req, resp := client.GetBucketPolicyRequest(params)
@@ -2356,7 +2483,7 @@ const opGetBucketPolicy = "GetBucketPolicy"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketPolicy
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketPolicy
 func (c *S3) GetBucketPolicyRequest(input *GetBucketPolicyInput) (req *request.Request, output *GetBucketPolicyOutput) {
         op := &request.Operation{
                 Name:       opGetBucketPolicy,
@@ -2383,7 +2510,7 @@ func (c *S3) GetBucketPolicyRequest(input *GetBucketPolicyInput) (req *request.R
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketPolicy for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketPolicy
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketPolicy
 func (c *S3) GetBucketPolicy(input *GetBucketPolicyInput) (*GetBucketPolicyOutput, error) {
         req, out := c.GetBucketPolicyRequest(input)
         return out, req.Send()
@@ -2409,19 +2536,18 @@ const opGetBucketReplication = "GetBucketReplication"
 
 // GetBucketReplicationRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketReplication operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See GetBucketReplication for usage and error information.
+// See GetBucketReplication for more information on using the GetBucketReplication
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketReplication method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketReplicationRequest method.
 //    req, resp := client.GetBucketReplicationRequest(params)
@@ -2431,7 +2557,7 @@ const opGetBucketReplication = "GetBucketReplication"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketReplication
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketReplication
 func (c *S3) GetBucketReplicationRequest(input *GetBucketReplicationInput) (req *request.Request, output *GetBucketReplicationOutput) {
         op := &request.Operation{
                 Name:       opGetBucketReplication,
@@ -2458,7 +2584,7 @@ func (c *S3) GetBucketReplicationRequest(input *GetBucketReplicationInput) (req
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketReplication for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketReplication
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketReplication
 func (c *S3) GetBucketReplication(input *GetBucketReplicationInput) (*GetBucketReplicationOutput, error) {
         req, out := c.GetBucketReplicationRequest(input)
         return out, req.Send()
@@ -2484,19 +2610,18 @@ const opGetBucketRequestPayment = "GetBucketRequestPayment"
 
 // GetBucketRequestPaymentRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketRequestPayment operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See GetBucketRequestPayment for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketRequestPayment method directly
-// instead.
+// See GetBucketRequestPayment for more information on using the GetBucketRequestPayment
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketRequestPaymentRequest method.
 //    req, resp := client.GetBucketRequestPaymentRequest(params)
@@ -2506,7 +2631,7 @@ const opGetBucketRequestPayment = "GetBucketRequestPayment"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketRequestPayment
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketRequestPayment
 func (c *S3) GetBucketRequestPaymentRequest(input *GetBucketRequestPaymentInput) (req *request.Request, output *GetBucketRequestPaymentOutput) {
         op := &request.Operation{
                 Name:       opGetBucketRequestPayment,
@@ -2533,7 +2658,7 @@ func (c *S3) GetBucketRequestPaymentRequest(input *GetBucketRequestPaymentInput)
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketRequestPayment for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketRequestPayment
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketRequestPayment
 func (c *S3) GetBucketRequestPayment(input *GetBucketRequestPaymentInput) (*GetBucketRequestPaymentOutput, error) {
         req, out := c.GetBucketRequestPaymentRequest(input)
         return out, req.Send()
@@ -2559,19 +2684,18 @@ const opGetBucketTagging = "GetBucketTagging"
 
 // GetBucketTaggingRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketTagging operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See GetBucketTagging for usage and error information.
+// See GetBucketTagging for more information on using the GetBucketTagging
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketTagging method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketTaggingRequest method.
 //    req, resp := client.GetBucketTaggingRequest(params)
@@ -2581,7 +2705,7 @@ const opGetBucketTagging = "GetBucketTagging"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketTagging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketTagging
 func (c *S3) GetBucketTaggingRequest(input *GetBucketTaggingInput) (req *request.Request, output *GetBucketTaggingOutput) {
         op := &request.Operation{
                 Name:       opGetBucketTagging,
@@ -2608,7 +2732,7 @@ func (c *S3) GetBucketTaggingRequest(input *GetBucketTaggingInput) (req *request
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketTagging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketTagging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketTagging
 func (c *S3) GetBucketTagging(input *GetBucketTaggingInput) (*GetBucketTaggingOutput, error) {
         req, out := c.GetBucketTaggingRequest(input)
         return out, req.Send()
@@ -2634,19 +2758,18 @@ const opGetBucketVersioning = "GetBucketVersioning"
 
 // GetBucketVersioningRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketVersioning operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See GetBucketVersioning for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketVersioning method directly
-// instead.
+// See GetBucketVersioning for more information on using the GetBucketVersioning
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketVersioningRequest method.
 //    req, resp := client.GetBucketVersioningRequest(params)
@@ -2656,7 +2779,7 @@ const opGetBucketVersioning = "GetBucketVersioning"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketVersioning
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketVersioning
 func (c *S3) GetBucketVersioningRequest(input *GetBucketVersioningInput) (req *request.Request, output *GetBucketVersioningOutput) {
         op := &request.Operation{
                 Name:       opGetBucketVersioning,
@@ -2683,7 +2806,7 @@ func (c *S3) GetBucketVersioningRequest(input *GetBucketVersioningInput) (req *r
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketVersioning for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketVersioning
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketVersioning
 func (c *S3) GetBucketVersioning(input *GetBucketVersioningInput) (*GetBucketVersioningOutput, error) {
         req, out := c.GetBucketVersioningRequest(input)
         return out, req.Send()
@@ -2709,19 +2832,18 @@ const opGetBucketWebsite = "GetBucketWebsite"
 
 // GetBucketWebsiteRequest generates a "aws/request.Request" representing the
 // client's request for the GetBucketWebsite operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See GetBucketWebsite for usage and error information.
+// See GetBucketWebsite for more information on using the GetBucketWebsite
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetBucketWebsite method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetBucketWebsiteRequest method.
 //    req, resp := client.GetBucketWebsiteRequest(params)
@@ -2731,7 +2853,7 @@ const opGetBucketWebsite = "GetBucketWebsite"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketWebsite
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketWebsite
 func (c *S3) GetBucketWebsiteRequest(input *GetBucketWebsiteInput) (req *request.Request, output *GetBucketWebsiteOutput) {
         op := &request.Operation{
                 Name:       opGetBucketWebsite,
@@ -2758,7 +2880,7 @@ func (c *S3) GetBucketWebsiteRequest(input *GetBucketWebsiteInput) (req *request
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetBucketWebsite for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketWebsite
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketWebsite
 func (c *S3) GetBucketWebsite(input *GetBucketWebsiteInput) (*GetBucketWebsiteOutput, error) {
         req, out := c.GetBucketWebsiteRequest(input)
         return out, req.Send()
@@ -2784,19 +2906,18 @@ const opGetObject = "GetObject"
 
 // GetObjectRequest generates a "aws/request.Request" representing the
 // client's request for the GetObject operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See GetObject for usage and error information.
+// See GetObject for more information on using the GetObject
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetObject method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetObjectRequest method.
 //    req, resp := client.GetObjectRequest(params)
@@ -2806,7 +2927,7 @@ const opGetObject = "GetObject"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObject
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObject
 func (c *S3) GetObjectRequest(input *GetObjectInput) (req *request.Request, output *GetObjectOutput) {
         op := &request.Operation{
                 Name:       opGetObject,
@@ -2838,7 +2959,7 @@ func (c *S3) GetObjectRequest(input *GetObjectInput) (req *request.Request, outp
 //   * ErrCodeNoSuchKey "NoSuchKey"
 //   The specified key does not exist.
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObject
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObject
 func (c *S3) GetObject(input *GetObjectInput) (*GetObjectOutput, error) {
         req, out := c.GetObjectRequest(input)
         return out, req.Send()
@@ -2864,19 +2985,18 @@ const opGetObjectAcl = "GetObjectAcl"
 
 // GetObjectAclRequest generates a "aws/request.Request" representing the
 // client's request for the GetObjectAcl operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See GetObjectAcl for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetObjectAcl method directly
-// instead.
+// See GetObjectAcl for more information on using the GetObjectAcl
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetObjectAclRequest method.
 //    req, resp := client.GetObjectAclRequest(params)
@@ -2886,7 +3006,7 @@ const opGetObjectAcl = "GetObjectAcl"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectAcl
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectAcl
 func (c *S3) GetObjectAclRequest(input *GetObjectAclInput) (req *request.Request, output *GetObjectAclOutput) {
         op := &request.Operation{
                 Name:       opGetObjectAcl,
@@ -2918,7 +3038,7 @@ func (c *S3) GetObjectAclRequest(input *GetObjectAclInput) (req *request.Request
 //   * ErrCodeNoSuchKey "NoSuchKey"
 //   The specified key does not exist.
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectAcl
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectAcl
 func (c *S3) GetObjectAcl(input *GetObjectAclInput) (*GetObjectAclOutput, error) {
         req, out := c.GetObjectAclRequest(input)
         return out, req.Send()
@@ -2944,19 +3064,18 @@ const opGetObjectTagging = "GetObjectTagging"
 
 // GetObjectTaggingRequest generates a "aws/request.Request" representing the
 // client's request for the GetObjectTagging operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See GetObjectTagging for usage and error information.
+// See GetObjectTagging for more information on using the GetObjectTagging
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetObjectTagging method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetObjectTaggingRequest method.
 //    req, resp := client.GetObjectTaggingRequest(params)
@@ -2966,7 +3085,7 @@ const opGetObjectTagging = "GetObjectTagging"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTagging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTagging
 func (c *S3) GetObjectTaggingRequest(input *GetObjectTaggingInput) (req *request.Request, output *GetObjectTaggingOutput) {
         op := &request.Operation{
                 Name:       opGetObjectTagging,
@@ -2993,7 +3112,7 @@ func (c *S3) GetObjectTaggingRequest(input *GetObjectTaggingInput) (req *request
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetObjectTagging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTagging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTagging
 func (c *S3) GetObjectTagging(input *GetObjectTaggingInput) (*GetObjectTaggingOutput, error) {
         req, out := c.GetObjectTaggingRequest(input)
         return out, req.Send()
@@ -3019,19 +3138,18 @@ const opGetObjectTorrent = "GetObjectTorrent"
 
 // GetObjectTorrentRequest generates a "aws/request.Request" representing the
 // client's request for the GetObjectTorrent operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See GetObjectTorrent for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetObjectTorrent method directly
-// instead.
+// See GetObjectTorrent for more information on using the GetObjectTorrent
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetObjectTorrentRequest method.
 //    req, resp := client.GetObjectTorrentRequest(params)
@@ -3041,7 +3159,7 @@ const opGetObjectTorrent = "GetObjectTorrent"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTorrent
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTorrent
 func (c *S3) GetObjectTorrentRequest(input *GetObjectTorrentInput) (req *request.Request, output *GetObjectTorrentOutput) {
         op := &request.Operation{
                 Name:       opGetObjectTorrent,
@@ -3068,7 +3186,7 @@ func (c *S3) GetObjectTorrentRequest(input *GetObjectTorrentInput) (req *request
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation GetObjectTorrent for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTorrent
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTorrent
 func (c *S3) GetObjectTorrent(input *GetObjectTorrentInput) (*GetObjectTorrentOutput, error) {
         req, out := c.GetObjectTorrentRequest(input)
         return out, req.Send()
@@ -3094,19 +3212,18 @@ const opHeadBucket = "HeadBucket"
 
 // HeadBucketRequest generates a "aws/request.Request" representing the
 // client's request for the HeadBucket operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See HeadBucket for usage and error information.
+// See HeadBucket for more information on using the HeadBucket
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the HeadBucket method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the HeadBucketRequest method.
 //    req, resp := client.HeadBucketRequest(params)
@@ -3116,7 +3233,7 @@ const opHeadBucket = "HeadBucket"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadBucket
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadBucket
 func (c *S3) HeadBucketRequest(input *HeadBucketInput) (req *request.Request, output *HeadBucketOutput) {
         op := &request.Operation{
                 Name:       opHeadBucket,
@@ -3151,7 +3268,7 @@ func (c *S3) HeadBucketRequest(input *HeadBucketInput) (req *request.Request, ou
 //   * ErrCodeNoSuchBucket "NoSuchBucket"
 //   The specified bucket does not exist.
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadBucket
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadBucket
 func (c *S3) HeadBucket(input *HeadBucketInput) (*HeadBucketOutput, error) {
         req, out := c.HeadBucketRequest(input)
         return out, req.Send()
@@ -3177,19 +3294,18 @@ const opHeadObject = "HeadObject"
 
 // HeadObjectRequest generates a "aws/request.Request" representing the
 // client's request for the HeadObject operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See HeadObject for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the HeadObject method directly
-// instead.
+// See HeadObject for more information on using the HeadObject
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the HeadObjectRequest method.
 //    req, resp := client.HeadObjectRequest(params)
@@ -3199,7 +3315,7 @@ const opHeadObject = "HeadObject"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadObject
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadObject
 func (c *S3) HeadObjectRequest(input *HeadObjectInput) (req *request.Request, output *HeadObjectOutput) {
         op := &request.Operation{
                 Name:       opHeadObject,
@@ -3231,7 +3347,7 @@ func (c *S3) HeadObjectRequest(input *HeadObjectInput) (req *request.Request, ou
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation HeadObject for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadObject
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadObject
 func (c *S3) HeadObject(input *HeadObjectInput) (*HeadObjectOutput, error) {
         req, out := c.HeadObjectRequest(input)
         return out, req.Send()
@@ -3257,19 +3373,18 @@ const opListBucketAnalyticsConfigurations = "ListBucketAnalyticsConfigurations"
 
 // ListBucketAnalyticsConfigurationsRequest generates a "aws/request.Request" representing the
 // client's request for the ListBucketAnalyticsConfigurations operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See ListBucketAnalyticsConfigurations for usage and error information.
+// See ListBucketAnalyticsConfigurations for more information on using the ListBucketAnalyticsConfigurations
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the ListBucketAnalyticsConfigurations method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the ListBucketAnalyticsConfigurationsRequest method.
 //    req, resp := client.ListBucketAnalyticsConfigurationsRequest(params)
@@ -3279,7 +3394,7 @@ const opListBucketAnalyticsConfigurations = "ListBucketAnalyticsConfigurations"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketAnalyticsConfigurations
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketAnalyticsConfigurations
 func (c *S3) ListBucketAnalyticsConfigurationsRequest(input *ListBucketAnalyticsConfigurationsInput) (req *request.Request, output *ListBucketAnalyticsConfigurationsOutput) {
         op := &request.Operation{
                 Name:       opListBucketAnalyticsConfigurations,
@@ -3306,7 +3421,7 @@ func (c *S3) ListBucketAnalyticsConfigurationsRequest(input *ListBucketAnalytics
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation ListBucketAnalyticsConfigurations for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketAnalyticsConfigurations
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketAnalyticsConfigurations
 func (c *S3) ListBucketAnalyticsConfigurations(input *ListBucketAnalyticsConfigurationsInput) (*ListBucketAnalyticsConfigurationsOutput, error) {
         req, out := c.ListBucketAnalyticsConfigurationsRequest(input)
         return out, req.Send()
@@ -3332,19 +3447,18 @@ const opListBucketInventoryConfigurations = "ListBucketInventoryConfigurations"
 
 // ListBucketInventoryConfigurationsRequest generates a "aws/request.Request" representing the
 // client's request for the ListBucketInventoryConfigurations operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See ListBucketInventoryConfigurations for usage and error information.
+// See ListBucketInventoryConfigurations for more information on using the ListBucketInventoryConfigurations
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the ListBucketInventoryConfigurations method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the ListBucketInventoryConfigurationsRequest method.
 //    req, resp := client.ListBucketInventoryConfigurationsRequest(params)
@@ -3354,7 +3468,7 @@ const opListBucketInventoryConfigurations = "ListBucketInventoryConfigurations"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketInventoryConfigurations
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketInventoryConfigurations
 func (c *S3) ListBucketInventoryConfigurationsRequest(input *ListBucketInventoryConfigurationsInput) (req *request.Request, output *ListBucketInventoryConfigurationsOutput) {
         op := &request.Operation{
                 Name:       opListBucketInventoryConfigurations,
@@ -3381,7 +3495,7 @@ func (c *S3) ListBucketInventoryConfigurationsRequest(input *ListBucketInventory
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation ListBucketInventoryConfigurations for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketInventoryConfigurations
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketInventoryConfigurations
 func (c *S3) ListBucketInventoryConfigurations(input *ListBucketInventoryConfigurationsInput) (*ListBucketInventoryConfigurationsOutput, error) {
         req, out := c.ListBucketInventoryConfigurationsRequest(input)
         return out, req.Send()
@@ -3407,19 +3521,18 @@ const opListBucketMetricsConfigurations = "ListBucketMetricsConfigurations"
 
 // ListBucketMetricsConfigurationsRequest generates a "aws/request.Request" representing the
 // client's request for the ListBucketMetricsConfigurations operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See ListBucketMetricsConfigurations for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the ListBucketMetricsConfigurations method directly
-// instead.
+// See ListBucketMetricsConfigurations for more information on using the ListBucketMetricsConfigurations
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the ListBucketMetricsConfigurationsRequest method.
 //    req, resp := client.ListBucketMetricsConfigurationsRequest(params)
@@ -3429,7 +3542,7 @@ const opListBucketMetricsConfigurations = "ListBucketMetricsConfigurations"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketMetricsConfigurations
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketMetricsConfigurations
 func (c *S3) ListBucketMetricsConfigurationsRequest(input *ListBucketMetricsConfigurationsInput) (req *request.Request, output *ListBucketMetricsConfigurationsOutput) {
         op := &request.Operation{
                 Name:       opListBucketMetricsConfigurations,
@@ -3456,7 +3569,7 @@ func (c *S3) ListBucketMetricsConfigurationsRequest(input *ListBucketMetricsConf
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation ListBucketMetricsConfigurations for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketMetricsConfigurations
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketMetricsConfigurations
 func (c *S3) ListBucketMetricsConfigurations(input *ListBucketMetricsConfigurationsInput) (*ListBucketMetricsConfigurationsOutput, error) {
         req, out := c.ListBucketMetricsConfigurationsRequest(input)
         return out, req.Send()
@@ -3482,19 +3595,18 @@ const opListBuckets = "ListBuckets"
 
 // ListBucketsRequest generates a "aws/request.Request" representing the
 // client's request for the ListBuckets operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See ListBuckets for usage and error information.
+// See ListBuckets for more information on using the ListBuckets
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the ListBuckets method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the ListBucketsRequest method.
 //    req, resp := client.ListBucketsRequest(params)
@@ -3504,7 +3616,7 @@ const opListBuckets = "ListBuckets"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBuckets
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBuckets
 func (c *S3) ListBucketsRequest(input *ListBucketsInput) (req *request.Request, output *ListBucketsOutput) {
         op := &request.Operation{
                 Name:       opListBuckets,
@@ -3531,7 +3643,7 @@ func (c *S3) ListBucketsRequest(input *ListBucketsInput) (req *request.Request,
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation ListBuckets for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBuckets
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBuckets
 func (c *S3) ListBuckets(input *ListBucketsInput) (*ListBucketsOutput, error) {
         req, out := c.ListBucketsRequest(input)
         return out, req.Send()
@@ -3557,19 +3669,18 @@ const opListMultipartUploads = "ListMultipartUploads"
 
 // ListMultipartUploadsRequest generates a "aws/request.Request" representing the
 // client's request for the ListMultipartUploads operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See ListMultipartUploads for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the ListMultipartUploads method directly
-// instead.
+// See ListMultipartUploads for more information on using the ListMultipartUploads
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the ListMultipartUploadsRequest method.
 //    req, resp := client.ListMultipartUploadsRequest(params)
@@ -3579,7 +3690,7 @@ const opListMultipartUploads = "ListMultipartUploads"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListMultipartUploads
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListMultipartUploads
 func (c *S3) ListMultipartUploadsRequest(input *ListMultipartUploadsInput) (req *request.Request, output *ListMultipartUploadsOutput) {
         op := &request.Operation{
                 Name:       opListMultipartUploads,
@@ -3612,7 +3723,7 @@ func (c *S3) ListMultipartUploadsRequest(input *ListMultipartUploadsInput) (req
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation ListMultipartUploads for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListMultipartUploads
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListMultipartUploads
 func (c *S3) ListMultipartUploads(input *ListMultipartUploadsInput) (*ListMultipartUploadsOutput, error) {
         req, out := c.ListMultipartUploadsRequest(input)
         return out, req.Send()
@@ -3688,19 +3799,18 @@ const opListObjectVersions = "ListObjectVersions"
 
 // ListObjectVersionsRequest generates a "aws/request.Request" representing the
 // client's request for the ListObjectVersions operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See ListObjectVersions for usage and error information.
+// See ListObjectVersions for more information on using the ListObjectVersions
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the ListObjectVersions method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the ListObjectVersionsRequest method.
 //    req, resp := client.ListObjectVersionsRequest(params)
@@ -3710,7 +3820,7 @@ const opListObjectVersions = "ListObjectVersions"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectVersions
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectVersions
 func (c *S3) ListObjectVersionsRequest(input *ListObjectVersionsInput) (req *request.Request, output *ListObjectVersionsOutput) {
         op := &request.Operation{
                 Name:       opListObjectVersions,
@@ -3743,7 +3853,7 @@ func (c *S3) ListObjectVersionsRequest(input *ListObjectVersionsInput) (req *req
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation ListObjectVersions for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectVersions
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectVersions
 func (c *S3) ListObjectVersions(input *ListObjectVersionsInput) (*ListObjectVersionsOutput, error) {
         req, out := c.ListObjectVersionsRequest(input)
         return out, req.Send()
@@ -3819,19 +3929,18 @@ const opListObjects = "ListObjects"
 
 // ListObjectsRequest generates a "aws/request.Request" representing the
 // client's request for the ListObjects operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See ListObjects for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the ListObjects method directly
-// instead.
+// See ListObjects for more information on using the ListObjects
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the ListObjectsRequest method.
 //    req, resp := client.ListObjectsRequest(params)
@@ -3841,7 +3950,7 @@ const opListObjects = "ListObjects"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjects
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjects
 func (c *S3) ListObjectsRequest(input *ListObjectsInput) (req *request.Request, output *ListObjectsOutput) {
         op := &request.Operation{
                 Name:       opListObjects,
@@ -3881,7 +3990,7 @@ func (c *S3) ListObjectsRequest(input *ListObjectsInput) (req *request.Request,
 //   * ErrCodeNoSuchBucket "NoSuchBucket"
 //   The specified bucket does not exist.
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjects
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjects
 func (c *S3) ListObjects(input *ListObjectsInput) (*ListObjectsOutput, error) {
         req, out := c.ListObjectsRequest(input)
         return out, req.Send()
@@ -3957,19 +4066,18 @@ const opListObjectsV2 = "ListObjectsV2"
 
 // ListObjectsV2Request generates a "aws/request.Request" representing the
 // client's request for the ListObjectsV2 operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See ListObjectsV2 for usage and error information.
+// See ListObjectsV2 for more information on using the ListObjectsV2
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the ListObjectsV2 method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the ListObjectsV2Request method.
 //    req, resp := client.ListObjectsV2Request(params)
@@ -3979,7 +4087,7 @@ const opListObjectsV2 = "ListObjectsV2"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectsV2
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectsV2
 func (c *S3) ListObjectsV2Request(input *ListObjectsV2Input) (req *request.Request, output *ListObjectsV2Output) {
         op := &request.Operation{
                 Name:       opListObjectsV2,
@@ -4020,7 +4128,7 @@ func (c *S3) ListObjectsV2Request(input *ListObjectsV2Input) (req *request.Reque
 //   * ErrCodeNoSuchBucket "NoSuchBucket"
 //   The specified bucket does not exist.
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectsV2
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectsV2
 func (c *S3) ListObjectsV2(input *ListObjectsV2Input) (*ListObjectsV2Output, error) {
         req, out := c.ListObjectsV2Request(input)
         return out, req.Send()
@@ -4096,19 +4204,18 @@ const opListParts = "ListParts"
 
 // ListPartsRequest generates a "aws/request.Request" representing the
 // client's request for the ListParts operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See ListParts for usage and error information.
+// See ListParts for more information on using the ListParts
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the ListParts method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the ListPartsRequest method.
 //    req, resp := client.ListPartsRequest(params)
@@ -4118,7 +4225,7 @@ const opListParts = "ListParts"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListParts
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListParts
 func (c *S3) ListPartsRequest(input *ListPartsInput) (req *request.Request, output *ListPartsOutput) {
         op := &request.Operation{
                 Name:       opListParts,
@@ -4151,7 +4258,7 @@ func (c *S3) ListPartsRequest(input *ListPartsInput) (req *request.Request, outp
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation ListParts for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListParts
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListParts
 func (c *S3) ListParts(input *ListPartsInput) (*ListPartsOutput, error) {
         req, out := c.ListPartsRequest(input)
         return out, req.Send()
@@ -4227,19 +4334,18 @@ const opPutBucketAccelerateConfiguration = "PutBucketAccelerateConfiguration"
 
 // PutBucketAccelerateConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketAccelerateConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See PutBucketAccelerateConfiguration for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketAccelerateConfiguration method directly
-// instead.
+// See PutBucketAccelerateConfiguration for more information on using the PutBucketAccelerateConfiguration
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketAccelerateConfigurationRequest method.
 //    req, resp := client.PutBucketAccelerateConfigurationRequest(params)
@@ -4249,7 +4355,7 @@ const opPutBucketAccelerateConfiguration = "PutBucketAccelerateConfiguration"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAccelerateConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAccelerateConfiguration
 func (c *S3) PutBucketAccelerateConfigurationRequest(input *PutBucketAccelerateConfigurationInput) (req *request.Request, output *PutBucketAccelerateConfigurationOutput) {
         op := &request.Operation{
                 Name:       opPutBucketAccelerateConfiguration,
@@ -4278,7 +4384,7 @@ func (c *S3) PutBucketAccelerateConfigurationRequest(input *PutBucketAccelerateC
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketAccelerateConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAccelerateConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAccelerateConfiguration
 func (c *S3) PutBucketAccelerateConfiguration(input *PutBucketAccelerateConfigurationInput) (*PutBucketAccelerateConfigurationOutput, error) {
         req, out := c.PutBucketAccelerateConfigurationRequest(input)
         return out, req.Send()
@@ -4304,19 +4410,18 @@ const opPutBucketAcl = "PutBucketAcl"
 
 // PutBucketAclRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketAcl operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See PutBucketAcl for usage and error information.
+// See PutBucketAcl for more information on using the PutBucketAcl
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketAcl method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketAclRequest method.
 //    req, resp := client.PutBucketAclRequest(params)
@@ -4326,7 +4431,7 @@ const opPutBucketAcl = "PutBucketAcl"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAcl
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAcl
 func (c *S3) PutBucketAclRequest(input *PutBucketAclInput) (req *request.Request, output *PutBucketAclOutput) {
         op := &request.Operation{
                 Name:       opPutBucketAcl,
@@ -4355,7 +4460,7 @@ func (c *S3) PutBucketAclRequest(input *PutBucketAclInput) (req *request.Request
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketAcl for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAcl
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAcl
 func (c *S3) PutBucketAcl(input *PutBucketAclInput) (*PutBucketAclOutput, error) {
         req, out := c.PutBucketAclRequest(input)
         return out, req.Send()
@@ -4381,19 +4486,18 @@ const opPutBucketAnalyticsConfiguration = "PutBucketAnalyticsConfiguration"
 
 // PutBucketAnalyticsConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketAnalyticsConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See PutBucketAnalyticsConfiguration for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketAnalyticsConfiguration method directly
-// instead.
+// See PutBucketAnalyticsConfiguration for more information on using the PutBucketAnalyticsConfiguration
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketAnalyticsConfigurationRequest method.
 //    req, resp := client.PutBucketAnalyticsConfigurationRequest(params)
@@ -4403,7 +4507,7 @@ const opPutBucketAnalyticsConfiguration = "PutBucketAnalyticsConfiguration"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAnalyticsConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAnalyticsConfiguration
 func (c *S3) PutBucketAnalyticsConfigurationRequest(input *PutBucketAnalyticsConfigurationInput) (req *request.Request, output *PutBucketAnalyticsConfigurationOutput) {
         op := &request.Operation{
                 Name:       opPutBucketAnalyticsConfiguration,
@@ -4433,7 +4537,7 @@ func (c *S3) PutBucketAnalyticsConfigurationRequest(input *PutBucketAnalyticsCon
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketAnalyticsConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAnalyticsConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAnalyticsConfiguration
 func (c *S3) PutBucketAnalyticsConfiguration(input *PutBucketAnalyticsConfigurationInput) (*PutBucketAnalyticsConfigurationOutput, error) {
         req, out := c.PutBucketAnalyticsConfigurationRequest(input)
         return out, req.Send()
@@ -4459,19 +4563,18 @@ const opPutBucketCors = "PutBucketCors"
 
 // PutBucketCorsRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketCors operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See PutBucketCors for usage and error information.
+// See PutBucketCors for more information on using the PutBucketCors
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketCors method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketCorsRequest method.
 //    req, resp := client.PutBucketCorsRequest(params)
@@ -4481,7 +4584,7 @@ const opPutBucketCors = "PutBucketCors"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketCors
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketCors
 func (c *S3) PutBucketCorsRequest(input *PutBucketCorsInput) (req *request.Request, output *PutBucketCorsOutput) {
         op := &request.Operation{
                 Name:       opPutBucketCors,
@@ -4510,7 +4613,7 @@ func (c *S3) PutBucketCorsRequest(input *PutBucketCorsInput) (req *request.Reque
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketCors for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketCors
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketCors
 func (c *S3) PutBucketCors(input *PutBucketCorsInput) (*PutBucketCorsOutput, error) {
         req, out := c.PutBucketCorsRequest(input)
         return out, req.Send()
@@ -4532,23 +4635,99 @@ func (c *S3) PutBucketCorsWithContext(ctx aws.Context, input *PutBucketCorsInput
         return out, req.Send()
 }
 
+const opPutBucketEncryption = "PutBucketEncryption"
+
+// PutBucketEncryptionRequest generates a "aws/request.Request" representing the
+// client's request for the PutBucketEncryption operation. The "output" return
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
+//
+// See PutBucketEncryption for more information on using the PutBucketEncryption
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
+//
+//
+//    // Example sending a request using the PutBucketEncryptionRequest method.
+//    req, resp := client.PutBucketEncryptionRequest(params)
+//
+//    err := req.Send()
+//    if err == nil { // resp is now filled
+//        fmt.Println(resp)
+//    }
+//
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketEncryption
+func (c *S3) PutBucketEncryptionRequest(input *PutBucketEncryptionInput) (req *request.Request, output *PutBucketEncryptionOutput) {
+        op := &request.Operation{
+                Name:       opPutBucketEncryption,
+                HTTPMethod: "PUT",
+                HTTPPath:   "/{Bucket}?encryption",
+        }
+
+        if input == nil {
+                input = &PutBucketEncryptionInput{}
+        }
+
+        output = &PutBucketEncryptionOutput{}
+        req = c.newRequest(op, input, output)
+        req.Handlers.Unmarshal.Remove(restxml.UnmarshalHandler)
+        req.Handlers.Unmarshal.PushBackNamed(protocol.UnmarshalDiscardBodyHandler)
+        return
+}
+
+// PutBucketEncryption API operation for Amazon Simple Storage Service.
+//
+// Creates a new server-side encryption configuration (or replaces an existing
+// one, if present).
+//
+// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
+// with awserr.Error's Code and Message methods to get detailed information about
+// the error.
+//
+// See the AWS API reference guide for Amazon Simple Storage Service's
+// API operation PutBucketEncryption for usage and error information.
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketEncryption
+func (c *S3) PutBucketEncryption(input *PutBucketEncryptionInput) (*PutBucketEncryptionOutput, error) {
+        req, out := c.PutBucketEncryptionRequest(input)
+        return out, req.Send()
+}
+
+// PutBucketEncryptionWithContext is the same as PutBucketEncryption with the addition of
+// the ability to pass a context and additional request options.
+//
+// See PutBucketEncryption for details on how to use this API operation.
+//
+// The context must be non-nil and will be used for request cancellation. If
+// the context is nil a panic will occur. In the future the SDK may create
+// sub-contexts for http.Requests. See https://golang.org/pkg/context/
+// for more information on using Contexts.
+func (c *S3) PutBucketEncryptionWithContext(ctx aws.Context, input *PutBucketEncryptionInput, opts ...request.Option) (*PutBucketEncryptionOutput, error) {
+        req, out := c.PutBucketEncryptionRequest(input)
+        req.SetContext(ctx)
+        req.ApplyOptions(opts...)
+        return out, req.Send()
+}
+
 const opPutBucketInventoryConfiguration = "PutBucketInventoryConfiguration"
 
 // PutBucketInventoryConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketInventoryConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See PutBucketInventoryConfiguration for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketInventoryConfiguration method directly
-// instead.
+// See PutBucketInventoryConfiguration for more information on using the PutBucketInventoryConfiguration
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketInventoryConfigurationRequest method.
 //    req, resp := client.PutBucketInventoryConfigurationRequest(params)
@@ -4558,7 +4737,7 @@ const opPutBucketInventoryConfiguration = "PutBucketInventoryConfiguration"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketInventoryConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketInventoryConfiguration
 func (c *S3) PutBucketInventoryConfigurationRequest(input *PutBucketInventoryConfigurationInput) (req *request.Request, output *PutBucketInventoryConfigurationOutput) {
         op := &request.Operation{
                 Name:       opPutBucketInventoryConfiguration,
@@ -4588,7 +4767,7 @@ func (c *S3) PutBucketInventoryConfigurationRequest(input *PutBucketInventoryCon
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketInventoryConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketInventoryConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketInventoryConfiguration
 func (c *S3) PutBucketInventoryConfiguration(input *PutBucketInventoryConfigurationInput) (*PutBucketInventoryConfigurationOutput, error) {
         req, out := c.PutBucketInventoryConfigurationRequest(input)
         return out, req.Send()
@@ -4614,19 +4793,18 @@ const opPutBucketLifecycle = "PutBucketLifecycle"
 
 // PutBucketLifecycleRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketLifecycle operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See PutBucketLifecycle for usage and error information.
+// See PutBucketLifecycle for more information on using the PutBucketLifecycle
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketLifecycle method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketLifecycleRequest method.
 //    req, resp := client.PutBucketLifecycleRequest(params)
@@ -4636,7 +4814,7 @@ const opPutBucketLifecycle = "PutBucketLifecycle"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycle
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycle
 func (c *S3) PutBucketLifecycleRequest(input *PutBucketLifecycleInput) (req *request.Request, output *PutBucketLifecycleOutput) {
         if c.Client.Config.Logger != nil {
                 c.Client.Config.Logger.Log("This operation, PutBucketLifecycle, has been deprecated")
@@ -4668,7 +4846,7 @@ func (c *S3) PutBucketLifecycleRequest(input *PutBucketLifecycleInput) (req *req
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketLifecycle for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycle
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycle
 func (c *S3) PutBucketLifecycle(input *PutBucketLifecycleInput) (*PutBucketLifecycleOutput, error) {
         req, out := c.PutBucketLifecycleRequest(input)
         return out, req.Send()
@@ -4694,19 +4872,18 @@ const opPutBucketLifecycleConfiguration = "PutBucketLifecycleConfiguration"
 
 // PutBucketLifecycleConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketLifecycleConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See PutBucketLifecycleConfiguration for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketLifecycleConfiguration method directly
-// instead.
+// See PutBucketLifecycleConfiguration for more information on using the PutBucketLifecycleConfiguration
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketLifecycleConfigurationRequest method.
 //    req, resp := client.PutBucketLifecycleConfigurationRequest(params)
@@ -4716,7 +4893,7 @@ const opPutBucketLifecycleConfiguration = "PutBucketLifecycleConfiguration"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycleConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycleConfiguration
 func (c *S3) PutBucketLifecycleConfigurationRequest(input *PutBucketLifecycleConfigurationInput) (req *request.Request, output *PutBucketLifecycleConfigurationOutput) {
         op := &request.Operation{
                 Name:       opPutBucketLifecycleConfiguration,
@@ -4746,7 +4923,7 @@ func (c *S3) PutBucketLifecycleConfigurationRequest(input *PutBucketLifecycleCon
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketLifecycleConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycleConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycleConfiguration
 func (c *S3) PutBucketLifecycleConfiguration(input *PutBucketLifecycleConfigurationInput) (*PutBucketLifecycleConfigurationOutput, error) {
         req, out := c.PutBucketLifecycleConfigurationRequest(input)
         return out, req.Send()
@@ -4772,19 +4949,18 @@ const opPutBucketLogging = "PutBucketLogging"
 
 // PutBucketLoggingRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketLogging operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See PutBucketLogging for usage and error information.
+// See PutBucketLogging for more information on using the PutBucketLogging
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketLogging method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketLoggingRequest method.
 //    req, resp := client.PutBucketLoggingRequest(params)
@@ -4794,7 +4970,7 @@ const opPutBucketLogging = "PutBucketLogging"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLogging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLogging
 func (c *S3) PutBucketLoggingRequest(input *PutBucketLoggingInput) (req *request.Request, output *PutBucketLoggingOutput) {
         op := &request.Operation{
                 Name:       opPutBucketLogging,
@@ -4825,7 +5001,7 @@ func (c *S3) PutBucketLoggingRequest(input *PutBucketLoggingInput) (req *request
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketLogging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLogging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLogging
 func (c *S3) PutBucketLogging(input *PutBucketLoggingInput) (*PutBucketLoggingOutput, error) {
         req, out := c.PutBucketLoggingRequest(input)
         return out, req.Send()
@@ -4851,19 +5027,18 @@ const opPutBucketMetricsConfiguration = "PutBucketMetricsConfiguration"
 
 // PutBucketMetricsConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketMetricsConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See PutBucketMetricsConfiguration for usage and error information.
+// See PutBucketMetricsConfiguration for more information on using the PutBucketMetricsConfiguration
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketMetricsConfiguration method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketMetricsConfigurationRequest method.
 //    req, resp := client.PutBucketMetricsConfigurationRequest(params)
@@ -4873,7 +5048,7 @@ const opPutBucketMetricsConfiguration = "PutBucketMetricsConfiguration"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketMetricsConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketMetricsConfiguration
 func (c *S3) PutBucketMetricsConfigurationRequest(input *PutBucketMetricsConfigurationInput) (req *request.Request, output *PutBucketMetricsConfigurationOutput) {
         op := &request.Operation{
                 Name:       opPutBucketMetricsConfiguration,
@@ -4903,7 +5078,7 @@ func (c *S3) PutBucketMetricsConfigurationRequest(input *PutBucketMetricsConfigu
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketMetricsConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketMetricsConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketMetricsConfiguration
 func (c *S3) PutBucketMetricsConfiguration(input *PutBucketMetricsConfigurationInput) (*PutBucketMetricsConfigurationOutput, error) {
         req, out := c.PutBucketMetricsConfigurationRequest(input)
         return out, req.Send()
@@ -4929,19 +5104,18 @@ const opPutBucketNotification = "PutBucketNotification"
 
 // PutBucketNotificationRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketNotification operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See PutBucketNotification for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketNotification method directly
-// instead.
+// See PutBucketNotification for more information on using the PutBucketNotification
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketNotificationRequest method.
 //    req, resp := client.PutBucketNotificationRequest(params)
@@ -4951,7 +5125,7 @@ const opPutBucketNotification = "PutBucketNotification"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotification
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotification
 func (c *S3) PutBucketNotificationRequest(input *PutBucketNotificationInput) (req *request.Request, output *PutBucketNotificationOutput) {
         if c.Client.Config.Logger != nil {
                 c.Client.Config.Logger.Log("This operation, PutBucketNotification, has been deprecated")
@@ -4983,7 +5157,7 @@ func (c *S3) PutBucketNotificationRequest(input *PutBucketNotificationInput) (re
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketNotification for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotification
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotification
 func (c *S3) PutBucketNotification(input *PutBucketNotificationInput) (*PutBucketNotificationOutput, error) {
         req, out := c.PutBucketNotificationRequest(input)
         return out, req.Send()
@@ -5009,19 +5183,18 @@ const opPutBucketNotificationConfiguration = "PutBucketNotificationConfiguration
 
 // PutBucketNotificationConfigurationRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketNotificationConfiguration operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See PutBucketNotificationConfiguration for usage and error information.
+// See PutBucketNotificationConfiguration for more information on using the PutBucketNotificationConfiguration
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketNotificationConfiguration method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketNotificationConfigurationRequest method.
 //    req, resp := client.PutBucketNotificationConfigurationRequest(params)
@@ -5031,7 +5204,7 @@ const opPutBucketNotificationConfiguration = "PutBucketNotificationConfiguration
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotificationConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotificationConfiguration
 func (c *S3) PutBucketNotificationConfigurationRequest(input *PutBucketNotificationConfigurationInput) (req *request.Request, output *PutBucketNotificationConfigurationOutput) {
         op := &request.Operation{
                 Name:       opPutBucketNotificationConfiguration,
@@ -5060,7 +5233,7 @@ func (c *S3) PutBucketNotificationConfigurationRequest(input *PutBucketNotificat
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketNotificationConfiguration for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotificationConfiguration
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotificationConfiguration
 func (c *S3) PutBucketNotificationConfiguration(input *PutBucketNotificationConfigurationInput) (*PutBucketNotificationConfigurationOutput, error) {
         req, out := c.PutBucketNotificationConfigurationRequest(input)
         return out, req.Send()
@@ -5086,19 +5259,18 @@ const opPutBucketPolicy = "PutBucketPolicy"
 
 // PutBucketPolicyRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketPolicy operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See PutBucketPolicy for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketPolicy method directly
-// instead.
+// See PutBucketPolicy for more information on using the PutBucketPolicy
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketPolicyRequest method.
 //    req, resp := client.PutBucketPolicyRequest(params)
@@ -5108,7 +5280,7 @@ const opPutBucketPolicy = "PutBucketPolicy"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketPolicy
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketPolicy
 func (c *S3) PutBucketPolicyRequest(input *PutBucketPolicyInput) (req *request.Request, output *PutBucketPolicyOutput) {
         op := &request.Operation{
                 Name:       opPutBucketPolicy,
@@ -5138,7 +5310,7 @@ func (c *S3) PutBucketPolicyRequest(input *PutBucketPolicyInput) (req *request.R
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketPolicy for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketPolicy
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketPolicy
 func (c *S3) PutBucketPolicy(input *PutBucketPolicyInput) (*PutBucketPolicyOutput, error) {
         req, out := c.PutBucketPolicyRequest(input)
         return out, req.Send()
@@ -5164,19 +5336,18 @@ const opPutBucketReplication = "PutBucketReplication"
 
 // PutBucketReplicationRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketReplication operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See PutBucketReplication for usage and error information.
+// See PutBucketReplication for more information on using the PutBucketReplication
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketReplication method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketReplicationRequest method.
 //    req, resp := client.PutBucketReplicationRequest(params)
@@ -5186,7 +5357,7 @@ const opPutBucketReplication = "PutBucketReplication"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketReplication
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketReplication
 func (c *S3) PutBucketReplicationRequest(input *PutBucketReplicationInput) (req *request.Request, output *PutBucketReplicationOutput) {
         op := &request.Operation{
                 Name:       opPutBucketReplication,
@@ -5216,7 +5387,7 @@ func (c *S3) PutBucketReplicationRequest(input *PutBucketReplicationInput) (req
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketReplication for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketReplication
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketReplication
 func (c *S3) PutBucketReplication(input *PutBucketReplicationInput) (*PutBucketReplicationOutput, error) {
         req, out := c.PutBucketReplicationRequest(input)
         return out, req.Send()
@@ -5242,19 +5413,18 @@ const opPutBucketRequestPayment = "PutBucketRequestPayment"
 
 // PutBucketRequestPaymentRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketRequestPayment operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See PutBucketRequestPayment for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketRequestPayment method directly
-// instead.
+// See PutBucketRequestPayment for more information on using the PutBucketRequestPayment
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketRequestPaymentRequest method.
 //    req, resp := client.PutBucketRequestPaymentRequest(params)
@@ -5264,7 +5434,7 @@ const opPutBucketRequestPayment = "PutBucketRequestPayment"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketRequestPayment
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketRequestPayment
 func (c *S3) PutBucketRequestPaymentRequest(input *PutBucketRequestPaymentInput) (req *request.Request, output *PutBucketRequestPaymentOutput) {
         op := &request.Operation{
                 Name:       opPutBucketRequestPayment,
@@ -5297,7 +5467,7 @@ func (c *S3) PutBucketRequestPaymentRequest(input *PutBucketRequestPaymentInput)
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketRequestPayment for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketRequestPayment
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketRequestPayment
 func (c *S3) PutBucketRequestPayment(input *PutBucketRequestPaymentInput) (*PutBucketRequestPaymentOutput, error) {
         req, out := c.PutBucketRequestPaymentRequest(input)
         return out, req.Send()
@@ -5323,19 +5493,18 @@ const opPutBucketTagging = "PutBucketTagging"
 
 // PutBucketTaggingRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketTagging operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See PutBucketTagging for usage and error information.
+// See PutBucketTagging for more information on using the PutBucketTagging
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketTagging method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketTaggingRequest method.
 //    req, resp := client.PutBucketTaggingRequest(params)
@@ -5345,7 +5514,7 @@ const opPutBucketTagging = "PutBucketTagging"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketTagging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketTagging
 func (c *S3) PutBucketTaggingRequest(input *PutBucketTaggingInput) (req *request.Request, output *PutBucketTaggingOutput) {
         op := &request.Operation{
                 Name:       opPutBucketTagging,
@@ -5374,7 +5543,7 @@ func (c *S3) PutBucketTaggingRequest(input *PutBucketTaggingInput) (req *request
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketTagging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketTagging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketTagging
 func (c *S3) PutBucketTagging(input *PutBucketTaggingInput) (*PutBucketTaggingOutput, error) {
         req, out := c.PutBucketTaggingRequest(input)
         return out, req.Send()
@@ -5400,19 +5569,18 @@ const opPutBucketVersioning = "PutBucketVersioning"
 
 // PutBucketVersioningRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketVersioning operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See PutBucketVersioning for usage and error information.
+// See PutBucketVersioning for more information on using the PutBucketVersioning
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketVersioning method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketVersioningRequest method.
 //    req, resp := client.PutBucketVersioningRequest(params)
@@ -5422,7 +5590,7 @@ const opPutBucketVersioning = "PutBucketVersioning"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketVersioning
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketVersioning
 func (c *S3) PutBucketVersioningRequest(input *PutBucketVersioningInput) (req *request.Request, output *PutBucketVersioningOutput) {
         op := &request.Operation{
                 Name:       opPutBucketVersioning,
@@ -5452,7 +5620,7 @@ func (c *S3) PutBucketVersioningRequest(input *PutBucketVersioningInput) (req *r
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketVersioning for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketVersioning
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketVersioning
 func (c *S3) PutBucketVersioning(input *PutBucketVersioningInput) (*PutBucketVersioningOutput, error) {
         req, out := c.PutBucketVersioningRequest(input)
         return out, req.Send()
@@ -5478,19 +5646,18 @@ const opPutBucketWebsite = "PutBucketWebsite"
 
 // PutBucketWebsiteRequest generates a "aws/request.Request" representing the
 // client's request for the PutBucketWebsite operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See PutBucketWebsite for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutBucketWebsite method directly
-// instead.
+// See PutBucketWebsite for more information on using the PutBucketWebsite
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutBucketWebsiteRequest method.
 //    req, resp := client.PutBucketWebsiteRequest(params)
@@ -5500,7 +5667,7 @@ const opPutBucketWebsite = "PutBucketWebsite"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketWebsite
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketWebsite
 func (c *S3) PutBucketWebsiteRequest(input *PutBucketWebsiteInput) (req *request.Request, output *PutBucketWebsiteOutput) {
         op := &request.Operation{
                 Name:       opPutBucketWebsite,
@@ -5529,7 +5696,7 @@ func (c *S3) PutBucketWebsiteRequest(input *PutBucketWebsiteInput) (req *request
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutBucketWebsite for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketWebsite
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketWebsite
 func (c *S3) PutBucketWebsite(input *PutBucketWebsiteInput) (*PutBucketWebsiteOutput, error) {
         req, out := c.PutBucketWebsiteRequest(input)
         return out, req.Send()
@@ -5555,19 +5722,18 @@ const opPutObject = "PutObject"
 
 // PutObjectRequest generates a "aws/request.Request" representing the
 // client's request for the PutObject operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See PutObject for usage and error information.
+// See PutObject for more information on using the PutObject
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutObject method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutObjectRequest method.
 //    req, resp := client.PutObjectRequest(params)
@@ -5577,7 +5743,7 @@ const opPutObject = "PutObject"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObject
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObject
 func (c *S3) PutObjectRequest(input *PutObjectInput) (req *request.Request, output *PutObjectOutput) {
         op := &request.Operation{
                 Name:       opPutObject,
@@ -5604,7 +5770,7 @@ func (c *S3) PutObjectRequest(input *PutObjectInput) (req *request.Request, outp
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutObject for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObject
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObject
 func (c *S3) PutObject(input *PutObjectInput) (*PutObjectOutput, error) {
         req, out := c.PutObjectRequest(input)
         return out, req.Send()
@@ -5630,19 +5796,18 @@ const opPutObjectAcl = "PutObjectAcl"
 
 // PutObjectAclRequest generates a "aws/request.Request" representing the
 // client's request for the PutObjectAcl operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See PutObjectAcl for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutObjectAcl method directly
-// instead.
+// See PutObjectAcl for more information on using the PutObjectAcl
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutObjectAclRequest method.
 //    req, resp := client.PutObjectAclRequest(params)
@@ -5652,7 +5817,7 @@ const opPutObjectAcl = "PutObjectAcl"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectAcl
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectAcl
 func (c *S3) PutObjectAclRequest(input *PutObjectAclInput) (req *request.Request, output *PutObjectAclOutput) {
         op := &request.Operation{
                 Name:       opPutObjectAcl,
@@ -5685,7 +5850,7 @@ func (c *S3) PutObjectAclRequest(input *PutObjectAclInput) (req *request.Request
 //   * ErrCodeNoSuchKey "NoSuchKey"
 //   The specified key does not exist.
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectAcl
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectAcl
 func (c *S3) PutObjectAcl(input *PutObjectAclInput) (*PutObjectAclOutput, error) {
         req, out := c.PutObjectAclRequest(input)
         return out, req.Send()
@@ -5711,19 +5876,18 @@ const opPutObjectTagging = "PutObjectTagging"
 
 // PutObjectTaggingRequest generates a "aws/request.Request" representing the
 // client's request for the PutObjectTagging operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See PutObjectTagging for usage and error information.
+// See PutObjectTagging for more information on using the PutObjectTagging
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the PutObjectTagging method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the PutObjectTaggingRequest method.
 //    req, resp := client.PutObjectTaggingRequest(params)
@@ -5733,7 +5897,7 @@ const opPutObjectTagging = "PutObjectTagging"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectTagging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectTagging
 func (c *S3) PutObjectTaggingRequest(input *PutObjectTaggingInput) (req *request.Request, output *PutObjectTaggingOutput) {
         op := &request.Operation{
                 Name:       opPutObjectTagging,
@@ -5760,7 +5924,7 @@ func (c *S3) PutObjectTaggingRequest(input *PutObjectTaggingInput) (req *request
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation PutObjectTagging for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectTagging
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectTagging
 func (c *S3) PutObjectTagging(input *PutObjectTaggingInput) (*PutObjectTaggingOutput, error) {
         req, out := c.PutObjectTaggingRequest(input)
         return out, req.Send()
@@ -5786,19 +5950,18 @@ const opRestoreObject = "RestoreObject"
 
 // RestoreObjectRequest generates a "aws/request.Request" representing the
 // client's request for the RestoreObject operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See RestoreObject for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the RestoreObject method directly
-// instead.
+// See RestoreObject for more information on using the RestoreObject
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the RestoreObjectRequest method.
 //    req, resp := client.RestoreObjectRequest(params)
@@ -5808,7 +5971,7 @@ const opRestoreObject = "RestoreObject"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreObject
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreObject
 func (c *S3) RestoreObjectRequest(input *RestoreObjectInput) (req *request.Request, output *RestoreObjectOutput) {
         op := &request.Operation{
                 Name:       opRestoreObject,
@@ -5840,7 +6003,7 @@ func (c *S3) RestoreObjectRequest(input *RestoreObjectInput) (req *request.Reque
 //   * ErrCodeObjectAlreadyInActiveTierError "ObjectAlreadyInActiveTierError"
 //   This operation is not allowed against this storage tier
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreObject
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreObject
 func (c *S3) RestoreObject(input *RestoreObjectInput) (*RestoreObjectOutput, error) {
         req, out := c.RestoreObjectRequest(input)
         return out, req.Send()
@@ -5862,23 +6025,104 @@ func (c *S3) RestoreObjectWithContext(ctx aws.Context, input *RestoreObjectInput
         return out, req.Send()
 }
 
+const opSelectObjectContent = "SelectObjectContent"
+
+// SelectObjectContentRequest generates a "aws/request.Request" representing the
+// client's request for the SelectObjectContent operation. The "output" return
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
+//
+// See SelectObjectContent for more information on using the SelectObjectContent
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
+//
+//
+//    // Example sending a request using the SelectObjectContentRequest method.
+//    req, resp := client.SelectObjectContentRequest(params)
+//
+//    err := req.Send()
+//    if err == nil { // resp is now filled
+//        fmt.Println(resp)
+//    }
+//
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/SelectObjectContent
+func (c *S3) SelectObjectContentRequest(input *SelectObjectContentInput) (req *request.Request, output *SelectObjectContentOutput) {
+        op := &request.Operation{
+                Name:       opSelectObjectContent,
+                HTTPMethod: "POST",
+                HTTPPath:   "/{Bucket}/{Key+}?select&select-type=2",
+        }
+
+        if input == nil {
+                input = &SelectObjectContentInput{}
+        }
+
+        output = &SelectObjectContentOutput{}
+        req = c.newRequest(op, input, output)
+        req.Handlers.Send.Swap(client.LogHTTPResponseHandler.Name, client.LogHTTPResponseHeaderHandler)
+        req.Handlers.Unmarshal.Swap(restxml.UnmarshalHandler.Name, rest.UnmarshalHandler)
+        req.Handlers.Unmarshal.PushBack(output.runEventStreamLoop)
+        return
+}
+
+// SelectObjectContent API operation for Amazon Simple Storage Service.
+//
+// This operation filters the contents of an Amazon S3 object based on a simple
+// Structured Query Language (SQL) statement. In the request, along with the
+// SQL expression, you must also specify a data serialization format (JSON or
+// CSV) of the object. Amazon S3 uses this to parse object data into records,
+// and returns only records that match the specified SQL expression. You must
+// also specify the data serialization format for the response.
+//
+// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
+// with awserr.Error's Code and Message methods to get detailed information about
+// the error.
+//
+// See the AWS API reference guide for Amazon Simple Storage Service's
+// API operation SelectObjectContent for usage and error information.
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/SelectObjectContent
+func (c *S3) SelectObjectContent(input *SelectObjectContentInput) (*SelectObjectContentOutput, error) {
+        req, out := c.SelectObjectContentRequest(input)
+        return out, req.Send()
+}
+
+// SelectObjectContentWithContext is the same as SelectObjectContent with the addition of
+// the ability to pass a context and additional request options.
+//
+// See SelectObjectContent for details on how to use this API operation.
+//
+// The context must be non-nil and will be used for request cancellation. If
+// the context is nil a panic will occur. In the future the SDK may create
+// sub-contexts for http.Requests. See https://golang.org/pkg/context/
+// for more information on using Contexts.
+func (c *S3) SelectObjectContentWithContext(ctx aws.Context, input *SelectObjectContentInput, opts ...request.Option) (*SelectObjectContentOutput, error) {
+        req, out := c.SelectObjectContentRequest(input)
+        req.SetContext(ctx)
+        req.ApplyOptions(opts...)
+        return out, req.Send()
+}
+
 const opUploadPart = "UploadPart"
 
 // UploadPartRequest generates a "aws/request.Request" representing the
 // client's request for the UploadPart operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See UploadPart for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the UploadPart method directly
-// instead.
+// See UploadPart for more information on using the UploadPart
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the UploadPartRequest method.
 //    req, resp := client.UploadPartRequest(params)
@@ -5888,7 +6132,7 @@ const opUploadPart = "UploadPart"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPart
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPart
 func (c *S3) UploadPartRequest(input *UploadPartInput) (req *request.Request, output *UploadPartOutput) {
         op := &request.Operation{
                 Name:       opUploadPart,
@@ -5921,7 +6165,7 @@ func (c *S3) UploadPartRequest(input *UploadPartInput) (req *request.Request, ou
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation UploadPart for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPart
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPart
 func (c *S3) UploadPart(input *UploadPartInput) (*UploadPartOutput, error) {
         req, out := c.UploadPartRequest(input)
         return out, req.Send()
@@ -5947,19 +6191,18 @@ const opUploadPartCopy = "UploadPartCopy"
 
 // UploadPartCopyRequest generates a "aws/request.Request" representing the
 // client's request for the UploadPartCopy operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See UploadPartCopy for usage and error information.
+// See UploadPartCopy for more information on using the UploadPartCopy
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the UploadPartCopy method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the UploadPartCopyRequest method.
 //    req, resp := client.UploadPartCopyRequest(params)
@@ -5969,7 +6212,7 @@ const opUploadPartCopy = "UploadPartCopy"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPartCopy
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPartCopy
 func (c *S3) UploadPartCopyRequest(input *UploadPartCopyInput) (req *request.Request, output *UploadPartCopyOutput) {
         op := &request.Operation{
                 Name:       opUploadPartCopy,
@@ -5996,7 +6239,7 @@ func (c *S3) UploadPartCopyRequest(input *UploadPartCopyInput) (req *request.Req
 //
 // See the AWS API reference guide for Amazon Simple Storage Service's
 // API operation UploadPartCopy for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPartCopy
+// See also, https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPartCopy
 func (c *S3) UploadPartCopy(input *UploadPartCopyInput) (*UploadPartCopyOutput, error) {
         req, out := c.UploadPartCopyRequest(input)
         return out, req.Send()
@@ -6020,7 +6263,6 @@ func (c *S3) UploadPartCopyWithContext(ctx aws.Context, input *UploadPartCopyInp
 
 // Specifies the days since the initiation of an Incomplete Multipart Upload
 // that Lifecycle will wait before permanently removing all parts of the upload.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AbortIncompleteMultipartUpload
 type AbortIncompleteMultipartUpload struct {
         _ struct{} `type:"structure"`
 
@@ -6045,7 +6287,6 @@ func (s *AbortIncompleteMultipartUpload) SetDaysAfterInitiation(v int64) *AbortI
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AbortMultipartUploadRequest
 type AbortMultipartUploadInput struct {
         _ struct{} `type:"structure"`
 
@@ -6103,6 +6344,13 @@ func (s *AbortMultipartUploadInput) SetBucket(v string) *AbortMultipartUploadInp
         return s
 }
 
+func (s *AbortMultipartUploadInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetKey sets the Key field's value.
 func (s *AbortMultipartUploadInput) SetKey(v string) *AbortMultipartUploadInput {
         s.Key = &v
@@ -6121,7 +6369,6 @@ func (s *AbortMultipartUploadInput) SetUploadId(v string) *AbortMultipartUploadI
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AbortMultipartUploadOutput
 type AbortMultipartUploadOutput struct {
         _ struct{} `type:"structure"`
 
@@ -6146,7 +6393,6 @@ func (s *AbortMultipartUploadOutput) SetRequestCharged(v string) *AbortMultipart
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AccelerateConfiguration
 type AccelerateConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -6170,7 +6416,6 @@ func (s *AccelerateConfiguration) SetStatus(v string) *AccelerateConfiguration {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AccessControlPolicy
 type AccessControlPolicy struct {
         _ struct{} `type:"structure"`
 
@@ -6222,7 +6467,45 @@ func (s *AccessControlPolicy) SetOwner(v *Owner) *AccessControlPolicy {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AnalyticsAndOperator
+// Container for information regarding the access control for replicas.
+type AccessControlTranslation struct {
+        _ struct{} `type:"structure"`
+
+        // The override value for the owner of the replica object.
+        //
+        // Owner is a required field
+        Owner *string `type:"string" required:"true" enum:"OwnerOverride"`
+}
+
+// String returns the string representation
+func (s AccessControlTranslation) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s AccessControlTranslation) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *AccessControlTranslation) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "AccessControlTranslation"}
+        if s.Owner == nil {
+                invalidParams.Add(request.NewErrParamRequired("Owner"))
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetOwner sets the Owner field's value.
+func (s *AccessControlTranslation) SetOwner(v string) *AccessControlTranslation {
+        s.Owner = &v
+        return s
+}
+
 type AnalyticsAndOperator struct {
         _ struct{} `type:"structure"`
 
@@ -6275,7 +6558,6 @@ func (s *AnalyticsAndOperator) SetTags(v []*Tag) *AnalyticsAndOperator {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AnalyticsConfiguration
 type AnalyticsConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -6350,7 +6632,6 @@ func (s *AnalyticsConfiguration) SetStorageClassAnalysis(v *StorageClassAnalysis
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AnalyticsExportDestination
 type AnalyticsExportDestination struct {
         _ struct{} `type:"structure"`
 
@@ -6394,7 +6675,6 @@ func (s *AnalyticsExportDestination) SetS3BucketDestination(v *AnalyticsS3Bucket
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AnalyticsFilter
 type AnalyticsFilter struct {
         _ struct{} `type:"structure"`
 
@@ -6457,7 +6737,6 @@ func (s *AnalyticsFilter) SetTag(v *Tag) *AnalyticsFilter {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/AnalyticsS3BucketDestination
 type AnalyticsS3BucketDestination struct {
         _ struct{} `type:"structure"`
 
@@ -6512,6 +6791,13 @@ func (s *AnalyticsS3BucketDestination) SetBucket(v string) *AnalyticsS3BucketDes
         return s
 }
 
+func (s *AnalyticsS3BucketDestination) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetBucketAccountId sets the BucketAccountId field's value.
 func (s *AnalyticsS3BucketDestination) SetBucketAccountId(v string) *AnalyticsS3BucketDestination {
         s.BucketAccountId = &v
@@ -6530,12 +6816,11 @@ func (s *AnalyticsS3BucketDestination) SetPrefix(v string) *AnalyticsS3BucketDes
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Bucket
 type Bucket struct {
         _ struct{} `type:"structure"`
 
         // Date the bucket was created.
-        CreationDate *time.Time `type:"timestamp" timestampFormat:"iso8601"`
+        CreationDate *time.Time `type:"timestamp"`
 
         // The name of the bucket.
         Name *string `type:"string"`
@@ -6563,7 +6848,6 @@ func (s *Bucket) SetName(v string) *Bucket {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/BucketLifecycleConfiguration
 type BucketLifecycleConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -6610,10 +6894,12 @@ func (s *BucketLifecycleConfiguration) SetRules(v []*LifecycleRule) *BucketLifec
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/BucketLoggingStatus
 type BucketLoggingStatus struct {
         _ struct{} `type:"structure"`
 
+        // Container for logging information. Presence of this element indicates that
+        // logging is enabled. Parameters TargetBucket and TargetPrefix are required
+        // in this case.
         LoggingEnabled *LoggingEnabled `type:"structure"`
 }
 
@@ -6648,7 +6934,6 @@ func (s *BucketLoggingStatus) SetLoggingEnabled(v *LoggingEnabled) *BucketLoggin
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CORSConfiguration
 type CORSConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -6695,7 +6980,6 @@ func (s *CORSConfiguration) SetCORSRules(v []*CORSRule) *CORSConfiguration {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CORSRule
 type CORSRule struct {
         _ struct{} `type:"structure"`
 
@@ -6779,7 +7063,149 @@ func (s *CORSRule) SetMaxAgeSeconds(v int64) *CORSRule {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CloudFunctionConfiguration
+// Describes how a CSV-formatted input object is formatted.
+type CSVInput struct {
+        _ struct{} `type:"structure"`
+
+        // Specifies that CSV field values may contain quoted record delimiters and
+        // such records should be allowed. Default value is FALSE. Setting this value
+        // to TRUE may lower performance.
+        AllowQuotedRecordDelimiter *bool `type:"boolean"`
+
+        // Single character used to indicate a row should be ignored when present at
+        // the start of a row.
+        Comments *string `type:"string"`
+
+        // Value used to separate individual fields in a record.
+        FieldDelimiter *string `type:"string"`
+
+        // Describes the first line of input. Valid values: None, Ignore, Use.
+        FileHeaderInfo *string `type:"string" enum:"FileHeaderInfo"`
+
+        // Value used for escaping where the field delimiter is part of the value.
+        QuoteCharacter *string `type:"string"`
+
+        // Single character used for escaping the quote character inside an already
+        // escaped value.
+        QuoteEscapeCharacter *string `type:"string"`
+
+        // Value used to separate individual records.
+        RecordDelimiter *string `type:"string"`
+}
+
+// String returns the string representation
+func (s CSVInput) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s CSVInput) GoString() string {
+        return s.String()
+}
+
+// SetAllowQuotedRecordDelimiter sets the AllowQuotedRecordDelimiter field's value.
+func (s *CSVInput) SetAllowQuotedRecordDelimiter(v bool) *CSVInput {
+        s.AllowQuotedRecordDelimiter = &v
+        return s
+}
+
+// SetComments sets the Comments field's value.
+func (s *CSVInput) SetComments(v string) *CSVInput {
+        s.Comments = &v
+        return s
+}
+
+// SetFieldDelimiter sets the FieldDelimiter field's value.
+func (s *CSVInput) SetFieldDelimiter(v string) *CSVInput {
+        s.FieldDelimiter = &v
+        return s
+}
+
+// SetFileHeaderInfo sets the FileHeaderInfo field's value.
+func (s *CSVInput) SetFileHeaderInfo(v string) *CSVInput {
+        s.FileHeaderInfo = &v
+        return s
+}
+
+// SetQuoteCharacter sets the QuoteCharacter field's value.
+func (s *CSVInput) SetQuoteCharacter(v string) *CSVInput {
+        s.QuoteCharacter = &v
+        return s
+}
+
+// SetQuoteEscapeCharacter sets the QuoteEscapeCharacter field's value.
+func (s *CSVInput) SetQuoteEscapeCharacter(v string) *CSVInput {
+        s.QuoteEscapeCharacter = &v
+        return s
+}
+
+// SetRecordDelimiter sets the RecordDelimiter field's value.
+func (s *CSVInput) SetRecordDelimiter(v string) *CSVInput {
+        s.RecordDelimiter = &v
+        return s
+}
+
+// Describes how CSV-formatted results are formatted.
+type CSVOutput struct {
+        _ struct{} `type:"structure"`
+
+        // Value used to separate individual fields in a record.
+        FieldDelimiter *string `type:"string"`
+
+        // Value used for escaping where the field delimiter is part of the value.
+        QuoteCharacter *string `type:"string"`
+
+        // Single character used for escaping the quote character inside an already
+        // escaped value.
+        QuoteEscapeCharacter *string `type:"string"`
+
+        // Indicates whether or not all output fields should be quoted.
+        QuoteFields *string `type:"string" enum:"QuoteFields"`
+
+        // Value used to separate individual records.
+        RecordDelimiter *string `type:"string"`
+}
+
+// String returns the string representation
+func (s CSVOutput) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s CSVOutput) GoString() string {
+        return s.String()
+}
+
+// SetFieldDelimiter sets the FieldDelimiter field's value.
+func (s *CSVOutput) SetFieldDelimiter(v string) *CSVOutput {
+        s.FieldDelimiter = &v
+        return s
+}
+
+// SetQuoteCharacter sets the QuoteCharacter field's value.
+func (s *CSVOutput) SetQuoteCharacter(v string) *CSVOutput {
+        s.QuoteCharacter = &v
+        return s
+}
+
+// SetQuoteEscapeCharacter sets the QuoteEscapeCharacter field's value.
+func (s *CSVOutput) SetQuoteEscapeCharacter(v string) *CSVOutput {
+        s.QuoteEscapeCharacter = &v
+        return s
+}
+
+// SetQuoteFields sets the QuoteFields field's value.
+func (s *CSVOutput) SetQuoteFields(v string) *CSVOutput {
+        s.QuoteFields = &v
+        return s
+}
+
+// SetRecordDelimiter sets the RecordDelimiter field's value.
+func (s *CSVOutput) SetRecordDelimiter(v string) *CSVOutput {
+        s.RecordDelimiter = &v
+        return s
+}
+
 type CloudFunctionConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -6837,7 +7263,6 @@ func (s *CloudFunctionConfiguration) SetInvocationRole(v string) *CloudFunctionC
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CommonPrefix
 type CommonPrefix struct {
         _ struct{} `type:"structure"`
 
@@ -6860,7 +7285,6 @@ func (s *CommonPrefix) SetPrefix(v string) *CommonPrefix {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompleteMultipartUploadRequest
 type CompleteMultipartUploadInput struct {
         _ struct{} `type:"structure" payload:"MultipartUpload"`
 
@@ -6870,7 +7294,7 @@ type CompleteMultipartUploadInput struct {
         // Key is a required field
         Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
 
-        MultipartUpload *CompletedMultipartUpload `locationName:"CompleteMultipartUpload" type:"structure"`
+        MultipartUpload *CompletedMultipartUpload `locationName:"CompleteMultipartUpload" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 
         // Confirms that the requester knows that she or he will be charged for the
         // request. Bucket owners need not specify this parameter in their requests.
@@ -6920,6 +7344,13 @@ func (s *CompleteMultipartUploadInput) SetBucket(v string) *CompleteMultipartUpl
         return s
 }
 
+func (s *CompleteMultipartUploadInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetKey sets the Key field's value.
 func (s *CompleteMultipartUploadInput) SetKey(v string) *CompleteMultipartUploadInput {
         s.Key = &v
@@ -6944,7 +7375,6 @@ func (s *CompleteMultipartUploadInput) SetUploadId(v string) *CompleteMultipartU
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompleteMultipartUploadOutput
 type CompleteMultipartUploadOutput struct {
         _ struct{} `type:"structure"`
 
@@ -6993,6 +7423,13 @@ func (s *CompleteMultipartUploadOutput) SetBucket(v string) *CompleteMultipartUp
         return s
 }
 
+func (s *CompleteMultipartUploadOutput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetETag sets the ETag field's value.
 func (s *CompleteMultipartUploadOutput) SetETag(v string) *CompleteMultipartUploadOutput {
         s.ETag = &v
@@ -7041,7 +7478,6 @@ func (s *CompleteMultipartUploadOutput) SetVersionId(v string) *CompleteMultipar
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompletedMultipartUpload
 type CompletedMultipartUpload struct {
         _ struct{} `type:"structure"`
 
@@ -7064,7 +7500,6 @@ func (s *CompletedMultipartUpload) SetParts(v []*CompletedPart) *CompletedMultip
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompletedPart
 type CompletedPart struct {
         _ struct{} `type:"structure"`
 
@@ -7098,7 +7533,6 @@ func (s *CompletedPart) SetPartNumber(v int64) *CompletedPart {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Condition
 type Condition struct {
         _ struct{} `type:"structure"`
 
@@ -7141,7 +7575,32 @@ func (s *Condition) SetKeyPrefixEquals(v string) *Condition {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyObjectRequest
+type ContinuationEvent struct {
+        _ struct{} `locationName:"ContinuationEvent" type:"structure"`
+}
+
+// String returns the string representation
+func (s ContinuationEvent) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s ContinuationEvent) GoString() string {
+        return s.String()
+}
+
+// The ContinuationEvent is and event in the SelectObjectContentEventStream group of events.
+func (s *ContinuationEvent) eventSelectObjectContentEventStream() {}
+
+// UnmarshalEvent unmarshals the EventStream Message into the ContinuationEvent value.
+// This method is only used internally within the SDK's EventStream handling.
+func (s *ContinuationEvent) UnmarshalEvent(
+        payloadUnmarshaler protocol.PayloadUnmarshaler,
+        msg eventstream.Message,
+) error {
+        return nil
+}
+
 type CopyObjectInput struct {
         _ struct{} `type:"structure"`
 
@@ -7178,14 +7637,14 @@ type CopyObjectInput struct {
         CopySourceIfMatch *string `location:"header" locationName:"x-amz-copy-source-if-match" type:"string"`
 
         // Copies the object if it has been modified since the specified time.
-        CopySourceIfModifiedSince *time.Time `location:"header" locationName:"x-amz-copy-source-if-modified-since" type:"timestamp" timestampFormat:"rfc822"`
+        CopySourceIfModifiedSince *time.Time `location:"header" locationName:"x-amz-copy-source-if-modified-since" type:"timestamp"`
 
         // Copies the object if its entity tag (ETag) is different than the specified
         // ETag.
         CopySourceIfNoneMatch *string `location:"header" locationName:"x-amz-copy-source-if-none-match" type:"string"`
 
         // Copies the object if it hasn't been modified since the specified time.
-        CopySourceIfUnmodifiedSince *time.Time `location:"header" locationName:"x-amz-copy-source-if-unmodified-since" type:"timestamp" timestampFormat:"rfc822"`
+        CopySourceIfUnmodifiedSince *time.Time `location:"header" locationName:"x-amz-copy-source-if-unmodified-since" type:"timestamp"`
 
         // Specifies the algorithm to use when decrypting the source object (e.g., AES256).
         CopySourceSSECustomerAlgorithm *string `location:"header" locationName:"x-amz-copy-source-server-side-encryption-customer-algorithm" type:"string"`
@@ -7201,7 +7660,7 @@ type CopyObjectInput struct {
         CopySourceSSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-copy-source-server-side-encryption-customer-key-MD5" type:"string"`
 
         // The date and time at which the object is no longer cacheable.
-        Expires *time.Time `location:"header" locationName:"Expires" type:"timestamp" timestampFormat:"rfc822"`
+        Expires *time.Time `location:"header" locationName:"Expires" type:"timestamp"`
 
         // Gives the grantee READ, READ_ACP, and WRITE_ACP permissions on the object.
         GrantFullControl *string `location:"header" locationName:"x-amz-grant-full-control" type:"string"`
@@ -7318,6 +7777,13 @@ func (s *CopyObjectInput) SetBucket(v string) *CopyObjectInput {
         return s
 }
 
+func (s *CopyObjectInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetCacheControl sets the CacheControl field's value.
 func (s *CopyObjectInput) SetCacheControl(v string) *CopyObjectInput {
         s.CacheControl = &v
@@ -7390,6 +7856,13 @@ func (s *CopyObjectInput) SetCopySourceSSECustomerKey(v string) *CopyObjectInput
         return s
 }
 
+func (s *CopyObjectInput) getCopySourceSSECustomerKey() (v string) {
+        if s.CopySourceSSECustomerKey == nil {
+                return v
+        }
+        return *s.CopySourceSSECustomerKey
+}
+
 // SetCopySourceSSECustomerKeyMD5 sets the CopySourceSSECustomerKeyMD5 field's value.
 func (s *CopyObjectInput) SetCopySourceSSECustomerKeyMD5(v string) *CopyObjectInput {
         s.CopySourceSSECustomerKeyMD5 = &v
@@ -7462,6 +7935,13 @@ func (s *CopyObjectInput) SetSSECustomerKey(v string) *CopyObjectInput {
         return s
 }
 
+func (s *CopyObjectInput) getSSECustomerKey() (v string) {
+        if s.SSECustomerKey == nil {
+                return v
+        }
+        return *s.SSECustomerKey
+}
+
 // SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
 func (s *CopyObjectInput) SetSSECustomerKeyMD5(v string) *CopyObjectInput {
         s.SSECustomerKeyMD5 = &v
@@ -7504,7 +7984,6 @@ func (s *CopyObjectInput) SetWebsiteRedirectLocation(v string) *CopyObjectInput
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyObjectOutput
 type CopyObjectOutput struct {
         _ struct{} `type:"structure" payload:"CopyObjectResult"`
 
@@ -7605,13 +8084,12 @@ func (s *CopyObjectOutput) SetVersionId(v string) *CopyObjectOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyObjectResult
 type CopyObjectResult struct {
         _ struct{} `type:"structure"`
 
         ETag *string `type:"string"`
 
-        LastModified *time.Time `type:"timestamp" timestampFormat:"iso8601"`
+        LastModified *time.Time `type:"timestamp"`
 }
 
 // String returns the string representation
@@ -7636,7 +8114,6 @@ func (s *CopyObjectResult) SetLastModified(v time.Time) *CopyObjectResult {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CopyPartResult
 type CopyPartResult struct {
         _ struct{} `type:"structure"`
 
@@ -7644,7 +8121,7 @@ type CopyPartResult struct {
         ETag *string `type:"string"`
 
         // Date and time at which the object was uploaded.
-        LastModified *time.Time `type:"timestamp" timestampFormat:"iso8601"`
+        LastModified *time.Time `type:"timestamp"`
 }
 
 // String returns the string representation
@@ -7669,7 +8146,6 @@ func (s *CopyPartResult) SetLastModified(v time.Time) *CopyPartResult {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateBucketConfiguration
 type CreateBucketConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -7694,7 +8170,6 @@ func (s *CreateBucketConfiguration) SetLocationConstraint(v string) *CreateBucke
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateBucketRequest
 type CreateBucketInput struct {
         _ struct{} `type:"structure" payload:"CreateBucketConfiguration"`
 
@@ -7704,7 +8179,7 @@ type CreateBucketInput struct {
         // Bucket is a required field
         Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
 
-        CreateBucketConfiguration *CreateBucketConfiguration `locationName:"CreateBucketConfiguration" type:"structure"`
+        CreateBucketConfiguration *CreateBucketConfiguration `locationName:"CreateBucketConfiguration" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 
         // Allows grantee the read, write, read ACP, and write ACP permissions on the
         // bucket.
@@ -7758,6 +8233,13 @@ func (s *CreateBucketInput) SetBucket(v string) *CreateBucketInput {
         return s
 }
 
+func (s *CreateBucketInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetCreateBucketConfiguration sets the CreateBucketConfiguration field's value.
 func (s *CreateBucketInput) SetCreateBucketConfiguration(v *CreateBucketConfiguration) *CreateBucketInput {
         s.CreateBucketConfiguration = v
@@ -7794,7 +8276,6 @@ func (s *CreateBucketInput) SetGrantWriteACP(v string) *CreateBucketInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateBucketOutput
 type CreateBucketOutput struct {
         _ struct{} `type:"structure"`
 
@@ -7817,7 +8298,6 @@ func (s *CreateBucketOutput) SetLocation(v string) *CreateBucketOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateMultipartUploadRequest
 type CreateMultipartUploadInput struct {
         _ struct{} `type:"structure"`
 
@@ -7845,7 +8325,7 @@ type CreateMultipartUploadInput struct {
         ContentType *string `location:"header" locationName:"Content-Type" type:"string"`
 
         // The date and time at which the object is no longer cacheable.
-        Expires *time.Time `location:"header" locationName:"Expires" type:"timestamp" timestampFormat:"rfc822"`
+        Expires *time.Time `location:"header" locationName:"Expires" type:"timestamp"`
 
         // Gives the grantee READ, READ_ACP, and WRITE_ACP permissions on the object.
         GrantFullControl *string `location:"header" locationName:"x-amz-grant-full-control" type:"string"`
@@ -7899,6 +8379,9 @@ type CreateMultipartUploadInput struct {
         // The type of storage to use for the object. Defaults to 'STANDARD'.
         StorageClass *string `location:"header" locationName:"x-amz-storage-class" type:"string" enum:"StorageClass"`
 
+        // The tag-set for the object. The tag-set must be encoded as URL Query parameters
+        Tagging *string `location:"header" locationName:"x-amz-tagging" type:"string"`
+
         // If the bucket is configured as a website, redirects requests for this object
         // to another object in the same bucket or to an external URL. Amazon S3 stores
         // the value of this header in the object metadata.
@@ -7946,6 +8429,13 @@ func (s *CreateMultipartUploadInput) SetBucket(v string) *CreateMultipartUploadI
         return s
 }
 
+func (s *CreateMultipartUploadInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetCacheControl sets the CacheControl field's value.
 func (s *CreateMultipartUploadInput) SetCacheControl(v string) *CreateMultipartUploadInput {
         s.CacheControl = &v
@@ -8036,6 +8526,13 @@ func (s *CreateMultipartUploadInput) SetSSECustomerKey(v string) *CreateMultipar
         return s
 }
 
+func (s *CreateMultipartUploadInput) getSSECustomerKey() (v string) {
+        if s.SSECustomerKey == nil {
+                return v
+        }
+        return *s.SSECustomerKey
+}
+
 // SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
 func (s *CreateMultipartUploadInput) SetSSECustomerKeyMD5(v string) *CreateMultipartUploadInput {
         s.SSECustomerKeyMD5 = &v
@@ -8060,18 +8557,23 @@ func (s *CreateMultipartUploadInput) SetStorageClass(v string) *CreateMultipartU
         return s
 }
 
+// SetTagging sets the Tagging field's value.
+func (s *CreateMultipartUploadInput) SetTagging(v string) *CreateMultipartUploadInput {
+        s.Tagging = &v
+        return s
+}
+
 // SetWebsiteRedirectLocation sets the WebsiteRedirectLocation field's value.
 func (s *CreateMultipartUploadInput) SetWebsiteRedirectLocation(v string) *CreateMultipartUploadInput {
         s.WebsiteRedirectLocation = &v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CreateMultipartUploadOutput
 type CreateMultipartUploadOutput struct {
         _ struct{} `type:"structure"`
 
         // Date when multipart upload will become eligible for abort operation by lifecycle.
-        AbortDate *time.Time `location:"header" locationName:"x-amz-abort-date" type:"timestamp" timestampFormat:"rfc822"`
+        AbortDate *time.Time `location:"header" locationName:"x-amz-abort-date" type:"timestamp"`
 
         // Id of the lifecycle rule that makes a multipart upload eligible for abort
         // operation.
@@ -8137,6 +8639,13 @@ func (s *CreateMultipartUploadOutput) SetBucket(v string) *CreateMultipartUpload
         return s
 }
 
+func (s *CreateMultipartUploadOutput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetKey sets the Key field's value.
 func (s *CreateMultipartUploadOutput) SetKey(v string) *CreateMultipartUploadOutput {
         s.Key = &v
@@ -8179,7 +8688,6 @@ func (s *CreateMultipartUploadOutput) SetUploadId(v string) *CreateMultipartUplo
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Delete
 type Delete struct {
         _ struct{} `type:"structure"`
 
@@ -8236,7 +8744,6 @@ func (s *Delete) SetQuiet(v bool) *Delete {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketAnalyticsConfigurationRequest
 type DeleteBucketAnalyticsConfigurationInput struct {
         _ struct{} `type:"structure"`
 
@@ -8283,13 +8790,19 @@ func (s *DeleteBucketAnalyticsConfigurationInput) SetBucket(v string) *DeleteBuc
         return s
 }
 
+func (s *DeleteBucketAnalyticsConfigurationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetId sets the Id field's value.
 func (s *DeleteBucketAnalyticsConfigurationInput) SetId(v string) *DeleteBucketAnalyticsConfigurationInput {
         s.Id = &v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketAnalyticsConfigurationOutput
 type DeleteBucketAnalyticsConfigurationOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -8304,7 +8817,6 @@ func (s DeleteBucketAnalyticsConfigurationOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketCorsRequest
 type DeleteBucketCorsInput struct {
         _ struct{} `type:"structure"`
 
@@ -8341,7 +8853,13 @@ func (s *DeleteBucketCorsInput) SetBucket(v string) *DeleteBucketCorsInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketCorsOutput
+func (s *DeleteBucketCorsInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type DeleteBucketCorsOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -8356,7 +8874,66 @@ func (s DeleteBucketCorsOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketRequest
+type DeleteBucketEncryptionInput struct {
+        _ struct{} `type:"structure"`
+
+        // The name of the bucket containing the server-side encryption configuration
+        // to delete.
+        //
+        // Bucket is a required field
+        Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
+}
+
+// String returns the string representation
+func (s DeleteBucketEncryptionInput) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s DeleteBucketEncryptionInput) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *DeleteBucketEncryptionInput) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "DeleteBucketEncryptionInput"}
+        if s.Bucket == nil {
+                invalidParams.Add(request.NewErrParamRequired("Bucket"))
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetBucket sets the Bucket field's value.
+func (s *DeleteBucketEncryptionInput) SetBucket(v string) *DeleteBucketEncryptionInput {
+        s.Bucket = &v
+        return s
+}
+
+func (s *DeleteBucketEncryptionInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
+type DeleteBucketEncryptionOutput struct {
+        _ struct{} `type:"structure"`
+}
+
+// String returns the string representation
+func (s DeleteBucketEncryptionOutput) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s DeleteBucketEncryptionOutput) GoString() string {
+        return s.String()
+}
+
 type DeleteBucketInput struct {
         _ struct{} `type:"structure"`
 
@@ -8393,7 +8970,13 @@ func (s *DeleteBucketInput) SetBucket(v string) *DeleteBucketInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketInventoryConfigurationRequest
+func (s *DeleteBucketInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type DeleteBucketInventoryConfigurationInput struct {
         _ struct{} `type:"structure"`
 
@@ -8440,13 +9023,19 @@ func (s *DeleteBucketInventoryConfigurationInput) SetBucket(v string) *DeleteBuc
         return s
 }
 
+func (s *DeleteBucketInventoryConfigurationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetId sets the Id field's value.
 func (s *DeleteBucketInventoryConfigurationInput) SetId(v string) *DeleteBucketInventoryConfigurationInput {
         s.Id = &v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketInventoryConfigurationOutput
 type DeleteBucketInventoryConfigurationOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -8461,7 +9050,6 @@ func (s DeleteBucketInventoryConfigurationOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketLifecycleRequest
 type DeleteBucketLifecycleInput struct {
         _ struct{} `type:"structure"`
 
@@ -8498,7 +9086,13 @@ func (s *DeleteBucketLifecycleInput) SetBucket(v string) *DeleteBucketLifecycleI
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketLifecycleOutput
+func (s *DeleteBucketLifecycleInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type DeleteBucketLifecycleOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -8513,7 +9107,6 @@ func (s DeleteBucketLifecycleOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketMetricsConfigurationRequest
 type DeleteBucketMetricsConfigurationInput struct {
         _ struct{} `type:"structure"`
 
@@ -8560,13 +9153,19 @@ func (s *DeleteBucketMetricsConfigurationInput) SetBucket(v string) *DeleteBucke
         return s
 }
 
+func (s *DeleteBucketMetricsConfigurationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetId sets the Id field's value.
 func (s *DeleteBucketMetricsConfigurationInput) SetId(v string) *DeleteBucketMetricsConfigurationInput {
         s.Id = &v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketMetricsConfigurationOutput
 type DeleteBucketMetricsConfigurationOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -8581,7 +9180,6 @@ func (s DeleteBucketMetricsConfigurationOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketOutput
 type DeleteBucketOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -8596,7 +9194,6 @@ func (s DeleteBucketOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketPolicyRequest
 type DeleteBucketPolicyInput struct {
         _ struct{} `type:"structure"`
 
@@ -8633,7 +9230,13 @@ func (s *DeleteBucketPolicyInput) SetBucket(v string) *DeleteBucketPolicyInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketPolicyOutput
+func (s *DeleteBucketPolicyInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type DeleteBucketPolicyOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -8648,7 +9251,6 @@ func (s DeleteBucketPolicyOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketReplicationRequest
 type DeleteBucketReplicationInput struct {
         _ struct{} `type:"structure"`
 
@@ -8685,7 +9287,13 @@ func (s *DeleteBucketReplicationInput) SetBucket(v string) *DeleteBucketReplicat
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketReplicationOutput
+func (s *DeleteBucketReplicationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type DeleteBucketReplicationOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -8700,7 +9308,6 @@ func (s DeleteBucketReplicationOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketTaggingRequest
 type DeleteBucketTaggingInput struct {
         _ struct{} `type:"structure"`
 
@@ -8737,7 +9344,13 @@ func (s *DeleteBucketTaggingInput) SetBucket(v string) *DeleteBucketTaggingInput
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketTaggingOutput
+func (s *DeleteBucketTaggingInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type DeleteBucketTaggingOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -8752,7 +9365,6 @@ func (s DeleteBucketTaggingOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketWebsiteRequest
 type DeleteBucketWebsiteInput struct {
         _ struct{} `type:"structure"`
 
@@ -8789,7 +9401,13 @@ func (s *DeleteBucketWebsiteInput) SetBucket(v string) *DeleteBucketWebsiteInput
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteBucketWebsiteOutput
+func (s *DeleteBucketWebsiteInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type DeleteBucketWebsiteOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -8804,7 +9422,6 @@ func (s DeleteBucketWebsiteOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteMarkerEntry
 type DeleteMarkerEntry struct {
         _ struct{} `type:"structure"`
 
@@ -8816,7 +9433,7 @@ type DeleteMarkerEntry struct {
         Key *string `min:"1" type:"string"`
 
         // Date and time the object was last modified.
-        LastModified *time.Time `type:"timestamp" timestampFormat:"iso8601"`
+        LastModified *time.Time `type:"timestamp"`
 
         Owner *Owner `type:"structure"`
 
@@ -8864,7 +9481,6 @@ func (s *DeleteMarkerEntry) SetVersionId(v string) *DeleteMarkerEntry {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectRequest
 type DeleteObjectInput struct {
         _ struct{} `type:"structure"`
 
@@ -8923,6 +9539,13 @@ func (s *DeleteObjectInput) SetBucket(v string) *DeleteObjectInput {
         return s
 }
 
+func (s *DeleteObjectInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetKey sets the Key field's value.
 func (s *DeleteObjectInput) SetKey(v string) *DeleteObjectInput {
         s.Key = &v
@@ -8947,7 +9570,6 @@ func (s *DeleteObjectInput) SetVersionId(v string) *DeleteObjectInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectOutput
 type DeleteObjectOutput struct {
         _ struct{} `type:"structure"`
 
@@ -8992,7 +9614,6 @@ func (s *DeleteObjectOutput) SetVersionId(v string) *DeleteObjectOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectTaggingRequest
 type DeleteObjectTaggingInput struct {
         _ struct{} `type:"structure"`
 
@@ -9041,6 +9662,13 @@ func (s *DeleteObjectTaggingInput) SetBucket(v string) *DeleteObjectTaggingInput
         return s
 }
 
+func (s *DeleteObjectTaggingInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetKey sets the Key field's value.
 func (s *DeleteObjectTaggingInput) SetKey(v string) *DeleteObjectTaggingInput {
         s.Key = &v
@@ -9053,7 +9681,6 @@ func (s *DeleteObjectTaggingInput) SetVersionId(v string) *DeleteObjectTaggingIn
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectTaggingOutput
 type DeleteObjectTaggingOutput struct {
         _ struct{} `type:"structure"`
 
@@ -9077,7 +9704,6 @@ func (s *DeleteObjectTaggingOutput) SetVersionId(v string) *DeleteObjectTaggingO
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectsRequest
 type DeleteObjectsInput struct {
         _ struct{} `type:"structure" payload:"Delete"`
 
@@ -9085,7 +9711,7 @@ type DeleteObjectsInput struct {
         Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
 
         // Delete is a required field
-        Delete *Delete `locationName:"Delete" type:"structure" required:"true"`
+        Delete *Delete `locationName:"Delete" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 
         // The concatenation of the authentication device's serial number, a space,
         // and the value that is displayed on your authentication device.
@@ -9135,6 +9761,13 @@ func (s *DeleteObjectsInput) SetBucket(v string) *DeleteObjectsInput {
         return s
 }
 
+func (s *DeleteObjectsInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetDelete sets the Delete field's value.
 func (s *DeleteObjectsInput) SetDelete(v *Delete) *DeleteObjectsInput {
         s.Delete = v
@@ -9153,7 +9786,6 @@ func (s *DeleteObjectsInput) SetRequestPayer(v string) *DeleteObjectsInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeleteObjectsOutput
 type DeleteObjectsOutput struct {
         _ struct{} `type:"structure"`
 
@@ -9194,7 +9826,6 @@ func (s *DeleteObjectsOutput) SetRequestCharged(v string) *DeleteObjectsOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/DeletedObject
 type DeletedObject struct {
         _ struct{} `type:"structure"`
 
@@ -9241,16 +9872,26 @@ func (s *DeletedObject) SetVersionId(v string) *DeletedObject {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Destination
+// Container for replication destination information.
 type Destination struct {
         _ struct{} `type:"structure"`
 
+        // Container for information regarding the access control for replicas.
+        AccessControlTranslation *AccessControlTranslation `type:"structure"`
+
+        // Account ID of the destination bucket. Currently this is only being verified
+        // if Access Control Translation is enabled
+        Account *string `type:"string"`
+
         // Amazon resource name (ARN) of the bucket where you want Amazon S3 to store
         // replicas of the object identified by the rule.
         //
         // Bucket is a required field
         Bucket *string `type:"string" required:"true"`
 
+        // Container for information regarding encryption based configuration for replicas.
+        EncryptionConfiguration *EncryptionConfiguration `type:"structure"`
+
         // The class of storage used to store the object.
         StorageClass *string `type:"string" enum:"StorageClass"`
 }
@@ -9271,6 +9912,11 @@ func (s *Destination) Validate() error {
         if s.Bucket == nil {
                 invalidParams.Add(request.NewErrParamRequired("Bucket"))
         }
+        if s.AccessControlTranslation != nil {
+                if err := s.AccessControlTranslation.Validate(); err != nil {
+                        invalidParams.AddNested("AccessControlTranslation", err.(request.ErrInvalidParams))
+                }
+        }
 
         if invalidParams.Len() > 0 {
                 return invalidParams
@@ -9278,19 +9924,154 @@ func (s *Destination) Validate() error {
         return nil
 }
 
+// SetAccessControlTranslation sets the AccessControlTranslation field's value.
+func (s *Destination) SetAccessControlTranslation(v *AccessControlTranslation) *Destination {
+        s.AccessControlTranslation = v
+        return s
+}
+
+// SetAccount sets the Account field's value.
+func (s *Destination) SetAccount(v string) *Destination {
+        s.Account = &v
+        return s
+}
+
 // SetBucket sets the Bucket field's value.
 func (s *Destination) SetBucket(v string) *Destination {
         s.Bucket = &v
         return s
 }
 
+func (s *Destination) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
+// SetEncryptionConfiguration sets the EncryptionConfiguration field's value.
+func (s *Destination) SetEncryptionConfiguration(v *EncryptionConfiguration) *Destination {
+        s.EncryptionConfiguration = v
+        return s
+}
+
 // SetStorageClass sets the StorageClass field's value.
 func (s *Destination) SetStorageClass(v string) *Destination {
         s.StorageClass = &v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Error
+// Describes the server-side encryption that will be applied to the restore
+// results.
+type Encryption struct {
+        _ struct{} `type:"structure"`
+
+        // The server-side encryption algorithm used when storing job results in Amazon
+        // S3 (e.g., AES256, aws:kms).
+        //
+        // EncryptionType is a required field
+        EncryptionType *string `type:"string" required:"true" enum:"ServerSideEncryption"`
+
+        // If the encryption type is aws:kms, this optional value can be used to specify
+        // the encryption context for the restore results.
+        KMSContext *string `type:"string"`
+
+        // If the encryption type is aws:kms, this optional value specifies the AWS
+        // KMS key ID to use for encryption of job results.
+        KMSKeyId *string `type:"string"`
+}
+
+// String returns the string representation
+func (s Encryption) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s Encryption) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *Encryption) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "Encryption"}
+        if s.EncryptionType == nil {
+                invalidParams.Add(request.NewErrParamRequired("EncryptionType"))
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetEncryptionType sets the EncryptionType field's value.
+func (s *Encryption) SetEncryptionType(v string) *Encryption {
+        s.EncryptionType = &v
+        return s
+}
+
+// SetKMSContext sets the KMSContext field's value.
+func (s *Encryption) SetKMSContext(v string) *Encryption {
+        s.KMSContext = &v
+        return s
+}
+
+// SetKMSKeyId sets the KMSKeyId field's value.
+func (s *Encryption) SetKMSKeyId(v string) *Encryption {
+        s.KMSKeyId = &v
+        return s
+}
+
+// Container for information regarding encryption based configuration for replicas.
+type EncryptionConfiguration struct {
+        _ struct{} `type:"structure"`
+
+        // The id of the KMS key used to encrypt the replica object.
+        ReplicaKmsKeyID *string `type:"string"`
+}
+
+// String returns the string representation
+func (s EncryptionConfiguration) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s EncryptionConfiguration) GoString() string {
+        return s.String()
+}
+
+// SetReplicaKmsKeyID sets the ReplicaKmsKeyID field's value.
+func (s *EncryptionConfiguration) SetReplicaKmsKeyID(v string) *EncryptionConfiguration {
+        s.ReplicaKmsKeyID = &v
+        return s
+}
+
+type EndEvent struct {
+        _ struct{} `locationName:"EndEvent" type:"structure"`
+}
+
+// String returns the string representation
+func (s EndEvent) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s EndEvent) GoString() string {
+        return s.String()
+}
+
+// The EndEvent is and event in the SelectObjectContentEventStream group of events.
+func (s *EndEvent) eventSelectObjectContentEventStream() {}
+
+// UnmarshalEvent unmarshals the EventStream Message into the EndEvent value.
+// This method is only used internally within the SDK's EventStream handling.
+func (s *EndEvent) UnmarshalEvent(
+        payloadUnmarshaler protocol.PayloadUnmarshaler,
+        msg eventstream.Message,
+) error {
+        return nil
+}
+
 type Error struct {
         _ struct{} `type:"structure"`
 
@@ -9337,7 +10118,6 @@ func (s *Error) SetVersionId(v string) *Error {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ErrorDocument
 type ErrorDocument struct {
         _ struct{} `type:"structure"`
 
@@ -9380,7 +10160,6 @@ func (s *ErrorDocument) SetKey(v string) *ErrorDocument {
 }
 
 // Container for key value pair that defines the criteria for the filter rule.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/FilterRule
 type FilterRule struct {
         _ struct{} `type:"structure"`
 
@@ -9388,6 +10167,7 @@ type FilterRule struct {
         // the filtering rule applies. Maximum prefix length can be up to 1,024 characters.
         // Overlapping prefixes and suffixes are not supported. For more information,
         // go to Configuring Event Notifications (http://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
+        // in the Amazon Simple Storage Service Developer Guide.
         Name *string `type:"string" enum:"FilterRuleName"`
 
         Value *string `type:"string"`
@@ -9415,7 +10195,6 @@ func (s *FilterRule) SetValue(v string) *FilterRule {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAccelerateConfigurationRequest
 type GetBucketAccelerateConfigurationInput struct {
         _ struct{} `type:"structure"`
 
@@ -9454,7 +10233,13 @@ func (s *GetBucketAccelerateConfigurationInput) SetBucket(v string) *GetBucketAc
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAccelerateConfigurationOutput
+func (s *GetBucketAccelerateConfigurationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type GetBucketAccelerateConfigurationOutput struct {
         _ struct{} `type:"structure"`
 
@@ -9478,7 +10263,6 @@ func (s *GetBucketAccelerateConfigurationOutput) SetStatus(v string) *GetBucketA
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAclRequest
 type GetBucketAclInput struct {
         _ struct{} `type:"structure"`
 
@@ -9515,7 +10299,13 @@ func (s *GetBucketAclInput) SetBucket(v string) *GetBucketAclInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAclOutput
+func (s *GetBucketAclInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type GetBucketAclOutput struct {
         _ struct{} `type:"structure"`
 
@@ -9547,7 +10337,6 @@ func (s *GetBucketAclOutput) SetOwner(v *Owner) *GetBucketAclOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAnalyticsConfigurationRequest
 type GetBucketAnalyticsConfigurationInput struct {
         _ struct{} `type:"structure"`
 
@@ -9594,13 +10383,19 @@ func (s *GetBucketAnalyticsConfigurationInput) SetBucket(v string) *GetBucketAna
         return s
 }
 
+func (s *GetBucketAnalyticsConfigurationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetId sets the Id field's value.
 func (s *GetBucketAnalyticsConfigurationInput) SetId(v string) *GetBucketAnalyticsConfigurationInput {
         s.Id = &v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketAnalyticsConfigurationOutput
 type GetBucketAnalyticsConfigurationOutput struct {
         _ struct{} `type:"structure" payload:"AnalyticsConfiguration"`
 
@@ -9624,7 +10419,6 @@ func (s *GetBucketAnalyticsConfigurationOutput) SetAnalyticsConfiguration(v *Ana
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketCorsRequest
 type GetBucketCorsInput struct {
         _ struct{} `type:"structure"`
 
@@ -9661,7 +10455,13 @@ func (s *GetBucketCorsInput) SetBucket(v string) *GetBucketCorsInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketCorsOutput
+func (s *GetBucketCorsInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type GetBucketCorsOutput struct {
         _ struct{} `type:"structure"`
 
@@ -9684,7 +10484,76 @@ func (s *GetBucketCorsOutput) SetCORSRules(v []*CORSRule) *GetBucketCorsOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketInventoryConfigurationRequest
+type GetBucketEncryptionInput struct {
+        _ struct{} `type:"structure"`
+
+        // The name of the bucket from which the server-side encryption configuration
+        // is retrieved.
+        //
+        // Bucket is a required field
+        Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
+}
+
+// String returns the string representation
+func (s GetBucketEncryptionInput) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s GetBucketEncryptionInput) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *GetBucketEncryptionInput) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "GetBucketEncryptionInput"}
+        if s.Bucket == nil {
+                invalidParams.Add(request.NewErrParamRequired("Bucket"))
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetBucket sets the Bucket field's value.
+func (s *GetBucketEncryptionInput) SetBucket(v string) *GetBucketEncryptionInput {
+        s.Bucket = &v
+        return s
+}
+
+func (s *GetBucketEncryptionInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
+type GetBucketEncryptionOutput struct {
+        _ struct{} `type:"structure" payload:"ServerSideEncryptionConfiguration"`
+
+        // Container for server-side encryption configuration rules. Currently S3 supports
+        // one rule only.
+        ServerSideEncryptionConfiguration *ServerSideEncryptionConfiguration `type:"structure"`
+}
+
+// String returns the string representation
+func (s GetBucketEncryptionOutput) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s GetBucketEncryptionOutput) GoString() string {
+        return s.String()
+}
+
+// SetServerSideEncryptionConfiguration sets the ServerSideEncryptionConfiguration field's value.
+func (s *GetBucketEncryptionOutput) SetServerSideEncryptionConfiguration(v *ServerSideEncryptionConfiguration) *GetBucketEncryptionOutput {
+        s.ServerSideEncryptionConfiguration = v
+        return s
+}
+
 type GetBucketInventoryConfigurationInput struct {
         _ struct{} `type:"structure"`
 
@@ -9731,13 +10600,19 @@ func (s *GetBucketInventoryConfigurationInput) SetBucket(v string) *GetBucketInv
         return s
 }
 
+func (s *GetBucketInventoryConfigurationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetId sets the Id field's value.
 func (s *GetBucketInventoryConfigurationInput) SetId(v string) *GetBucketInventoryConfigurationInput {
         s.Id = &v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketInventoryConfigurationOutput
 type GetBucketInventoryConfigurationOutput struct {
         _ struct{} `type:"structure" payload:"InventoryConfiguration"`
 
@@ -9761,7 +10636,6 @@ func (s *GetBucketInventoryConfigurationOutput) SetInventoryConfiguration(v *Inv
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycleConfigurationRequest
 type GetBucketLifecycleConfigurationInput struct {
         _ struct{} `type:"structure"`
 
@@ -9798,7 +10672,13 @@ func (s *GetBucketLifecycleConfigurationInput) SetBucket(v string) *GetBucketLif
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycleConfigurationOutput
+func (s *GetBucketLifecycleConfigurationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type GetBucketLifecycleConfigurationOutput struct {
         _ struct{} `type:"structure"`
 
@@ -9821,7 +10701,6 @@ func (s *GetBucketLifecycleConfigurationOutput) SetRules(v []*LifecycleRule) *Ge
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycleRequest
 type GetBucketLifecycleInput struct {
         _ struct{} `type:"structure"`
 
@@ -9858,7 +10737,13 @@ func (s *GetBucketLifecycleInput) SetBucket(v string) *GetBucketLifecycleInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLifecycleOutput
+func (s *GetBucketLifecycleInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type GetBucketLifecycleOutput struct {
         _ struct{} `type:"structure"`
 
@@ -9881,7 +10766,6 @@ func (s *GetBucketLifecycleOutput) SetRules(v []*Rule) *GetBucketLifecycleOutput
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLocationRequest
 type GetBucketLocationInput struct {
         _ struct{} `type:"structure"`
 
@@ -9918,7 +10802,13 @@ func (s *GetBucketLocationInput) SetBucket(v string) *GetBucketLocationInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLocationOutput
+func (s *GetBucketLocationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type GetBucketLocationOutput struct {
         _ struct{} `type:"structure"`
 
@@ -9941,7 +10831,6 @@ func (s *GetBucketLocationOutput) SetLocationConstraint(v string) *GetBucketLoca
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLoggingRequest
 type GetBucketLoggingInput struct {
         _ struct{} `type:"structure"`
 
@@ -9978,10 +10867,19 @@ func (s *GetBucketLoggingInput) SetBucket(v string) *GetBucketLoggingInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketLoggingOutput
+func (s *GetBucketLoggingInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type GetBucketLoggingOutput struct {
         _ struct{} `type:"structure"`
 
+        // Container for logging information. Presence of this element indicates that
+        // logging is enabled. Parameters TargetBucket and TargetPrefix are required
+        // in this case.
         LoggingEnabled *LoggingEnabled `type:"structure"`
 }
 
@@ -10001,7 +10899,6 @@ func (s *GetBucketLoggingOutput) SetLoggingEnabled(v *LoggingEnabled) *GetBucket
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketMetricsConfigurationRequest
 type GetBucketMetricsConfigurationInput struct {
         _ struct{} `type:"structure"`
 
@@ -10048,13 +10945,19 @@ func (s *GetBucketMetricsConfigurationInput) SetBucket(v string) *GetBucketMetri
         return s
 }
 
+func (s *GetBucketMetricsConfigurationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetId sets the Id field's value.
 func (s *GetBucketMetricsConfigurationInput) SetId(v string) *GetBucketMetricsConfigurationInput {
         s.Id = &v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketMetricsConfigurationOutput
 type GetBucketMetricsConfigurationOutput struct {
         _ struct{} `type:"structure" payload:"MetricsConfiguration"`
 
@@ -10078,7 +10981,6 @@ func (s *GetBucketMetricsConfigurationOutput) SetMetricsConfiguration(v *Metrics
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketNotificationConfigurationRequest
 type GetBucketNotificationConfigurationRequest struct {
         _ struct{} `type:"structure"`
 
@@ -10117,7 +11019,13 @@ func (s *GetBucketNotificationConfigurationRequest) SetBucket(v string) *GetBuck
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketPolicyRequest
+func (s *GetBucketNotificationConfigurationRequest) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type GetBucketPolicyInput struct {
         _ struct{} `type:"structure"`
 
@@ -10154,7 +11062,13 @@ func (s *GetBucketPolicyInput) SetBucket(v string) *GetBucketPolicyInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketPolicyOutput
+func (s *GetBucketPolicyInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type GetBucketPolicyOutput struct {
         _ struct{} `type:"structure" payload:"Policy"`
 
@@ -10178,7 +11092,6 @@ func (s *GetBucketPolicyOutput) SetPolicy(v string) *GetBucketPolicyOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketReplicationRequest
 type GetBucketReplicationInput struct {
         _ struct{} `type:"structure"`
 
@@ -10215,7 +11128,13 @@ func (s *GetBucketReplicationInput) SetBucket(v string) *GetBucketReplicationInp
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketReplicationOutput
+func (s *GetBucketReplicationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type GetBucketReplicationOutput struct {
         _ struct{} `type:"structure" payload:"ReplicationConfiguration"`
 
@@ -10240,7 +11159,6 @@ func (s *GetBucketReplicationOutput) SetReplicationConfiguration(v *ReplicationC
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketRequestPaymentRequest
 type GetBucketRequestPaymentInput struct {
         _ struct{} `type:"structure"`
 
@@ -10277,7 +11195,13 @@ func (s *GetBucketRequestPaymentInput) SetBucket(v string) *GetBucketRequestPaym
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketRequestPaymentOutput
+func (s *GetBucketRequestPaymentInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type GetBucketRequestPaymentOutput struct {
         _ struct{} `type:"structure"`
 
@@ -10301,7 +11225,6 @@ func (s *GetBucketRequestPaymentOutput) SetPayer(v string) *GetBucketRequestPaym
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketTaggingRequest
 type GetBucketTaggingInput struct {
         _ struct{} `type:"structure"`
 
@@ -10338,7 +11261,13 @@ func (s *GetBucketTaggingInput) SetBucket(v string) *GetBucketTaggingInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketTaggingOutput
+func (s *GetBucketTaggingInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type GetBucketTaggingOutput struct {
         _ struct{} `type:"structure"`
 
@@ -10362,7 +11291,6 @@ func (s *GetBucketTaggingOutput) SetTagSet(v []*Tag) *GetBucketTaggingOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketVersioningRequest
 type GetBucketVersioningInput struct {
         _ struct{} `type:"structure"`
 
@@ -10399,7 +11327,13 @@ func (s *GetBucketVersioningInput) SetBucket(v string) *GetBucketVersioningInput
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketVersioningOutput
+func (s *GetBucketVersioningInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type GetBucketVersioningOutput struct {
         _ struct{} `type:"structure"`
 
@@ -10434,7 +11368,6 @@ func (s *GetBucketVersioningOutput) SetStatus(v string) *GetBucketVersioningOutp
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketWebsiteRequest
 type GetBucketWebsiteInput struct {
         _ struct{} `type:"structure"`
 
@@ -10471,7 +11404,13 @@ func (s *GetBucketWebsiteInput) SetBucket(v string) *GetBucketWebsiteInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetBucketWebsiteOutput
+func (s *GetBucketWebsiteInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type GetBucketWebsiteOutput struct {
         _ struct{} `type:"structure"`
 
@@ -10518,7 +11457,6 @@ func (s *GetBucketWebsiteOutput) SetRoutingRules(v []*RoutingRule) *GetBucketWeb
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectAclRequest
 type GetObjectAclInput struct {
         _ struct{} `type:"structure"`
 
@@ -10573,6 +11511,13 @@ func (s *GetObjectAclInput) SetBucket(v string) *GetObjectAclInput {
         return s
 }
 
+func (s *GetObjectAclInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetKey sets the Key field's value.
 func (s *GetObjectAclInput) SetKey(v string) *GetObjectAclInput {
         s.Key = &v
@@ -10591,7 +11536,6 @@ func (s *GetObjectAclInput) SetVersionId(v string) *GetObjectAclInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectAclOutput
 type GetObjectAclOutput struct {
         _ struct{} `type:"structure"`
 
@@ -10633,7 +11577,6 @@ func (s *GetObjectAclOutput) SetRequestCharged(v string) *GetObjectAclOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectRequest
 type GetObjectInput struct {
         _ struct{} `type:"structure"`
 
@@ -10646,7 +11589,7 @@ type GetObjectInput struct {
 
         // Return the object only if it has been modified since the specified time,
         // otherwise return a 304 (not modified).
-        IfModifiedSince *time.Time `location:"header" locationName:"If-Modified-Since" type:"timestamp" timestampFormat:"rfc822"`
+        IfModifiedSince *time.Time `location:"header" locationName:"If-Modified-Since" type:"timestamp"`
 
         // Return the object only if its entity tag (ETag) is different from the one
         // specified, otherwise return a 304 (not modified).
@@ -10654,7 +11597,7 @@ type GetObjectInput struct {
 
         // Return the object only if it has not been modified since the specified time,
         // otherwise return a 412 (precondition failed).
-        IfUnmodifiedSince *time.Time `location:"header" locationName:"If-Unmodified-Since" type:"timestamp" timestampFormat:"rfc822"`
+        IfUnmodifiedSince *time.Time `location:"header" locationName:"If-Unmodified-Since" type:"timestamp"`
 
         // Key is a required field
         Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
@@ -10690,7 +11633,7 @@ type GetObjectInput struct {
         ResponseContentType *string `location:"querystring" locationName:"response-content-type" type:"string"`
 
         // Sets the Expires header of the response.
-        ResponseExpires *time.Time `location:"querystring" locationName:"response-expires" type:"timestamp" timestampFormat:"iso8601"`
+        ResponseExpires *time.Time `location:"querystring" locationName:"response-expires" type:"timestamp"`
 
         // Specifies the algorithm to use to when encrypting the object (e.g., AES256).
         SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
@@ -10746,6 +11689,13 @@ func (s *GetObjectInput) SetBucket(v string) *GetObjectInput {
         return s
 }
 
+func (s *GetObjectInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetIfMatch sets the IfMatch field's value.
 func (s *GetObjectInput) SetIfMatch(v string) *GetObjectInput {
         s.IfMatch = &v
@@ -10842,6 +11792,13 @@ func (s *GetObjectInput) SetSSECustomerKey(v string) *GetObjectInput {
         return s
 }
 
+func (s *GetObjectInput) getSSECustomerKey() (v string) {
+        if s.SSECustomerKey == nil {
+                return v
+        }
+        return *s.SSECustomerKey
+}
+
 // SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
 func (s *GetObjectInput) SetSSECustomerKeyMD5(v string) *GetObjectInput {
         s.SSECustomerKeyMD5 = &v
@@ -10854,7 +11811,6 @@ func (s *GetObjectInput) SetVersionId(v string) *GetObjectInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectOutput
 type GetObjectOutput struct {
         _ struct{} `type:"structure" payload:"Body"`
 
@@ -10904,7 +11860,7 @@ type GetObjectOutput struct {
         Expires *string `location:"header" locationName:"Expires" type:"string"`
 
         // Last modified date of the object
-        LastModified *time.Time `location:"header" locationName:"Last-Modified" type:"timestamp" timestampFormat:"rfc822"`
+        LastModified *time.Time `location:"header" locationName:"Last-Modified" type:"timestamp"`
 
         // A map of metadata to store with the object in S3.
         Metadata map[string]*string `location:"headers" locationName:"x-amz-meta-" type:"map"`
@@ -11138,7 +12094,6 @@ func (s *GetObjectOutput) SetWebsiteRedirectLocation(v string) *GetObjectOutput
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTaggingRequest
 type GetObjectTaggingInput struct {
         _ struct{} `type:"structure"`
 
@@ -11186,6 +12141,13 @@ func (s *GetObjectTaggingInput) SetBucket(v string) *GetObjectTaggingInput {
         return s
 }
 
+func (s *GetObjectTaggingInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetKey sets the Key field's value.
 func (s *GetObjectTaggingInput) SetKey(v string) *GetObjectTaggingInput {
         s.Key = &v
@@ -11198,7 +12160,6 @@ func (s *GetObjectTaggingInput) SetVersionId(v string) *GetObjectTaggingInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTaggingOutput
 type GetObjectTaggingOutput struct {
         _ struct{} `type:"structure"`
 
@@ -11230,7 +12191,6 @@ func (s *GetObjectTaggingOutput) SetVersionId(v string) *GetObjectTaggingOutput
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTorrentRequest
 type GetObjectTorrentInput struct {
         _ struct{} `type:"structure"`
 
@@ -11282,6 +12242,13 @@ func (s *GetObjectTorrentInput) SetBucket(v string) *GetObjectTorrentInput {
         return s
 }
 
+func (s *GetObjectTorrentInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetKey sets the Key field's value.
 func (s *GetObjectTorrentInput) SetKey(v string) *GetObjectTorrentInput {
         s.Key = &v
@@ -11294,7 +12261,6 @@ func (s *GetObjectTorrentInput) SetRequestPayer(v string) *GetObjectTorrentInput
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GetObjectTorrentOutput
 type GetObjectTorrentOutput struct {
         _ struct{} `type:"structure" payload:"Body"`
 
@@ -11327,7 +12293,6 @@ func (s *GetObjectTorrentOutput) SetRequestCharged(v string) *GetObjectTorrentOu
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/GlacierJobParameters
 type GlacierJobParameters struct {
         _ struct{} `type:"structure"`
 
@@ -11366,11 +12331,10 @@ func (s *GlacierJobParameters) SetTier(v string) *GlacierJobParameters {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Grant
 type Grant struct {
         _ struct{} `type:"structure"`
 
-        Grantee *Grantee `type:"structure"`
+        Grantee *Grantee `type:"structure" xmlPrefix:"xsi" xmlURI:"http://www.w3.org/2001/XMLSchema-instance"`
 
         // Specifies the permission given to the grantee.
         Permission *string `type:"string" enum:"Permission"`
@@ -11413,7 +12377,6 @@ func (s *Grant) SetPermission(v string) *Grant {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Grantee
 type Grantee struct {
         _ struct{} `type:"structure" xmlPrefix:"xsi" xmlURI:"http://www.w3.org/2001/XMLSchema-instance"`
 
@@ -11488,7 +12451,6 @@ func (s *Grantee) SetURI(v string) *Grantee {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadBucketRequest
 type HeadBucketInput struct {
         _ struct{} `type:"structure"`
 
@@ -11525,7 +12487,13 @@ func (s *HeadBucketInput) SetBucket(v string) *HeadBucketInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadBucketOutput
+func (s *HeadBucketInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type HeadBucketOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -11540,7 +12508,6 @@ func (s HeadBucketOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadObjectRequest
 type HeadObjectInput struct {
         _ struct{} `type:"structure"`
 
@@ -11553,7 +12520,7 @@ type HeadObjectInput struct {
 
         // Return the object only if it has been modified since the specified time,
         // otherwise return a 304 (not modified).
-        IfModifiedSince *time.Time `location:"header" locationName:"If-Modified-Since" type:"timestamp" timestampFormat:"rfc822"`
+        IfModifiedSince *time.Time `location:"header" locationName:"If-Modified-Since" type:"timestamp"`
 
         // Return the object only if its entity tag (ETag) is different from the one
         // specified, otherwise return a 304 (not modified).
@@ -11561,7 +12528,7 @@ type HeadObjectInput struct {
 
         // Return the object only if it has not been modified since the specified time,
         // otherwise return a 412 (precondition failed).
-        IfUnmodifiedSince *time.Time `location:"header" locationName:"If-Unmodified-Since" type:"timestamp" timestampFormat:"rfc822"`
+        IfUnmodifiedSince *time.Time `location:"header" locationName:"If-Unmodified-Since" type:"timestamp"`
 
         // Key is a required field
         Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
@@ -11636,6 +12603,13 @@ func (s *HeadObjectInput) SetBucket(v string) *HeadObjectInput {
         return s
 }
 
+func (s *HeadObjectInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetIfMatch sets the IfMatch field's value.
 func (s *HeadObjectInput) SetIfMatch(v string) *HeadObjectInput {
         s.IfMatch = &v
@@ -11696,6 +12670,13 @@ func (s *HeadObjectInput) SetSSECustomerKey(v string) *HeadObjectInput {
         return s
 }
 
+func (s *HeadObjectInput) getSSECustomerKey() (v string) {
+        if s.SSECustomerKey == nil {
+                return v
+        }
+        return *s.SSECustomerKey
+}
+
 // SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
 func (s *HeadObjectInput) SetSSECustomerKeyMD5(v string) *HeadObjectInput {
         s.SSECustomerKeyMD5 = &v
@@ -11708,7 +12689,6 @@ func (s *HeadObjectInput) SetVersionId(v string) *HeadObjectInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/HeadObjectOutput
 type HeadObjectOutput struct {
         _ struct{} `type:"structure"`
 
@@ -11752,7 +12732,7 @@ type HeadObjectOutput struct {
         Expires *string `location:"header" locationName:"Expires" type:"string"`
 
         // Last modified date of the object
-        LastModified *time.Time `location:"header" locationName:"Last-Modified" type:"timestamp" timestampFormat:"rfc822"`
+        LastModified *time.Time `location:"header" locationName:"Last-Modified" type:"timestamp"`
 
         // A map of metadata to store with the object in S3.
         Metadata map[string]*string `location:"headers" locationName:"x-amz-meta-" type:"map"`
@@ -11965,7 +12945,6 @@ func (s *HeadObjectOutput) SetWebsiteRedirectLocation(v string) *HeadObjectOutpu
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/IndexDocument
 type IndexDocument struct {
         _ struct{} `type:"structure"`
 
@@ -12007,7 +12986,6 @@ func (s *IndexDocument) SetSuffix(v string) *IndexDocument {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Initiator
 type Initiator struct {
         _ struct{} `type:"structure"`
 
@@ -12041,7 +13019,49 @@ func (s *Initiator) SetID(v string) *Initiator {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InventoryConfiguration
+// Describes the serialization format of the object.
+type InputSerialization struct {
+        _ struct{} `type:"structure"`
+
+        // Describes the serialization of a CSV-encoded object.
+        CSV *CSVInput `type:"structure"`
+
+        // Specifies object's compression format. Valid values: NONE, GZIP, BZIP2. Default
+        // Value: NONE.
+        CompressionType *string `type:"string" enum:"CompressionType"`
+
+        // Specifies JSON as object's input serialization format.
+        JSON *JSONInput `type:"structure"`
+}
+
+// String returns the string representation
+func (s InputSerialization) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s InputSerialization) GoString() string {
+        return s.String()
+}
+
+// SetCSV sets the CSV field's value.
+func (s *InputSerialization) SetCSV(v *CSVInput) *InputSerialization {
+        s.CSV = v
+        return s
+}
+
+// SetCompressionType sets the CompressionType field's value.
+func (s *InputSerialization) SetCompressionType(v string) *InputSerialization {
+        s.CompressionType = &v
+        return s
+}
+
+// SetJSON sets the JSON field's value.
+func (s *InputSerialization) SetJSON(v *JSONInput) *InputSerialization {
+        s.JSON = v
+        return s
+}
+
 type InventoryConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -12170,7 +13190,6 @@ func (s *InventoryConfiguration) SetSchedule(v *InventorySchedule) *InventoryCon
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InventoryDestination
 type InventoryDestination struct {
         _ struct{} `type:"structure"`
 
@@ -12215,7 +13234,55 @@ func (s *InventoryDestination) SetS3BucketDestination(v *InventoryS3BucketDestin
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InventoryFilter
+// Contains the type of server-side encryption used to encrypt the inventory
+// results.
+type InventoryEncryption struct {
+        _ struct{} `type:"structure"`
+
+        // Specifies the use of SSE-KMS to encrypt delievered Inventory reports.
+        SSEKMS *SSEKMS `locationName:"SSE-KMS" type:"structure"`
+
+        // Specifies the use of SSE-S3 to encrypt delievered Inventory reports.
+        SSES3 *SSES3 `locationName:"SSE-S3" type:"structure"`
+}
+
+// String returns the string representation
+func (s InventoryEncryption) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s InventoryEncryption) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *InventoryEncryption) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "InventoryEncryption"}
+        if s.SSEKMS != nil {
+                if err := s.SSEKMS.Validate(); err != nil {
+                        invalidParams.AddNested("SSEKMS", err.(request.ErrInvalidParams))
+                }
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetSSEKMS sets the SSEKMS field's value.
+func (s *InventoryEncryption) SetSSEKMS(v *SSEKMS) *InventoryEncryption {
+        s.SSEKMS = v
+        return s
+}
+
+// SetSSES3 sets the SSES3 field's value.
+func (s *InventoryEncryption) SetSSES3(v *SSES3) *InventoryEncryption {
+        s.SSES3 = v
+        return s
+}
+
 type InventoryFilter struct {
         _ struct{} `type:"structure"`
 
@@ -12254,7 +13321,6 @@ func (s *InventoryFilter) SetPrefix(v string) *InventoryFilter {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InventoryS3BucketDestination
 type InventoryS3BucketDestination struct {
         _ struct{} `type:"structure"`
 
@@ -12267,6 +13333,10 @@ type InventoryS3BucketDestination struct {
         // Bucket is a required field
         Bucket *string `type:"string" required:"true"`
 
+        // Contains the type of server-side encryption used to encrypt the inventory
+        // results.
+        Encryption *InventoryEncryption `type:"structure"`
+
         // Specifies the output format of the inventory results.
         //
         // Format is a required field
@@ -12295,6 +13365,11 @@ func (s *InventoryS3BucketDestination) Validate() error {
         if s.Format == nil {
                 invalidParams.Add(request.NewErrParamRequired("Format"))
         }
+        if s.Encryption != nil {
+                if err := s.Encryption.Validate(); err != nil {
+                        invalidParams.AddNested("Encryption", err.(request.ErrInvalidParams))
+                }
+        }
 
         if invalidParams.Len() > 0 {
                 return invalidParams
@@ -12314,6 +13389,19 @@ func (s *InventoryS3BucketDestination) SetBucket(v string) *InventoryS3BucketDes
         return s
 }
 
+func (s *InventoryS3BucketDestination) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
+// SetEncryption sets the Encryption field's value.
+func (s *InventoryS3BucketDestination) SetEncryption(v *InventoryEncryption) *InventoryS3BucketDestination {
+        s.Encryption = v
+        return s
+}
+
 // SetFormat sets the Format field's value.
 func (s *InventoryS3BucketDestination) SetFormat(v string) *InventoryS3BucketDestination {
         s.Format = &v
@@ -12326,7 +13414,6 @@ func (s *InventoryS3BucketDestination) SetPrefix(v string) *InventoryS3BucketDes
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/InventorySchedule
 type InventorySchedule struct {
         _ struct{} `type:"structure"`
 
@@ -12365,8 +13452,53 @@ func (s *InventorySchedule) SetFrequency(v string) *InventorySchedule {
         return s
 }
 
+type JSONInput struct {
+        _ struct{} `type:"structure"`
+
+        // The type of JSON. Valid values: Document, Lines.
+        Type *string `type:"string" enum:"JSONType"`
+}
+
+// String returns the string representation
+func (s JSONInput) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s JSONInput) GoString() string {
+        return s.String()
+}
+
+// SetType sets the Type field's value.
+func (s *JSONInput) SetType(v string) *JSONInput {
+        s.Type = &v
+        return s
+}
+
+type JSONOutput struct {
+        _ struct{} `type:"structure"`
+
+        // The value used to separate individual records in the output.
+        RecordDelimiter *string `type:"string"`
+}
+
+// String returns the string representation
+func (s JSONOutput) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s JSONOutput) GoString() string {
+        return s.String()
+}
+
+// SetRecordDelimiter sets the RecordDelimiter field's value.
+func (s *JSONOutput) SetRecordDelimiter(v string) *JSONOutput {
+        s.RecordDelimiter = &v
+        return s
+}
+
 // Container for object key name prefix and suffix filtering rules.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/S3KeyFilter
 type KeyFilter struct {
         _ struct{} `type:"structure"`
 
@@ -12392,7 +13524,6 @@ func (s *KeyFilter) SetFilterRules(v []*FilterRule) *KeyFilter {
 }
 
 // Container for specifying the AWS Lambda notification configuration.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/LambdaFunctionConfiguration
 type LambdaFunctionConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -12401,6 +13532,7 @@ type LambdaFunctionConfiguration struct {
 
         // Container for object key name filtering rules. For information about key
         // name filtering, go to Configuring Event Notifications (http://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
+        // in the Amazon Simple Storage Service Developer Guide.
         Filter *NotificationConfigurationFilter `type:"structure"`
 
         // Optional unique identifier for configurations in a notification configuration.
@@ -12464,7 +13596,6 @@ func (s *LambdaFunctionConfiguration) SetLambdaFunctionArn(v string) *LambdaFunc
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/LifecycleConfiguration
 type LifecycleConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -12511,7 +13642,6 @@ func (s *LifecycleConfiguration) SetRules(v []*Rule) *LifecycleConfiguration {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/LifecycleExpiration
 type LifecycleExpiration struct {
         _ struct{} `type:"structure"`
 
@@ -12558,7 +13688,6 @@ func (s *LifecycleExpiration) SetExpiredObjectDeleteMarker(v bool) *LifecycleExp
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/LifecycleRule
 type LifecycleRule struct {
         _ struct{} `type:"structure"`
 
@@ -12682,7 +13811,6 @@ func (s *LifecycleRule) SetTransitions(v []*Transition) *LifecycleRule {
 // This is used in a Lifecycle Rule Filter to apply a logical AND to two or
 // more predicates. The Lifecycle Rule will apply to any object matching all
 // of the predicates configured inside the And operator.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/LifecycleRuleAndOperator
 type LifecycleRuleAndOperator struct {
         _ struct{} `type:"structure"`
 
@@ -12737,7 +13865,6 @@ func (s *LifecycleRuleAndOperator) SetTags(v []*Tag) *LifecycleRuleAndOperator {
 
 // The Filter is used to identify objects that a Lifecycle Rule applies to.
 // A Filter must have exactly one of Prefix, Tag, or And specified.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/LifecycleRuleFilter
 type LifecycleRuleFilter struct {
         _ struct{} `type:"structure"`
 
@@ -12801,7 +13928,6 @@ func (s *LifecycleRuleFilter) SetTag(v *Tag) *LifecycleRuleFilter {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketAnalyticsConfigurationsRequest
 type ListBucketAnalyticsConfigurationsInput struct {
         _ struct{} `type:"structure"`
 
@@ -12844,13 +13970,19 @@ func (s *ListBucketAnalyticsConfigurationsInput) SetBucket(v string) *ListBucket
         return s
 }
 
+func (s *ListBucketAnalyticsConfigurationsInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetContinuationToken sets the ContinuationToken field's value.
 func (s *ListBucketAnalyticsConfigurationsInput) SetContinuationToken(v string) *ListBucketAnalyticsConfigurationsInput {
         s.ContinuationToken = &v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketAnalyticsConfigurationsOutput
 type ListBucketAnalyticsConfigurationsOutput struct {
         _ struct{} `type:"structure"`
 
@@ -12905,7 +14037,6 @@ func (s *ListBucketAnalyticsConfigurationsOutput) SetNextContinuationToken(v str
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketInventoryConfigurationsRequest
 type ListBucketInventoryConfigurationsInput struct {
         _ struct{} `type:"structure"`
 
@@ -12950,13 +14081,19 @@ func (s *ListBucketInventoryConfigurationsInput) SetBucket(v string) *ListBucket
         return s
 }
 
+func (s *ListBucketInventoryConfigurationsInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetContinuationToken sets the ContinuationToken field's value.
 func (s *ListBucketInventoryConfigurationsInput) SetContinuationToken(v string) *ListBucketInventoryConfigurationsInput {
         s.ContinuationToken = &v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketInventoryConfigurationsOutput
 type ListBucketInventoryConfigurationsOutput struct {
         _ struct{} `type:"structure"`
 
@@ -13011,7 +14148,6 @@ func (s *ListBucketInventoryConfigurationsOutput) SetNextContinuationToken(v str
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketMetricsConfigurationsRequest
 type ListBucketMetricsConfigurationsInput struct {
         _ struct{} `type:"structure"`
 
@@ -13056,13 +14192,19 @@ func (s *ListBucketMetricsConfigurationsInput) SetBucket(v string) *ListBucketMe
         return s
 }
 
+func (s *ListBucketMetricsConfigurationsInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetContinuationToken sets the ContinuationToken field's value.
 func (s *ListBucketMetricsConfigurationsInput) SetContinuationToken(v string) *ListBucketMetricsConfigurationsInput {
         s.ContinuationToken = &v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketMetricsConfigurationsOutput
 type ListBucketMetricsConfigurationsOutput struct {
         _ struct{} `type:"structure"`
 
@@ -13119,7 +14261,6 @@ func (s *ListBucketMetricsConfigurationsOutput) SetNextContinuationToken(v strin
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketsInput
 type ListBucketsInput struct {
         _ struct{} `type:"structure"`
 }
@@ -13134,7 +14275,6 @@ func (s ListBucketsInput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListBucketsOutput
 type ListBucketsOutput struct {
         _ struct{} `type:"structure"`
 
@@ -13165,7 +14305,6 @@ func (s *ListBucketsOutput) SetOwner(v *Owner) *ListBucketsOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListMultipartUploadsRequest
 type ListMultipartUploadsInput struct {
         _ struct{} `type:"structure"`
 
@@ -13231,6 +14370,13 @@ func (s *ListMultipartUploadsInput) SetBucket(v string) *ListMultipartUploadsInp
         return s
 }
 
+func (s *ListMultipartUploadsInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetDelimiter sets the Delimiter field's value.
 func (s *ListMultipartUploadsInput) SetDelimiter(v string) *ListMultipartUploadsInput {
         s.Delimiter = &v
@@ -13267,7 +14413,6 @@ func (s *ListMultipartUploadsInput) SetUploadIdMarker(v string) *ListMultipartUp
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListMultipartUploadsOutput
 type ListMultipartUploadsOutput struct {
         _ struct{} `type:"structure"`
 
@@ -13328,6 +14473,13 @@ func (s *ListMultipartUploadsOutput) SetBucket(v string) *ListMultipartUploadsOu
         return s
 }
 
+func (s *ListMultipartUploadsOutput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetCommonPrefixes sets the CommonPrefixes field's value.
 func (s *ListMultipartUploadsOutput) SetCommonPrefixes(v []*CommonPrefix) *ListMultipartUploadsOutput {
         s.CommonPrefixes = v
@@ -13394,7 +14546,6 @@ func (s *ListMultipartUploadsOutput) SetUploads(v []*MultipartUpload) *ListMulti
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectVersionsRequest
 type ListObjectVersionsInput struct {
         _ struct{} `type:"structure"`
 
@@ -13455,6 +14606,13 @@ func (s *ListObjectVersionsInput) SetBucket(v string) *ListObjectVersionsInput {
         return s
 }
 
+func (s *ListObjectVersionsInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetDelimiter sets the Delimiter field's value.
 func (s *ListObjectVersionsInput) SetDelimiter(v string) *ListObjectVersionsInput {
         s.Delimiter = &v
@@ -13491,7 +14649,6 @@ func (s *ListObjectVersionsInput) SetVersionIdMarker(v string) *ListObjectVersio
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectVersionsOutput
 type ListObjectVersionsOutput struct {
         _ struct{} `type:"structure"`
 
@@ -13619,7 +14776,6 @@ func (s *ListObjectVersionsOutput) SetVersions(v []*ObjectVersion) *ListObjectVe
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectsRequest
 type ListObjectsInput struct {
         _ struct{} `type:"structure"`
 
@@ -13682,6 +14838,13 @@ func (s *ListObjectsInput) SetBucket(v string) *ListObjectsInput {
         return s
 }
 
+func (s *ListObjectsInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetDelimiter sets the Delimiter field's value.
 func (s *ListObjectsInput) SetDelimiter(v string) *ListObjectsInput {
         s.Delimiter = &v
@@ -13718,7 +14881,6 @@ func (s *ListObjectsInput) SetRequestPayer(v string) *ListObjectsInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectsOutput
 type ListObjectsOutput struct {
         _ struct{} `type:"structure"`
 
@@ -13823,7 +14985,6 @@ func (s *ListObjectsOutput) SetPrefix(v string) *ListObjectsOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectsV2Request
 type ListObjectsV2Input struct {
         _ struct{} `type:"structure"`
 
@@ -13894,6 +15055,13 @@ func (s *ListObjectsV2Input) SetBucket(v string) *ListObjectsV2Input {
         return s
 }
 
+func (s *ListObjectsV2Input) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetContinuationToken sets the ContinuationToken field's value.
 func (s *ListObjectsV2Input) SetContinuationToken(v string) *ListObjectsV2Input {
         s.ContinuationToken = &v
@@ -13942,7 +15110,6 @@ func (s *ListObjectsV2Input) SetStartAfter(v string) *ListObjectsV2Input {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListObjectsV2Output
 type ListObjectsV2Output struct {
         _ struct{} `type:"structure"`
 
@@ -14076,7 +15243,6 @@ func (s *ListObjectsV2Output) SetStartAfter(v string) *ListObjectsV2Output {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListPartsRequest
 type ListPartsInput struct {
         _ struct{} `type:"structure"`
 
@@ -14143,6 +15309,13 @@ func (s *ListPartsInput) SetBucket(v string) *ListPartsInput {
         return s
 }
 
+func (s *ListPartsInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetKey sets the Key field's value.
 func (s *ListPartsInput) SetKey(v string) *ListPartsInput {
         s.Key = &v
@@ -14173,12 +15346,11 @@ func (s *ListPartsInput) SetUploadId(v string) *ListPartsInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ListPartsOutput
 type ListPartsOutput struct {
         _ struct{} `type:"structure"`
 
         // Date when multipart upload will become eligible for abort operation by lifecycle.
-        AbortDate *time.Time `location:"header" locationName:"x-amz-abort-date" type:"timestamp" timestampFormat:"rfc822"`
+        AbortDate *time.Time `location:"header" locationName:"x-amz-abort-date" type:"timestamp"`
 
         // Id of the lifecycle rule that makes a multipart upload eligible for abort
         // operation.
@@ -14250,6 +15422,13 @@ func (s *ListPartsOutput) SetBucket(v string) *ListPartsOutput {
         return s
 }
 
+func (s *ListPartsOutput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetInitiator sets the Initiator field's value.
 func (s *ListPartsOutput) SetInitiator(v *Initiator) *ListPartsOutput {
         s.Initiator = v
@@ -14316,7 +15495,137 @@ func (s *ListPartsOutput) SetUploadId(v string) *ListPartsOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/LoggingEnabled
+// Describes an S3 location that will receive the results of the restore request.
+type Location struct {
+        _ struct{} `type:"structure"`
+
+        // A list of grants that control access to the staged results.
+        AccessControlList []*Grant `locationNameList:"Grant" type:"list"`
+
+        // The name of the bucket where the restore results will be placed.
+        //
+        // BucketName is a required field
+        BucketName *string `type:"string" required:"true"`
+
+        // The canned ACL to apply to the restore results.
+        CannedACL *string `type:"string" enum:"ObjectCannedACL"`
+
+        // Describes the server-side encryption that will be applied to the restore
+        // results.
+        Encryption *Encryption `type:"structure"`
+
+        // The prefix that is prepended to the restore results for this request.
+        //
+        // Prefix is a required field
+        Prefix *string `type:"string" required:"true"`
+
+        // The class of storage used to store the restore results.
+        StorageClass *string `type:"string" enum:"StorageClass"`
+
+        // The tag-set that is applied to the restore results.
+        Tagging *Tagging `type:"structure"`
+
+        // A list of metadata to store with the restore results in S3.
+        UserMetadata []*MetadataEntry `locationNameList:"MetadataEntry" type:"list"`
+}
+
+// String returns the string representation
+func (s Location) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s Location) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *Location) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "Location"}
+        if s.BucketName == nil {
+                invalidParams.Add(request.NewErrParamRequired("BucketName"))
+        }
+        if s.Prefix == nil {
+                invalidParams.Add(request.NewErrParamRequired("Prefix"))
+        }
+        if s.AccessControlList != nil {
+                for i, v := range s.AccessControlList {
+                        if v == nil {
+                                continue
+                        }
+                        if err := v.Validate(); err != nil {
+                                invalidParams.AddNested(fmt.Sprintf("%s[%v]", "AccessControlList", i), err.(request.ErrInvalidParams))
+                        }
+                }
+        }
+        if s.Encryption != nil {
+                if err := s.Encryption.Validate(); err != nil {
+                        invalidParams.AddNested("Encryption", err.(request.ErrInvalidParams))
+                }
+        }
+        if s.Tagging != nil {
+                if err := s.Tagging.Validate(); err != nil {
+                        invalidParams.AddNested("Tagging", err.(request.ErrInvalidParams))
+                }
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetAccessControlList sets the AccessControlList field's value.
+func (s *Location) SetAccessControlList(v []*Grant) *Location {
+        s.AccessControlList = v
+        return s
+}
+
+// SetBucketName sets the BucketName field's value.
+func (s *Location) SetBucketName(v string) *Location {
+        s.BucketName = &v
+        return s
+}
+
+// SetCannedACL sets the CannedACL field's value.
+func (s *Location) SetCannedACL(v string) *Location {
+        s.CannedACL = &v
+        return s
+}
+
+// SetEncryption sets the Encryption field's value.
+func (s *Location) SetEncryption(v *Encryption) *Location {
+        s.Encryption = v
+        return s
+}
+
+// SetPrefix sets the Prefix field's value.
+func (s *Location) SetPrefix(v string) *Location {
+        s.Prefix = &v
+        return s
+}
+
+// SetStorageClass sets the StorageClass field's value.
+func (s *Location) SetStorageClass(v string) *Location {
+        s.StorageClass = &v
+        return s
+}
+
+// SetTagging sets the Tagging field's value.
+func (s *Location) SetTagging(v *Tagging) *Location {
+        s.Tagging = v
+        return s
+}
+
+// SetUserMetadata sets the UserMetadata field's value.
+func (s *Location) SetUserMetadata(v []*MetadataEntry) *Location {
+        s.UserMetadata = v
+        return s
+}
+
+// Container for logging information. Presence of this element indicates that
+// logging is enabled. Parameters TargetBucket and TargetPrefix are required
+// in this case.
 type LoggingEnabled struct {
         _ struct{} `type:"structure"`
 
@@ -14326,13 +15635,17 @@ type LoggingEnabled struct {
         // to deliver their logs to the same target bucket. In this case you should
         // choose a different TargetPrefix for each source bucket so that the delivered
         // log files can be distinguished by key.
-        TargetBucket *string `type:"string"`
+        //
+        // TargetBucket is a required field
+        TargetBucket *string `type:"string" required:"true"`
 
         TargetGrants []*TargetGrant `locationNameList:"Grant" type:"list"`
 
         // This element lets you specify a prefix for the keys that the log files will
         // be stored under.
-        TargetPrefix *string `type:"string"`
+        //
+        // TargetPrefix is a required field
+        TargetPrefix *string `type:"string" required:"true"`
 }
 
 // String returns the string representation
@@ -14348,6 +15661,12 @@ func (s LoggingEnabled) GoString() string {
 // Validate inspects the fields of the type to determine if they are valid.
 func (s *LoggingEnabled) Validate() error {
         invalidParams := request.ErrInvalidParams{Context: "LoggingEnabled"}
+        if s.TargetBucket == nil {
+                invalidParams.Add(request.NewErrParamRequired("TargetBucket"))
+        }
+        if s.TargetPrefix == nil {
+                invalidParams.Add(request.NewErrParamRequired("TargetPrefix"))
+        }
         if s.TargetGrants != nil {
                 for i, v := range s.TargetGrants {
                         if v == nil {
@@ -14383,7 +15702,37 @@ func (s *LoggingEnabled) SetTargetPrefix(v string) *LoggingEnabled {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/MetricsAndOperator
+// A metadata key-value pair to store with an object.
+type MetadataEntry struct {
+        _ struct{} `type:"structure"`
+
+        Name *string `type:"string"`
+
+        Value *string `type:"string"`
+}
+
+// String returns the string representation
+func (s MetadataEntry) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s MetadataEntry) GoString() string {
+        return s.String()
+}
+
+// SetName sets the Name field's value.
+func (s *MetadataEntry) SetName(v string) *MetadataEntry {
+        s.Name = &v
+        return s
+}
+
+// SetValue sets the Value field's value.
+func (s *MetadataEntry) SetValue(v string) *MetadataEntry {
+        s.Value = &v
+        return s
+}
+
 type MetricsAndOperator struct {
         _ struct{} `type:"structure"`
 
@@ -14436,7 +15785,6 @@ func (s *MetricsAndOperator) SetTags(v []*Tag) *MetricsAndOperator {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/MetricsConfiguration
 type MetricsConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -14491,7 +15839,6 @@ func (s *MetricsConfiguration) SetId(v string) *MetricsConfiguration {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/MetricsFilter
 type MetricsFilter struct {
         _ struct{} `type:"structure"`
 
@@ -14555,12 +15902,11 @@ func (s *MetricsFilter) SetTag(v *Tag) *MetricsFilter {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/MultipartUpload
 type MultipartUpload struct {
         _ struct{} `type:"structure"`
 
         // Date and time at which the multipart upload was initiated.
-        Initiated *time.Time `type:"timestamp" timestampFormat:"iso8601"`
+        Initiated *time.Time `type:"timestamp"`
 
         // Identifies who initiated the multipart upload.
         Initiator *Initiator `type:"structure"`
@@ -14628,14 +15974,14 @@ func (s *MultipartUpload) SetUploadId(v string) *MultipartUpload {
 // configuration action on a bucket that has versioning enabled (or suspended)
 // to request that Amazon S3 delete noncurrent object versions at a specific
 // period in the object's lifetime.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/NoncurrentVersionExpiration
 type NoncurrentVersionExpiration struct {
         _ struct{} `type:"structure"`
 
         // Specifies the number of days an object is noncurrent before Amazon S3 can
         // perform the associated action. For information about the noncurrent days
         // calculations, see How Amazon S3 Calculates When an Object Became Noncurrent
-        // (http://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html)
+        // (http://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html) in
+        // the Amazon Simple Storage Service Developer Guide.
         NoncurrentDays *int64 `type:"integer"`
 }
 
@@ -14656,18 +16002,19 @@ func (s *NoncurrentVersionExpiration) SetNoncurrentDays(v int64) *NoncurrentVers
 }
 
 // Container for the transition rule that describes when noncurrent objects
-// transition to the STANDARD_IA or GLACIER storage class. If your bucket is
-// versioning-enabled (or versioning is suspended), you can set this action
-// to request that Amazon S3 transition noncurrent object versions to the STANDARD_IA
-// or GLACIER storage class at a specific period in the object's lifetime.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/NoncurrentVersionTransition
+// transition to the STANDARD_IA, ONEZONE_IA or GLACIER storage class. If your
+// bucket is versioning-enabled (or versioning is suspended), you can set this
+// action to request that Amazon S3 transition noncurrent object versions to
+// the STANDARD_IA, ONEZONE_IA or GLACIER storage class at a specific period
+// in the object's lifetime.
 type NoncurrentVersionTransition struct {
         _ struct{} `type:"structure"`
 
         // Specifies the number of days an object is noncurrent before Amazon S3 can
         // perform the associated action. For information about the noncurrent days
         // calculations, see How Amazon S3 Calculates When an Object Became Noncurrent
-        // (http://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html)
+        // (http://docs.aws.amazon.com/AmazonS3/latest/dev/s3-access-control.html) in
+        // the Amazon Simple Storage Service Developer Guide.
         NoncurrentDays *int64 `type:"integer"`
 
         // The class of storage used to store the object.
@@ -14698,7 +16045,6 @@ func (s *NoncurrentVersionTransition) SetStorageClass(v string) *NoncurrentVersi
 
 // Container for specifying the notification configuration of the bucket. If
 // this element is empty, notifications are turned off on the bucket.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/NotificationConfiguration
 type NotificationConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -14777,7 +16123,6 @@ func (s *NotificationConfiguration) SetTopicConfigurations(v []*TopicConfigurati
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/NotificationConfigurationDeprecated
 type NotificationConfigurationDeprecated struct {
         _ struct{} `type:"structure"`
 
@@ -14818,7 +16163,7 @@ func (s *NotificationConfigurationDeprecated) SetTopicConfiguration(v *TopicConf
 
 // Container for object key name filtering rules. For information about key
 // name filtering, go to Configuring Event Notifications (http://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/NotificationConfigurationFilter
+// in the Amazon Simple Storage Service Developer Guide.
 type NotificationConfigurationFilter struct {
         _ struct{} `type:"structure"`
 
@@ -14842,7 +16187,6 @@ func (s *NotificationConfigurationFilter) SetKey(v *KeyFilter) *NotificationConf
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Object
 type Object struct {
         _ struct{} `type:"structure"`
 
@@ -14850,7 +16194,7 @@ type Object struct {
 
         Key *string `min:"1" type:"string"`
 
-        LastModified *time.Time `type:"timestamp" timestampFormat:"iso8601"`
+        LastModified *time.Time `type:"timestamp"`
 
         Owner *Owner `type:"structure"`
 
@@ -14906,7 +16250,6 @@ func (s *Object) SetStorageClass(v string) *Object {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ObjectIdentifier
 type ObjectIdentifier struct {
         _ struct{} `type:"structure"`
 
@@ -14957,7 +16300,6 @@ func (s *ObjectIdentifier) SetVersionId(v string) *ObjectIdentifier {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ObjectVersion
 type ObjectVersion struct {
         _ struct{} `type:"structure"`
 
@@ -14971,7 +16313,7 @@ type ObjectVersion struct {
         Key *string `min:"1" type:"string"`
 
         // Date and time the object was last modified.
-        LastModified *time.Time `type:"timestamp" timestampFormat:"iso8601"`
+        LastModified *time.Time `type:"timestamp"`
 
         Owner *Owner `type:"structure"`
 
@@ -15043,7 +16385,78 @@ func (s *ObjectVersion) SetVersionId(v string) *ObjectVersion {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Owner
+// Describes the location where the restore job's output is stored.
+type OutputLocation struct {
+        _ struct{} `type:"structure"`
+
+        // Describes an S3 location that will receive the results of the restore request.
+        S3 *Location `type:"structure"`
+}
+
+// String returns the string representation
+func (s OutputLocation) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s OutputLocation) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *OutputLocation) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "OutputLocation"}
+        if s.S3 != nil {
+                if err := s.S3.Validate(); err != nil {
+                        invalidParams.AddNested("S3", err.(request.ErrInvalidParams))
+                }
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetS3 sets the S3 field's value.
+func (s *OutputLocation) SetS3(v *Location) *OutputLocation {
+        s.S3 = v
+        return s
+}
+
+// Describes how results of the Select job are serialized.
+type OutputSerialization struct {
+        _ struct{} `type:"structure"`
+
+        // Describes the serialization of CSV-encoded Select results.
+        CSV *CSVOutput `type:"structure"`
+
+        // Specifies JSON as request's output serialization format.
+        JSON *JSONOutput `type:"structure"`
+}
+
+// String returns the string representation
+func (s OutputSerialization) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s OutputSerialization) GoString() string {
+        return s.String()
+}
+
+// SetCSV sets the CSV field's value.
+func (s *OutputSerialization) SetCSV(v *CSVOutput) *OutputSerialization {
+        s.CSV = v
+        return s
+}
+
+// SetJSON sets the JSON field's value.
+func (s *OutputSerialization) SetJSON(v *JSONOutput) *OutputSerialization {
+        s.JSON = v
+        return s
+}
+
 type Owner struct {
         _ struct{} `type:"structure"`
 
@@ -15074,7 +16487,6 @@ func (s *Owner) SetID(v string) *Owner {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Part
 type Part struct {
         _ struct{} `type:"structure"`
 
@@ -15082,7 +16494,7 @@ type Part struct {
         ETag *string `type:"string"`
 
         // Date and time at which the part was uploaded.
-        LastModified *time.Time `type:"timestamp" timestampFormat:"iso8601"`
+        LastModified *time.Time `type:"timestamp"`
 
         // Part number identifying the part. This is a positive integer between 1 and
         // 10,000.
@@ -15126,14 +16538,94 @@ func (s *Part) SetSize(v int64) *Part {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAccelerateConfigurationRequest
+type Progress struct {
+        _ struct{} `type:"structure"`
+
+        // Current number of uncompressed object bytes processed.
+        BytesProcessed *int64 `type:"long"`
+
+        // Current number of bytes of records payload data returned.
+        BytesReturned *int64 `type:"long"`
+
+        // Current number of object bytes scanned.
+        BytesScanned *int64 `type:"long"`
+}
+
+// String returns the string representation
+func (s Progress) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s Progress) GoString() string {
+        return s.String()
+}
+
+// SetBytesProcessed sets the BytesProcessed field's value.
+func (s *Progress) SetBytesProcessed(v int64) *Progress {
+        s.BytesProcessed = &v
+        return s
+}
+
+// SetBytesReturned sets the BytesReturned field's value.
+func (s *Progress) SetBytesReturned(v int64) *Progress {
+        s.BytesReturned = &v
+        return s
+}
+
+// SetBytesScanned sets the BytesScanned field's value.
+func (s *Progress) SetBytesScanned(v int64) *Progress {
+        s.BytesScanned = &v
+        return s
+}
+
+type ProgressEvent struct {
+        _ struct{} `locationName:"ProgressEvent" type:"structure" payload:"Details"`
+
+        // The Progress event details.
+        Details *Progress `locationName:"Details" type:"structure"`
+}
+
+// String returns the string representation
+func (s ProgressEvent) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s ProgressEvent) GoString() string {
+        return s.String()
+}
+
+// SetDetails sets the Details field's value.
+func (s *ProgressEvent) SetDetails(v *Progress) *ProgressEvent {
+        s.Details = v
+        return s
+}
+
+// The ProgressEvent is and event in the SelectObjectContentEventStream group of events.
+func (s *ProgressEvent) eventSelectObjectContentEventStream() {}
+
+// UnmarshalEvent unmarshals the EventStream Message into the ProgressEvent value.
+// This method is only used internally within the SDK's EventStream handling.
+func (s *ProgressEvent) UnmarshalEvent(
+        payloadUnmarshaler protocol.PayloadUnmarshaler,
+        msg eventstream.Message,
+) error {
+        if err := payloadUnmarshaler.UnmarshalPayload(
+                bytes.NewReader(msg.Payload), s,
+        ); err != nil {
+                return err
+        }
+        return nil
+}
+
 type PutBucketAccelerateConfigurationInput struct {
         _ struct{} `type:"structure" payload:"AccelerateConfiguration"`
 
         // Specifies the Accelerate Configuration you want to set for the bucket.
         //
         // AccelerateConfiguration is a required field
-        AccelerateConfiguration *AccelerateConfiguration `locationName:"AccelerateConfiguration" type:"structure" required:"true"`
+        AccelerateConfiguration *AccelerateConfiguration `locationName:"AccelerateConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 
         // Name of the bucket for which the accelerate configuration is set.
         //
@@ -15179,7 +16671,13 @@ func (s *PutBucketAccelerateConfigurationInput) SetBucket(v string) *PutBucketAc
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAccelerateConfigurationOutput
+func (s *PutBucketAccelerateConfigurationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 type PutBucketAccelerateConfigurationOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -15194,14 +16692,13 @@ func (s PutBucketAccelerateConfigurationOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAclRequest
 type PutBucketAclInput struct {
         _ struct{} `type:"structure" payload:"AccessControlPolicy"`
 
         // The canned ACL to apply to the bucket.
         ACL *string `location:"header" locationName:"x-amz-acl" type:"string" enum:"BucketCannedACL"`
 
-        AccessControlPolicy *AccessControlPolicy `locationName:"AccessControlPolicy" type:"structure"`
+        AccessControlPolicy *AccessControlPolicy `locationName:"AccessControlPolicy" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 
         // Bucket is a required field
         Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
@@ -15269,6 +16766,13 @@ func (s *PutBucketAclInput) SetBucket(v string) *PutBucketAclInput {
         return s
 }
 
+func (s *PutBucketAclInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetGrantFullControl sets the GrantFullControl field's value.
 func (s *PutBucketAclInput) SetGrantFullControl(v string) *PutBucketAclInput {
         s.GrantFullControl = &v
@@ -15299,7 +16803,6 @@ func (s *PutBucketAclInput) SetGrantWriteACP(v string) *PutBucketAclInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAclOutput
 type PutBucketAclOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -15314,14 +16817,13 @@ func (s PutBucketAclOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAnalyticsConfigurationRequest
 type PutBucketAnalyticsConfigurationInput struct {
         _ struct{} `type:"structure" payload:"AnalyticsConfiguration"`
 
         // The configuration and any analyses for the analytics filter.
         //
         // AnalyticsConfiguration is a required field
-        AnalyticsConfiguration *AnalyticsConfiguration `locationName:"AnalyticsConfiguration" type:"structure" required:"true"`
+        AnalyticsConfiguration *AnalyticsConfiguration `locationName:"AnalyticsConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 
         // The name of the bucket to which an analytics configuration is stored.
         //
@@ -15380,13 +16882,19 @@ func (s *PutBucketAnalyticsConfigurationInput) SetBucket(v string) *PutBucketAna
         return s
 }
 
+func (s *PutBucketAnalyticsConfigurationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetId sets the Id field's value.
 func (s *PutBucketAnalyticsConfigurationInput) SetId(v string) *PutBucketAnalyticsConfigurationInput {
         s.Id = &v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketAnalyticsConfigurationOutput
 type PutBucketAnalyticsConfigurationOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -15401,7 +16909,6 @@ func (s PutBucketAnalyticsConfigurationOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketCorsRequest
 type PutBucketCorsInput struct {
         _ struct{} `type:"structure" payload:"CORSConfiguration"`
 
@@ -15409,7 +16916,7 @@ type PutBucketCorsInput struct {
         Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
 
         // CORSConfiguration is a required field
-        CORSConfiguration *CORSConfiguration `locationName:"CORSConfiguration" type:"structure" required:"true"`
+        CORSConfiguration *CORSConfiguration `locationName:"CORSConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 }
 
 // String returns the string representation
@@ -15449,13 +16956,19 @@ func (s *PutBucketCorsInput) SetBucket(v string) *PutBucketCorsInput {
         return s
 }
 
+func (s *PutBucketCorsInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetCORSConfiguration sets the CORSConfiguration field's value.
 func (s *PutBucketCorsInput) SetCORSConfiguration(v *CORSConfiguration) *PutBucketCorsInput {
         s.CORSConfiguration = v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketCorsOutput
 type PutBucketCorsOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -15470,7 +16983,86 @@ func (s PutBucketCorsOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketInventoryConfigurationRequest
+type PutBucketEncryptionInput struct {
+        _ struct{} `type:"structure" payload:"ServerSideEncryptionConfiguration"`
+
+        // The name of the bucket for which the server-side encryption configuration
+        // is set.
+        //
+        // Bucket is a required field
+        Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
+
+        // Container for server-side encryption configuration rules. Currently S3 supports
+        // one rule only.
+        //
+        // ServerSideEncryptionConfiguration is a required field
+        ServerSideEncryptionConfiguration *ServerSideEncryptionConfiguration `locationName:"ServerSideEncryptionConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
+}
+
+// String returns the string representation
+func (s PutBucketEncryptionInput) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s PutBucketEncryptionInput) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *PutBucketEncryptionInput) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "PutBucketEncryptionInput"}
+        if s.Bucket == nil {
+                invalidParams.Add(request.NewErrParamRequired("Bucket"))
+        }
+        if s.ServerSideEncryptionConfiguration == nil {
+                invalidParams.Add(request.NewErrParamRequired("ServerSideEncryptionConfiguration"))
+        }
+        if s.ServerSideEncryptionConfiguration != nil {
+                if err := s.ServerSideEncryptionConfiguration.Validate(); err != nil {
+                        invalidParams.AddNested("ServerSideEncryptionConfiguration", err.(request.ErrInvalidParams))
+                }
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetBucket sets the Bucket field's value.
+func (s *PutBucketEncryptionInput) SetBucket(v string) *PutBucketEncryptionInput {
+        s.Bucket = &v
+        return s
+}
+
+func (s *PutBucketEncryptionInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
+// SetServerSideEncryptionConfiguration sets the ServerSideEncryptionConfiguration field's value.
+func (s *PutBucketEncryptionInput) SetServerSideEncryptionConfiguration(v *ServerSideEncryptionConfiguration) *PutBucketEncryptionInput {
+        s.ServerSideEncryptionConfiguration = v
+        return s
+}
+
+type PutBucketEncryptionOutput struct {
+        _ struct{} `type:"structure"`
+}
+
+// String returns the string representation
+func (s PutBucketEncryptionOutput) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s PutBucketEncryptionOutput) GoString() string {
+        return s.String()
+}
+
 type PutBucketInventoryConfigurationInput struct {
         _ struct{} `type:"structure" payload:"InventoryConfiguration"`
 
@@ -15487,7 +17079,7 @@ type PutBucketInventoryConfigurationInput struct {
         // Specifies the inventory configuration.
         //
         // InventoryConfiguration is a required field
-        InventoryConfiguration *InventoryConfiguration `locationName:"InventoryConfiguration" type:"structure" required:"true"`
+        InventoryConfiguration *InventoryConfiguration `locationName:"InventoryConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 }
 
 // String returns the string representation
@@ -15530,6 +17122,13 @@ func (s *PutBucketInventoryConfigurationInput) SetBucket(v string) *PutBucketInv
         return s
 }
 
+func (s *PutBucketInventoryConfigurationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetId sets the Id field's value.
 func (s *PutBucketInventoryConfigurationInput) SetId(v string) *PutBucketInventoryConfigurationInput {
         s.Id = &v
@@ -15542,7 +17141,6 @@ func (s *PutBucketInventoryConfigurationInput) SetInventoryConfiguration(v *Inve
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketInventoryConfigurationOutput
 type PutBucketInventoryConfigurationOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -15557,14 +17155,13 @@ func (s PutBucketInventoryConfigurationOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycleConfigurationRequest
 type PutBucketLifecycleConfigurationInput struct {
         _ struct{} `type:"structure" payload:"LifecycleConfiguration"`
 
         // Bucket is a required field
         Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
 
-        LifecycleConfiguration *BucketLifecycleConfiguration `locationName:"LifecycleConfiguration" type:"structure"`
+        LifecycleConfiguration *BucketLifecycleConfiguration `locationName:"LifecycleConfiguration" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 }
 
 // String returns the string representation
@@ -15601,13 +17198,19 @@ func (s *PutBucketLifecycleConfigurationInput) SetBucket(v string) *PutBucketLif
         return s
 }
 
+func (s *PutBucketLifecycleConfigurationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetLifecycleConfiguration sets the LifecycleConfiguration field's value.
 func (s *PutBucketLifecycleConfigurationInput) SetLifecycleConfiguration(v *BucketLifecycleConfiguration) *PutBucketLifecycleConfigurationInput {
         s.LifecycleConfiguration = v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycleConfigurationOutput
 type PutBucketLifecycleConfigurationOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -15622,14 +17225,13 @@ func (s PutBucketLifecycleConfigurationOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycleRequest
 type PutBucketLifecycleInput struct {
         _ struct{} `type:"structure" payload:"LifecycleConfiguration"`
 
         // Bucket is a required field
         Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
 
-        LifecycleConfiguration *LifecycleConfiguration `locationName:"LifecycleConfiguration" type:"structure"`
+        LifecycleConfiguration *LifecycleConfiguration `locationName:"LifecycleConfiguration" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 }
 
 // String returns the string representation
@@ -15666,13 +17268,19 @@ func (s *PutBucketLifecycleInput) SetBucket(v string) *PutBucketLifecycleInput {
         return s
 }
 
+func (s *PutBucketLifecycleInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetLifecycleConfiguration sets the LifecycleConfiguration field's value.
 func (s *PutBucketLifecycleInput) SetLifecycleConfiguration(v *LifecycleConfiguration) *PutBucketLifecycleInput {
         s.LifecycleConfiguration = v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLifecycleOutput
 type PutBucketLifecycleOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -15687,7 +17295,6 @@ func (s PutBucketLifecycleOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLoggingRequest
 type PutBucketLoggingInput struct {
         _ struct{} `type:"structure" payload:"BucketLoggingStatus"`
 
@@ -15695,7 +17302,7 @@ type PutBucketLoggingInput struct {
         Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
 
         // BucketLoggingStatus is a required field
-        BucketLoggingStatus *BucketLoggingStatus `locationName:"BucketLoggingStatus" type:"structure" required:"true"`
+        BucketLoggingStatus *BucketLoggingStatus `locationName:"BucketLoggingStatus" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 }
 
 // String returns the string representation
@@ -15735,13 +17342,19 @@ func (s *PutBucketLoggingInput) SetBucket(v string) *PutBucketLoggingInput {
         return s
 }
 
+func (s *PutBucketLoggingInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetBucketLoggingStatus sets the BucketLoggingStatus field's value.
 func (s *PutBucketLoggingInput) SetBucketLoggingStatus(v *BucketLoggingStatus) *PutBucketLoggingInput {
         s.BucketLoggingStatus = v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketLoggingOutput
 type PutBucketLoggingOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -15756,7 +17369,6 @@ func (s PutBucketLoggingOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketMetricsConfigurationRequest
 type PutBucketMetricsConfigurationInput struct {
         _ struct{} `type:"structure" payload:"MetricsConfiguration"`
 
@@ -15773,7 +17385,7 @@ type PutBucketMetricsConfigurationInput struct {
         // Specifies the metrics configuration.
         //
         // MetricsConfiguration is a required field
-        MetricsConfiguration *MetricsConfiguration `locationName:"MetricsConfiguration" type:"structure" required:"true"`
+        MetricsConfiguration *MetricsConfiguration `locationName:"MetricsConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 }
 
 // String returns the string representation
@@ -15816,6 +17428,13 @@ func (s *PutBucketMetricsConfigurationInput) SetBucket(v string) *PutBucketMetri
         return s
 }
 
+func (s *PutBucketMetricsConfigurationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetId sets the Id field's value.
 func (s *PutBucketMetricsConfigurationInput) SetId(v string) *PutBucketMetricsConfigurationInput {
         s.Id = &v
@@ -15828,7 +17447,6 @@ func (s *PutBucketMetricsConfigurationInput) SetMetricsConfiguration(v *MetricsC
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketMetricsConfigurationOutput
 type PutBucketMetricsConfigurationOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -15843,7 +17461,6 @@ func (s PutBucketMetricsConfigurationOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotificationConfigurationRequest
 type PutBucketNotificationConfigurationInput struct {
         _ struct{} `type:"structure" payload:"NotificationConfiguration"`
 
@@ -15854,7 +17471,7 @@ type PutBucketNotificationConfigurationInput struct {
         // this element is empty, notifications are turned off on the bucket.
         //
         // NotificationConfiguration is a required field
-        NotificationConfiguration *NotificationConfiguration `locationName:"NotificationConfiguration" type:"structure" required:"true"`
+        NotificationConfiguration *NotificationConfiguration `locationName:"NotificationConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 }
 
 // String returns the string representation
@@ -15894,13 +17511,19 @@ func (s *PutBucketNotificationConfigurationInput) SetBucket(v string) *PutBucket
         return s
 }
 
+func (s *PutBucketNotificationConfigurationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetNotificationConfiguration sets the NotificationConfiguration field's value.
 func (s *PutBucketNotificationConfigurationInput) SetNotificationConfiguration(v *NotificationConfiguration) *PutBucketNotificationConfigurationInput {
         s.NotificationConfiguration = v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotificationConfigurationOutput
 type PutBucketNotificationConfigurationOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -15915,7 +17538,6 @@ func (s PutBucketNotificationConfigurationOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotificationRequest
 type PutBucketNotificationInput struct {
         _ struct{} `type:"structure" payload:"NotificationConfiguration"`
 
@@ -15923,7 +17545,7 @@ type PutBucketNotificationInput struct {
         Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
 
         // NotificationConfiguration is a required field
-        NotificationConfiguration *NotificationConfigurationDeprecated `locationName:"NotificationConfiguration" type:"structure" required:"true"`
+        NotificationConfiguration *NotificationConfigurationDeprecated `locationName:"NotificationConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 }
 
 // String returns the string representation
@@ -15958,13 +17580,19 @@ func (s *PutBucketNotificationInput) SetBucket(v string) *PutBucketNotificationI
         return s
 }
 
+func (s *PutBucketNotificationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetNotificationConfiguration sets the NotificationConfiguration field's value.
 func (s *PutBucketNotificationInput) SetNotificationConfiguration(v *NotificationConfigurationDeprecated) *PutBucketNotificationInput {
         s.NotificationConfiguration = v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketNotificationOutput
 type PutBucketNotificationOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -15979,13 +17607,16 @@ func (s PutBucketNotificationOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketPolicyRequest
 type PutBucketPolicyInput struct {
         _ struct{} `type:"structure" payload:"Policy"`
 
         // Bucket is a required field
         Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
 
+        // Set this parameter to true to confirm that you want to remove your permissions
+        // to change this bucket policy in the future.
+        ConfirmRemoveSelfBucketAccess *bool `location:"header" locationName:"x-amz-confirm-remove-self-bucket-access" type:"boolean"`
+
         // The bucket policy as a JSON document.
         //
         // Policy is a required field
@@ -16024,13 +17655,25 @@ func (s *PutBucketPolicyInput) SetBucket(v string) *PutBucketPolicyInput {
         return s
 }
 
+func (s *PutBucketPolicyInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
+// SetConfirmRemoveSelfBucketAccess sets the ConfirmRemoveSelfBucketAccess field's value.
+func (s *PutBucketPolicyInput) SetConfirmRemoveSelfBucketAccess(v bool) *PutBucketPolicyInput {
+        s.ConfirmRemoveSelfBucketAccess = &v
+        return s
+}
+
 // SetPolicy sets the Policy field's value.
 func (s *PutBucketPolicyInput) SetPolicy(v string) *PutBucketPolicyInput {
         s.Policy = &v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketPolicyOutput
 type PutBucketPolicyOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -16045,7 +17688,6 @@ func (s PutBucketPolicyOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketReplicationRequest
 type PutBucketReplicationInput struct {
         _ struct{} `type:"structure" payload:"ReplicationConfiguration"`
 
@@ -16056,7 +17698,7 @@ type PutBucketReplicationInput struct {
         // replication configuration size can be up to 2 MB.
         //
         // ReplicationConfiguration is a required field
-        ReplicationConfiguration *ReplicationConfiguration `locationName:"ReplicationConfiguration" type:"structure" required:"true"`
+        ReplicationConfiguration *ReplicationConfiguration `locationName:"ReplicationConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 }
 
 // String returns the string representation
@@ -16096,13 +17738,19 @@ func (s *PutBucketReplicationInput) SetBucket(v string) *PutBucketReplicationInp
         return s
 }
 
+func (s *PutBucketReplicationInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetReplicationConfiguration sets the ReplicationConfiguration field's value.
 func (s *PutBucketReplicationInput) SetReplicationConfiguration(v *ReplicationConfiguration) *PutBucketReplicationInput {
         s.ReplicationConfiguration = v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketReplicationOutput
 type PutBucketReplicationOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -16117,7 +17765,6 @@ func (s PutBucketReplicationOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketRequestPaymentRequest
 type PutBucketRequestPaymentInput struct {
         _ struct{} `type:"structure" payload:"RequestPaymentConfiguration"`
 
@@ -16125,7 +17772,7 @@ type PutBucketRequestPaymentInput struct {
         Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
 
         // RequestPaymentConfiguration is a required field
-        RequestPaymentConfiguration *RequestPaymentConfiguration `locationName:"RequestPaymentConfiguration" type:"structure" required:"true"`
+        RequestPaymentConfiguration *RequestPaymentConfiguration `locationName:"RequestPaymentConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 }
 
 // String returns the string representation
@@ -16165,13 +17812,19 @@ func (s *PutBucketRequestPaymentInput) SetBucket(v string) *PutBucketRequestPaym
         return s
 }
 
+func (s *PutBucketRequestPaymentInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetRequestPaymentConfiguration sets the RequestPaymentConfiguration field's value.
 func (s *PutBucketRequestPaymentInput) SetRequestPaymentConfiguration(v *RequestPaymentConfiguration) *PutBucketRequestPaymentInput {
         s.RequestPaymentConfiguration = v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketRequestPaymentOutput
 type PutBucketRequestPaymentOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -16186,7 +17839,6 @@ func (s PutBucketRequestPaymentOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketTaggingRequest
 type PutBucketTaggingInput struct {
         _ struct{} `type:"structure" payload:"Tagging"`
 
@@ -16194,7 +17846,7 @@ type PutBucketTaggingInput struct {
         Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
 
         // Tagging is a required field
-        Tagging *Tagging `locationName:"Tagging" type:"structure" required:"true"`
+        Tagging *Tagging `locationName:"Tagging" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 }
 
 // String returns the string representation
@@ -16234,13 +17886,19 @@ func (s *PutBucketTaggingInput) SetBucket(v string) *PutBucketTaggingInput {
         return s
 }
 
+func (s *PutBucketTaggingInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetTagging sets the Tagging field's value.
 func (s *PutBucketTaggingInput) SetTagging(v *Tagging) *PutBucketTaggingInput {
         s.Tagging = v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketTaggingOutput
 type PutBucketTaggingOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -16255,7 +17913,6 @@ func (s PutBucketTaggingOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketVersioningRequest
 type PutBucketVersioningInput struct {
         _ struct{} `type:"structure" payload:"VersioningConfiguration"`
 
@@ -16267,7 +17924,7 @@ type PutBucketVersioningInput struct {
         MFA *string `location:"header" locationName:"x-amz-mfa" type:"string"`
 
         // VersioningConfiguration is a required field
-        VersioningConfiguration *VersioningConfiguration `locationName:"VersioningConfiguration" type:"structure" required:"true"`
+        VersioningConfiguration *VersioningConfiguration `locationName:"VersioningConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 }
 
 // String returns the string representation
@@ -16302,6 +17959,13 @@ func (s *PutBucketVersioningInput) SetBucket(v string) *PutBucketVersioningInput
         return s
 }
 
+func (s *PutBucketVersioningInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetMFA sets the MFA field's value.
 func (s *PutBucketVersioningInput) SetMFA(v string) *PutBucketVersioningInput {
         s.MFA = &v
@@ -16314,7 +17978,6 @@ func (s *PutBucketVersioningInput) SetVersioningConfiguration(v *VersioningConfi
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketVersioningOutput
 type PutBucketVersioningOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -16329,7 +17992,6 @@ func (s PutBucketVersioningOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketWebsiteRequest
 type PutBucketWebsiteInput struct {
         _ struct{} `type:"structure" payload:"WebsiteConfiguration"`
 
@@ -16337,7 +17999,7 @@ type PutBucketWebsiteInput struct {
         Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
 
         // WebsiteConfiguration is a required field
-        WebsiteConfiguration *WebsiteConfiguration `locationName:"WebsiteConfiguration" type:"structure" required:"true"`
+        WebsiteConfiguration *WebsiteConfiguration `locationName:"WebsiteConfiguration" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 }
 
 // String returns the string representation
@@ -16377,13 +18039,19 @@ func (s *PutBucketWebsiteInput) SetBucket(v string) *PutBucketWebsiteInput {
         return s
 }
 
+func (s *PutBucketWebsiteInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetWebsiteConfiguration sets the WebsiteConfiguration field's value.
 func (s *PutBucketWebsiteInput) SetWebsiteConfiguration(v *WebsiteConfiguration) *PutBucketWebsiteInput {
         s.WebsiteConfiguration = v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutBucketWebsiteOutput
 type PutBucketWebsiteOutput struct {
         _ struct{} `type:"structure"`
 }
@@ -16398,14 +18066,13 @@ func (s PutBucketWebsiteOutput) GoString() string {
         return s.String()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectAclRequest
 type PutObjectAclInput struct {
         _ struct{} `type:"structure" payload:"AccessControlPolicy"`
 
         // The canned ACL to apply to the object.
         ACL *string `location:"header" locationName:"x-amz-acl" type:"string" enum:"ObjectCannedACL"`
 
-        AccessControlPolicy *AccessControlPolicy `locationName:"AccessControlPolicy" type:"structure"`
+        AccessControlPolicy *AccessControlPolicy `locationName:"AccessControlPolicy" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 
         // Bucket is a required field
         Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
@@ -16491,6 +18158,13 @@ func (s *PutObjectAclInput) SetBucket(v string) *PutObjectAclInput {
         return s
 }
 
+func (s *PutObjectAclInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetGrantFullControl sets the GrantFullControl field's value.
 func (s *PutObjectAclInput) SetGrantFullControl(v string) *PutObjectAclInput {
         s.GrantFullControl = &v
@@ -16539,7 +18213,6 @@ func (s *PutObjectAclInput) SetVersionId(v string) *PutObjectAclInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectAclOutput
 type PutObjectAclOutput struct {
         _ struct{} `type:"structure"`
 
@@ -16564,7 +18237,6 @@ func (s *PutObjectAclOutput) SetRequestCharged(v string) *PutObjectAclOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectRequest
 type PutObjectInput struct {
         _ struct{} `type:"structure" payload:"Body"`
 
@@ -16597,11 +18269,14 @@ type PutObjectInput struct {
         // body cannot be determined automatically.
         ContentLength *int64 `location:"header" locationName:"Content-Length" type:"long"`
 
+        // The base64-encoded 128-bit MD5 digest of the part data.
+        ContentMD5 *string `location:"header" locationName:"Content-MD5" type:"string"`
+
         // A standard MIME type describing the format of the object data.
         ContentType *string `location:"header" locationName:"Content-Type" type:"string"`
 
         // The date and time at which the object is no longer cacheable.
-        Expires *time.Time `location:"header" locationName:"Expires" type:"timestamp" timestampFormat:"rfc822"`
+        Expires *time.Time `location:"header" locationName:"Expires" type:"timestamp"`
 
         // Gives the grantee READ, READ_ACP, and WRITE_ACP permissions on the object.
         GrantFullControl *string `location:"header" locationName:"x-amz-grant-full-control" type:"string"`
@@ -16713,6 +18388,13 @@ func (s *PutObjectInput) SetBucket(v string) *PutObjectInput {
         return s
 }
 
+func (s *PutObjectInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetCacheControl sets the CacheControl field's value.
 func (s *PutObjectInput) SetCacheControl(v string) *PutObjectInput {
         s.CacheControl = &v
@@ -16743,6 +18425,12 @@ func (s *PutObjectInput) SetContentLength(v int64) *PutObjectInput {
         return s
 }
 
+// SetContentMD5 sets the ContentMD5 field's value.
+func (s *PutObjectInput) SetContentMD5(v string) *PutObjectInput {
+        s.ContentMD5 = &v
+        return s
+}
+
 // SetContentType sets the ContentType field's value.
 func (s *PutObjectInput) SetContentType(v string) *PutObjectInput {
         s.ContentType = &v
@@ -16809,6 +18497,13 @@ func (s *PutObjectInput) SetSSECustomerKey(v string) *PutObjectInput {
         return s
 }
 
+func (s *PutObjectInput) getSSECustomerKey() (v string) {
+        if s.SSECustomerKey == nil {
+                return v
+        }
+        return *s.SSECustomerKey
+}
+
 // SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
 func (s *PutObjectInput) SetSSECustomerKeyMD5(v string) *PutObjectInput {
         s.SSECustomerKeyMD5 = &v
@@ -16845,7 +18540,6 @@ func (s *PutObjectInput) SetWebsiteRedirectLocation(v string) *PutObjectInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectOutput
 type PutObjectOutput struct {
         _ struct{} `type:"structure"`
 
@@ -16940,7 +18634,6 @@ func (s *PutObjectOutput) SetVersionId(v string) *PutObjectOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectTaggingRequest
 type PutObjectTaggingInput struct {
         _ struct{} `type:"structure" payload:"Tagging"`
 
@@ -16951,7 +18644,7 @@ type PutObjectTaggingInput struct {
         Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
 
         // Tagging is a required field
-        Tagging *Tagging `locationName:"Tagging" type:"structure" required:"true"`
+        Tagging *Tagging `locationName:"Tagging" type:"structure" required:"true" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 
         VersionId *string `location:"querystring" locationName:"versionId" type:"string"`
 }
@@ -16999,6 +18692,13 @@ func (s *PutObjectTaggingInput) SetBucket(v string) *PutObjectTaggingInput {
         return s
 }
 
+func (s *PutObjectTaggingInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetKey sets the Key field's value.
 func (s *PutObjectTaggingInput) SetKey(v string) *PutObjectTaggingInput {
         s.Key = &v
@@ -17017,7 +18717,6 @@ func (s *PutObjectTaggingInput) SetVersionId(v string) *PutObjectTaggingInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/PutObjectTaggingOutput
 type PutObjectTaggingOutput struct {
         _ struct{} `type:"structure"`
 
@@ -17042,7 +18741,6 @@ func (s *PutObjectTaggingOutput) SetVersionId(v string) *PutObjectTaggingOutput
 
 // Container for specifying an configuration when you want Amazon S3 to publish
 // events to an Amazon Simple Queue Service (Amazon SQS) queue.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/QueueConfiguration
 type QueueConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -17051,6 +18749,7 @@ type QueueConfiguration struct {
 
         // Container for object key name filtering rules. For information about key
         // name filtering, go to Configuring Event Notifications (http://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
+        // in the Amazon Simple Storage Service Developer Guide.
         Filter *NotificationConfigurationFilter `type:"structure"`
 
         // Optional unique identifier for configurations in a notification configuration.
@@ -17114,7 +18813,6 @@ func (s *QueueConfiguration) SetQueueArn(v string) *QueueConfiguration {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/QueueConfigurationDeprecated
 type QueueConfigurationDeprecated struct {
         _ struct{} `type:"structure"`
 
@@ -17164,7 +18862,45 @@ func (s *QueueConfigurationDeprecated) SetQueue(v string) *QueueConfigurationDep
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Redirect
+type RecordsEvent struct {
+        _ struct{} `locationName:"RecordsEvent" type:"structure" payload:"Payload"`
+
+        // The byte array of partial, one or more result records.
+        //
+        // Payload is automatically base64 encoded/decoded by the SDK.
+        Payload []byte `type:"blob"`
+}
+
+// String returns the string representation
+func (s RecordsEvent) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s RecordsEvent) GoString() string {
+        return s.String()
+}
+
+// SetPayload sets the Payload field's value.
+func (s *RecordsEvent) SetPayload(v []byte) *RecordsEvent {
+        s.Payload = v
+        return s
+}
+
+// The RecordsEvent is and event in the SelectObjectContentEventStream group of events.
+func (s *RecordsEvent) eventSelectObjectContentEventStream() {}
+
+// UnmarshalEvent unmarshals the EventStream Message into the RecordsEvent value.
+// This method is only used internally within the SDK's EventStream handling.
+func (s *RecordsEvent) UnmarshalEvent(
+        payloadUnmarshaler protocol.PayloadUnmarshaler,
+        msg eventstream.Message,
+) error {
+        s.Payload = make([]byte, len(msg.Payload))
+        copy(s.Payload, msg.Payload)
+        return nil
+}
+
 type Redirect struct {
         _ struct{} `type:"structure"`
 
@@ -17233,7 +18969,6 @@ func (s *Redirect) SetReplaceKeyWith(v string) *Redirect {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RedirectAllRequestsTo
 type RedirectAllRequestsTo struct {
         _ struct{} `type:"structure"`
 
@@ -17284,7 +19019,6 @@ func (s *RedirectAllRequestsTo) SetProtocol(v string) *RedirectAllRequestsTo {
 
 // Container for replication rules. You can add as many as 1,000 rules. Total
 // replication configuration size can be up to 2 MB.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ReplicationConfiguration
 type ReplicationConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -17349,10 +19083,12 @@ func (s *ReplicationConfiguration) SetRules(v []*ReplicationRule) *ReplicationCo
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/ReplicationRule
+// Container for information about a particular replication rule.
 type ReplicationRule struct {
         _ struct{} `type:"structure"`
 
+        // Container for replication destination information.
+        //
         // Destination is a required field
         Destination *Destination `type:"structure" required:"true"`
 
@@ -17366,6 +19102,9 @@ type ReplicationRule struct {
         // Prefix is a required field
         Prefix *string `type:"string" required:"true"`
 
+        // Container for filters that define which source objects should be replicated.
+        SourceSelectionCriteria *SourceSelectionCriteria `type:"structure"`
+
         // The rule is ignored if status is not Enabled.
         //
         // Status is a required field
@@ -17399,6 +19138,11 @@ func (s *ReplicationRule) Validate() error {
                         invalidParams.AddNested("Destination", err.(request.ErrInvalidParams))
                 }
         }
+        if s.SourceSelectionCriteria != nil {
+                if err := s.SourceSelectionCriteria.Validate(); err != nil {
+                        invalidParams.AddNested("SourceSelectionCriteria", err.(request.ErrInvalidParams))
+                }
+        }
 
         if invalidParams.Len() > 0 {
                 return invalidParams
@@ -17424,13 +19168,18 @@ func (s *ReplicationRule) SetPrefix(v string) *ReplicationRule {
         return s
 }
 
+// SetSourceSelectionCriteria sets the SourceSelectionCriteria field's value.
+func (s *ReplicationRule) SetSourceSelectionCriteria(v *SourceSelectionCriteria) *ReplicationRule {
+        s.SourceSelectionCriteria = v
+        return s
+}
+
 // SetStatus sets the Status field's value.
 func (s *ReplicationRule) SetStatus(v string) *ReplicationRule {
         s.Status = &v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RequestPaymentConfiguration
 type RequestPaymentConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -17469,7 +19218,30 @@ func (s *RequestPaymentConfiguration) SetPayer(v string) *RequestPaymentConfigur
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreObjectRequest
+type RequestProgress struct {
+        _ struct{} `type:"structure"`
+
+        // Specifies whether periodic QueryProgress frames should be sent. Valid values:
+        // TRUE, FALSE. Default value: FALSE.
+        Enabled *bool `type:"boolean"`
+}
+
+// String returns the string representation
+func (s RequestProgress) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s RequestProgress) GoString() string {
+        return s.String()
+}
+
+// SetEnabled sets the Enabled field's value.
+func (s *RequestProgress) SetEnabled(v bool) *RequestProgress {
+        s.Enabled = &v
+        return s
+}
+
 type RestoreObjectInput struct {
         _ struct{} `type:"structure" payload:"RestoreRequest"`
 
@@ -17485,7 +19257,8 @@ type RestoreObjectInput struct {
         // at http://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectsinRequesterPaysBuckets.html
         RequestPayer *string `location:"header" locationName:"x-amz-request-payer" type:"string" enum:"RequestPayer"`
 
-        RestoreRequest *RestoreRequest `locationName:"RestoreRequest" type:"structure"`
+        // Container for restore job parameters.
+        RestoreRequest *RestoreRequest `locationName:"RestoreRequest" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
 
         VersionId *string `location:"querystring" locationName:"versionId" type:"string"`
 }
@@ -17530,6 +19303,13 @@ func (s *RestoreObjectInput) SetBucket(v string) *RestoreObjectInput {
         return s
 }
 
+func (s *RestoreObjectInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetKey sets the Key field's value.
 func (s *RestoreObjectInput) SetKey(v string) *RestoreObjectInput {
         s.Key = &v
@@ -17554,13 +19334,16 @@ func (s *RestoreObjectInput) SetVersionId(v string) *RestoreObjectInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreObjectOutput
 type RestoreObjectOutput struct {
         _ struct{} `type:"structure"`
 
         // If present, indicates that the requester was successfully charged for the
         // request.
         RequestCharged *string `location:"header" locationName:"x-amz-request-charged" type:"string" enum:"RequestCharged"`
+
+        // Indicates the path in the provided S3 output location where Select results
+        // will be restored to.
+        RestoreOutputPath *string `location:"header" locationName:"x-amz-restore-output-path" type:"string"`
 }
 
 // String returns the string representation
@@ -17579,17 +19362,38 @@ func (s *RestoreObjectOutput) SetRequestCharged(v string) *RestoreObjectOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RestoreRequest
+// SetRestoreOutputPath sets the RestoreOutputPath field's value.
+func (s *RestoreObjectOutput) SetRestoreOutputPath(v string) *RestoreObjectOutput {
+        s.RestoreOutputPath = &v
+        return s
+}
+
+// Container for restore job parameters.
 type RestoreRequest struct {
         _ struct{} `type:"structure"`
 
-        // Lifetime of the active copy in days
-        //
-        // Days is a required field
-        Days *int64 `type:"integer" required:"true"`
+        // Lifetime of the active copy in days. Do not use with restores that specify
+        // OutputLocation.
+        Days *int64 `type:"integer"`
+
+        // The optional description for the job.
+        Description *string `type:"string"`
 
-        // Glacier related prameters pertaining to this job.
+        // Glacier related parameters pertaining to this job. Do not use with restores
+        // that specify OutputLocation.
         GlacierJobParameters *GlacierJobParameters `type:"structure"`
+
+        // Describes the location where the restore job's output is stored.
+        OutputLocation *OutputLocation `type:"structure"`
+
+        // Describes the parameters for Select job types.
+        SelectParameters *SelectParameters `type:"structure"`
+
+        // Glacier retrieval tier at which the restore will be processed.
+        Tier *string `type:"string" enum:"Tier"`
+
+        // Type of restore request.
+        Type *string `type:"string" enum:"RestoreRequestType"`
 }
 
 // String returns the string representation
@@ -17605,14 +19409,21 @@ func (s RestoreRequest) GoString() string {
 // Validate inspects the fields of the type to determine if they are valid.
 func (s *RestoreRequest) Validate() error {
         invalidParams := request.ErrInvalidParams{Context: "RestoreRequest"}
-        if s.Days == nil {
-                invalidParams.Add(request.NewErrParamRequired("Days"))
-        }
         if s.GlacierJobParameters != nil {
                 if err := s.GlacierJobParameters.Validate(); err != nil {
                         invalidParams.AddNested("GlacierJobParameters", err.(request.ErrInvalidParams))
                 }
         }
+        if s.OutputLocation != nil {
+                if err := s.OutputLocation.Validate(); err != nil {
+                        invalidParams.AddNested("OutputLocation", err.(request.ErrInvalidParams))
+                }
+        }
+        if s.SelectParameters != nil {
+                if err := s.SelectParameters.Validate(); err != nil {
+                        invalidParams.AddNested("SelectParameters", err.(request.ErrInvalidParams))
+                }
+        }
 
         if invalidParams.Len() > 0 {
                 return invalidParams
@@ -17626,13 +19437,42 @@ func (s *RestoreRequest) SetDays(v int64) *RestoreRequest {
         return s
 }
 
+// SetDescription sets the Description field's value.
+func (s *RestoreRequest) SetDescription(v string) *RestoreRequest {
+        s.Description = &v
+        return s
+}
+
 // SetGlacierJobParameters sets the GlacierJobParameters field's value.
 func (s *RestoreRequest) SetGlacierJobParameters(v *GlacierJobParameters) *RestoreRequest {
         s.GlacierJobParameters = v
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/RoutingRule
+// SetOutputLocation sets the OutputLocation field's value.
+func (s *RestoreRequest) SetOutputLocation(v *OutputLocation) *RestoreRequest {
+        s.OutputLocation = v
+        return s
+}
+
+// SetSelectParameters sets the SelectParameters field's value.
+func (s *RestoreRequest) SetSelectParameters(v *SelectParameters) *RestoreRequest {
+        s.SelectParameters = v
+        return s
+}
+
+// SetTier sets the Tier field's value.
+func (s *RestoreRequest) SetTier(v string) *RestoreRequest {
+        s.Tier = &v
+        return s
+}
+
+// SetType sets the Type field's value.
+func (s *RestoreRequest) SetType(v string) *RestoreRequest {
+        s.Type = &v
+        return s
+}
+
 type RoutingRule struct {
         _ struct{} `type:"structure"`
 
@@ -17685,7 +19525,6 @@ func (s *RoutingRule) SetRedirect(v *Redirect) *RoutingRule {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Rule
 type Rule struct {
         _ struct{} `type:"structure"`
 
@@ -17706,10 +19545,11 @@ type Rule struct {
         NoncurrentVersionExpiration *NoncurrentVersionExpiration `type:"structure"`
 
         // Container for the transition rule that describes when noncurrent objects
-        // transition to the STANDARD_IA or GLACIER storage class. If your bucket is
-        // versioning-enabled (or versioning is suspended), you can set this action
-        // to request that Amazon S3 transition noncurrent object versions to the STANDARD_IA
-        // or GLACIER storage class at a specific period in the object's lifetime.
+        // transition to the STANDARD_IA, ONEZONE_IA or GLACIER storage class. If your
+        // bucket is versioning-enabled (or versioning is suspended), you can set this
+        // action to request that Amazon S3 transition noncurrent object versions to
+        // the STANDARD_IA, ONEZONE_IA or GLACIER storage class at a specific period
+        // in the object's lifetime.
         NoncurrentVersionTransition *NoncurrentVersionTransition `type:"structure"`
 
         // Prefix identifying one or more objects to which the rule applies.
@@ -17800,7 +19640,879 @@ func (s *Rule) SetTransition(v *Transition) *Rule {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/StorageClassAnalysis
+// Specifies the use of SSE-KMS to encrypt delievered Inventory reports.
+type SSEKMS struct {
+        _ struct{} `locationName:"SSE-KMS" type:"structure"`
+
+        // Specifies the ID of the AWS Key Management Service (KMS) master encryption
+        // key to use for encrypting Inventory reports.
+        //
+        // KeyId is a required field
+        KeyId *string `type:"string" required:"true"`
+}
+
+// String returns the string representation
+func (s SSEKMS) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s SSEKMS) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *SSEKMS) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "SSEKMS"}
+        if s.KeyId == nil {
+                invalidParams.Add(request.NewErrParamRequired("KeyId"))
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetKeyId sets the KeyId field's value.
+func (s *SSEKMS) SetKeyId(v string) *SSEKMS {
+        s.KeyId = &v
+        return s
+}
+
+// Specifies the use of SSE-S3 to encrypt delievered Inventory reports.
+type SSES3 struct {
+        _ struct{} `locationName:"SSE-S3" type:"structure"`
+}
+
+// String returns the string representation
+func (s SSES3) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s SSES3) GoString() string {
+        return s.String()
+}
+
+// SelectObjectContentEventStream provides handling of EventStreams for
+// the SelectObjectContent API.
+//
+// Use this type to receive SelectObjectContentEventStream events. The events
+// can be read from the Events channel member.
+//
+// The events that can be received are:
+//
+//     * ContinuationEvent
+//     * EndEvent
+//     * ProgressEvent
+//     * RecordsEvent
+//     * StatsEvent
+type SelectObjectContentEventStream struct {
+        // Reader is the EventStream reader for the SelectObjectContentEventStream
+        // events. This value is automatically set by the SDK when the API call is made
+        // Use this member when unit testing your code with the SDK to mock out the
+        // EventStream Reader.
+        //
+        // Must not be nil.
+        Reader SelectObjectContentEventStreamReader
+
+        // StreamCloser is the io.Closer for the EventStream connection. For HTTP
+        // EventStream this is the response Body. The stream will be closed when
+        // the Close method of the EventStream is called.
+        StreamCloser io.Closer
+}
+
+// Close closes the EventStream. This will also cause the Events channel to be
+// closed. You can use the closing of the Events channel to terminate your
+// application's read from the API's EventStream.
+//
+// Will close the underlying EventStream reader. For EventStream over HTTP
+// connection this will also close the HTTP connection.
+//
+// Close must be called when done using the EventStream API. Not calling Close
+// may result in resource leaks.
+func (es *SelectObjectContentEventStream) Close() (err error) {
+        es.Reader.Close()
+        return es.Err()
+}
+
+// Err returns any error that occurred while reading EventStream Events from
+// the service API's response. Returns nil if there were no errors.
+func (es *SelectObjectContentEventStream) Err() error {
+        if err := es.Reader.Err(); err != nil {
+                return err
+        }
+        es.StreamCloser.Close()
+
+        return nil
+}
+
+// Events returns a channel to read EventStream Events from the
+// SelectObjectContent API.
+//
+// These events are:
+//
+//     * ContinuationEvent
+//     * EndEvent
+//     * ProgressEvent
+//     * RecordsEvent
+//     * StatsEvent
+func (es *SelectObjectContentEventStream) Events() <-chan SelectObjectContentEventStreamEvent {
+        return es.Reader.Events()
+}
+
+// SelectObjectContentEventStreamEvent groups together all EventStream
+// events read from the SelectObjectContent API.
+//
+// These events are:
+//
+//     * ContinuationEvent
+//     * EndEvent
+//     * ProgressEvent
+//     * RecordsEvent
+//     * StatsEvent
+type SelectObjectContentEventStreamEvent interface {
+        eventSelectObjectContentEventStream()
+}
+
+// SelectObjectContentEventStreamReader provides the interface for reading EventStream
+// Events from the SelectObjectContent API. The
+// default implementation for this interface will be SelectObjectContentEventStream.
+//
+// The reader's Close method must allow multiple concurrent calls.
+//
+// These events are:
+//
+//     * ContinuationEvent
+//     * EndEvent
+//     * ProgressEvent
+//     * RecordsEvent
+//     * StatsEvent
+type SelectObjectContentEventStreamReader interface {
+        // Returns a channel of events as they are read from the event stream.
+        Events() <-chan SelectObjectContentEventStreamEvent
+
+        // Close will close the underlying event stream reader. For event stream over
+        // HTTP this will also close the HTTP connection.
+        Close() error
+
+        // Returns any error that has occured while reading from the event stream.
+        Err() error
+}
+
+type readSelectObjectContentEventStream struct {
+        eventReader *eventstreamapi.EventReader
+        stream      chan SelectObjectContentEventStreamEvent
+        errVal      atomic.Value
+
+        done      chan struct{}
+        closeOnce sync.Once
+}
+
+func newReadSelectObjectContentEventStream(
+        reader io.ReadCloser,
+        unmarshalers request.HandlerList,
+        logger aws.Logger,
+        logLevel aws.LogLevelType,
+) *readSelectObjectContentEventStream {
+        r := &readSelectObjectContentEventStream{
+                stream: make(chan SelectObjectContentEventStreamEvent),
+                done:   make(chan struct{}),
+        }
+
+        r.eventReader = eventstreamapi.NewEventReader(
+                reader,
+                protocol.HandlerPayloadUnmarshal{
+                        Unmarshalers: unmarshalers,
+                },
+                r.unmarshalerForEventType,
+        )
+        r.eventReader.UseLogger(logger, logLevel)
+
+        return r
+}
+
+// Close will close the underlying event stream reader. For EventStream over
+// HTTP this will also close the HTTP connection.
+func (r *readSelectObjectContentEventStream) Close() error {
+        r.closeOnce.Do(r.safeClose)
+
+        return r.Err()
+}
+
+func (r *readSelectObjectContentEventStream) safeClose() {
+        close(r.done)
+        err := r.eventReader.Close()
+        if err != nil {
+                r.errVal.Store(err)
+        }
+}
+
+func (r *readSelectObjectContentEventStream) Err() error {
+        if v := r.errVal.Load(); v != nil {
+                return v.(error)
+        }
+
+        return nil
+}
+
+func (r *readSelectObjectContentEventStream) Events() <-chan SelectObjectContentEventStreamEvent {
+        return r.stream
+}
+
+func (r *readSelectObjectContentEventStream) readEventStream() {
+        defer close(r.stream)
+
+        for {
+                event, err := r.eventReader.ReadEvent()
+                if err != nil {
+                        if err == io.EOF {
+                                return
+                        }
+                        select {
+                        case <-r.done:
+                                // If closed already ignore the error
+                                return
+                        default:
+                        }
+                        r.errVal.Store(err)
+                        return
+                }
+
+                select {
+                case r.stream <- event.(SelectObjectContentEventStreamEvent):
+                case <-r.done:
+                        return
+                }
+        }
+}
+
+func (r *readSelectObjectContentEventStream) unmarshalerForEventType(
+        eventType string,
+) (eventstreamapi.Unmarshaler, error) {
+        switch eventType {
+        case "Cont":
+                return &ContinuationEvent{}, nil
+
+        case "End":
+                return &EndEvent{}, nil
+
+        case "Progress":
+                return &ProgressEvent{}, nil
+
+        case "Records":
+                return &RecordsEvent{}, nil
+
+        case "Stats":
+                return &StatsEvent{}, nil
+        default:
+                return nil, awserr.New(
+                        request.ErrCodeSerialization,
+                        fmt.Sprintf("unknown event type name, %s, for SelectObjectContentEventStream", eventType),
+                        nil,
+                )
+        }
+}
+
+// Request to filter the contents of an Amazon S3 object based on a simple Structured
+// Query Language (SQL) statement. In the request, along with the SQL expression,
+// you must also specify a data serialization format (JSON or CSV) of the object.
+// Amazon S3 uses this to parse object data into records, and returns only records
+// that match the specified SQL expression. You must also specify the data serialization
+// format for the response. For more information, go to S3Select API Documentation
+// (http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectSELECTContent.html).
+type SelectObjectContentInput struct {
+        _ struct{} `locationName:"SelectObjectContentRequest" type:"structure" xmlURI:"http://s3.amazonaws.com/doc/2006-03-01/"`
+
+        // The S3 Bucket.
+        //
+        // Bucket is a required field
+        Bucket *string `location:"uri" locationName:"Bucket" type:"string" required:"true"`
+
+        // The expression that is used to query the object.
+        //
+        // Expression is a required field
+        Expression *string `type:"string" required:"true"`
+
+        // The type of the provided expression (e.g., SQL).
+        //
+        // ExpressionType is a required field
+        ExpressionType *string `type:"string" required:"true" enum:"ExpressionType"`
+
+        // Describes the format of the data in the object that is being queried.
+        //
+        // InputSerialization is a required field
+        InputSerialization *InputSerialization `type:"structure" required:"true"`
+
+        // The Object Key.
+        //
+        // Key is a required field
+        Key *string `location:"uri" locationName:"Key" min:"1" type:"string" required:"true"`
+
+        // Describes the format of the data that you want Amazon S3 to return in response.
+        //
+        // OutputSerialization is a required field
+        OutputSerialization *OutputSerialization `type:"structure" required:"true"`
+
+        // Specifies if periodic request progress information should be enabled.
+        RequestProgress *RequestProgress `type:"structure"`
+
+        // The SSE Algorithm used to encrypt the object. For more information, go to
+        //  Server-Side Encryption (Using Customer-Provided Encryption Keys (http://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html).
+        SSECustomerAlgorithm *string `location:"header" locationName:"x-amz-server-side-encryption-customer-algorithm" type:"string"`
+
+        // The SSE Customer Key. For more information, go to  Server-Side Encryption
+        // (Using Customer-Provided Encryption Keys (http://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html).
+        SSECustomerKey *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key" type:"string"`
+
+        // The SSE Customer Key MD5. For more information, go to  Server-Side Encryption
+        // (Using Customer-Provided Encryption Keys (http://docs.aws.amazon.com/AmazonS3/latest/dev/ServerSideEncryptionCustomerKeys.html).
+        SSECustomerKeyMD5 *string `location:"header" locationName:"x-amz-server-side-encryption-customer-key-MD5" type:"string"`
+}
+
+// String returns the string representation
+func (s SelectObjectContentInput) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s SelectObjectContentInput) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *SelectObjectContentInput) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "SelectObjectContentInput"}
+        if s.Bucket == nil {
+                invalidParams.Add(request.NewErrParamRequired("Bucket"))
+        }
+        if s.Expression == nil {
+                invalidParams.Add(request.NewErrParamRequired("Expression"))
+        }
+        if s.ExpressionType == nil {
+                invalidParams.Add(request.NewErrParamRequired("ExpressionType"))
+        }
+        if s.InputSerialization == nil {
+                invalidParams.Add(request.NewErrParamRequired("InputSerialization"))
+        }
+        if s.Key == nil {
+                invalidParams.Add(request.NewErrParamRequired("Key"))
+        }
+        if s.Key != nil && len(*s.Key) < 1 {
+                invalidParams.Add(request.NewErrParamMinLen("Key", 1))
+        }
+        if s.OutputSerialization == nil {
+                invalidParams.Add(request.NewErrParamRequired("OutputSerialization"))
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetBucket sets the Bucket field's value.
+func (s *SelectObjectContentInput) SetBucket(v string) *SelectObjectContentInput {
+        s.Bucket = &v
+        return s
+}
+
+func (s *SelectObjectContentInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
+// SetExpression sets the Expression field's value.
+func (s *SelectObjectContentInput) SetExpression(v string) *SelectObjectContentInput {
+        s.Expression = &v
+        return s
+}
+
+// SetExpressionType sets the ExpressionType field's value.
+func (s *SelectObjectContentInput) SetExpressionType(v string) *SelectObjectContentInput {
+        s.ExpressionType = &v
+        return s
+}
+
+// SetInputSerialization sets the InputSerialization field's value.
+func (s *SelectObjectContentInput) SetInputSerialization(v *InputSerialization) *SelectObjectContentInput {
+        s.InputSerialization = v
+        return s
+}
+
+// SetKey sets the Key field's value.
+func (s *SelectObjectContentInput) SetKey(v string) *SelectObjectContentInput {
+        s.Key = &v
+        return s
+}
+
+// SetOutputSerialization sets the OutputSerialization field's value.
+func (s *SelectObjectContentInput) SetOutputSerialization(v *OutputSerialization) *SelectObjectContentInput {
+        s.OutputSerialization = v
+        return s
+}
+
+// SetRequestProgress sets the RequestProgress field's value.
+func (s *SelectObjectContentInput) SetRequestProgress(v *RequestProgress) *SelectObjectContentInput {
+        s.RequestProgress = v
+        return s
+}
+
+// SetSSECustomerAlgorithm sets the SSECustomerAlgorithm field's value.
+func (s *SelectObjectContentInput) SetSSECustomerAlgorithm(v string) *SelectObjectContentInput {
+        s.SSECustomerAlgorithm = &v
+        return s
+}
+
+// SetSSECustomerKey sets the SSECustomerKey field's value.
+func (s *SelectObjectContentInput) SetSSECustomerKey(v string) *SelectObjectContentInput {
+        s.SSECustomerKey = &v
+        return s
+}
+
+func (s *SelectObjectContentInput) getSSECustomerKey() (v string) {
+        if s.SSECustomerKey == nil {
+                return v
+        }
+        return *s.SSECustomerKey
+}
+
+// SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
+func (s *SelectObjectContentInput) SetSSECustomerKeyMD5(v string) *SelectObjectContentInput {
+        s.SSECustomerKeyMD5 = &v
+        return s
+}
+
+type SelectObjectContentOutput struct {
+        _ struct{} `type:"structure" payload:"Payload"`
+
+        // Use EventStream to use the API's stream.
+        EventStream *SelectObjectContentEventStream `type:"structure"`
+}
+
+// String returns the string representation
+func (s SelectObjectContentOutput) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s SelectObjectContentOutput) GoString() string {
+        return s.String()
+}
+
+// SetEventStream sets the EventStream field's value.
+func (s *SelectObjectContentOutput) SetEventStream(v *SelectObjectContentEventStream) *SelectObjectContentOutput {
+        s.EventStream = v
+        return s
+}
+
+func (s *SelectObjectContentOutput) runEventStreamLoop(r *request.Request) {
+        if r.Error != nil {
+                return
+        }
+        reader := newReadSelectObjectContentEventStream(
+                r.HTTPResponse.Body,
+                r.Handlers.UnmarshalStream,
+                r.Config.Logger,
+                r.Config.LogLevel.Value(),
+        )
+        go reader.readEventStream()
+
+        eventStream := &SelectObjectContentEventStream{
+                StreamCloser: r.HTTPResponse.Body,
+                Reader:       reader,
+        }
+        s.EventStream = eventStream
+}
+
+// Describes the parameters for Select job types.
+type SelectParameters struct {
+        _ struct{} `type:"structure"`
+
+        // The expression that is used to query the object.
+        //
+        // Expression is a required field
+        Expression *string `type:"string" required:"true"`
+
+        // The type of the provided expression (e.g., SQL).
+        //
+        // ExpressionType is a required field
+        ExpressionType *string `type:"string" required:"true" enum:"ExpressionType"`
+
+        // Describes the serialization format of the object.
+        //
+        // InputSerialization is a required field
+        InputSerialization *InputSerialization `type:"structure" required:"true"`
+
+        // Describes how the results of the Select job are serialized.
+        //
+        // OutputSerialization is a required field
+        OutputSerialization *OutputSerialization `type:"structure" required:"true"`
+}
+
+// String returns the string representation
+func (s SelectParameters) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s SelectParameters) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *SelectParameters) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "SelectParameters"}
+        if s.Expression == nil {
+                invalidParams.Add(request.NewErrParamRequired("Expression"))
+        }
+        if s.ExpressionType == nil {
+                invalidParams.Add(request.NewErrParamRequired("ExpressionType"))
+        }
+        if s.InputSerialization == nil {
+                invalidParams.Add(request.NewErrParamRequired("InputSerialization"))
+        }
+        if s.OutputSerialization == nil {
+                invalidParams.Add(request.NewErrParamRequired("OutputSerialization"))
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetExpression sets the Expression field's value.
+func (s *SelectParameters) SetExpression(v string) *SelectParameters {
+        s.Expression = &v
+        return s
+}
+
+// SetExpressionType sets the ExpressionType field's value.
+func (s *SelectParameters) SetExpressionType(v string) *SelectParameters {
+        s.ExpressionType = &v
+        return s
+}
+
+// SetInputSerialization sets the InputSerialization field's value.
+func (s *SelectParameters) SetInputSerialization(v *InputSerialization) *SelectParameters {
+        s.InputSerialization = v
+        return s
+}
+
+// SetOutputSerialization sets the OutputSerialization field's value.
+func (s *SelectParameters) SetOutputSerialization(v *OutputSerialization) *SelectParameters {
+        s.OutputSerialization = v
+        return s
+}
+
+// Describes the default server-side encryption to apply to new objects in the
+// bucket. If Put Object request does not specify any server-side encryption,
+// this default encryption will be applied.
+type ServerSideEncryptionByDefault struct {
+        _ struct{} `type:"structure"`
+
+        // KMS master key ID to use for the default encryption. This parameter is allowed
+        // if SSEAlgorithm is aws:kms.
+        KMSMasterKeyID *string `type:"string"`
+
+        // Server-side encryption algorithm to use for the default encryption.
+        //
+        // SSEAlgorithm is a required field
+        SSEAlgorithm *string `type:"string" required:"true" enum:"ServerSideEncryption"`
+}
+
+// String returns the string representation
+func (s ServerSideEncryptionByDefault) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s ServerSideEncryptionByDefault) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *ServerSideEncryptionByDefault) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "ServerSideEncryptionByDefault"}
+        if s.SSEAlgorithm == nil {
+                invalidParams.Add(request.NewErrParamRequired("SSEAlgorithm"))
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetKMSMasterKeyID sets the KMSMasterKeyID field's value.
+func (s *ServerSideEncryptionByDefault) SetKMSMasterKeyID(v string) *ServerSideEncryptionByDefault {
+        s.KMSMasterKeyID = &v
+        return s
+}
+
+// SetSSEAlgorithm sets the SSEAlgorithm field's value.
+func (s *ServerSideEncryptionByDefault) SetSSEAlgorithm(v string) *ServerSideEncryptionByDefault {
+        s.SSEAlgorithm = &v
+        return s
+}
+
+// Container for server-side encryption configuration rules. Currently S3 supports
+// one rule only.
+type ServerSideEncryptionConfiguration struct {
+        _ struct{} `type:"structure"`
+
+        // Container for information about a particular server-side encryption configuration
+        // rule.
+        //
+        // Rules is a required field
+        Rules []*ServerSideEncryptionRule `locationName:"Rule" type:"list" flattened:"true" required:"true"`
+}
+
+// String returns the string representation
+func (s ServerSideEncryptionConfiguration) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s ServerSideEncryptionConfiguration) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *ServerSideEncryptionConfiguration) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "ServerSideEncryptionConfiguration"}
+        if s.Rules == nil {
+                invalidParams.Add(request.NewErrParamRequired("Rules"))
+        }
+        if s.Rules != nil {
+                for i, v := range s.Rules {
+                        if v == nil {
+                                continue
+                        }
+                        if err := v.Validate(); err != nil {
+                                invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Rules", i), err.(request.ErrInvalidParams))
+                        }
+                }
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetRules sets the Rules field's value.
+func (s *ServerSideEncryptionConfiguration) SetRules(v []*ServerSideEncryptionRule) *ServerSideEncryptionConfiguration {
+        s.Rules = v
+        return s
+}
+
+// Container for information about a particular server-side encryption configuration
+// rule.
+type ServerSideEncryptionRule struct {
+        _ struct{} `type:"structure"`
+
+        // Describes the default server-side encryption to apply to new objects in the
+        // bucket. If Put Object request does not specify any server-side encryption,
+        // this default encryption will be applied.
+        ApplyServerSideEncryptionByDefault *ServerSideEncryptionByDefault `type:"structure"`
+}
+
+// String returns the string representation
+func (s ServerSideEncryptionRule) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s ServerSideEncryptionRule) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *ServerSideEncryptionRule) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "ServerSideEncryptionRule"}
+        if s.ApplyServerSideEncryptionByDefault != nil {
+                if err := s.ApplyServerSideEncryptionByDefault.Validate(); err != nil {
+                        invalidParams.AddNested("ApplyServerSideEncryptionByDefault", err.(request.ErrInvalidParams))
+                }
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetApplyServerSideEncryptionByDefault sets the ApplyServerSideEncryptionByDefault field's value.
+func (s *ServerSideEncryptionRule) SetApplyServerSideEncryptionByDefault(v *ServerSideEncryptionByDefault) *ServerSideEncryptionRule {
+        s.ApplyServerSideEncryptionByDefault = v
+        return s
+}
+
+// Container for filters that define which source objects should be replicated.
+type SourceSelectionCriteria struct {
+        _ struct{} `type:"structure"`
+
+        // Container for filter information of selection of KMS Encrypted S3 objects.
+        SseKmsEncryptedObjects *SseKmsEncryptedObjects `type:"structure"`
+}
+
+// String returns the string representation
+func (s SourceSelectionCriteria) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s SourceSelectionCriteria) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *SourceSelectionCriteria) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "SourceSelectionCriteria"}
+        if s.SseKmsEncryptedObjects != nil {
+                if err := s.SseKmsEncryptedObjects.Validate(); err != nil {
+                        invalidParams.AddNested("SseKmsEncryptedObjects", err.(request.ErrInvalidParams))
+                }
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetSseKmsEncryptedObjects sets the SseKmsEncryptedObjects field's value.
+func (s *SourceSelectionCriteria) SetSseKmsEncryptedObjects(v *SseKmsEncryptedObjects) *SourceSelectionCriteria {
+        s.SseKmsEncryptedObjects = v
+        return s
+}
+
+// Container for filter information of selection of KMS Encrypted S3 objects.
+type SseKmsEncryptedObjects struct {
+        _ struct{} `type:"structure"`
+
+        // The replication for KMS encrypted S3 objects is disabled if status is not
+        // Enabled.
+        //
+        // Status is a required field
+        Status *string `type:"string" required:"true" enum:"SseKmsEncryptedObjectsStatus"`
+}
+
+// String returns the string representation
+func (s SseKmsEncryptedObjects) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s SseKmsEncryptedObjects) GoString() string {
+        return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *SseKmsEncryptedObjects) Validate() error {
+        invalidParams := request.ErrInvalidParams{Context: "SseKmsEncryptedObjects"}
+        if s.Status == nil {
+                invalidParams.Add(request.NewErrParamRequired("Status"))
+        }
+
+        if invalidParams.Len() > 0 {
+                return invalidParams
+        }
+        return nil
+}
+
+// SetStatus sets the Status field's value.
+func (s *SseKmsEncryptedObjects) SetStatus(v string) *SseKmsEncryptedObjects {
+        s.Status = &v
+        return s
+}
+
+type Stats struct {
+        _ struct{} `type:"structure"`
+
+        // Total number of uncompressed object bytes processed.
+        BytesProcessed *int64 `type:"long"`
+
+        // Total number of bytes of records payload data returned.
+        BytesReturned *int64 `type:"long"`
+
+        // Total number of object bytes scanned.
+        BytesScanned *int64 `type:"long"`
+}
+
+// String returns the string representation
+func (s Stats) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s Stats) GoString() string {
+        return s.String()
+}
+
+// SetBytesProcessed sets the BytesProcessed field's value.
+func (s *Stats) SetBytesProcessed(v int64) *Stats {
+        s.BytesProcessed = &v
+        return s
+}
+
+// SetBytesReturned sets the BytesReturned field's value.
+func (s *Stats) SetBytesReturned(v int64) *Stats {
+        s.BytesReturned = &v
+        return s
+}
+
+// SetBytesScanned sets the BytesScanned field's value.
+func (s *Stats) SetBytesScanned(v int64) *Stats {
+        s.BytesScanned = &v
+        return s
+}
+
+type StatsEvent struct {
+        _ struct{} `locationName:"StatsEvent" type:"structure" payload:"Details"`
+
+        // The Stats event details.
+        Details *Stats `locationName:"Details" type:"structure"`
+}
+
+// String returns the string representation
+func (s StatsEvent) String() string {
+        return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation
+func (s StatsEvent) GoString() string {
+        return s.String()
+}
+
+// SetDetails sets the Details field's value.
+func (s *StatsEvent) SetDetails(v *Stats) *StatsEvent {
+        s.Details = v
+        return s
+}
+
+// The StatsEvent is and event in the SelectObjectContentEventStream group of events.
+func (s *StatsEvent) eventSelectObjectContentEventStream() {}
+
+// UnmarshalEvent unmarshals the EventStream Message into the StatsEvent value.
+// This method is only used internally within the SDK's EventStream handling.
+func (s *StatsEvent) UnmarshalEvent(
+        payloadUnmarshaler protocol.PayloadUnmarshaler,
+        msg eventstream.Message,
+) error {
+        if err := payloadUnmarshaler.UnmarshalPayload(
+                bytes.NewReader(msg.Payload), s,
+        ); err != nil {
+                return err
+        }
+        return nil
+}
+
 type StorageClassAnalysis struct {
         _ struct{} `type:"structure"`
 
@@ -17840,7 +20552,6 @@ func (s *StorageClassAnalysis) SetDataExport(v *StorageClassAnalysisDataExport)
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/StorageClassAnalysisDataExport
 type StorageClassAnalysisDataExport struct {
         _ struct{} `type:"structure"`
 
@@ -17898,7 +20609,6 @@ func (s *StorageClassAnalysisDataExport) SetOutputSchemaVersion(v string) *Stora
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Tag
 type Tag struct {
         _ struct{} `type:"structure"`
 
@@ -17954,7 +20664,6 @@ func (s *Tag) SetValue(v string) *Tag {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Tagging
 type Tagging struct {
         _ struct{} `type:"structure"`
 
@@ -18001,11 +20710,10 @@ func (s *Tagging) SetTagSet(v []*Tag) *Tagging {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/TargetGrant
 type TargetGrant struct {
         _ struct{} `type:"structure"`
 
-        Grantee *Grantee `type:"structure"`
+        Grantee *Grantee `type:"structure" xmlPrefix:"xsi" xmlURI:"http://www.w3.org/2001/XMLSchema-instance"`
 
         // Logging permissions assigned to the Grantee for the bucket.
         Permission *string `type:"string" enum:"BucketLogsPermission"`
@@ -18050,7 +20758,6 @@ func (s *TargetGrant) SetPermission(v string) *TargetGrant {
 
 // Container for specifying the configuration when you want Amazon S3 to publish
 // events to an Amazon Simple Notification Service (Amazon SNS) topic.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/TopicConfiguration
 type TopicConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -18059,6 +20766,7 @@ type TopicConfiguration struct {
 
         // Container for object key name filtering rules. For information about key
         // name filtering, go to Configuring Event Notifications (http://docs.aws.amazon.com/AmazonS3/latest/dev/NotificationHowTo.html)
+        // in the Amazon Simple Storage Service Developer Guide.
         Filter *NotificationConfigurationFilter `type:"structure"`
 
         // Optional unique identifier for configurations in a notification configuration.
@@ -18122,7 +20830,6 @@ func (s *TopicConfiguration) SetTopicArn(v string) *TopicConfiguration {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/TopicConfigurationDeprecated
 type TopicConfigurationDeprecated struct {
         _ struct{} `type:"structure"`
 
@@ -18174,7 +20881,6 @@ func (s *TopicConfigurationDeprecated) SetTopic(v string) *TopicConfigurationDep
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/Transition
 type Transition struct {
         _ struct{} `type:"structure"`
 
@@ -18218,7 +20924,6 @@ func (s *Transition) SetStorageClass(v string) *Transition {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPartCopyRequest
 type UploadPartCopyInput struct {
         _ struct{} `type:"structure"`
 
@@ -18235,14 +20940,14 @@ type UploadPartCopyInput struct {
         CopySourceIfMatch *string `location:"header" locationName:"x-amz-copy-source-if-match" type:"string"`
 
         // Copies the object if it has been modified since the specified time.
-        CopySourceIfModifiedSince *time.Time `location:"header" locationName:"x-amz-copy-source-if-modified-since" type:"timestamp" timestampFormat:"rfc822"`
+        CopySourceIfModifiedSince *time.Time `location:"header" locationName:"x-amz-copy-source-if-modified-since" type:"timestamp"`
 
         // Copies the object if its entity tag (ETag) is different than the specified
         // ETag.
         CopySourceIfNoneMatch *string `location:"header" locationName:"x-amz-copy-source-if-none-match" type:"string"`
 
         // Copies the object if it hasn't been modified since the specified time.
-        CopySourceIfUnmodifiedSince *time.Time `location:"header" locationName:"x-amz-copy-source-if-unmodified-since" type:"timestamp" timestampFormat:"rfc822"`
+        CopySourceIfUnmodifiedSince *time.Time `location:"header" locationName:"x-amz-copy-source-if-unmodified-since" type:"timestamp"`
 
         // The range of bytes to copy from the source object. The range value must use
         // the form bytes=first-last, where the first and last are the zero-based byte
@@ -18345,6 +21050,13 @@ func (s *UploadPartCopyInput) SetBucket(v string) *UploadPartCopyInput {
         return s
 }
 
+func (s *UploadPartCopyInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetCopySource sets the CopySource field's value.
 func (s *UploadPartCopyInput) SetCopySource(v string) *UploadPartCopyInput {
         s.CopySource = &v
@@ -18393,6 +21105,13 @@ func (s *UploadPartCopyInput) SetCopySourceSSECustomerKey(v string) *UploadPartC
         return s
 }
 
+func (s *UploadPartCopyInput) getCopySourceSSECustomerKey() (v string) {
+        if s.CopySourceSSECustomerKey == nil {
+                return v
+        }
+        return *s.CopySourceSSECustomerKey
+}
+
 // SetCopySourceSSECustomerKeyMD5 sets the CopySourceSSECustomerKeyMD5 field's value.
 func (s *UploadPartCopyInput) SetCopySourceSSECustomerKeyMD5(v string) *UploadPartCopyInput {
         s.CopySourceSSECustomerKeyMD5 = &v
@@ -18429,6 +21148,13 @@ func (s *UploadPartCopyInput) SetSSECustomerKey(v string) *UploadPartCopyInput {
         return s
 }
 
+func (s *UploadPartCopyInput) getSSECustomerKey() (v string) {
+        if s.SSECustomerKey == nil {
+                return v
+        }
+        return *s.SSECustomerKey
+}
+
 // SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
 func (s *UploadPartCopyInput) SetSSECustomerKeyMD5(v string) *UploadPartCopyInput {
         s.SSECustomerKeyMD5 = &v
@@ -18441,7 +21167,6 @@ func (s *UploadPartCopyInput) SetUploadId(v string) *UploadPartCopyInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPartCopyOutput
 type UploadPartCopyOutput struct {
         _ struct{} `type:"structure" payload:"CopyPartResult"`
 
@@ -18526,7 +21251,6 @@ func (s *UploadPartCopyOutput) SetServerSideEncryption(v string) *UploadPartCopy
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPartRequest
 type UploadPartInput struct {
         _ struct{} `type:"structure" payload:"Body"`
 
@@ -18542,6 +21266,9 @@ type UploadPartInput struct {
         // body cannot be determined automatically.
         ContentLength *int64 `location:"header" locationName:"Content-Length" type:"long"`
 
+        // The base64-encoded 128-bit MD5 digest of the part data.
+        ContentMD5 *string `location:"header" locationName:"Content-MD5" type:"string"`
+
         // Object key for which the multipart upload was initiated.
         //
         // Key is a required field
@@ -18628,12 +21355,25 @@ func (s *UploadPartInput) SetBucket(v string) *UploadPartInput {
         return s
 }
 
+func (s *UploadPartInput) getBucket() (v string) {
+        if s.Bucket == nil {
+                return v
+        }
+        return *s.Bucket
+}
+
 // SetContentLength sets the ContentLength field's value.
 func (s *UploadPartInput) SetContentLength(v int64) *UploadPartInput {
         s.ContentLength = &v
         return s
 }
 
+// SetContentMD5 sets the ContentMD5 field's value.
+func (s *UploadPartInput) SetContentMD5(v string) *UploadPartInput {
+        s.ContentMD5 = &v
+        return s
+}
+
 // SetKey sets the Key field's value.
 func (s *UploadPartInput) SetKey(v string) *UploadPartInput {
         s.Key = &v
@@ -18664,6 +21404,13 @@ func (s *UploadPartInput) SetSSECustomerKey(v string) *UploadPartInput {
         return s
 }
 
+func (s *UploadPartInput) getSSECustomerKey() (v string) {
+        if s.SSECustomerKey == nil {
+                return v
+        }
+        return *s.SSECustomerKey
+}
+
 // SetSSECustomerKeyMD5 sets the SSECustomerKeyMD5 field's value.
 func (s *UploadPartInput) SetSSECustomerKeyMD5(v string) *UploadPartInput {
         s.SSECustomerKeyMD5 = &v
@@ -18676,7 +21423,6 @@ func (s *UploadPartInput) SetUploadId(v string) *UploadPartInput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/UploadPartOutput
 type UploadPartOutput struct {
         _ struct{} `type:"structure"`
 
@@ -18752,7 +21498,6 @@ func (s *UploadPartOutput) SetServerSideEncryption(v string) *UploadPartOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/VersioningConfiguration
 type VersioningConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -18787,7 +21532,6 @@ func (s *VersioningConfiguration) SetStatus(v string) *VersioningConfiguration {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/WebsiteConfiguration
 type WebsiteConfiguration struct {
         _ struct{} `type:"structure"`
 
@@ -18950,6 +21694,17 @@ const (
         BucketVersioningStatusSuspended = "Suspended"
 )
 
+const (
+        // CompressionTypeNone is a CompressionType enum value
+        CompressionTypeNone = "NONE"
+
+        // CompressionTypeGzip is a CompressionType enum value
+        CompressionTypeGzip = "GZIP"
+
+        // CompressionTypeBzip2 is a CompressionType enum value
+        CompressionTypeBzip2 = "BZIP2"
+)
+
 // Requests Amazon S3 to encode the object keys in the response and specifies
 // the encoding method to use. An object key may contain any Unicode character;
 // however, XML 1.0 parser cannot parse some characters, such as characters
@@ -19000,6 +21755,22 @@ const (
 )
 
 const (
+        // ExpressionTypeSql is a ExpressionType enum value
+        ExpressionTypeSql = "SQL"
+)
+
+const (
+        // FileHeaderInfoUse is a FileHeaderInfo enum value
+        FileHeaderInfoUse = "USE"
+
+        // FileHeaderInfoIgnore is a FileHeaderInfo enum value
+        FileHeaderInfoIgnore = "IGNORE"
+
+        // FileHeaderInfoNone is a FileHeaderInfo enum value
+        FileHeaderInfoNone = "NONE"
+)
+
+const (
         // FilterRuleNamePrefix is a FilterRuleName enum value
         FilterRuleNamePrefix = "prefix"
 
@@ -19010,6 +21781,9 @@ const (
 const (
         // InventoryFormatCsv is a InventoryFormat enum value
         InventoryFormatCsv = "CSV"
+
+        // InventoryFormatOrc is a InventoryFormat enum value
+        InventoryFormatOrc = "ORC"
 )
 
 const (
@@ -19046,6 +21820,17 @@ const (
 
         // InventoryOptionalFieldReplicationStatus is a InventoryOptionalField enum value
         InventoryOptionalFieldReplicationStatus = "ReplicationStatus"
+
+        // InventoryOptionalFieldEncryptionStatus is a InventoryOptionalField enum value
+        InventoryOptionalFieldEncryptionStatus = "EncryptionStatus"
+)
+
+const (
+        // JSONTypeDocument is a JSONType enum value
+        JSONTypeDocument = "DOCUMENT"
+
+        // JSONTypeLines is a JSONType enum value
+        JSONTypeLines = "LINES"
 )
 
 const (
@@ -19104,6 +21889,12 @@ const (
 
         // ObjectStorageClassGlacier is a ObjectStorageClass enum value
         ObjectStorageClassGlacier = "GLACIER"
+
+        // ObjectStorageClassStandardIa is a ObjectStorageClass enum value
+        ObjectStorageClassStandardIa = "STANDARD_IA"
+
+        // ObjectStorageClassOnezoneIa is a ObjectStorageClass enum value
+        ObjectStorageClassOnezoneIa = "ONEZONE_IA"
 )
 
 const (
@@ -19112,6 +21903,11 @@ const (
 )
 
 const (
+        // OwnerOverrideDestination is a OwnerOverride enum value
+        OwnerOverrideDestination = "Destination"
+)
+
+const (
         // PayerRequester is a Payer enum value
         PayerRequester = "Requester"
 
@@ -19145,6 +21941,14 @@ const (
 )
 
 const (
+        // QuoteFieldsAlways is a QuoteFields enum value
+        QuoteFieldsAlways = "ALWAYS"
+
+        // QuoteFieldsAsneeded is a QuoteFields enum value
+        QuoteFieldsAsneeded = "ASNEEDED"
+)
+
+const (
         // ReplicationRuleStatusEnabled is a ReplicationRuleStatus enum value
         ReplicationRuleStatusEnabled = "Enabled"
 
@@ -19183,6 +21987,11 @@ const (
 )
 
 const (
+        // RestoreRequestTypeSelect is a RestoreRequestType enum value
+        RestoreRequestTypeSelect = "SELECT"
+)
+
+const (
         // ServerSideEncryptionAes256 is a ServerSideEncryption enum value
         ServerSideEncryptionAes256 = "AES256"
 
@@ -19191,6 +22000,14 @@ const (
 )
 
 const (
+        // SseKmsEncryptedObjectsStatusEnabled is a SseKmsEncryptedObjectsStatus enum value
+        SseKmsEncryptedObjectsStatusEnabled = "Enabled"
+
+        // SseKmsEncryptedObjectsStatusDisabled is a SseKmsEncryptedObjectsStatus enum value
+        SseKmsEncryptedObjectsStatusDisabled = "Disabled"
+)
+
+const (
         // StorageClassStandard is a StorageClass enum value
         StorageClassStandard = "STANDARD"
 
@@ -19199,6 +22016,9 @@ const (
 
         // StorageClassStandardIa is a StorageClass enum value
         StorageClassStandardIa = "STANDARD_IA"
+
+        // StorageClassOnezoneIa is a StorageClass enum value
+        StorageClassOnezoneIa = "ONEZONE_IA"
 )
 
 const (
@@ -19231,6 +22051,9 @@ const (
 
         // TransitionStorageClassStandardIa is a TransitionStorageClass enum value
         TransitionStorageClassStandardIa = "STANDARD_IA"
+
+        // TransitionStorageClassOnezoneIa is a TransitionStorageClass enum value
+        TransitionStorageClassOnezoneIa = "ONEZONE_IA"
 )
 
 const (
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/body_hash.go b/vendor/github.com/aws/aws-sdk-go/service/s3/body_hash.go
new file mode 100644
index 0000000..5c8ce5c
--- /dev/null
+++ b/vendor/github.com/aws/aws-sdk-go/service/s3/body_hash.go
@@ -0,0 +1,249 @@
+package s3
+
+import (
+        "bytes"
+        "crypto/md5"
+        "crypto/sha256"
+        "encoding/base64"
+        "encoding/hex"
+        "fmt"
+        "hash"
+        "io"
+
+        "github.com/aws/aws-sdk-go/aws"
+        "github.com/aws/aws-sdk-go/aws/awserr"
+        "github.com/aws/aws-sdk-go/aws/request"
+        "github.com/aws/aws-sdk-go/internal/sdkio"
+)
+
+const (
+        contentMD5Header    = "Content-Md5"
+        contentSha256Header = "X-Amz-Content-Sha256"
+        amzTeHeader         = "X-Amz-Te"
+        amzTxEncodingHeader = "X-Amz-Transfer-Encoding"
+
+        appendMD5TxEncoding = "append-md5"
+)
+
+// contentMD5 computes and sets the HTTP Content-MD5 header for requests that
+// require it.
+func contentMD5(r *request.Request) {
+        h := md5.New()
+
+        if !aws.IsReaderSeekable(r.Body) {
+                if r.Config.Logger != nil {
+                        r.Config.Logger.Log(fmt.Sprintf(
+                                "Unable to compute Content-MD5 for unseekable body, S3.%s",
+                                r.Operation.Name))
+                }
+                return
+        }
+
+        if _, err := copySeekableBody(h, r.Body); err != nil {
+                r.Error = awserr.New("ContentMD5", "failed to compute body MD5", err)
+                return
+        }
+
+        // encode the md5 checksum in base64 and set the request header.
+        v := base64.StdEncoding.EncodeToString(h.Sum(nil))
+        r.HTTPRequest.Header.Set(contentMD5Header, v)
+}
+
+// computeBodyHashes will add Content MD5 and Content Sha256 hashes to the
+// request. If the body is not seekable or S3DisableContentMD5Validation set
+// this handler will be ignored.
+func computeBodyHashes(r *request.Request) {
+        if aws.BoolValue(r.Config.S3DisableContentMD5Validation) {
+                return
+        }
+        if r.IsPresigned() {
+                return
+        }
+        if r.Error != nil || !aws.IsReaderSeekable(r.Body) {
+                return
+        }
+
+        var md5Hash, sha256Hash hash.Hash
+        hashers := make([]io.Writer, 0, 2)
+
+        // Determine upfront which hashes can be set without overriding user
+        // provide header data.
+        if v := r.HTTPRequest.Header.Get(contentMD5Header); len(v) == 0 {
+                md5Hash = md5.New()
+                hashers = append(hashers, md5Hash)
+        }
+
+        if v := r.HTTPRequest.Header.Get(contentSha256Header); len(v) == 0 {
+                sha256Hash = sha256.New()
+                hashers = append(hashers, sha256Hash)
+        }
+
+        // Create the destination writer based on the hashes that are not already
+        // provided by the user.
+        var dst io.Writer
+        switch len(hashers) {
+        case 0:
+                return
+        case 1:
+                dst = hashers[0]
+        default:
+                dst = io.MultiWriter(hashers...)
+        }
+
+        if _, err := copySeekableBody(dst, r.Body); err != nil {
+                r.Error = awserr.New("BodyHashError", "failed to compute body hashes", err)
+                return
+        }
+
+        // For the hashes created, set the associated headers that the user did not
+        // already provide.
+        if md5Hash != nil {
+                sum := make([]byte, md5.Size)
+                encoded := make([]byte, md5Base64EncLen)
+
+                base64.StdEncoding.Encode(encoded, md5Hash.Sum(sum[0:0]))
+                r.HTTPRequest.Header[contentMD5Header] = []string{string(encoded)}
+        }
+
+        if sha256Hash != nil {
+                encoded := make([]byte, sha256HexEncLen)
+                sum := make([]byte, sha256.Size)
+
+                hex.Encode(encoded, sha256Hash.Sum(sum[0:0]))
+                r.HTTPRequest.Header[contentSha256Header] = []string{string(encoded)}
+        }
+}
+
+const (
+        md5Base64EncLen = (md5.Size + 2) / 3 * 4 // base64.StdEncoding.EncodedLen
+        sha256HexEncLen = sha256.Size * 2        // hex.EncodedLen
+)
+
+func copySeekableBody(dst io.Writer, src io.ReadSeeker) (int64, error) {
+        curPos, err := src.Seek(0, sdkio.SeekCurrent)
+        if err != nil {
+                return 0, err
+        }
+
+        // hash the body.  seek back to the first position after reading to reset
+        // the body for transmission.  copy errors may be assumed to be from the
+        // body.
+        n, err := io.Copy(dst, src)
+        if err != nil {
+                return n, err
+        }
+
+        _, err = src.Seek(curPos, sdkio.SeekStart)
+        if err != nil {
+                return n, err
+        }
+
+        return n, nil
+}
+
+// Adds the x-amz-te: append_md5 header to the request. This requests the service
+// responds with a trailing MD5 checksum.
+//
+// Will not ask for append MD5 if disabled, the request is presigned or,
+// or the API operation does not support content MD5 validation.
+func askForTxEncodingAppendMD5(r *request.Request) {
+        if aws.BoolValue(r.Config.S3DisableContentMD5Validation) {
+                return
+        }
+        if r.IsPresigned() {
+                return
+        }
+        r.HTTPRequest.Header.Set(amzTeHeader, appendMD5TxEncoding)
+}
+
+func useMD5ValidationReader(r *request.Request) {
+        if r.Error != nil {
+                return
+        }
+
+        if v := r.HTTPResponse.Header.Get(amzTxEncodingHeader); v != appendMD5TxEncoding {
+                return
+        }
+
+        var bodyReader *io.ReadCloser
+        var contentLen int64
+        switch tv := r.Data.(type) {
+        case *GetObjectOutput:
+                bodyReader = &tv.Body
+                contentLen = aws.Int64Value(tv.ContentLength)
+                // Update ContentLength hiden the trailing MD5 checksum.
+                tv.ContentLength = aws.Int64(contentLen - md5.Size)
+                tv.ContentRange = aws.String(r.HTTPResponse.Header.Get("X-Amz-Content-Range"))
+        default:
+                r.Error = awserr.New("ChecksumValidationError",
+                        fmt.Sprintf("%s: %s header received on unsupported API, %s",
+                                amzTxEncodingHeader, appendMD5TxEncoding, r.Operation.Name,
+                        ), nil)
+                return
+        }
+
+        if contentLen < md5.Size {
+                r.Error = awserr.New("ChecksumValidationError",
+                        fmt.Sprintf("invalid Content-Length %d for %s %s",
+                                contentLen, appendMD5TxEncoding, amzTxEncodingHeader,
+                        ), nil)
+                return
+        }
+
+        // Wrap and swap the response body reader with the validation reader.
+        *bodyReader = newMD5ValidationReader(*bodyReader, contentLen-md5.Size)
+}
+
+type md5ValidationReader struct {
+        rawReader io.ReadCloser
+        payload   io.Reader
+        hash      hash.Hash
+
+        payloadLen int64
+        read       int64
+}
+
+func newMD5ValidationReader(reader io.ReadCloser, payloadLen int64) *md5ValidationReader {
+        h := md5.New()
+        return &md5ValidationReader{
+                rawReader:  reader,
+                payload:    io.TeeReader(&io.LimitedReader{R: reader, N: payloadLen}, h),
+                hash:       h,
+                payloadLen: payloadLen,
+        }
+}
+
+func (v *md5ValidationReader) Read(p []byte) (n int, err error) {
+        n, err = v.payload.Read(p)
+        if err != nil && err != io.EOF {
+                return n, err
+        }
+
+        v.read += int64(n)
+
+        if err == io.EOF {
+                if v.read != v.payloadLen {
+                        return n, io.ErrUnexpectedEOF
+                }
+                expectSum := make([]byte, md5.Size)
+                actualSum := make([]byte, md5.Size)
+                if _, sumReadErr := io.ReadFull(v.rawReader, expectSum); sumReadErr != nil {
+                        return n, sumReadErr
+                }
+                actualSum = v.hash.Sum(actualSum[0:0])
+                if !bytes.Equal(expectSum, actualSum) {
+                        return n, awserr.New("InvalidChecksum",
+                                fmt.Sprintf("expected MD5 checksum %s, got %s",
+                                        hex.EncodeToString(expectSum),
+                                        hex.EncodeToString(actualSum),
+                                ),
+                                nil)
+                }
+        }
+
+        return n, err
+}
+
+func (v *md5ValidationReader) Close() error {
+        return v.rawReader.Close()
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/content_md5.go b/vendor/github.com/aws/aws-sdk-go/service/s3/content_md5.go
deleted file mode 100644
index 9fc5df9..0000000
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/content_md5.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package s3
-
-import (
-        "crypto/md5"
-        "encoding/base64"
-        "io"
-
-        "github.com/aws/aws-sdk-go/aws/awserr"
-        "github.com/aws/aws-sdk-go/aws/request"
-)
-
-// contentMD5 computes and sets the HTTP Content-MD5 header for requests that
-// require it.
-func contentMD5(r *request.Request) {
-        h := md5.New()
-
-        // hash the body.  seek back to the first position after reading to reset
-        // the body for transmission.  copy errors may be assumed to be from the
-        // body.
-        _, err := io.Copy(h, r.Body)
-        if err != nil {
-                r.Error = awserr.New("ContentMD5", "failed to read body", err)
-                return
-        }
-        _, err = r.Body.Seek(0, 0)
-        if err != nil {
-                r.Error = awserr.New("ContentMD5", "failed to seek body", err)
-                return
-        }
-
-        // encode the md5 checksum in base64 and set the request header.
-        sum := h.Sum(nil)
-        sum64 := make([]byte, base64.StdEncoding.EncodedLen(len(sum)))
-        base64.StdEncoding.Encode(sum64, sum)
-        r.HTTPRequest.Header.Set("Content-MD5", string(sum64))
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/customizations.go b/vendor/github.com/aws/aws-sdk-go/service/s3/customizations.go
index 8463347..a55beab 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/customizations.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/s3/customizations.go
@@ -42,5 +42,29 @@ func defaultInitRequestFn(r *request.Request) {
                 r.Handlers.Validate.PushFront(populateLocationConstraint)
         case opCopyObject, opUploadPartCopy, opCompleteMultipartUpload:
                 r.Handlers.Unmarshal.PushFront(copyMultipartStatusOKUnmarhsalError)
+        case opPutObject, opUploadPart:
+                r.Handlers.Build.PushBack(computeBodyHashes)
+                // Disabled until #1837 root issue is resolved.
+                //      case opGetObject:
+                //              r.Handlers.Build.PushBack(askForTxEncodingAppendMD5)
+                //              r.Handlers.Unmarshal.PushBack(useMD5ValidationReader)
         }
 }
+
+// bucketGetter is an accessor interface to grab the "Bucket" field from
+// an S3 type.
+type bucketGetter interface {
+        getBucket() string
+}
+
+// sseCustomerKeyGetter is an accessor interface to grab the "SSECustomerKey"
+// field from an S3 type.
+type sseCustomerKeyGetter interface {
+        getSSECustomerKey() string
+}
+
+// copySourceSSECustomerKeyGetter is an accessor interface to grab the
+// "CopySourceSSECustomerKey" field from an S3 type.
+type copySourceSSECustomerKeyGetter interface {
+        getCopySourceSSECustomerKey() string
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/doc.go b/vendor/github.com/aws/aws-sdk-go/service/s3/doc.go
index f045fd0..0def022 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/doc.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/s3/doc.go
@@ -10,69 +10,17 @@
 //
 // Using the Client
 //
-// To use the client for Amazon Simple Storage Service you will first need
-// to create a new instance of it.
+// To contact Amazon Simple Storage Service with the SDK use the New function to create
+// a new service client. With that client you can make API requests to the service.
+// These clients are safe to use concurrently.
 //
-// When creating a client for an AWS service you'll first need to have a Session
-// already created. The Session provides configuration that can be shared
-// between multiple service clients. Additional configuration can be applied to
-// the Session and service's client when they are constructed. The aws package's
-// Config type contains several fields such as Region for the AWS Region the
-// client should make API requests too. The optional Config value can be provided
-// as the variadic argument for Sessions and client creation.
-//
-// Once the service's client is created you can use it to make API requests the
-// AWS service. These clients are safe to use concurrently.
-//
-//   // Create a session to share configuration, and load external configuration.
-//   sess := session.Must(session.NewSession())
-//
-//   // Create the service's client with the session.
-//   svc := s3.New(sess)
-//
-// See the SDK's documentation for more information on how to use service clients.
+// See the SDK's documentation for more information on how to use the SDK.
 // https://docs.aws.amazon.com/sdk-for-go/api/
 //
-// See aws package's Config type for more information on configuration options.
+// See aws.Config documentation for more information on configuring SDK clients.
 // https://docs.aws.amazon.com/sdk-for-go/api/aws/#Config
 //
 // See the Amazon Simple Storage Service client S3 for more
-// information on creating the service's client.
+// information on creating client for this service.
 // https://docs.aws.amazon.com/sdk-for-go/api/service/s3/#New
-//
-// Once the client is created you can make an API request to the service.
-// Each API method takes a input parameter, and returns the service response
-// and an error.
-//
-// The API method will document which error codes the service can be returned
-// by the operation if the service models the API operation's errors. These
-// errors will also be available as const strings prefixed with "ErrCode".
-//
-//   result, err := svc.AbortMultipartUpload(params)
-//   if err != nil {
-//       // Cast err to awserr.Error to handle specific error codes.
-//       aerr, ok := err.(awserr.Error)
-//       if ok && aerr.Code() == <error code to check for> {
-//           // Specific error code handling
-//       }
-//       return err
-//   }
-//
-//   fmt.Println("AbortMultipartUpload result:")
-//   fmt.Println(result)
-//
-// Using the Client with Context
-//
-// The service's client also provides methods to make API requests with a Context
-// value. This allows you to control the timeout, and cancellation of pending
-// requests. These methods also take request Option as variadic parameter to apply
-// additional configuration to the API request.
-//
-//   ctx := context.Background()
-//
-//   result, err := svc.AbortMultipartUploadWithContext(ctx, params)
-//
-// See the request package documentation for more information on using Context pattern
-// with the SDK.
-// https://docs.aws.amazon.com/sdk-for-go/api/aws/request/
 package s3
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/doc_custom.go b/vendor/github.com/aws/aws-sdk-go/service/s3/doc_custom.go
index b794a63..39b912c 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/doc_custom.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/s3/doc_custom.go
@@ -35,7 +35,7 @@
 //
 // The s3manager package's Downloader provides concurrently downloading of Objects
 // from S3. The Downloader will write S3 Object content with an io.WriterAt.
-// Once the Downloader instance is created you can call Upload concurrently from
+// Once the Downloader instance is created you can call Download concurrently from
 // multiple goroutines safely.
 //
 //   // The session the S3 Downloader will use
@@ -56,7 +56,7 @@
 //       Key:    aws.String(myString),
 //   })
 //   if err != nil {
-//       return fmt.Errorf("failed to upload file, %v", err)
+//       return fmt.Errorf("failed to download file, %v", err)
 //   }
 //   fmt.Printf("file downloaded, %d bytes\n", n)
 //
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go b/vendor/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go
index ec3ffe4..a7fbc2d 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/s3/host_style_bucket.go
@@ -8,7 +8,6 @@ import (
 
         "github.com/aws/aws-sdk-go/aws"
         "github.com/aws/aws-sdk-go/aws/awserr"
-        "github.com/aws/aws-sdk-go/aws/awsutil"
         "github.com/aws/aws-sdk-go/aws/request"
 )
 
@@ -113,15 +112,9 @@ func updateEndpointForAccelerate(r *request.Request) {
 // Attempts to retrieve the bucket name from the request input parameters.
 // If no bucket is found, or the field is empty "", false will be returned.
 func bucketNameFromReqParams(params interface{}) (string, bool) {
-        b, _ := awsutil.ValuesAtPath(params, "Bucket")
-        if len(b) == 0 {
-                return "", false
-        }
-
-        if bucket, ok := b[0].(*string); ok {
-                if bucketStr := aws.StringValue(bucket); bucketStr != "" {
-                        return bucketStr, true
-                }
+        if iface, ok := params.(bucketGetter); ok {
+                b := iface.getBucket()
+                return b, len(b) > 0
         }
 
         return "", false
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/service.go b/vendor/github.com/aws/aws-sdk-go/service/s3/service.go
index 614e477..20de53f 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/service.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/s3/service.go
@@ -29,8 +29,9 @@ var initRequest func(*request.Request)
 
 // Service information constants
 const (
-        ServiceName = "s3"        // Service endpoint prefix API calls made to.
-        EndpointsID = ServiceName // Service ID for Regions and Endpoints metadata.
+        ServiceName = "s3"        // Name of service.
+        EndpointsID = ServiceName // ID to lookup a service endpoint with.
+        ServiceID   = "S3"        // ServiceID is a unique identifer of a specific service.
 )
 
 // New creates a new instance of the S3 client with a session.
@@ -55,6 +56,7 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio
                         cfg,
                         metadata.ClientInfo{
                                 ServiceName:   ServiceName,
+                                ServiceID:     ServiceID,
                                 SigningName:   signingName,
                                 SigningRegion: signingRegion,
                                 Endpoint:      endpoint,
@@ -71,6 +73,8 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio
         svc.Handlers.UnmarshalMeta.PushBackNamed(restxml.UnmarshalMetaHandler)
         svc.Handlers.UnmarshalError.PushBackNamed(restxml.UnmarshalErrorHandler)
 
+        svc.Handlers.UnmarshalStream.PushBackNamed(restxml.UnmarshalHandler)
+
         // Run custom client initialization if present
         if initClient != nil {
                 initClient(svc.Client)
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/sse.go b/vendor/github.com/aws/aws-sdk-go/service/s3/sse.go
index 268ea2f..8010c4f 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/sse.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/s3/sse.go
@@ -5,17 +5,27 @@ import (
         "encoding/base64"
 
         "github.com/aws/aws-sdk-go/aws/awserr"
-        "github.com/aws/aws-sdk-go/aws/awsutil"
         "github.com/aws/aws-sdk-go/aws/request"
 )
 
 var errSSERequiresSSL = awserr.New("ConfigError", "cannot send SSE keys over HTTP.", nil)
 
 func validateSSERequiresSSL(r *request.Request) {
-        if r.HTTPRequest.URL.Scheme != "https" {
-                p, _ := awsutil.ValuesAtPath(r.Params, "SSECustomerKey||CopySourceSSECustomerKey")
-                if len(p) > 0 {
+        if r.HTTPRequest.URL.Scheme == "https" {
+                return
+        }
+
+        if iface, ok := r.Params.(sseCustomerKeyGetter); ok {
+                if len(iface.getSSECustomerKey()) > 0 {
+                        r.Error = errSSERequiresSSL
+                        return
+                }
+        }
+
+        if iface, ok := r.Params.(copySourceSSECustomerKeyGetter); ok {
+                if len(iface.getCopySourceSSECustomerKey()) > 0 {
                         r.Error = errSSERequiresSSL
+                        return
                 }
         }
 }
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error.go b/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error.go
index 5a78fd3..9f33efc 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/s3/statusok_error.go
@@ -7,6 +7,7 @@ import (
 
         "github.com/aws/aws-sdk-go/aws/awserr"
         "github.com/aws/aws-sdk-go/aws/request"
+        "github.com/aws/aws-sdk-go/internal/sdkio"
 )
 
 func copyMultipartStatusOKUnmarhsalError(r *request.Request) {
@@ -17,7 +18,7 @@ func copyMultipartStatusOKUnmarhsalError(r *request.Request) {
         }
         body := bytes.NewReader(b)
         r.HTTPResponse.Body = ioutil.NopCloser(body)
-        defer body.Seek(0, 0)
+        defer body.Seek(0, sdkio.SeekStart)
 
         if body.Len() == 0 {
                 // If there is no body don't attempt to parse the body.
diff --git a/vendor/github.com/aws/aws-sdk-go/service/s3/waiters.go b/vendor/github.com/aws/aws-sdk-go/service/s3/waiters.go
index cccfa8c..2596c69 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/s3/waiters.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/s3/waiters.go
@@ -11,7 +11,7 @@ import (
 
 // WaitUntilBucketExists uses the Amazon S3 API operation
 // HeadBucket to wait for a condition to be met before returning.
-// If the condition is not meet within the max attempt window an error will
+// If the condition is not met within the max attempt window, an error will
 // be returned.
 func (c *S3) WaitUntilBucketExists(input *HeadBucketInput) error {
         return c.WaitUntilBucketExistsWithContext(aws.BackgroundContext(), input)
@@ -72,7 +72,7 @@ func (c *S3) WaitUntilBucketExistsWithContext(ctx aws.Context, input *HeadBucket
 
 // WaitUntilBucketNotExists uses the Amazon S3 API operation
 // HeadBucket to wait for a condition to be met before returning.
-// If the condition is not meet within the max attempt window an error will
+// If the condition is not met within the max attempt window, an error will
 // be returned.
 func (c *S3) WaitUntilBucketNotExists(input *HeadBucketInput) error {
         return c.WaitUntilBucketNotExistsWithContext(aws.BackgroundContext(), input)
@@ -118,7 +118,7 @@ func (c *S3) WaitUntilBucketNotExistsWithContext(ctx aws.Context, input *HeadBuc
 
 // WaitUntilObjectExists uses the Amazon S3 API operation
 // HeadObject to wait for a condition to be met before returning.
-// If the condition is not meet within the max attempt window an error will
+// If the condition is not met within the max attempt window, an error will
 // be returned.
 func (c *S3) WaitUntilObjectExists(input *HeadObjectInput) error {
         return c.WaitUntilObjectExistsWithContext(aws.BackgroundContext(), input)
@@ -169,7 +169,7 @@ func (c *S3) WaitUntilObjectExistsWithContext(ctx aws.Context, input *HeadObject
 
 // WaitUntilObjectNotExists uses the Amazon S3 API operation
 // HeadObject to wait for a condition to be met before returning.
-// If the condition is not meet within the max attempt window an error will
+// If the condition is not met within the max attempt window, an error will
 // be returned.
 func (c *S3) WaitUntilObjectNotExists(input *HeadObjectInput) error {
         return c.WaitUntilObjectNotExistsWithContext(aws.BackgroundContext(), input)
diff --git a/vendor/github.com/aws/aws-sdk-go/service/sts/api.go b/vendor/github.com/aws/aws-sdk-go/service/sts/api.go
index e5c105f..6f89a79 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/sts/api.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/sts/api.go
@@ -14,19 +14,18 @@ const opAssumeRole = "AssumeRole"
 
 // AssumeRoleRequest generates a "aws/request.Request" representing the
 // client's request for the AssumeRole operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See AssumeRole for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the AssumeRole method directly
-// instead.
+// See AssumeRole for more information on using the AssumeRole
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the AssumeRoleRequest method.
 //    req, resp := client.AssumeRoleRequest(params)
@@ -36,7 +35,7 @@ const opAssumeRole = "AssumeRole"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRole
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRole
 func (c *STS) AssumeRoleRequest(input *AssumeRoleInput) (req *request.Request, output *AssumeRoleOutput) {
         op := &request.Operation{
                 Name:       opAssumeRole,
@@ -89,9 +88,18 @@ func (c *STS) AssumeRoleRequest(input *AssumeRoleInput) (req *request.Request, o
 // Scenarios for Temporary Credentials (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp.html#sts-introduction)
 // in the IAM User Guide.
 //
-// The temporary security credentials are valid for the duration that you specified
-// when calling AssumeRole, which can be from 900 seconds (15 minutes) to a
-// maximum of 3600 seconds (1 hour). The default is 1 hour.
+// By default, the temporary security credentials created by AssumeRole last
+// for one hour. However, you can use the optional DurationSeconds parameter
+// to specify the duration of your session. You can provide a value from 900
+// seconds (15 minutes) up to the maximum session duration setting for the role.
+// This setting can have a value from 1 hour to 12 hours. To learn how to view
+// the maximum value for your role, see View the Maximum Session Duration Setting
+// for a Role (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session)
+// in the IAM User Guide. The maximum session duration limit applies when you
+// use the AssumeRole* API operations or the assume-role* CLI operations but
+// does not apply when you use those operations to create a console URL. For
+// more information, see Using IAM Roles (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html)
+// in the IAM User Guide.
 //
 // The temporary security credentials created by AssumeRole can be used to make
 // API calls to any AWS service with the following exception: you cannot call
@@ -122,7 +130,12 @@ func (c *STS) AssumeRoleRequest(input *AssumeRoleInput) (req *request.Request, o
 // the user to call AssumeRole on the ARN of the role in the other account.
 // If the user is in the same account as the role, then you can either attach
 // a policy to the user (identical to the previous different account user),
-// or you can add the user as a principal directly in the role's trust policy
+// or you can add the user as a principal directly in the role's trust policy.
+// In this case, the trust policy acts as the only resource-based policy in
+// IAM, and users in the same account as the role do not need explicit permission
+// to assume the role. For more information about trust policies and resource-based
+// policies, see IAM Policies (http://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html)
+// in the IAM User Guide.
 //
 // Using MFA with AssumeRole
 //
@@ -169,7 +182,7 @@ func (c *STS) AssumeRoleRequest(input *AssumeRoleInput) (req *request.Request, o
 //   and Deactivating AWS STS in an AWS Region (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html)
 //   in the IAM User Guide.
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRole
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRole
 func (c *STS) AssumeRole(input *AssumeRoleInput) (*AssumeRoleOutput, error) {
         req, out := c.AssumeRoleRequest(input)
         return out, req.Send()
@@ -195,19 +208,18 @@ const opAssumeRoleWithSAML = "AssumeRoleWithSAML"
 
 // AssumeRoleWithSAMLRequest generates a "aws/request.Request" representing the
 // client's request for the AssumeRoleWithSAML operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See AssumeRoleWithSAML for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the AssumeRoleWithSAML method directly
-// instead.
+// See AssumeRoleWithSAML for more information on using the AssumeRoleWithSAML
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the AssumeRoleWithSAMLRequest method.
 //    req, resp := client.AssumeRoleWithSAMLRequest(params)
@@ -217,7 +229,7 @@ const opAssumeRoleWithSAML = "AssumeRoleWithSAML"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithSAML
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithSAML
 func (c *STS) AssumeRoleWithSAMLRequest(input *AssumeRoleWithSAMLInput) (req *request.Request, output *AssumeRoleWithSAMLOutput) {
         op := &request.Operation{
                 Name:       opAssumeRoleWithSAML,
@@ -249,11 +261,20 @@ func (c *STS) AssumeRoleWithSAMLRequest(input *AssumeRoleWithSAMLInput) (req *re
 // an access key ID, a secret access key, and a security token. Applications
 // can use these temporary security credentials to sign calls to AWS services.
 //
-// The temporary security credentials are valid for the duration that you specified
-// when calling AssumeRole, or until the time specified in the SAML authentication
-// response's SessionNotOnOrAfter value, whichever is shorter. The duration
-// can be from 900 seconds (15 minutes) to a maximum of 3600 seconds (1 hour).
-// The default is 1 hour.
+// By default, the temporary security credentials created by AssumeRoleWithSAML
+// last for one hour. However, you can use the optional DurationSeconds parameter
+// to specify the duration of your session. Your role session lasts for the
+// duration that you specify, or until the time specified in the SAML authentication
+// response's SessionNotOnOrAfter value, whichever is shorter. You can provide
+// a DurationSeconds value from 900 seconds (15 minutes) up to the maximum session
+// duration setting for the role. This setting can have a value from 1 hour
+// to 12 hours. To learn how to view the maximum value for your role, see View
+// the Maximum Session Duration Setting for a Role (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session)
+// in the IAM User Guide. The maximum session duration limit applies when you
+// use the AssumeRole* API operations or the assume-role* CLI operations but
+// does not apply when you use those operations to create a console URL. For
+// more information, see Using IAM Roles (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html)
+// in the IAM User Guide.
 //
 // The temporary security credentials created by AssumeRoleWithSAML can be used
 // to make API calls to any AWS service with the following exception: you cannot
@@ -343,7 +364,7 @@ func (c *STS) AssumeRoleWithSAMLRequest(input *AssumeRoleWithSAMLInput) (req *re
 //   and Deactivating AWS STS in an AWS Region (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html)
 //   in the IAM User Guide.
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithSAML
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithSAML
 func (c *STS) AssumeRoleWithSAML(input *AssumeRoleWithSAMLInput) (*AssumeRoleWithSAMLOutput, error) {
         req, out := c.AssumeRoleWithSAMLRequest(input)
         return out, req.Send()
@@ -369,19 +390,18 @@ const opAssumeRoleWithWebIdentity = "AssumeRoleWithWebIdentity"
 
 // AssumeRoleWithWebIdentityRequest generates a "aws/request.Request" representing the
 // client's request for the AssumeRoleWithWebIdentity operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See AssumeRoleWithWebIdentity for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the AssumeRoleWithWebIdentity method directly
-// instead.
+// See AssumeRoleWithWebIdentity for more information on using the AssumeRoleWithWebIdentity
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the AssumeRoleWithWebIdentityRequest method.
 //    req, resp := client.AssumeRoleWithWebIdentityRequest(params)
@@ -391,7 +411,7 @@ const opAssumeRoleWithWebIdentity = "AssumeRoleWithWebIdentity"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithWebIdentity
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithWebIdentity
 func (c *STS) AssumeRoleWithWebIdentityRequest(input *AssumeRoleWithWebIdentityInput) (req *request.Request, output *AssumeRoleWithWebIdentityOutput) {
         op := &request.Operation{
                 Name:       opAssumeRoleWithWebIdentity,
@@ -441,9 +461,18 @@ func (c *STS) AssumeRoleWithWebIdentityRequest(input *AssumeRoleWithWebIdentityI
 // key ID, a secret access key, and a security token. Applications can use these
 // temporary security credentials to sign calls to AWS service APIs.
 //
-// The credentials are valid for the duration that you specified when calling
-// AssumeRoleWithWebIdentity, which can be from 900 seconds (15 minutes) to
-// a maximum of 3600 seconds (1 hour). The default is 1 hour.
+// By default, the temporary security credentials created by AssumeRoleWithWebIdentity
+// last for one hour. However, you can use the optional DurationSeconds parameter
+// to specify the duration of your session. You can provide a value from 900
+// seconds (15 minutes) up to the maximum session duration setting for the role.
+// This setting can have a value from 1 hour to 12 hours. To learn how to view
+// the maximum value for your role, see View the Maximum Session Duration Setting
+// for a Role (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session)
+// in the IAM User Guide. The maximum session duration limit applies when you
+// use the AssumeRole* API operations or the assume-role* CLI operations but
+// does not apply when you use those operations to create a console URL. For
+// more information, see Using IAM Roles (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html)
+// in the IAM User Guide.
 //
 // The temporary security credentials created by AssumeRoleWithWebIdentity can
 // be used to make API calls to any AWS service with the following exception:
@@ -495,7 +524,7 @@ func (c *STS) AssumeRoleWithWebIdentityRequest(input *AssumeRoleWithWebIdentityI
 //    the information from these providers to get and use temporary security
 //    credentials.
 //
-//    * Web Identity Federation with Mobile Applications (http://aws.amazon.com/articles/4617974389850313).
+//    * Web Identity Federation with Mobile Applications (http://aws.amazon.com/articles/web-identity-federation-with-mobile-applications).
 //    This article discusses web identity federation and shows an example of
 //    how to use web identity federation to get access to content in Amazon
 //    S3.
@@ -546,7 +575,7 @@ func (c *STS) AssumeRoleWithWebIdentityRequest(input *AssumeRoleWithWebIdentityI
 //   and Deactivating AWS STS in an AWS Region (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html)
 //   in the IAM User Guide.
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithWebIdentity
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithWebIdentity
 func (c *STS) AssumeRoleWithWebIdentity(input *AssumeRoleWithWebIdentityInput) (*AssumeRoleWithWebIdentityOutput, error) {
         req, out := c.AssumeRoleWithWebIdentityRequest(input)
         return out, req.Send()
@@ -572,19 +601,18 @@ const opDecodeAuthorizationMessage = "DecodeAuthorizationMessage"
 
 // DecodeAuthorizationMessageRequest generates a "aws/request.Request" representing the
 // client's request for the DecodeAuthorizationMessage operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See DecodeAuthorizationMessage for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the DecodeAuthorizationMessage method directly
-// instead.
+// See DecodeAuthorizationMessage for more information on using the DecodeAuthorizationMessage
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the DecodeAuthorizationMessageRequest method.
 //    req, resp := client.DecodeAuthorizationMessageRequest(params)
@@ -594,7 +622,7 @@ const opDecodeAuthorizationMessage = "DecodeAuthorizationMessage"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/DecodeAuthorizationMessage
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/DecodeAuthorizationMessage
 func (c *STS) DecodeAuthorizationMessageRequest(input *DecodeAuthorizationMessageInput) (req *request.Request, output *DecodeAuthorizationMessageOutput) {
         op := &request.Operation{
                 Name:       opDecodeAuthorizationMessage,
@@ -659,7 +687,7 @@ func (c *STS) DecodeAuthorizationMessageRequest(input *DecodeAuthorizationMessag
 //   invalid. This can happen if the token contains invalid characters, such as
 //   linebreaks.
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/DecodeAuthorizationMessage
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/DecodeAuthorizationMessage
 func (c *STS) DecodeAuthorizationMessage(input *DecodeAuthorizationMessageInput) (*DecodeAuthorizationMessageOutput, error) {
         req, out := c.DecodeAuthorizationMessageRequest(input)
         return out, req.Send()
@@ -685,19 +713,18 @@ const opGetCallerIdentity = "GetCallerIdentity"
 
 // GetCallerIdentityRequest generates a "aws/request.Request" representing the
 // client's request for the GetCallerIdentity operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See GetCallerIdentity for usage and error information.
+// See GetCallerIdentity for more information on using the GetCallerIdentity
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetCallerIdentity method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetCallerIdentityRequest method.
 //    req, resp := client.GetCallerIdentityRequest(params)
@@ -707,7 +734,7 @@ const opGetCallerIdentity = "GetCallerIdentity"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetCallerIdentity
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetCallerIdentity
 func (c *STS) GetCallerIdentityRequest(input *GetCallerIdentityInput) (req *request.Request, output *GetCallerIdentityOutput) {
         op := &request.Operation{
                 Name:       opGetCallerIdentity,
@@ -735,7 +762,7 @@ func (c *STS) GetCallerIdentityRequest(input *GetCallerIdentityInput) (req *requ
 //
 // See the AWS API reference guide for AWS Security Token Service's
 // API operation GetCallerIdentity for usage and error information.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetCallerIdentity
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetCallerIdentity
 func (c *STS) GetCallerIdentity(input *GetCallerIdentityInput) (*GetCallerIdentityOutput, error) {
         req, out := c.GetCallerIdentityRequest(input)
         return out, req.Send()
@@ -761,19 +788,18 @@ const opGetFederationToken = "GetFederationToken"
 
 // GetFederationTokenRequest generates a "aws/request.Request" representing the
 // client's request for the GetFederationToken operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
 //
-// See GetFederationToken for usage and error information.
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetFederationToken method directly
-// instead.
+// See GetFederationToken for more information on using the GetFederationToken
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetFederationTokenRequest method.
 //    req, resp := client.GetFederationTokenRequest(params)
@@ -783,7 +809,7 @@ const opGetFederationToken = "GetFederationToken"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetFederationToken
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetFederationToken
 func (c *STS) GetFederationTokenRequest(input *GetFederationTokenInput) (req *request.Request, output *GetFederationTokenOutput) {
         op := &request.Operation{
                 Name:       opGetFederationToken,
@@ -905,7 +931,7 @@ func (c *STS) GetFederationTokenRequest(input *GetFederationTokenInput) (req *re
 //   and Deactivating AWS STS in an AWS Region (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html)
 //   in the IAM User Guide.
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetFederationToken
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetFederationToken
 func (c *STS) GetFederationToken(input *GetFederationTokenInput) (*GetFederationTokenOutput, error) {
         req, out := c.GetFederationTokenRequest(input)
         return out, req.Send()
@@ -931,19 +957,18 @@ const opGetSessionToken = "GetSessionToken"
 
 // GetSessionTokenRequest generates a "aws/request.Request" representing the
 // client's request for the GetSessionToken operation. The "output" return
-// value can be used to capture response data after the request's "Send" method
-// is called.
+// value will be populated with the request's response once the request completes
+// successfuly.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
 //
-// See GetSessionToken for usage and error information.
+// See GetSessionToken for more information on using the GetSessionToken
+// API call, and error handling.
 //
-// Creating a request object using this method should be used when you want to inject
-// custom logic into the request's lifecycle using a custom handler, or if you want to
-// access properties on the request object before or after sending the request. If
-// you just want the service response, call the GetSessionToken method directly
-// instead.
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
 //
-// Note: You must call the "Send" method on the returned request object in order
-// to execute the request.
 //
 //    // Example sending a request using the GetSessionTokenRequest method.
 //    req, resp := client.GetSessionTokenRequest(params)
@@ -953,7 +978,7 @@ const opGetSessionToken = "GetSessionToken"
 //        fmt.Println(resp)
 //    }
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetSessionToken
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetSessionToken
 func (c *STS) GetSessionTokenRequest(input *GetSessionTokenInput) (req *request.Request, output *GetSessionTokenOutput) {
         op := &request.Operation{
                 Name:       opGetSessionToken,
@@ -1034,7 +1059,7 @@ func (c *STS) GetSessionTokenRequest(input *GetSessionTokenInput) (req *request.
 //   and Deactivating AWS STS in an AWS Region (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html)
 //   in the IAM User Guide.
 //
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetSessionToken
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetSessionToken
 func (c *STS) GetSessionToken(input *GetSessionTokenInput) (*GetSessionTokenOutput, error) {
         req, out := c.GetSessionTokenRequest(input)
         return out, req.Send()
@@ -1056,20 +1081,27 @@ func (c *STS) GetSessionTokenWithContext(ctx aws.Context, input *GetSessionToken
         return out, req.Send()
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleRequest
 type AssumeRoleInput struct {
         _ struct{} `type:"structure"`
 
         // The duration, in seconds, of the role session. The value can range from 900
-        // seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set
-        // to 3600 seconds.
+        // seconds (15 minutes) up to the maximum session duration setting for the role.
+        // This setting can have a value from 1 hour to 12 hours. If you specify a value
+        // higher than this setting, the operation fails. For example, if you specify
+        // a session duration of 12 hours, but your administrator set the maximum session
+        // duration to 6 hours, your operation fails. To learn how to view the maximum
+        // value for your role, see View the Maximum Session Duration Setting for a
+        // Role (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session)
+        // in the IAM User Guide.
         //
-        // This is separate from the duration of a console session that you might request
-        // using the returned credentials. The request to the federation endpoint for
-        // a console sign-in token takes a SessionDuration parameter that specifies
-        // the maximum length of the console session, separately from the DurationSeconds
-        // parameter on this API. For more information, see Creating a URL that Enables
-        // Federated Users to Access the AWS Management Console (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html)
+        // By default, the value is set to 3600 seconds.
+        //
+        // The DurationSeconds parameter is separate from the duration of a console
+        // session that you might request using the returned credentials. The request
+        // to the federation endpoint for a console sign-in token takes a SessionDuration
+        // parameter that specifies the maximum length of the console session. For more
+        // information, see Creating a URL that Enables Federated Users to Access the
+        // AWS Management Console (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html)
         // in the IAM User Guide.
         DurationSeconds *int64 `min:"900" type:"integer"`
 
@@ -1248,7 +1280,6 @@ func (s *AssumeRoleInput) SetTokenCode(v string) *AssumeRoleInput {
 
 // Contains the response to a successful AssumeRole request, including temporary
 // AWS credentials that can be used to make AWS requests.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleResponse
 type AssumeRoleOutput struct {
         _ struct{} `type:"structure"`
 
@@ -1302,22 +1333,30 @@ func (s *AssumeRoleOutput) SetPackedPolicySize(v int64) *AssumeRoleOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithSAMLRequest
 type AssumeRoleWithSAMLInput struct {
         _ struct{} `type:"structure"`
 
-        // The duration, in seconds, of the role session. The value can range from 900
-        // seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set
-        // to 3600 seconds. An expiration can also be specified in the SAML authentication
-        // response's SessionNotOnOrAfter value. The actual expiration time is whichever
-        // value is shorter.
+        // The duration, in seconds, of the role session. Your role session lasts for
+        // the duration that you specify for the DurationSeconds parameter, or until
+        // the time specified in the SAML authentication response's SessionNotOnOrAfter
+        // value, whichever is shorter. You can provide a DurationSeconds value from
+        // 900 seconds (15 minutes) up to the maximum session duration setting for the
+        // role. This setting can have a value from 1 hour to 12 hours. If you specify
+        // a value higher than this setting, the operation fails. For example, if you
+        // specify a session duration of 12 hours, but your administrator set the maximum
+        // session duration to 6 hours, your operation fails. To learn how to view the
+        // maximum value for your role, see View the Maximum Session Duration Setting
+        // for a Role (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session)
+        // in the IAM User Guide.
+        //
+        // By default, the value is set to 3600 seconds.
         //
-        // This is separate from the duration of a console session that you might request
-        // using the returned credentials. The request to the federation endpoint for
-        // a console sign-in token takes a SessionDuration parameter that specifies
-        // the maximum length of the console session, separately from the DurationSeconds
-        // parameter on this API. For more information, see Enabling SAML 2.0 Federated
-        // Users to Access the AWS Management Console (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-saml.html)
+        // The DurationSeconds parameter is separate from the duration of a console
+        // session that you might request using the returned credentials. The request
+        // to the federation endpoint for a console sign-in token takes a SessionDuration
+        // parameter that specifies the maximum length of the console session. For more
+        // information, see Creating a URL that Enables Federated Users to Access the
+        // AWS Management Console (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html)
         // in the IAM User Guide.
         DurationSeconds *int64 `min:"900" type:"integer"`
 
@@ -1443,7 +1482,6 @@ func (s *AssumeRoleWithSAMLInput) SetSAMLAssertion(v string) *AssumeRoleWithSAML
 
 // Contains the response to a successful AssumeRoleWithSAML request, including
 // temporary AWS credentials that can be used to make AWS requests.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithSAMLResponse
 type AssumeRoleWithSAMLOutput struct {
         _ struct{} `type:"structure"`
 
@@ -1555,20 +1593,27 @@ func (s *AssumeRoleWithSAMLOutput) SetSubjectType(v string) *AssumeRoleWithSAMLO
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithWebIdentityRequest
 type AssumeRoleWithWebIdentityInput struct {
         _ struct{} `type:"structure"`
 
         // The duration, in seconds, of the role session. The value can range from 900
-        // seconds (15 minutes) to 3600 seconds (1 hour). By default, the value is set
-        // to 3600 seconds.
+        // seconds (15 minutes) up to the maximum session duration setting for the role.
+        // This setting can have a value from 1 hour to 12 hours. If you specify a value
+        // higher than this setting, the operation fails. For example, if you specify
+        // a session duration of 12 hours, but your administrator set the maximum session
+        // duration to 6 hours, your operation fails. To learn how to view the maximum
+        // value for your role, see View the Maximum Session Duration Setting for a
+        // Role (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use.html#id_roles_use_view-role-max-session)
+        // in the IAM User Guide.
+        //
+        // By default, the value is set to 3600 seconds.
         //
-        // This is separate from the duration of a console session that you might request
-        // using the returned credentials. The request to the federation endpoint for
-        // a console sign-in token takes a SessionDuration parameter that specifies
-        // the maximum length of the console session, separately from the DurationSeconds
-        // parameter on this API. For more information, see Creating a URL that Enables
-        // Federated Users to Access the AWS Management Console (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html)
+        // The DurationSeconds parameter is separate from the duration of a console
+        // session that you might request using the returned credentials. The request
+        // to the federation endpoint for a console sign-in token takes a SessionDuration
+        // parameter that specifies the maximum length of the console session. For more
+        // information, see Creating a URL that Enables Federated Users to Access the
+        // AWS Management Console (http://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-custom-url.html)
         // in the IAM User Guide.
         DurationSeconds *int64 `min:"900" type:"integer"`
 
@@ -1718,7 +1763,6 @@ func (s *AssumeRoleWithWebIdentityInput) SetWebIdentityToken(v string) *AssumeRo
 
 // Contains the response to a successful AssumeRoleWithWebIdentity request,
 // including temporary AWS credentials that can be used to make AWS requests.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumeRoleWithWebIdentityResponse
 type AssumeRoleWithWebIdentityOutput struct {
         _ struct{} `type:"structure"`
 
@@ -1811,7 +1855,6 @@ func (s *AssumeRoleWithWebIdentityOutput) SetSubjectFromWebIdentityToken(v strin
 
 // The identifiers for the temporary security credentials that the operation
 // returns.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/AssumedRoleUser
 type AssumedRoleUser struct {
         _ struct{} `type:"structure"`
 
@@ -1854,7 +1897,6 @@ func (s *AssumedRoleUser) SetAssumedRoleId(v string) *AssumedRoleUser {
 }
 
 // AWS credentials for API authentication.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/Credentials
 type Credentials struct {
         _ struct{} `type:"structure"`
 
@@ -1866,7 +1908,7 @@ type Credentials struct {
         // The date on which the current credentials expire.
         //
         // Expiration is a required field
-        Expiration *time.Time `type:"timestamp" timestampFormat:"iso8601" required:"true"`
+        Expiration *time.Time `type:"timestamp" required:"true"`
 
         // The secret access key that can be used to sign requests.
         //
@@ -1913,7 +1955,6 @@ func (s *Credentials) SetSessionToken(v string) *Credentials {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/DecodeAuthorizationMessageRequest
 type DecodeAuthorizationMessageInput struct {
         _ struct{} `type:"structure"`
 
@@ -1958,7 +1999,6 @@ func (s *DecodeAuthorizationMessageInput) SetEncodedMessage(v string) *DecodeAut
 // A document that contains additional information about the authorization status
 // of a request from an encoded message that is returned in response to an AWS
 // request.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/DecodeAuthorizationMessageResponse
 type DecodeAuthorizationMessageOutput struct {
         _ struct{} `type:"structure"`
 
@@ -1983,7 +2023,6 @@ func (s *DecodeAuthorizationMessageOutput) SetDecodedMessage(v string) *DecodeAu
 }
 
 // Identifiers for the federated user that is associated with the credentials.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/FederatedUser
 type FederatedUser struct {
         _ struct{} `type:"structure"`
 
@@ -2024,7 +2063,6 @@ func (s *FederatedUser) SetFederatedUserId(v string) *FederatedUser {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetCallerIdentityRequest
 type GetCallerIdentityInput struct {
         _ struct{} `type:"structure"`
 }
@@ -2041,7 +2079,6 @@ func (s GetCallerIdentityInput) GoString() string {
 
 // Contains the response to a successful GetCallerIdentity request, including
 // information about the entity making the request.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetCallerIdentityResponse
 type GetCallerIdentityOutput struct {
         _ struct{} `type:"structure"`
 
@@ -2087,7 +2124,6 @@ func (s *GetCallerIdentityOutput) SetUserId(v string) *GetCallerIdentityOutput {
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetFederationTokenRequest
 type GetFederationTokenInput struct {
         _ struct{} `type:"structure"`
 
@@ -2196,7 +2232,6 @@ func (s *GetFederationTokenInput) SetPolicy(v string) *GetFederationTokenInput {
 
 // Contains the response to a successful GetFederationToken request, including
 // temporary AWS credentials that can be used to make AWS requests.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetFederationTokenResponse
 type GetFederationTokenOutput struct {
         _ struct{} `type:"structure"`
 
@@ -2249,7 +2284,6 @@ func (s *GetFederationTokenOutput) SetPackedPolicySize(v int64) *GetFederationTo
         return s
 }
 
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetSessionTokenRequest
 type GetSessionTokenInput struct {
         _ struct{} `type:"structure"`
 
@@ -2334,7 +2368,6 @@ func (s *GetSessionTokenInput) SetTokenCode(v string) *GetSessionTokenInput {
 
 // Contains the response to a successful GetSessionToken request, including
 // temporary AWS credentials that can be used to make AWS requests.
-// Please also see https://docs.aws.amazon.com/goto/WebAPI/sts-2011-06-15/GetSessionTokenResponse
 type GetSessionTokenOutput struct {
         _ struct{} `type:"structure"`
 
diff --git a/vendor/github.com/aws/aws-sdk-go/service/sts/doc.go b/vendor/github.com/aws/aws-sdk-go/service/sts/doc.go
index d2af518..ef681ab 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/sts/doc.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/sts/doc.go
@@ -56,69 +56,17 @@
 //
 // Using the Client
 //
-// To use the client for AWS Security Token Service you will first need
-// to create a new instance of it.
+// To contact AWS Security Token Service with the SDK use the New function to create
+// a new service client. With that client you can make API requests to the service.
+// These clients are safe to use concurrently.
 //
-// When creating a client for an AWS service you'll first need to have a Session
-// already created. The Session provides configuration that can be shared
-// between multiple service clients. Additional configuration can be applied to
-// the Session and service's client when they are constructed. The aws package's
-// Config type contains several fields such as Region for the AWS Region the
-// client should make API requests too. The optional Config value can be provided
-// as the variadic argument for Sessions and client creation.
-//
-// Once the service's client is created you can use it to make API requests the
-// AWS service. These clients are safe to use concurrently.
-//
-//   // Create a session to share configuration, and load external configuration.
-//   sess := session.Must(session.NewSession())
-//
-//   // Create the service's client with the session.
-//   svc := sts.New(sess)
-//
-// See the SDK's documentation for more information on how to use service clients.
+// See the SDK's documentation for more information on how to use the SDK.
 // https://docs.aws.amazon.com/sdk-for-go/api/
 //
-// See aws package's Config type for more information on configuration options.
+// See aws.Config documentation for more information on configuring SDK clients.
 // https://docs.aws.amazon.com/sdk-for-go/api/aws/#Config
 //
 // See the AWS Security Token Service client STS for more
-// information on creating the service's client.
+// information on creating client for this service.
 // https://docs.aws.amazon.com/sdk-for-go/api/service/sts/#New
-//
-// Once the client is created you can make an API request to the service.
-// Each API method takes a input parameter, and returns the service response
-// and an error.
-//
-// The API method will document which error codes the service can be returned
-// by the operation if the service models the API operation's errors. These
-// errors will also be available as const strings prefixed with "ErrCode".
-//
-//   result, err := svc.AssumeRole(params)
-//   if err != nil {
-//       // Cast err to awserr.Error to handle specific error codes.
-//       aerr, ok := err.(awserr.Error)
-//       if ok && aerr.Code() == <error code to check for> {
-//           // Specific error code handling
-//       }
-//       return err
-//   }
-//
-//   fmt.Println("AssumeRole result:")
-//   fmt.Println(result)
-//
-// Using the Client with Context
-//
-// The service's client also provides methods to make API requests with a Context
-// value. This allows you to control the timeout, and cancellation of pending
-// requests. These methods also take request Option as variadic parameter to apply
-// additional configuration to the API request.
-//
-//   ctx := context.Background()
-//
-//   result, err := svc.AssumeRoleWithContext(ctx, params)
-//
-// See the request package documentation for more information on using Context pattern
-// with the SDK.
-// https://docs.aws.amazon.com/sdk-for-go/api/aws/request/
 package sts
diff --git a/vendor/github.com/aws/aws-sdk-go/service/sts/service.go b/vendor/github.com/aws/aws-sdk-go/service/sts/service.go
index 1ee5839..185c914 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/sts/service.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/sts/service.go
@@ -29,8 +29,9 @@ var initRequest func(*request.Request)
 
 // Service information constants
 const (
-        ServiceName = "sts"       // Service endpoint prefix API calls made to.
-        EndpointsID = ServiceName // Service ID for Regions and Endpoints metadata.
+        ServiceName = "sts"       // Name of service.
+        EndpointsID = ServiceName // ID to lookup a service endpoint with.
+        ServiceID   = "STS"       // ServiceID is a unique identifer of a specific service.
 )
 
 // New creates a new instance of the STS client with a session.
@@ -55,6 +56,7 @@ func newClient(cfg aws.Config, handlers request.Handlers, endpoint, signingRegio
                         cfg,
                         metadata.ClientInfo{
                                 ServiceName:   ServiceName,
+                                ServiceID:     ServiceID,
                                 SigningName:   signingName,
                                 SigningRegion: signingRegion,
                                 Endpoint:      endpoint,