Merge pull request #65 from developmentseed/v2.2.3

fix the corrupt zip file bug

.circleci/config.yml

@@ -16,9 +16,14 @@ jobs:
 
       - run:
           name: Install
-          command: |
-            npm install
+          command: npm install
 
+      - run:
+          name: Lint
+          command: |
+            ./node_modules/.bin/eslint src --ext .js
+            ./node_modules/.bin/eslint bin --ext .js
+
       # save cahce
       - save_cache:
           key: deploy-{{ .Branch }}-{{ checksum "package.json" }}

.gitignore

@@ -5,4 +5,4 @@ build
 dist
 cloudformation.yml
 myNestedTemplate.yml
-
+yarn.lock

CHANGELOG

@@ -1,3 +1,6 @@
+## v2.2.3
+- Fix a bug where corrupt zip files were created and uploaded to S3 when the source file didn't exist
+
 ## v2.2.2
 - allow plus in the apigateway path to support the new proxy resource
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kes",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Making deployment to AWS using CloudFormation easier and fun",
   "scripts": {
     "html-docs": "documentation build bin/cli.js -f html -o _docs --theme node_modules/documentation-devseed-theme",

src/config.js

@@ -6,7 +6,6 @@ const get = require('lodash.get');
 const has = require('lodash.has');
 const values = require('lodash.values');
 const startsWith = require('lodash.startswith');
-const trim = require('lodash.trim');
 const replace = require('lodash.replace');
 const upperFirst = require('lodash.upperfirst');
 const capitalize = require('lodash.capitalize');

src/lambda.js

@@ -98,7 +98,10 @@ class Lambda {
 
     // skip if the file with the same hash is zipped
     if (fs.existsSync(lambda.local)) {
-      return Promise.resolve(lambda);
+      const stats = fs.statSync(lambda.local);
+      if (stats.isFile() && stats.size > 0) {
+        return Promise.resolve(lambda);
+      }
     }
 
     return utils.zip(lambda.local, [lambda.source]).then(() => {
@@ -131,7 +134,10 @@ class Lambda {
       s3.headObject({
         Bucket: this.bucket,
         Key: lambda.remote
-      }).promise().then(() => {
+      }).promise().then((data) => {
+        if (data.ContentLength !== params.Body.byteLength) {
+          throw new Error('File sizes don\'t match');
+        }
         console.log(`Already Uploaded: s3://${this.bucket}/${lambda.remote}`);
         return resolve(lambda);
       }).catch(() => {
@@ -153,7 +159,8 @@ class Lambda {
    * @returns {Promise} returns the promise of updated lambda object
    */
   zipAndUploadLambda(lambda) {
-    return this.zipLambda(lambda).then(l => this.uploadLambda(l));
+    return this.zipLambda(lambda)
+      .then(l => this.uploadLambda(l));
   }
 
   /**
@@ -196,19 +203,29 @@ class Lambda {
       });
       const jobs = Object.keys(uniqueHashes).map(l => this.zipAndUploadLambda(uniqueHashes[l]));
 
-      return Promise.all(jobs).then(() => {
-        // we handle lambdas as both arrays and key/objects
-        // below condition is intended to for cases where
-        // the lambda is returned as a lsit
-        if (Array.isArray(this.config.lambdas)) {
-          this.config.lambdas = lambdas;
+      return Promise.all(jobs)
+        .then(() => {
+          // we handle lambdas as both arrays and key/objects
+          // below condition is intended to for cases where
+          // the lambda is returned as a list
+          if (Array.isArray(this.config.lambdas)) {
+            this.config.lambdas = lambdas;
+            return this.config;
+          }
+          const tmp = {};
+          lambdas.forEach(l => (tmp[l.name] = l));
+          this.config.lambdas = tmp;
           return this.config;
-        }
-        const tmp = {};
-        lambdas.forEach(l => (tmp[l.name] = l));
-        this.config.lambdas = tmp;
-        return this.config;
-      });
+        })
+        .catch((e) => {
+          // if the zip operation stops for any of the lambdas because the source
+          // file is missing, zip files with the size of 0 are created. Removing
+          // the build folder ensures that we start fresh in the next round of zipping
+          if (e.message.includes('ENOENT')) {
+            fs.removeSync(this.buildFolder);
+          }
+          throw e;
+        });
     }
     else return Promise.resolve(this.config);
   }