Merge pull request #276 from eczajk1/master

support relative config filename

Author: horike37

lib/yamlParser.js

@@ -11,7 +11,7 @@ module.exports = {
       return BbPromise.resolve();
     }
 
-    const serviceFileName = this.serverless.config.serverless.service.serviceFilename || 'serverless.yml';
+    const serviceFileName = this.options.config || this.serverless.config.serverless.service.serviceFilename || 'serverless.yml';
     const serverlessYmlPath = path.join(servicePath, serviceFileName);
     return this.serverless.yamlParser
       .parse(serverlessYmlPath)

lib/yamlParser.test.js

@@ -2,6 +2,7 @@
 
 const expect = require('chai').expect;
 const sinon = require('sinon');
+const path = require('path');
 const BbPromise = require('bluebird');
 const Serverless = require('serverless/lib/Serverless');
 const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider');
@@ -154,6 +155,17 @@ describe('#yamlParse', () => {
           expect(yamlParserStub.calledWith(`${servicePath}/${fileName}`)).to.be.equal(true);
         });
     });
+
+    it('should read relative serviceFileName path if passed as --config option', () => {
+      const servicePath = serverlessStepFunctions.serverless.config.servicePath;
+      const relativeFilename = './some_folder/other_config.yml';
+      serverlessStepFunctions.options.config = relativeFilename;
+      const serviceFilePath = path.normalize(`${servicePath}/${relativeFilename}`);
+      serverlessStepFunctions.yamlParse()
+        .then(() => {
+          expect(yamlParserStub.calledWith(serviceFilePath)).to.be.equal(true);
+        });
+    });
   });
 
   describe('#getAllStateMachines()', () => {