Switch to using the dep tool and update all the dependencies

vendor/github.com/aws/aws-sdk-go/service/s3/s3manager/download.go

@@ -40,6 +40,17 @@ type Downloader struct {
 
 	// An S3 client to use when performing downloads.
 	S3 s3iface.S3API
+
+	// List of request options that will be passed down to individual API
+	// operation requests made by the downloader.
+	RequestOptions []request.Option
+}
+
+// WithDownloaderRequestOptions appends to the Downloader's API request options.
+func WithDownloaderRequestOptions(opts ...request.Option) func(*Downloader) {
+	return func(d *Downloader) {
+		d.RequestOptions = append(d.RequestOptions, opts...)
+	}
 }
 
 // NewDownloader creates a new Downloader instance to downloads objects from
@@ -50,7 +61,7 @@ type Downloader struct {
 //
 // Example:
 //     // The session the S3 Downloader will use
-//     sess, err := session.NewSession()
+//     sess := session.Must(session.NewSession())
 //
 //     // Create a downloader with the session and default options
 //     downloader := s3manager.NewDownloader(sess)
@@ -79,7 +90,7 @@ func NewDownloader(c client.ConfigProvider, options ...func(*Downloader)) *Downl
 //
 // Example:
 //     // The session the S3 Downloader will use
-//     sess, err := session.NewSession()
+//     sess := session.Must(session.NewSession())
 //
 //     // The S3 client the S3 Downloader will use
 //     s3Svc := s3.new(sess)
@@ -120,23 +131,47 @@ type maxRetrier interface {
 // The w io.WriterAt can be satisfied by an os.File to do multipart concurrent
 // downloads, or in memory []byte wrapper using aws.WriteAtBuffer.
 func (d Downloader) Download(w io.WriterAt, input *s3.GetObjectInput, options ...func(*Downloader)) (n int64, err error) {
-	impl := downloader{w: w, in: input, ctx: d}
+	return d.DownloadWithContext(aws.BackgroundContext(), w, input, options...)
+}
+
+// DownloadWithContext downloads an object in S3 and writes the payload into w
+// using concurrent GET requests.
+//
+// DownloadWithContext is the same as Download with the additional support for
+// Context input parameters. The Context must not be nil. A nil Context will
+// cause a panic. Use the Context to add deadlining, timeouts, ect. The
+// DownloadWithContext may create sub-contexts for individual underlying
+// requests.
+//
+// Additional functional options can be provided to configure the individual
+// download. These options are copies of the Downloader instance Download is
+// called from. Modifying the options will not impact the original Downloader
+// instance. Use the WithDownloaderRequestOptions helper function to pass in request
+// options that will be applied to all API operations made with this downloader.
+//
+// The w io.WriterAt can be satisfied by an os.File to do multipart concurrent
+// downloads, or in memory []byte wrapper using aws.WriteAtBuffer.
+//
+// It is safe to call this method concurrently across goroutines.
+func (d Downloader) DownloadWithContext(ctx aws.Context, w io.WriterAt, input *s3.GetObjectInput, options ...func(*Downloader)) (n int64, err error) {
+	impl := downloader{w: w, in: input, cfg: d, ctx: ctx}
 
 	for _, option := range options {
-		option(&impl.ctx)
+		option(&impl.cfg)
 	}
+	impl.cfg.RequestOptions = append(impl.cfg.RequestOptions, request.WithAppendUserAgent("S3Manager"))
 
 	if s, ok := d.S3.(maxRetrier); ok {
 		impl.partBodyMaxRetries = s.MaxRetries()
 	}
 
 	impl.totalBytes = -1
-	if impl.ctx.Concurrency == 0 {
-		impl.ctx.Concurrency = DefaultDownloadConcurrency
+	if impl.cfg.Concurrency == 0 {
+		impl.cfg.Concurrency = DefaultDownloadConcurrency
 	}
 
-	if impl.ctx.PartSize == 0 {
-		impl.ctx.PartSize = DefaultDownloadPartSize
+	if impl.cfg.PartSize == 0 {
+		impl.cfg.PartSize = DefaultDownloadPartSize
 	}
 
 	return impl.download()
@@ -144,7 +179,8 @@ func (d Downloader) Download(w io.WriterAt, input *s3.GetObjectInput, options ..
 
 // downloader is the implementation structure used internally by Downloader.
 type downloader struct {
-	ctx Downloader
+	ctx aws.Context
+	cfg Downloader
 
 	in *s3.GetObjectInput
 	w  io.WriterAt
@@ -168,9 +204,9 @@ func (d *downloader) download() (n int64, err error) {
 
 	if total := d.getTotalBytes(); total >= 0 {
 		// Spin up workers
-		ch := make(chan dlchunk, d.ctx.Concurrency)
+		ch := make(chan dlchunk, d.cfg.Concurrency)
 
-		for i := 0; i < d.ctx.Concurrency; i++ {
+		for i := 0; i < d.cfg.Concurrency; i++ {
 			d.wg.Add(1)
 			go d.downloadPart(ch)
 		}
@@ -182,8 +218,8 @@ func (d *downloader) download() (n int64, err error) {
 			}
 
 			// Queue the next range of bytes to read.
-			ch <- dlchunk{w: d.w, start: d.pos, size: d.ctx.PartSize}
-			d.pos += d.ctx.PartSize
+			ch <- dlchunk{w: d.w, start: d.pos, size: d.cfg.PartSize}
+			d.pos += d.cfg.PartSize
 		}
 
 		// Wait for completion
@@ -219,13 +255,17 @@ func (d *downloader) downloadPart(ch chan dlchunk) {
 	defer d.wg.Done()
 	for {
 		chunk, ok := <-ch
-		if !ok || d.getErr() != nil {
+		if !ok {
 			break
 		}
+		if d.getErr() != nil {
+			// Drain the channel if there is an error, to prevent deadlocking
+			// of download producer.
+			continue
+		}
 
 		if err := d.downloadChunk(chunk); err != nil {
 			d.setErr(err)
-			break
 		}
 	}
 }
@@ -237,8 +277,8 @@ func (d *downloader) getChunk() {
 		return
 	}
 
-	chunk := dlchunk{w: d.w, start: d.pos, size: d.ctx.PartSize}
-	d.pos += d.ctx.PartSize
+	chunk := dlchunk{w: d.w, start: d.pos, size: d.cfg.PartSize}
+	d.pos += d.cfg.PartSize
 
 	if err := d.downloadChunk(chunk); err != nil {
 		d.setErr(err)
@@ -257,10 +297,8 @@ func (d *downloader) downloadChunk(chunk dlchunk) error {
 	var n int64
 	var err error
 	for retry := 0; retry <= d.partBodyMaxRetries; retry++ {
-		req, resp := d.ctx.S3.GetObjectRequest(in)
-		req.Handlers.Build.PushBack(request.MakeAddToUserAgentFreeFormHandler("S3Manager"))
-
-		err = req.Send()
+		var resp *s3.GetObjectOutput
+		resp, err = d.cfg.S3.GetObjectWithContext(d.ctx, in, d.cfg.RequestOptions...)
 		if err != nil {
 			return err
 		}
@@ -273,7 +311,7 @@ func (d *downloader) downloadChunk(chunk dlchunk) error {
 		}
 
 		chunk.cur = 0
-		logMessage(d.ctx.S3, aws.LogDebugWithRequestRetries,
+		logMessage(d.cfg.S3, aws.LogDebugWithRequestRetries,
 			fmt.Sprintf("DEBUG: object part body download interrupted %s, err, %v, retrying attempt %d",
 				aws.StringValue(in.Key), err, retry))
 	}
@@ -320,7 +358,7 @@ func (d *downloader) setTotalBytes(resp *s3.GetObjectOutput) {
 	}
 
 	if resp.ContentRange == nil {
-		// ContentRange is nil when the full file contents is provied, and
+		// ContentRange is nil when the full file contents is provided, and
 		// is not chunked. Use ContentLength instead.
 		if resp.ContentLength != nil {
 			d.totalBytes = *resp.ContentLength