fix: large json (#63)

screwdriver-cd · Oct 18, 2018 · 258d919 · 258d919
1 parent b509838
commit 258d919
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/plugins/builds.js b/plugins/builds.js
@@ -105,11 +105,10 @@ exports.plugin = {
                     }
                 });
 
-                // For text/plain payload or application/zip, upload it as Buffer
+                // For text/plain payload, upload it as Buffer
                 // Otherwise, catbox-s3 will try to JSON.stringify (https://github.com/fhemberger/catbox-s3/blob/master/lib/index.js#L236)
                 // and might create issue on large payload
-                if (contents.h['content-type'] === 'text/plain' ||
-                    contents.h['content-type'] === 'application/zip') {
+                if (contents.h['content-type'] === 'text/plain') {
                     value = contents.c;
                 }
 

diff --git a/plugins/caches.js b/plugins/caches.js
@@ -65,7 +65,7 @@ exports.plugin = {
                     response.headers = value.h;
                 } else {
                     response = h.response(Buffer.from(value));
-                    response.headers['content-type'] = 'text/plain';
+                    response.headers['content-type'] = 'application/zip';
                 }
 
                 if (strategyConfig.plugin !== 's3') {
@@ -134,8 +134,10 @@ exports.plugin = {
                     }
                 });
 
-                // For text/plain payload, upload it as Buffer
-                if (contents.h['content-type'] === 'text/plain') {
+                // For application/zip, upload it as Buffer
+                // Otherwise, catbox-s3 will try to JSON.stringify (https://github.com/fhemberger/catbox-s3/blob/master/lib/index.js#L236)
+                // and might create issue on large payload
+                if (contents.h['content-type'] === 'application/zip') {
                     value = contents.c;
                 }
 

diff --git a/test/plugins/caches.test.js b/test/plugins/caches.test.js
@@ -166,7 +166,7 @@ describe('events plugin test', () => {
                 payload: 'THIS IS A TEST',
                 headers: {
                     'x-foo': 'bar',
-                    'content-type': 'text/plain',
+                    'content-type': 'application/zip',
                     ignore: 'true'
                 },
                 credentials: {
@@ -224,7 +224,7 @@ describe('events plugin test', () => {
             });
         });
 
-        it('saves a cache without headers for text/plain type', async () => {
+        it('saves a cache without headers for application/zip type', async () => {
             options.url = `/caches/events/${mockEventID}/foo`;
 
             const putResponse = await server.inject(options);
@@ -239,7 +239,7 @@ describe('events plugin test', () => {
                 }
             }).then((getResponse) => {
                 assert.equal(getResponse.statusCode, 200);
-                assert.equal(getResponse.headers['content-type'], 'text/plain; charset=utf-8');
+                assert.equal(getResponse.headers['content-type'], 'application/zip');
                 assert.isNotOk(getResponse.headers['x-foo']);
                 assert.isNotOk(getResponse.headers.ignore);
                 assert.equal(getResponse.result, 'THIS IS A TEST');