Merge pull request #663 from jgrantr/master

Don't package non-node functions (fix for #644)
serverless-heaven · Feb 3, 2021 · b9fa44a · b9fa44a
2 parents c43bbc2 + b2cf9ac
commit b9fa44a
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 12 deletions.
diff --git a/lib/validate.js b/lib/validate.js
@@ -191,7 +191,10 @@ module.exports = {
       if (_.has(this.serverless, 'service.package') && this.serverless.service.package.individually) {
         this.multiCompile = true;
         this.serializedCompile = this.configuration.serializedCompile;
-        this.options.verbose && this.serverless.cli.log(`Using ${this.serializedCompile ? 'serialized' : 'multi'}-compile (individual packaging)`);
+        this.options.verbose &&
+          this.serverless.cli.log(
+            `Using ${this.serializedCompile ? 'serialized' : 'multi'}-compile (individual packaging)`
+          );
 
         if (this.webpackConfig.entry && !_.isEqual(this.webpackConfig.entry, entries)) {
           return BbPromise.reject(
@@ -203,16 +206,23 @@ module.exports = {
         }
 
         // Lookup associated Serverless functions
-        const allEntryFunctions = _.map(this.serverless.service.getAllFunctions(), funcName => {
-          const func = this.serverless.service.getFunction(funcName);
-          const handler = func.handler;
-          const handlerFile = path.relative('.', getHandlerFile(handler));
-          return {
-            handlerFile,
-            funcName,
-            func
-          };
-        });
+        const allEntryFunctions = _.map(
+          _.filter(this.serverless.service.getAllFunctions(), funcName => {
+            const func = this.serverless.service.getFunction(funcName);
+            const runtime = func.runtime || this.serverless.service.provider.runtime || 'nodejs';
+            return runtime.match(/node/);
+          }),
+          funcName => {
+            const func = this.serverless.service.getFunction(funcName);
+            const handler = func.handler;
+            const handlerFile = path.relative('.', getHandlerFile(handler));
+            return {
+              handlerFile,
+              funcName,
+              func
+            };
+          }
+        );
 
         this.entryFunctions = _.flatMap(entries, (value, key) => {
           const entry = path.relative('.', value);

diff --git a/tests/validate.test.js b/tests/validate.test.js
@@ -468,6 +468,18 @@ describe('validate', () => {
             }
           ],
           runtime: 'java8'
+        },
+        rustfunc: {
+          handler: 'my-rust-func',
+          runtime: 'rust',
+          events: [
+            {
+              http: {
+                method: 'POST',
+                path: 'rustfuncpath'
+              }
+            }
+          ]
         }
       };
 
@@ -960,7 +972,7 @@ describe('validate', () => {
   });
 
   describe('with skipped builds', () => {
-    it('should set `skipComile` to true if `options.build` is false', () => {
+    it('should set `skipCompile` to true if `options.build` is false', () => {
       const testConfig = {
         entry: 'test',
         output: {}