Merge pull request #562 from aws/s3-0b-upload

Fix `AWS.S3.ManagedUpload` to upload zero byte bodies.

Author: lsegal

lib/s3/managed_upload.js

@@ -168,7 +168,6 @@ AWS.S3.ManagedUpload = AWS.util.inherit({
           });
       }
     }
-
     if (runFill) self.fillQueue.call(self);
   },
 
@@ -204,7 +203,9 @@ AWS.S3.ManagedUpload = AWS.util.inherit({
   validateBody: function validateBody() {
     var self = this;
     self.body = self.service.config.params.Body;
-    if (!self.body) throw new Error('params.Body is required');
+    if (self.body === null || self.body === undefined) {
+      throw new Error('params.Body is required');
+    }
     if (typeof self.body === 'string') {
       self.body = new AWS.util.Buffer(self.body);
     }
@@ -239,7 +240,7 @@ AWS.S3.ManagedUpload = AWS.util.inherit({
     } catch (e) { }
 
     // try to adjust partSize if we know payload length
-    if (self.totalBytes) {
+    if (typeof self.totalBytes === 'number') {
       var newPartSize = Math.ceil(self.totalBytes / self.maxTotalParts);
       if (newPartSize > self.partSize) self.partSize = newPartSize;
     } else {
@@ -323,7 +324,8 @@ AWS.S3.ManagedUpload = AWS.util.inherit({
   fillBuffer: function fillBuffer() {
     var self = this;
     var bodyLen = byteLength(self.body);
-    while (self.activeParts < self.queueSize && self.partPos < bodyLen) {
+    while (!self.isDoneChunking && self.activeParts < self.queueSize
+           && self.partPos <= bodyLen) {
       var endPos = Math.min(self.partPos + self.partSize, bodyLen);
       var buf = self.sliceFn.call(self.body, self.partPos, endPos);
       self.partPos += self.partSize;
@@ -349,20 +351,19 @@ AWS.S3.ManagedUpload = AWS.util.inherit({
       self.partBuffer = AWS.util.Buffer.concat([self.partBuffer, buf]);
       self.totalChunkedBytes += buf.length;
     }
-
     if (self.partBuffer.length >= self.partSize) {
       self.nextChunk(self.partBuffer.slice(0, self.partSize));
       self.partBuffer = self.partBuffer.slice(self.partSize);
     } else if (self.isDoneChunking) {
       self.totalBytes = self.totalChunkedBytes;
-      if (self.partBuffer.length > 0) {
+      if (self.partBuffer.length >= 0) {
         self.numParts++;
         self.nextChunk(self.partBuffer);
       }
       self.partBuffer = new AWS.util.Buffer(0);
     }
 
-    self.body.read(0);
+    if (!self.isDoneChunking) self.body.read(0);
   },
 
   /**

test/s3/managed_upload.spec.coffee

@@ -7,6 +7,7 @@ body = (size) ->
   catch e
     return new AWS.util.Buffer(size)
 
+zerobody = body(0)
 smallbody = body(5)
 bigbody = body(36)
 
@@ -53,6 +54,18 @@ describe 'AWS.S3.ManagedUpload', ->
     it 'uses a default service object if none provided', ->
       expect(-> new AWS.S3.ManagedUpload()).to.throw('params.Body is required')
 
+    it 'uploads a zero byte body', ->
+      reqs = helpers.mockResponses [
+        data: ETag: 'ETAG'
+      ]
+
+      send Body: zerobody, ContentEncoding: 'encoding', ->
+        expect(err).not.to.exist
+        expect(data.ETag).to.equal('ETAG')
+        expect(data.Location).to.equal('https://bucket.s3.mock-region.amazonaws.com/key')
+        expect(helpers.operationsForRequests(reqs)).to.eql ['s3.putObject']
+        expect(reqs[0].params.ContentEncoding).to.equal('encoding')
+
     it 'uploads a single part if size is less than min multipart size', ->
       reqs = helpers.mockResponses [
         data: ETag: 'ETAG'
@@ -226,6 +239,16 @@ describe 'AWS.S3.ManagedUpload', ->
 
     if AWS.util.isNode()
       describe 'streaming', ->
+
+        it 'sends a zero length stream in a single putObject', (done) ->
+          stream = AWS.util.buffer.toStream(zerobody)
+          reqs = helpers.mockResponses [data: ETag: 'ETAG']
+          upload = new AWS.S3.ManagedUpload params: { Body: stream }
+          upload.send ->
+            expect(helpers.operationsForRequests(reqs)).to.eql ['s3.putObject']
+            expect(err).not.to.exist
+            done()
+
         it 'sends a small stream in a single putObject', (done) ->
           stream = AWS.util.buffer.toStream(smallbody)
           reqs = helpers.mockResponses [data: ETag: 'ETAG']