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

refactor: Configure main progress titles through command schema

Browse Source
This commit is contained in:
Mariusz Nowak 2021-09-20 14:55:27 +02:00 committed by Mariusz Nowak
parent fd68f9e803
commit 9e308bdf04
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/cli/commands-schema/aws-service.js
View File

@ -45,6 +45,15 @@ commands.set('deploy', {
'deploy',
'finalize',
],
mainProgressTitles: new Map([
['before:package:cleanup', 'Packaging'],
['before:aws:deploy:deploy:createStack', 'Retrieving CloudFormation stack info'],
['before:aws:deploy:deploy:checkForChanges', 'Retrieving CloudFormation stack info'],
['before:aws:deploy:deploy:uploadArtifacts', 'Uploading'],
['before:aws:deploy:deploy:validateTemplate', 'Updating CloudFormation stack'],
['before:aws:info:validate', 'Retrieving CloudFormation stack info'],
['after:deploy:deploy', 'Updating'],
]),
});
commands.set('deploy function', {

1
lib/cli/commands-schema/service.js
View File

@ -25,6 +25,7 @@ commands.set('package', {
'compileEvents',
'finalize',
],
mainProgressTitles: new Map([['before:package:cleanup', 'Packaging']]),
});
commands.set('plugin install', {

3
lib/plugins/aws/deploy/index.js
View File

@ -11,7 +11,7 @@ const validateTemplate = require('./lib/validateTemplate');
const updateStack = require('../lib/updateStack');
const existsDeploymentBucket = require('./lib/existsDeploymentBucket');
const path = require('path');
const { style, log, progress, writeText } = require('@serverless/utils/log');
const { style, log, writeText } = require('@serverless/utils/log');
const memoize = require('memoizee');
class AwsDeploy {
@ -124,7 +124,6 @@ class AwsDeploy {
// Deploy finalize inner lifecycle
'aws:deploy:finalize:cleanup': async () => {
if (this.serverless.service.provider.shouldNotDeploy) return;
progress.get('main').notice('Updating');
log.info('Updating');
await this.cleanupS3Bucket();
if (this.options.package || this.serverless.service.package.path) {

1
lib/plugins/aws/lib/updateStack.js
View File

@ -74,7 +74,6 @@ module.exports = {
const templateUrl = `https://${s3Endpoint}/${this.bucketName}/${this.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`;
legacy.log('Updating Stack...');
progress.get('main').notice('Updating CloudFormation stack');
log.info('Updating CloudFormation stack');
const stackName = this.provider.naming.getStackName();
let stackTags = { STAGE: this.provider.getStage() };

3
lib/plugins/package/lib/packageService.js
View File

@ -7,7 +7,7 @@ const _ = require('lodash');
const micromatch = require('micromatch');
const ServerlessError = require('../../../serverless-error');
const parseS3URI = require('../../aws/utils/parse-s3-uri');
const { legacy, progress, log } = require('@serverless/utils/log');
const { legacy, log } = require('@serverless/utils/log');
module.exports = {
defaultExcludes: [
@ -68,7 +68,6 @@ module.exports = {
async packageService() {
legacy.log('Packaging service...');
progress.get('main').notice('Packaging');
log.info();
log.info('Packaging');
let shouldPackageService = false;