archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-18 14:58:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1635 from serverless/provider-config

Browse Source 
Provider property can be an object
This commit is contained in:
Eslam λ Hefnawy 2016-07-22 14:02:27 +09:00 committed by GitHub
commit 3aefa90ee7
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Serverless.js
View File

@ -54,7 +54,7 @@ class Serverless {
.then(() => {
// set the provider of the service (so that the PluginManager takes care to
// execute the correct provider specific plugins)
this.pluginManager.setProvider(this.service.provider);
this.pluginManager.setProvider(this.service.provider.name);
// load all plugins
this.pluginManager.loadAllPlugins(this.service.plugins);

16
lib/classes/Service.js
View File

@ -14,7 +14,7 @@ class Service {
// Default properties
this.service = null;
this.provider = null;
this.provider = {};
this.runtime = null;
this.defaults = {
stage: 'dev',
@ -44,7 +44,8 @@ class Service {
return that.serverless.yamlParser
.parse(path.join(servicePath, 'serverless.yaml'))
.then((serverlessYaml) => {
.then((serverlessYamlParam) => {
const serverlessYaml = serverlessYamlParam;
// basic service level validation
if (!serverlessYaml.service) {
throw new SError('"service" property is missing in serverless.yaml');
@ -59,9 +60,16 @@ class Service {
throw new SError('"functions" property is missing in serverless.yaml');
}
if (['aws', 'azure', 'google', 'ibm'].indexOf(serverlessYaml.provider)) {
if (typeof serverlessYaml.provider !== 'object') {
const providerName = serverlessYaml.provider;
serverlessYaml.provider = {
name: providerName,
};
}
if (['aws', 'azure', 'google', 'ibm'].indexOf(serverlessYaml.provider.name)) {
const errorMessage = [
`Provider "${serverlessYaml.provider}" is not supported.`,
`Provider "${serverlessYaml.provider.name}" is not supported.`,
' Valid values for provider are: aws, azure, google, ibm.',
' Please provide one of those values to the "provider" property in serverless.yaml.',
].join('');

4
tests/classes/Service.js
View File

@ -21,7 +21,7 @@ describe('Service', () => {
const serviceInstance = new Service(serverless);
expect(serviceInstance.service).to.be.equal(null);
expect(serviceInstance.provider).to.be.equal(null);
expect(serviceInstance.provider).to.deep.equal({});
expect(serviceInstance.runtime).to.be.equal(null);
expect(serviceInstance.variableSyntax).to.be.equal(null);
expect(serviceInstance.custom).to.deep.equal({});
@ -151,7 +151,7 @@ describe('Service', () => {
};
return serviceInstance.load().then((loadedService) => {
expect(loadedService.service).to.be.equal('commonVar');
expect(loadedService.provider).to.be.equal('aws');
expect(loadedService.provider).to.deep.equal({ name: 'aws' });
expect(loadedService.runtime).to.be.equal('nodejs4.3');
expect(loadedService.plugins).to.deep.equal(['testPlugin']);
expect(loadedService.environment.vars).to.deep.equal(commonVars);