Merge pull request #142 from jrjohnson/v3-fix

Handle empty s3 response
ember-cli-deploy · Apr 5, 2024 · afb57ce · afb57ce
2 parents 9c7fc45 + 21343ca
commit afb57ce
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 'latest',
     sourceType: 'module'
   },
   extends: 'eslint:recommended',

diff --git a/lib/s3.js b/lib/s3.js
@@ -166,7 +166,7 @@ module.exports = CoreObject.extend({
     var revisionPrefix = joinUriSegments(prefix, options.filePattern + ":" + options.revisionKey);
 
     return listObjects({ Bucket: bucket, Prefix: revisionPrefix })
-      .then((response) => response.Contents.find((element) => element.Key === revisionPrefix));
+      .then((response) => response.Contents?.find((element) => element.Key === revisionPrefix));
   },
 
   fetchRevisions: function(options) {

diff --git a/tests/unit/lib/s3-test.js b/tests/unit/lib/s3-test.js
@@ -242,6 +242,15 @@ describe('s3', function() {
         });
     });
 
+    it('succeeds when revision key search returns no values', function() {
+      s3Client.listObjects = function(params, cb) {
+        cb(undefined, {});
+      };
+      var promise = subject.upload(options);
+
+      return assert.isFulfilled(promise);
+    });
+
     describe("when revisionKey was already uploaded", function() {
       beforeEach(function() {
         options.revisionKey = "123";