Merge pull request #133 from serverless/fix-default-region-setting

Fix default region setting

Author: pmuens

shared/utils.js

@@ -5,18 +5,19 @@ const BbPromise = require('bluebird');
 
 module.exports = {
   setDefaults() {
-    this.options.stage = _.get(this, 'options.stage')
-      || 'dev';
-    this.options.runtime = _.get(this, 'options.runtime')
-      || 'nodejs8';
+    this.options.stage = _.get(this, 'options.stage') || 'dev';
+    this.options.runtime = _.get(this, 'options.runtime') || 'nodejs8';
 
     // serverless framework is hard-coding us-east-1 region from aws
     // this is temporary fix for multiple regions
-    const region = _.get(this, 'options.region')
-      || _.get(this, 'serverless.service.provider.region');
+    let region = _.get(this, 'options.region') || _.get(this, 'serverless.service.provider.region');
 
-    this.options.region = (!region || region === 'us-east-1')
-      ? 'us-central1' : region;
+    if (region === 'us-east-1') {
+      region = 'us-central1';
+    }
+
+    this.options.region = region;
+    this.serverless.service.provider.region = region;
 
     return BbPromise.resolve();
   },

shared/utils.test.js

@@ -13,6 +13,10 @@ describe('Utils', () => {
     serverless = new Serverless();
     serverless.setProvider('google', new GoogleProvider(serverless));
     googleCommand = new GoogleCommand(serverless, {}, setDefaults);
+    // mocking the standard value passed in from Serverless here
+    googleCommand.serverless.service.provider = {
+      region: 'us-east-1',
+    };
   });
 
   describe('#setDefaults()', () => {
@@ -45,5 +49,10 @@ describe('Utils', () => {
         expect(googleCommand.options.region).toEqual('my-region');
       });
     });
+
+    it('shoud default to the us-central1 region when no region is provided', () => googleCommand
+      .setDefaults().then(() => {
+        expect(googleCommand.options.region).toEqual('us-central1');
+      }));
   });
 });