Merge pull request #111 from hgiasac/add-provider-based-region-support

Add provider based region support

Author: pmuens

shared/utils.js

@@ -7,11 +7,17 @@ module.exports = {
   setDefaults() {
     this.options.stage = _.get(this, 'options.stage')
       || 'dev';
-    this.options.region = _.get(this, 'options.region')
-      || 'us-central1';
     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');
+
+    this.options.region = (!region || region === 'us-east-1')
+      ? 'us-central1' : region;
+
     return BbPromise.resolve();
   },
 };

shared/utils.test.js

@@ -34,5 +34,16 @@ describe('Utils', () => {
         expect(googleCommand.options.runtime).toEqual('nodejs6');
       });
     });
+
+
+    it('should set the provider values for stage and region if provided', () => {
+      googleCommand.serverless.service.provider = {
+        region: 'my-region',
+      };
+
+      return googleCommand.setDefaults().then(() => {
+        expect(googleCommand.options.region).toEqual('my-region');
+      });
+    });
   });
 });