Merge pull request #116 from lucas-rudd/PopulateObjectBeforeParsingStepFunction

Populating object before parsing step function

Author: horike37

lib/yamlParser.js

@@ -14,30 +14,32 @@ module.exports = {
     return this.serverless.yamlParser
       .parse(serverlessYmlPath)
       .then((serverlessFileParam) => {
-        this.serverless.service.stepFunctions = {};
-        this.serverless.service.stepFunctions.stateMachines
-          = serverlessFileParam.stepFunctions
-          && serverlessFileParam.stepFunctions.stateMachines
-          ? serverlessFileParam.stepFunctions.stateMachines : {};
-        this.serverless.service.stepFunctions.activities
-          = serverlessFileParam.stepFunctions
-          && serverlessFileParam.stepFunctions.activities
-          ? serverlessFileParam.stepFunctions.activities : [];
+        this.serverless.variables.populateObject(serverlessFileParam).then((parsedObject) => {
+          this.serverless.service.stepFunctions = {};
+          this.serverless.service.stepFunctions.stateMachines
+              = parsedObject.stepFunctions
+            && parsedObject.stepFunctions.stateMachines
+              ? parsedObject.stepFunctions.stateMachines : {};
+          this.serverless.service.stepFunctions.activities
+              = parsedObject.stepFunctions
+            && parsedObject.stepFunctions.activities
+              ? parsedObject.stepFunctions.activities : [];
 
-        if (!this.serverless.pluginManager.cliOptions.stage) {
-          this.serverless.pluginManager.cliOptions.stage = this.options.stage
+          if (!this.serverless.pluginManager.cliOptions.stage) {
+            this.serverless.pluginManager.cliOptions.stage = this.options.stage
             || (this.serverless.service.provider && this.serverless.service.provider.stage)
             || 'dev';
-        }
+          }
 
-        if (!this.serverless.pluginManager.cliOptions.region) {
-          this.serverless.pluginManager.cliOptions.region = this.options.region
+          if (!this.serverless.pluginManager.cliOptions.region) {
+            this.serverless.pluginManager.cliOptions.region = this.options.region
             || (this.serverless.service.provider && this.serverless.service.provider.region)
             || 'us-east-1';
-        }
+          }
 
-        this.serverless.variables.populateService(this.serverless.pluginManager.cliOptions);
-        return BbPromise.resolve();
+          this.serverless.variables.populateService(this.serverless.pluginManager.cliOptions);
+          return BbPromise.resolve();
+        });
       });
   },
 

lib/yamlParser.test.js

@@ -22,9 +22,17 @@ describe('#yamlParse', () => {
   describe('#yamlParse()', () => {
     let yamlParserStub;
     let populateServiceStub;
+    let yamlObjectParserStub;
     beforeEach(() => {
       populateServiceStub = sinon.stub(serverlessStepFunctions.serverless.variables,
       'populateService').returns(BbPromise.resolve());
+      yamlObjectParserStub = sinon.stub(serverlessStepFunctions.serverless.variables,
+        'populateObject').returns(BbPromise.resolve({
+          stepFunctions: {
+            stateMachines: 'stepFunctions',
+            activities: 'my-activity',
+          },
+        }));
       yamlParserStub = sinon.stub(serverlessStepFunctions.serverless.yamlParser, 'parse')
       .returns(BbPromise.resolve({
         stepFunctions: {
@@ -35,6 +43,12 @@ describe('#yamlParse', () => {
       serverlessStepFunctions.serverless.config.servicePath = 'servicePath';
     });
 
+    afterEach(() => {
+      serverlessStepFunctions.serverless.yamlParser.parse.restore();
+      serverlessStepFunctions.serverless.variables.populateService.restore();
+      serverlessStepFunctions.serverless.variables.populateObject.restore();
+    });
+
     it('should default to dev when stage and provider are not defined', () => {
       serverlessStepFunctions.serverless.pluginManager.cliOptions.stage = null;
       serverlessStepFunctions.serverless.service.provider = null;
@@ -74,39 +88,49 @@ describe('#yamlParse', () => {
       serverlessStepFunctions.yamlParse()
       .then(() => {
         expect(yamlParserStub.calledOnce).to.be.equal(false);
+        expect(yamlObjectParserStub.calledOnce).to.be.equal(false);
         expect(populateServiceStub.calledOnce).to.be.equal(false);
         expect(serverless.service.stepFunctions).to.be.undefined; // eslint-disable-line
-        serverlessStepFunctions.serverless.yamlParser.parse.restore();
-        serverlessStepFunctions.serverless.variables.populateService.restore();
       });
     });
 
     it('should create corresponding when stepfunctions param are given', () => {
+      serverlessStepFunctions.serverless.variables.populateObject.restore();
+      yamlObjectParserStub = sinon.stub(serverlessStepFunctions.serverless.variables,
+        'populateObject').returns(BbPromise.resolve({
+          stepFunctions: {
+            stateMachines: 'stepFunctions',
+            activities: 'my-activity',
+          },
+        }));
       serverlessStepFunctions.yamlParse()
       .then(() => {
         expect(yamlParserStub.calledOnce).to.be.equal(true);
+        expect(yamlObjectParserStub.calledOnce).to.be.equal(true);
         expect(populateServiceStub.calledOnce).to.be.equal(true);
         expect(serverless.service.stepFunctions.stateMachines).to.be.equal('stepFunctions');
         expect(serverless.service.stepFunctions.activities).to.be.equal('my-activity');
-        serverlessStepFunctions.serverless.yamlParser.parse.restore();
-        serverlessStepFunctions.serverless.variables.populateService.restore();
       });
     });
 
     it('should create empty object when stepfunctions param are not given', () => {
       serverlessStepFunctions.serverless.yamlParser.parse.restore();
+      serverlessStepFunctions.serverless.variables.populateObject.restore();
       yamlParserStub = sinon.stub(serverlessStepFunctions.serverless.yamlParser, 'parse')
       .returns(BbPromise.resolve({
         stepFunctions: {},
       }));
+      yamlObjectParserStub = sinon.stub(serverless.variables,
+        'populateObject').returns(BbPromise.resolve({
+          stepFunctions: {},
+        }));
       serverlessStepFunctions.yamlParse()
       .then(() => {
         expect(yamlParserStub.calledOnce).to.be.equal(true);
+        expect(yamlObjectParserStub.calledOnce).to.be.equal(true);
         expect(populateServiceStub.calledOnce).to.be.equal(true);
         expect(serverless.service.stepFunctions.stateMachines).to.be.deep.equal({});
         expect(serverless.service.stepFunctions.activities).to.be.deep.equal([]);
-        serverlessStepFunctions.serverless.yamlParser.parse.restore();
-        serverlessStepFunctions.serverless.variables.populateService.restore();
       });
     });
   });