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

fix(Config Schema): Run validation logic unconditionally

Browse Source 
It's to ensure that properties normalization is applied unconditionally
This commit is contained in:
Mariusz Nowak 2020-10-30 13:42:58 +01:00 committed by Mariusz Nowak
parent 9481029b59
commit df1b8a9433
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/classes/ConfigSchemaHandler/index.js
View File

@ -112,7 +112,7 @@ class ConfigSchemaHandler {
const denormalizeOptions = normalizeUserConfig(userConfig); const denormalizeOptions = normalizeUserConfig(userConfig);
validate(userConfig); validate(userConfig);
denormalizeUserConfig(userConfig, denormalizeOptions); denormalizeUserConfig(userConfig, denormalizeOptions);
if (validate.errors) { if (validate.errors && this.serverless.service.configValidationMode !== 'off') {
const messages = normalizeAjvErrors(validate.errors).map(err => err.message); const messages = normalizeAjvErrors(validate.errors).map(err => err.message);
this.handleErrorMessages(messages); this.handleErrorMessages(messages);
} }

4
lib/classes/Service.js
View File

@ -224,9 +224,7 @@ class Service {
if (userConfig.functions) userConfig.functions = this.functions; if (userConfig.functions) userConfig.functions = this.functions;
if (userConfig.resources) userConfig.resources = this.resources; if (userConfig.resources) userConfig.resources = this.resources;
if (this.configValidationMode !== 'off') { this.serverless.configSchemaHandler.validateConfig(userConfig);
this.serverless.configSchemaHandler.validateConfig(userConfig);
}
return this; return this;
} }