Merge pull request #196 from elastic-coders/handle-entry-detection-for-malformed-handlers

Ignore handlers that do not follow a path pattern

Author: HyperBrain

lib/validate.js

@@ -48,10 +48,16 @@ module.exports = {
       return path.extname(_.first(sortedFiles));
     }
 
-    const getEntryForFunction = serverlessFunction => {
+    const getEntryForFunction = (name, serverlessFunction) => {
       const handler = serverlessFunction.handler;
-      const handlerFile = /(.*)\..*?$/.exec(handler)[1];
-
+      // Check if handler is a well-formed path based handler.
+      const handlerEntry = /(.*)\..*?$/.exec(handler);
+      if (!handlerEntry) {
+        _.get(this.serverless, 'service.provider.name') !== 'google' &&
+          this.serverless.cli.log(`\nWARNING: Entry for ${name}@${handler} could not be retrieved.\nPlease check your service config if you want to use lib.entries.`);
+        return {};
+      }
+      const handlerFile = handlerEntry[1];
       const ext = getEntryExtension(handlerFile);
 
       // Create a valid entry key
@@ -70,12 +76,12 @@ module.exports = {
     const entries = {};
     const functions = this.serverless.service.getAllFunctions();
     if (this.options.function) {
-			const serverlessFunction = this.serverless.service.getFunction(this.options.function);
-      const entry = getEntryForFunction(serverlessFunction);
+      const serverlessFunction = this.serverless.service.getFunction(this.options.function);
+      const entry = getEntryForFunction.call(this, this.options.function, serverlessFunction);
       _.merge(entries, entry);
     } else {
-      _.forEach(functions, func => {
-        const entry = getEntryForFunction(this.serverless.service.getFunction(func));
+      _.forEach(functions, (func, index) => {
+        const entry = getEntryForFunction.call(this, functions[index], this.serverless.service.getFunction(func));
         _.merge(entries, entry);
       });
     }