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

fix(CLI): Fix handling when local serverless is removed in command run

Browse Source
This commit is contained in:
Mariusz Nowak 2021-09-28 14:02:26 +02:00 committed by Mariusz Nowak
parent 54af90884c
commit 1a3ccdbef8
2 changed files with 52 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
lib/cli/handle-error.js
View File

@ -8,8 +8,8 @@ const sfeVersion = require('@serverless/dashboard-plugin/package.json').version;
const { platformClientVersion } = require('@serverless/dashboard-plugin');
const { style, writeText, legacy } = require('@serverless/utils/log');
const slsVersion = require('./../../package').version;
const { logWarning } = require('../classes/Error');
const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
const ServerlessError = require('../serverless-error');
const tokenizeException = require('../utils/tokenize-exception');
const logDeprecation = require('../utils/logDeprecation');
const resolveIsLocallyInstalled = require('../utils/is-locally-installed');
@ -65,40 +65,48 @@ module.exports = async (exception, options = {}) => {
if (isInvokedByGlobalInstallation && !resolveIsLocallyInstalled()) {
const localServerlessPath = resolveLocalServerlessPath();
try {
// Attempt to use error handler from local version
// TODO: Remove local version fallback with next major (when its moved to the top of the process)
const localErrorHandlerData = (() => {
try {
require(path.resolve(localServerlessPath, 'lib/cli/handle-error'))(exception, {
serverless,
isLocallyInstalled,
isUncaughtException,
command,
options: cliOptions,
commandSchema,
serviceDir,
configuration,
hasTelemetryBeenReported,
commandUsage,
variableSourcesInConfig,
});
return;
} catch (error) {
// Pass and attempt to use old-style error handler from local version
// Ugly mock of serverless below is used to ensure that Framework version will be logged with `(local)` suffix
require(path.resolve(localServerlessPath, 'lib/classes/Error')).logError(exception, {
serverless: serverless || { isLocallyInstalled },
forceExit: isUncaughtException,
});
return;
return {
handle: require.resolve(path.resolve(localServerlessPath, 'lib/cli/handle-error')),
options: {
serverless,
isLocallyInstalled,
isUncaughtException,
command,
options: cliOptions,
commandSchema,
serviceDir,
configuration,
hasTelemetryBeenReported,
commandUsage,
variableSourcesInConfig,
},
};
} catch {
try {
// Ugly mock of serverless below is used to ensure that Framework version will be logged with `(local)` suffix
return {
handle: require.resolve(path.resolve(localServerlessPath, 'lib/classes/Error'))
.logError,
options: {
serverless: serverless || { isLocallyInstalled },
forceExit: isUncaughtException,
},
};
} catch {
// Corner case of local installation being removed during command processing.
// It can happen e.g. during "plugin uninstall" command, where "serverless" originally
// installed a as peer dependency was removed
logWarning('Could not resolve path to locally installed error handler');
return null;
}
}
} catch (err) {
// This is just a fallback as for most (all?) versions it shouldn't happen
throw new ServerlessError(
'Could not resolve path to locally installed error handler.',
'INVALID_LOCAL_SERVERLESS_ERROR_HANDLER'
);
})();
if (localErrorHandlerData) {
localErrorHandlerData.handle(exception, localErrorHandlerData.options);
return;
}
}

11
lib/utils/telemetry/generatePayload.js
View File

@ -197,6 +197,17 @@ module.exports = ({
};
}
const localServerlessPath = resolveLocalServerlessPath();
try {
require.resolve(path.resolve(localServerlessPath, 'package.json'));
} catch {
// Corner case of local installation being removed during command processing.
// It can happen e.g. during "plugin uninstall" command, where "serverless" originally
// installed a as peer dependency was removed
return {
'serverless': require('../../../package').version,
'@serverless/dashboard-plugin': require('@serverless/dashboard-plugin/package').version,
};
}
return {
'serverless': require(path.resolve(localServerlessPath, 'package.json')).version,
// Since v2.42.0 it's "@serverless/dashboard-plugin"