fix: add region and runtime to deploy template, fixes #113 and #112

Author: PatrickHeneise

package/lib/compileFunctions.js

@@ -24,16 +24,26 @@ module.exports = {
       validateHandlerProperty(funcObject, functionName);
       validateEventsProperty(funcObject, functionName);
 
+      console.log('----------------------------------------------------------')
+      console.log(this.options)
+      console.log('----------------------------------------------------------')
+
       const funcTemplate = getFunctionTemplate(
         funcObject,
         this.options.region,
         `gs://${
-          this.serverless.service.provider.deploymentBucketName
+        this.serverless.service.provider.deploymentBucketName
         }/${this.serverless.service.package.artifactFilePath}`);
 
       funcTemplate.properties.availableMemoryMb = _.get(funcObject, 'memorySize')
         || _.get(this, 'serverless.service.provider.memorySize')
         || 256;
+      funcTemplate.properties.location = _.get(funcObject, 'location')
+        || _.get(this, 'serverless.service.provider.region')
+        || 'us-central1';
+      funcTemplate.properties.runtime = _.get(funcObject, 'runtime')
+        || _.get(this, 'serverless.service.provider.runtime')
+        || 'nodejs8';
       funcTemplate.properties.timeout = _.get(funcObject, 'timeout')
         || _.get(this, 'serverless.service.provider.timeout')
         || '60s';

package/lib/compileFunctions.test.js

@@ -102,6 +102,7 @@ describe('CompileFunctions', () => {
         func1: {
           handler: 'func1',
           memorySize: 1024,
+          runtime: 'nodejs8',
           events: [
             { http: 'foo' },
           ],
@@ -113,6 +114,7 @@ describe('CompileFunctions', () => {
         name: 'my-service-dev-func1',
         properties: {
           location: 'us-central1',
+          runtime: 'nodejs8',
           function: 'func1',
           availableMemoryMb: 1024,
           timeout: '60s',
@@ -147,6 +149,7 @@ describe('CompileFunctions', () => {
         name: 'my-service-dev-func1',
         properties: {
           location: 'us-central1',
+          runtime: 'nodejs8',
           function: 'func1',
           availableMemoryMb: 1024,
           timeout: '60s',
@@ -181,6 +184,7 @@ describe('CompileFunctions', () => {
         name: 'my-service-dev-func1',
         properties: {
           location: 'us-central1',
+          runtime: 'nodejs8',
           function: 'func1',
           availableMemoryMb: 256,
           timeout: '120s',
@@ -215,6 +219,7 @@ describe('CompileFunctions', () => {
         name: 'my-service-dev-func1',
         properties: {
           location: 'us-central1',
+          runtime: 'nodejs8',
           function: 'func1',
           availableMemoryMb: 256,
           timeout: '120s',
@@ -251,6 +256,7 @@ describe('CompileFunctions', () => {
         name: 'my-service-dev-func1',
         properties: {
           location: 'us-central1',
+          runtime: 'nodejs8',
           function: 'func1',
           availableMemoryMb: 256,
           timeout: '60s',
@@ -289,6 +295,7 @@ describe('CompileFunctions', () => {
         name: 'my-service-dev-func1',
         properties: {
           location: 'us-central1',
+          runtime: 'nodejs8',
           function: 'func1',
           availableMemoryMb: 256,
           timeout: '60s',
@@ -331,6 +338,7 @@ describe('CompileFunctions', () => {
         name: 'my-service-dev-func1',
         properties: {
           location: 'us-central1',
+          runtime: 'nodejs8',
           function: 'func1',
           availableMemoryMb: 256,
           timeout: '60s',
@@ -367,6 +375,7 @@ describe('CompileFunctions', () => {
         name: 'my-service-dev-func1',
         properties: {
           location: 'us-central1',
+          runtime: 'nodejs8',
           function: 'func1',
           availableMemoryMb: 256,
           timeout: '60s',
@@ -418,6 +427,7 @@ describe('CompileFunctions', () => {
           name: 'my-service-dev-func1',
           properties: {
             location: 'us-central1',
+            runtime: 'nodejs8',
             function: 'func1',
             availableMemoryMb: 256,
             timeout: '60s',
@@ -435,6 +445,7 @@ describe('CompileFunctions', () => {
           name: 'my-service-dev-func2',
           properties: {
             location: 'us-central1',
+            runtime: 'nodejs8',
             function: 'func2',
             availableMemoryMb: 256,
             timeout: '60s',