Propagate an error from a stream to s3.upload callback

aws · Oct 7, 2016 · 0794efa · 0794efa
1 parent b0de518
commit 0794efa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/lib/s3/managed_upload.js b/lib/s3/managed_upload.js
@@ -168,6 +168,7 @@ AWS.S3.ManagedUpload = AWS.util.inherit({
         self.fillQueue = self.fillStream;
         self.partBuffers = [];
         self.body.
+          on('error', function(err) { self.cleanup(err); }).
           on('readable', function() { self.fillQueue(); }).
           on('end', function() {
             self.isDoneChunking = true;

diff --git a/test/s3/managed_upload.spec.coffee b/test/s3/managed_upload.spec.coffee
@@ -356,3 +356,14 @@ describe 'AWS.S3.ManagedUpload', ->
             expect(helpers.operationsForRequests(reqs)).to.eql ['s3.putObject']
             expect(err).not.to.exist
             done()
+
+        it 'propagates an error from a stream', (done) ->
+          errorStream = new require('stream').Readable()
+          errorStream._read = -> this.emit('error', new Error('message'))
+
+          upload = new AWS.S3.ManagedUpload params: { Body: errorStream }
+          upload.send (e, d) ->
+            expect(e).to.exist
+            expect(d).not.to.exist
+            expect(e.message).to.equal('message')
+            done()