archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-02-01 16:07:28 +00:00
Code Issues Projects Releases Wiki Activity

Classes: fix all tests

Browse Source
This commit is contained in:
ac360 2016-02-03 20:31:47 -08:00
parent 953c1d313e
commit ad5e929941
10 changed files with 136 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ServerlessEndpoint.js
View File

@ -170,8 +170,7 @@ class ServerlessEndpoint {
return _.merge(
this.getProject().getTemplates(),
this.getComponent().getTemplates(),
this.getFunction().getTemplates(),
_.cloneDeep(this.templates)
this.getFunction().getTemplates()
);
}
@ -231,7 +230,7 @@ class ServerlessEndpoint {
getComponent() {
let components = this._S.state.getComponents({
component: this._config.component
paths: [this._config.sPath.split('/')[0]]
});
if (components.length === 1) {
@ -249,9 +248,7 @@ class ServerlessEndpoint {
getFunction() {
let functions = this._S.state.getFunctions({
component: this._config.component,
cPath: this._config.cPath,
function: this._config.function
paths: [this._config.sPath.split('@')[0]]
});
if (functions.length === 1) {

179
lib/ServerlessFunction.js
View File

@ -7,12 +7,12 @@
*/
const SError = require('./ServerlessError'),
SUtils = require('./utils/index'),
BbPromise = require('bluebird'),
async = require('async'),
path = require('path'),
fs = require('fs'),
_ = require('lodash');
SUtils = require('./utils/index'),
BbPromise = require('bluebird'),
async = require('async'),
path = require('path'),
fs = require('fs'),
_ = require('lodash');
class ServerlessFunction {
@ -33,8 +33,8 @@ class ServerlessFunction {
// Default properties
_this.name = _this._config.function || 'function' + SUtils.generateShortId(6);
_this.handler = path.posix.join(
_this._config.sPath.split('/').splice(1, _this._config.sPath.split('/').length).join('/'),
'handler.handler');
_this._config.sPath.split('/').splice(1, _this._config.sPath.split('/').length).join('/'),
'handler.handler');
_this.timeout = 6;
_this.memorySize = 1024;
_this.custom = {
@ -107,47 +107,72 @@ class ServerlessFunction {
load() {
let _this = this,
functionJson;
functionJson;
return BbPromise.try(function() {
// Validate: Check project path is set
if (!_this._S.config.projectPath) throw new SError('Function could not be loaded because no project path has been set on Serverless instance');
// Validate: Check project path is set
if (!_this._S.config.projectPath) throw new SError('Function could not be loaded because no project path has been set on Serverless instance');
// Validate: Check function exists
if (!SUtils.fileExistsSync(path.join(_this._config.fullPath, 's-function.json'))) {
throw new SError('Function could not be loaded because it does not exist in your project: ' + _this._config.sPath);
}
// Validate: Check function exists
if (!SUtils.fileExistsSync(path.join(_this._config.fullPath, 's-function.json'))) {
throw new SError('Function could not be loaded because it does not exist in your project: ' + _this._config.sPath);
}
functionJson = SUtils.readAndParseJsonSync(path.join(_this._config.fullPath, 's-function.json'));
return functionJson.endpoints;
})
.each(function(e, i) {
functionJson = SUtils.readAndParseJsonSync(path.join(_this._config.fullPath, 's-function.json'));
return functionJson.endpoints;
})
.each(function(e, i) {
// Add Endpoint Class Instances
functionJson.endpoints[i] = new _this._S.classes.Endpoint(_this._S, {
sPath: _this._config.sPath + '@' + e.path + '~' + e.method
});
return functionJson.endpoints[i].load()
.then(function(instance) {
functionJson.endpoints[i] = instance;
return functionJson.endpoints[i];
});
})
.then(function() {
// Get templates
if (_this._config.fullPath && SUtils.fileExistsSync(path.join(_this._config.fullPath, 's-templates.json'))) {
functionJson.templates = require(path.join(_this._config.fullPath, 's-templates.json'));
}
})
.then(function() {
// Merge
_.assign(_this, functionJson);
return _this;
// Add Endpoint Class Instances
functionJson.endpoints[i] = new _this._S.classes.Endpoint(_this._S, {
sPath: _this._config.sPath + '@' + e.path + '~' + e.method
});
return functionJson.endpoints[i].load()
.then(function(instance) {
functionJson.endpoints[i] = instance;
return functionJson.endpoints[i];
});
})
.then(function() {
// Get templates
if (_this._config.fullPath && SUtils.fileExistsSync(path.join(_this._config.fullPath, 's-templates.json'))) {
functionJson.templates = require(path.join(_this._config.fullPath, 's-templates.json'));
}
// Get templates in parent folders and merge into this.templates
let parentOne = path.join(_this._config.fullPath, '..'),
parentTwo = path.join(_this._config.fullPath, '..', '..'),
parentTemplateOne = {},
parentTemplateTwo = {};
if (!SUtils.fileExistsSync(path.join(parentOne, 's-component.json'))) {
if (SUtils.fileExistsSync(path.join(parentOne, 's-templates.json'))) {
parentTemplateOne = SUtils.readAndParseJsonSync(path.join(parentOne, 's-templates.json'));
}
if (!SUtils.fileExistsSync(path.join(parentTwo, 's-component.json'))) {
if (SUtils.fileExistsSync(path.join(parentTwo, 's-templates.json'))) {
parentTemplateTwo = SUtils.readAndParseJsonSync(path.join(parentTwo, 's-templates.json'));
}
}
}
// Merge
functionJson.templates = _.merge(
parentTemplateTwo,
parentTemplateOne,
functionJson.templates
);
})
.then(function() {
// Merge
_.assign(_this, functionJson);
return _this;
});
}
/**
@ -203,9 +228,9 @@ class ServerlessFunction {
getTemplates() {
return _.merge(
this.getProject().getTemplates(),
this.getComponent().getTemplates(),
_.cloneDeep(this.templates)
this.getProject().getTemplates(),
this.getComponent().getTemplates(),
_.cloneDeep(this.templates)
);
}
@ -229,39 +254,39 @@ class ServerlessFunction {
return _this._create();
}
})
.then(function() {
.then(function() {
// Save all nested endpoints
if (options && options.deep) {
return BbPromise.try(function () {
return _this.endpoints;
})
.each(function(endpoint) {
return endpoint.save();
})
}
})
.then(function() {
// Save all nested endpoints
if (options && options.deep) {
return BbPromise.try(function () {
return _this.endpoints;
})
.each(function(endpoint) {
return endpoint.save();
})
}
})
.then(function() {
// If templates, save templates
if (_this.templates && Object.keys(_this.templates).length) {
return SUtils.writeFile(path.join(_this._config.fullPath, 's-templates.json'), _this.templates);
}
})
.then(function() {
// If templates, save templates
if (_this.templates && Object.keys(_this.templates).length) {
return SUtils.writeFile(path.join(_this._config.fullPath, 's-templates.json'), _this.templates);
}
})
.then(function() {
let clone = _this.get();
let clone = _this.get();
// Strip properties
if (clone.templates) delete clone.templates;
// Strip properties
if (clone.templates) delete clone.templates;
// Write file
return SUtils.writeFile(path.join(_this._config.fullPath, 's-function.json'),
JSON.stringify(clone, null, 2));
})
.then(function() {
return _this;
})
// Write file
return SUtils.writeFile(path.join(_this._config.fullPath, 's-function.json'),
JSON.stringify(clone, null, 2));
})
.then(function() {
return _this;
})
}
/**
@ -279,16 +304,16 @@ class ServerlessFunction {
// Runtime: nodejs
writeDeferred.push(
fs.mkdirSync(_this._config.fullPath),
SUtils.writeFile(path.join(_this._config.fullPath, 'event.json'), '{}')
fs.mkdirSync(_this._config.fullPath),
SUtils.writeFile(path.join(_this._config.fullPath, 'event.json'), '{}')
);
if (_this.getRuntime() === 'nodejs') {
writeDeferred.push(
SUtils.writeFile(path.join(_this._config.fullPath, 'handler.js'), fs.readFileSync(path.join(_this._S.config.serverlessPath, 'templates', 'nodejs', 'handler.js')))
SUtils.writeFile(path.join(_this._config.fullPath, 'handler.js'), fs.readFileSync(path.join(_this._S.config.serverlessPath, 'templates', 'nodejs', 'handler.js')))
)
} else if (_this.getRuntime() === 'python2.7') {
writeDeferred.push(
SUtils.writeFile(path.join(_this._config.fullPath, 'handler.py'), fs.readFileSync(path.join(_this._S.config.serverlessPath, 'templates', 'python2.7', 'handler.py')))
SUtils.writeFile(path.join(_this._config.fullPath, 'handler.py'), fs.readFileSync(path.join(_this._S.config.serverlessPath, 'templates', 'python2.7', 'handler.py')))
)
}
return BbPromise.all(writeDeferred);

2
lib/utils/index.js
View File

@ -616,11 +616,9 @@ exports.populate = function(meta, templates, data, stage, region) {
// Sanitize: Remove nested properties. DO NOT populate these. Rely on calling those classes getPopulated methods instead.
if (data.components) delete data.components;
if (data.modules) delete data.modules;
if (data.functions) delete data.functions;
if (data.endpoints) delete data.endpoints;
// Populate templates
traverse(data).forEach(function (val) {

8
tests/all.js
View File

@ -11,10 +11,10 @@ describe('All Tests', function() {
after(function() {});
require('./tests/classes/ServerlessStateTest');
//require('./tests/classes/ServerlessProjectTest');
//require('./tests/classes/ServerlessComponentTest');
//require('./tests/classes/ServerlessFunctionTest');
//require('./tests/classes/ServerlessEndpointTest');
require('./tests/classes/ServerlessProjectTest');
require('./tests/classes/ServerlessComponentTest');
require('./tests/classes/ServerlessFunctionTest');
require('./tests/classes/ServerlessEndpointTest');
//require('./tests/actions/TestPluginCustom');
//require('./tests/actions/TestDefaultActionHook');
//require('./tests/actions/StageCreate');

4
tests/test-prj/nodejscomponent/function0/s-function.json
View File

@ -14,8 +14,8 @@
"method": "GET",
"authorizationType": "${endpointVariable}",
"apiKeyRequired": false,
"requestParameters": "$${endpointTemplate}",
"requestTemplates": "$${apiRequestTemplate}",
"requestParameters": {},
"requestTemplates": {},
"responses": {
"default": {
"statusCode": "200",

4
tests/tests/classes/ServerlessComponentTest.js
View File

@ -35,7 +35,7 @@ describe('Test Serverless Component Class', function() {
// Instantiate Class
instance = new serverless.classes.Component(serverless, {
component: 'nodejscomponent'
sPath: 'nodejscomponent'
});
done();
@ -92,7 +92,7 @@ describe('Test Serverless Component Class', function() {
it('Create new and save', function(done) {
let component = new serverless.classes.Component(serverless, {
component: 'nodejscomponent'
sPath: 'nodejscomponent'
});
component.save()

8
tests/tests/classes/ServerlessEndpointTest.js
View File

@ -116,7 +116,13 @@ describe('Test Serverless Endpoint Class', function() {
it('Get function', function() {
let func = instance.getFunction();
assert.instanceOf(func, serverless.classes.Function);
assert.equal(func.name, instance._config.function);
assert.equal(true, instance._config.sPath.indexOf(func._config.sPath) !== -1)
});
it('Get component', function() {
let comp = instance.getComponent();
assert.instanceOf(comp, serverless.classes.Component);
assert.equal(true, instance._config.sPath.indexOf(comp._config.sPath) !== -1)
});
});
});

14
tests/tests/classes/ServerlessFunctionTest.js
View File

@ -34,9 +34,7 @@ describe('Test Serverless Function Class', function() {
// Instantiate Class
instance = new serverless.classes.Function(serverless, {
component: 'nodejscomponent',
module: 'group1',
function: 'function1'
sPath: 'nodejscomponent/group1/function1'
});
done();
@ -93,9 +91,7 @@ describe('Test Serverless Function Class', function() {
it('Create new and save', function(done) {
let func = new serverless.classes.Function(serverless, {
component: 'nodejscomponent',
module: 'group1',
function: 'function4'
sPath: 'nodejscomponent/group1/function1'
});
func.save()
@ -109,11 +105,5 @@ describe('Test Serverless Function Class', function() {
done(e);
});
});
it('Get module', function() {
let module = instance.getModule();
assert.instanceOf(module, serverless.classes.Module);
assert.equal(module.name, instance._config.module);
});
});
});

12
tests/tests/classes/ServerlessProjectTest.js
View File

@ -70,21 +70,21 @@ describe('Test Serverless Project Class', function() {
// We've set a template in the project that gets extended at the module level and function level, check it:
// Project template
assert.equal(true, typeof data.components.nodejscomponent.modules.module1.functions.function1.endpoints[0].requestTemplates['application/json'].httpMethod !== 'undefined');
assert.equal(true, typeof data.components.nodejscomponent.functions['nodejscomponent/group1/function1'].endpoints[0].requestTemplates['application/json'].httpMethod !== 'undefined');
// Component template
assert.equal(true, typeof data.components.nodejscomponent.modules.module1.functions.function1.endpoints[0].requestTemplates['application/json'].headerParams !== 'undefined');
assert.equal(true, typeof data.components.nodejscomponent.functions['nodejscomponent/group1/function1'].endpoints[0].requestTemplates['application/json'].headerParams !== 'undefined');
// Module template
assert.equal(true, typeof data.components.nodejscomponent.modules.module1.functions.function1.endpoints[0].requestTemplates['application/json'].queryParams !== 'undefined');
assert.equal(true, typeof data.components.nodejscomponent.functions['nodejscomponent/group1/function1'].endpoints[0].requestTemplates['application/json'].queryParams !== 'undefined');
// Test subjective template inheritance
// These functions have their own s-templates.json files which give them the same template, with one different property
// Function1 template
assert.equal(true, data.components.nodejscomponent.modules.module1.functions.function1.endpoints[0].requestTemplates['application/json'].pathParams === "$input.path('$.id1')");
assert.equal(true, data.components.nodejscomponent.functions['nodejscomponent/group1/function1'].endpoints[0].requestTemplates['application/json'].pathParams === "$input.path('$.id1')");
// Function2 template
assert.equal(true, data.components.nodejscomponent.modules.module1.functions.function2.endpoints[0].requestTemplates['application/json'].pathParams === "$input.path('$.id2')");
assert.equal(true, data.components.nodejscomponent.functions['nodejscomponent/group1/function2'].endpoints[0].requestTemplates['application/json'].pathParams === "$input.path('$.id2')");
// Function3 template - s-templates.json left undefined
assert.equal(true, typeof data.components.nodejscomponent.modules.module1.functions.function3.endpoints[0].requestTemplates['application/json'].pathParams === 'undefined');
assert.equal(true, typeof data.components.nodejscomponent.functions['nodejscomponent/group1/function3'].endpoints[0].requestTemplates['application/json'].pathParams === 'undefined');
done();
});

14
tests/tests/classes/ServerlessStateTest.js
View File

@ -105,12 +105,14 @@ describe('Test Serverless State Class', function() {
done();
});
//it('Get resources (populated)', function(done) {
// let resources = instance.getResources({ populate: true, stage: config.stage, region: config.region });
// assert.equal(true, JSON.stringify(resources).indexOf('$${') == -1);
// assert.equal(true, JSON.stringify(resources).indexOf('${') == -1);
// done();
//});
it('Get resources (populated)', function(done) {
let resources = instance.getResources({
populate: true, stage: config.stage, region: config.region
});
assert.equal(true, JSON.stringify(resources).indexOf('$${') == -1);
assert.equal(true, JSON.stringify(resources).indexOf('${') == -1);
done();
});
it('Get stages', function(done) {
let stages = instance.getStages();