Merge pull request #43 from serverless/add-provider-based-stage-and-r…

…egion-support Add provider based stage and region support
serverless · Mar 6, 2017 · 75fccfd · 75fccfd
2 parents 90d07d5 + 1d8785f
commit 75fccfd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/shared/utils.js b/shared/utils.js
@@ -1,12 +1,15 @@
 'use strict';
 
+const _ = require('lodash');
 const BbPromise = require('bluebird');
 
 module.exports = {
   setDefaults() {
-    this.options.stage = this.options.stage
+    this.options.stage = _.get(this, 'options.stage')
+      || _.get(this, 'serverless.service.provider.stage')
       || 'dev';
-    this.options.region = this.options.region
+    this.options.region = _.get(this, 'options.region')
+      || _.get(this, 'serverless.service.provider.region')
       || 'us-central1';
 
     return BbPromise.resolve();

diff --git a/shared/utils.test.js b/shared/utils.test.js
@@ -31,5 +31,17 @@ describe('Utils', () => {
         expect(googleCommand.options.region).toEqual('my-region');
       });
     });
+
+    it('should set the provider values for stage and region if provided', () => {
+      googleCommand.serverless.service.provider = {
+        stage: 'my-stage',
+        region: 'my-region',
+      };
+
+      return googleCommand.setDefaults().then(() => {
+        expect(googleCommand.options.stage).toEqual('my-stage');
+        expect(googleCommand.options.region).toEqual('my-region');
+      });
+    });
   });
 });