Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve "print" command internals #8281

Merged
merged 3 commits into from Sep 24, 2020
Merged

Improve "print" command internals #8281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
679aef0
chore: Register "Print" commit message scope
medikoo Sep 24, 2020
4dbec6a
refactor(Print): Read provider values from provider
medikoo Sep 24, 2020
4428bb5
refactor(Print): Improve variables handling
medikoo Sep 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions commitlint.config.js
View file
Open in desktop
Expand Up @@ -37,6 +37,7 @@ module.exports = {
'Dashboard',
'Packaging',
'Plugins',
'Print',
'Standalone',
'Templates',
'User Config',
Expand Down
39 changes: 19 additions & 20 deletions lib/plugins/print/print.js
View file
Open in desktop
Expand Up @@ -37,46 +37,45 @@ class Print {
};
}

adorn(svc) {
const service = svc;
adorn(serviceConfig) {
// service object treatment
this.cache.serviceService = service.service;
this.cache.serviceService = serviceConfig.service;
if (_.isObject(this.cache.serviceService)) {
service.service = service.service.name;
service.serviceObject = this.cache.serviceService;
serviceConfig.service = serviceConfig.service.name;
serviceConfig.serviceObject = this.cache.serviceService;
}
// provider treatment and defaults
this.cache.serviceProvider = service.provider;
this.cache.serviceProvider = serviceConfig.provider;
if (typeof this.cache.serviceProvider === 'string') {
service.provider = { name: this.cache.serviceProvider };
serviceConfig.provider = { name: this.cache.serviceProvider };
}
service.provider = _.merge(
const serviceProvider = this.serverless.service.provider;
serviceConfig.provider = _.merge(
{
stage: 'dev',
region: 'us-east-1',
variableSyntax: '\\${([^{}]+?)}',
stage: serviceProvider.stage,
region: serviceProvider.region,
variableSyntax: serviceProvider.variableSyntax,
},
service.provider
serviceConfig.provider
);
}
strip(svc) {
const service = svc;
strip(serviceConfig) {
if (_.isObject(this.cache.serviceService)) {
service.service = this.cache.serviceService;
delete service.serviceObject;
serviceConfig.service = this.cache.serviceService;
delete serviceConfig.serviceObject;
}
if (typeof this.cache.serviceProvider === 'string') {
service.provider = this.cache.serviceProvider;
serviceConfig.provider = this.cache.serviceProvider;
} else {
// is object
if (!this.cache.serviceProvider.stage) {
delete service.provider.stage;
delete serviceConfig.provider.stage;
}
if (!this.cache.serviceProvider.region) {
delete service.provider.region;
delete serviceConfig.provider.region;
}
if (this.cache.serviceProvider.variableSyntax) {
service.provider.variableSyntax = this.cache.serviceProvider.variableSyntax;
serviceConfig.provider.variableSyntax = this.cache.serviceProvider.variableSyntax;
}
}
}
Expand Down