@sap/cds-dk 7.0.2 → 7.1.0

package/lib/build/provider/buildTaskProviderInternal.js

@@ -1,7 +1,7 @@
 const fs = require('fs')
 const path = require('path')
 const cds = require('../../cds')
-const { hasJavaNature, getDefaultModelOptions, BuildError, hasOptionValue } = require('../util')
+const { hasJavaNature, getDefaultModelOptions, BuildError, hasOptionValue, isClassicMtx } = require('../util')
 const BuildTaskProvider = require('../buildTaskProvider')
 
 const { FILE_EXT_CDS, BUILD_TASK_HANA, BUILD_TASK_FIORI, BUILD_TASK_JAVA, BUILD_TASK_JAVA_CF, BUILD_TASK_NODEJS, BUILD_TASK_NODE_CF, BUILD_TASK_MTX,
@@ -12,6 +12,11 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
     constructor(logger) {
         super()
         this._logger = logger
+        // ensure that classic mtx is not used in combination with cds-dk@7
+        if (isClassicMtx()) {
+            throw new BuildError(`@sap/cds-mtx is deprecated and not supported by @sap/cds-dk >= 7.
+Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/docs/guides/multitenancy/old-mtx-migration or install @sap/cds-dk version 6 instead.`)
+        }
     }
     get logger() {
         return this._logger
@@ -65,7 +70,8 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                 this.logger.debug("No service module found")
             }
         }
-        // create required build tasks
+
+        // order of creation is relevant
         if (addRequiredTasks) {
             const mtxTask = tasks.find(task => task.for === BUILD_TASK_MTX || task.for === BUILD_TASK_MTX_SIDECAR)
             if (mtxTask) {
@@ -80,12 +86,15 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                 let dbTask = tasks.find(task => task.for === BUILD_TASK_HANA)
                 if (!dbTask) {
                     //  db task might be missing if mtx task is enforced by 'cds build --for mtx'
-                    dbTask = this._createDbTask(db, dbOptions)
+                    dbTask = cds.env.build.tasks?.find(task => task.for === BUILD_TASK_HANA)
+                    if (!dbTask) {
+                        dbTask = this._createDbTask(db, dbOptions)
+                    }
                     if (dbTask) {
                         tasks.push(dbTask)
                     }
                 }
-                if (dbTask && (!mtxTask._uses || !mtxTask._uses.map(use => use.task).includes(dbTask))) {
+                if (dbTask && !mtxTask._uses?.map(use => use.task).includes(dbTask)) {
                     const use = { task: dbTask }
                     mtxTask._uses ? mtxTask._uses.push(use) : mtxTask._uses = [use]
                 }
@@ -106,7 +115,7 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
             }
 
             // create mtx build task
-            const mtxTask = this._createMtxTask(srv, tasks)
+            const mtxTask = this._createMtxTask(srv)
             if (mtxTask) {
                 tasks.push(mtxTask)
             }
@@ -153,7 +162,7 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
         return userEnv && (userEnv.data?.model || userEnv.service?.model)
     }
 
-    _createMtxTask(src, tasks) {
+    _createMtxTask(src) {
         this.logger.debug("determining MTX architecture")
 
         // preserve order of creation
@@ -177,26 +186,26 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                     throw new BuildError(`MTX sidecar directory '${sidecarPath}' not existing. Custom build task configuration required if the folder is named differently.`)
                 }
                 if (!sidecarEnv.requires["cds.xt.ModelProviderService"]?._in_sidecar) {
-                    // correct profile might have been set, but couldn't be resolved
                     if (sidecarEnv.profiles?.includes('mtx-sidecar')) {
-                        throw new BuildError('MTX configuration cannot be resolved. Make sure an up-to-date version of @sap/cds-mtxs is installed.')
+                        // profile has been set, but cannot be resolved
+                        throw new BuildError('MTX configuration cannot be resolved. Make sure up-to-date versions of @sap/cds-mtxs and @sap/cds are installed.')
                     }
                     throw new BuildError(`Invalid MTX sidecar configuration - profile 'mtx-sidecar' not set.`)
                 }
                 return { for: BUILD_TASK_MTX_SIDECAR }
             }
+
             if (sidecarEnv?.requires["cds.xt.ModelProviderService"]?._in_sidecar || sidecarEnv?.profiles?.includes('mtx-sidecar')) {
                 throw new BuildError(`MTX sidecar requires profile 'with-mtx-sidecar' in project root configuration.`)
             }
-
             if (cds.env.requires["cds.xt.ModelProviderService"]?._in_sidecar || cds.env.profiles?.includes('mtx-sidecar')) {
                 // cds build is executed in sidecar folder
                 throw new BuildError(`Seems that you are executing 'cds build' in the 'mtx/sidecar' folder. Execute 'cds build' in the project root folder instead.`)
             }
 
-            // mtxs with nodejs, but without sidecar
-            if (!tasks.some(task => task.for === BUILD_TASK_JAVA || task.for === BUILD_TASK_JAVA_CF)) {
-                this.logger.debug("MTX app without sidecar")
+            // mtxs nodejs app without sidecar
+            if (!BuildTaskProviderInternal._hasJavaNature(src)) {
+                this.logger.debug("MTX Nodejs app without sidecar")
                 return {
                     for: BUILD_TASK_MTX,
                     src
@@ -278,7 +287,6 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
                 task.src = task.src || "."
                 break
             case BUILD_TASK_MTX:
-                require('../../util/version').checkMtx(cds)
                 // mtxs with nodejs, but without sidecar
                 task.src = task.src || this._normalizePath(cds.env.folders.srv)
                 break
@@ -310,7 +318,7 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
         }
 
         // REVISIT: filter nodejs bootstrap service models for Java - issues/12770#issuecomment-1805719
-        if (this._hasJavaNature(cds.env.folders.srv)) {
+        if (this._hasJavaNature()) {
             defaultModelPaths = defaultModelPaths.filter(p => !NODEJS_MODEL_EXCLUDE_LIST.includes(p))
         }
         // also add built-in models to custom build tasks already containing model options
@@ -323,7 +331,7 @@ class BuildTaskProviderInternal extends BuildTaskProvider {
      * Returns whether this project is a java project or not.
      * @param {string} srv - the folder name of the service module
      */
-    static _hasJavaNature(srv) {
+    static _hasJavaNature(srv = cds.env.folders.srv) {
         srv = this._getModuleFolder(Array.isArray(srv) ? srv : [srv])
         return hasJavaNature([cds.root, srv && path.join(cds.root, srv)])
     }

package/lib/build/provider/mtx/index.js

@@ -5,6 +5,7 @@ const cds = require('../../../cds')
 const BuildTaskHandlerEdmx = require('../buildTaskHandlerEdmx')
 const ResourcesTarProvider = require('./resourcesTarBuilder')
 const { FOLDER_GEN } = require('../../constants')
+const { BuildError } = require('../../util')
 
 class MtxModuleBuilder extends BuildTaskHandlerEdmx {
     get priority() {
@@ -13,12 +14,17 @@ class MtxModuleBuilder extends BuildTaskHandlerEdmx {
     }
     init() {
         super.init()
+
+        // this build task only supports nodejs mtxs apps without sidecar
+        if (cds.env['project-nature'] === 'java') {
+            throw new BuildError(`@sap/cds-mtx is deprecated and not supported by @sap/cds-dk >= 7. This also applies to the 'mtx' build task in Java projects.
+Upgrade to @sap/cds-mtxs following the migration guide https://cap.cloud.sap/docs/guides/multitenancy/old-mtx-migration or install @sap/cds-dk version 6 instead.`)
+        }
     }
 
     async build() {
-        // Non-sidecar scenario: model-provider is implemented by the Nodejs app itself (default for Nodejs).
         // Only create resources TAR, compiled CSN(s) are created by the Nodejs app build task.
-        const dest = cds.env.build.target !== "." ? this.task.dest : path.join(this.task.dest, FOLDER_GEN)
+        const dest = cds.env.build.target !== '.' ? this.task.dest : path.join(this.task.dest, FOLDER_GEN)
         const model = await this.model()
         if (!model) {
             return

package/lib/build/provider/mtx/resourcesTarBuilder.js

@@ -83,12 +83,8 @@ class ResourcesTarBuilder {
     }
 
     async _getHanaTenantDbDest() {
-        let hanaTask = this.handler.context.tasks.find(task => task.for === BUILD_TASK_HANA)
-        if (!hanaTask) {
-            this.handler.pushMessage(`Found SQLite database configuration. Ensure that productive cloud deployments requiring SAP HANA database are built with 'production' profile.`, WARNING)
-            return null
-        }
-        return hanaTask.dest
+        const hanaTask = this.handler.context.tasks.find(task => task.for === BUILD_TASK_HANA)
+        return hanaTask?.dest
     }
 }
 module.exports = ResourcesTarBuilder

package/lib/build/provider/mtx-sidecar/index.js

@@ -1,10 +1,10 @@
 const path = require('path')
 const cds = require('../../../cds')
 const fs = require('fs')
-const { FOLDER_GEN, DEFAULT_CSN_FILE_NAME } = require('../../constants')
+const { FOLDER_GEN, DEFAULT_CSN_FILE_NAME, MTX_SIDECAR_DB_VALIDATION } = require('../../constants')
 const NodeCfModuleBuilder = require('../nodejs')
 const ResourcesTarProvider = require('../mtx/resourcesTarBuilder')
-const { WARNING, ERROR } = NodeCfModuleBuilder
+const { ERROR } = NodeCfModuleBuilder
 const { relativePaths, BuildError, resolveRequiredSapModels, getI18nDefaultFolder } = require('../../util')
 
 const DEFAULT_MAIN_FOLDER = "_main"
@@ -61,13 +61,18 @@ class MtxSidecarModuleBuilder extends NodeCfModuleBuilder {
         if (!main) {
             throw new BuildError(`Invalid MTX sidecar configuration. Make sure that the profile 'mtx-sidecar' is configured and an up-to-date version of @sap/cds-mtxs is installed.`)
         }
-        const profiles = cds.env.profiles || []
+        if (!this.hasBuildOption(MTX_SIDECAR_DB_VALIDATION, false)
+            && !cds.env.build.tasks?.length                     // disable if custom build tasks exist
+            && sidecarEnv.requires.db && cds.env.requires.db    // ensure database is configured
+            && sidecarEnv.requires.db.kind !== cds.env.requires.db.kind) {
+            throw new BuildError(`Inconsistent database configuration found - application db '${cds.env.requires.db?.kind}', sidecar db '${sidecarEnv.requires.db?.kind}'`)
+        }
+        const profiles = cds.env.profiles ?? []
+        if (!profiles.includes("production") && !profiles.includes("prod")) {
+            // need to overwrite 'development' profile setting '../..' with '_main', although it is questionable why cds build is executed with development profile
+            main = DEFAULT_MAIN_FOLDER
+        }
 
-            if (!profiles.includes("production") && !profiles.includes("prod")) {
-                main = DEFAULT_MAIN_FOLDER
-                // root should represent the production use case and not development
-                this.pushMessage(`MTX sidecar build results are created in folder '${main}'. Enable 'production' or 'prod' profile if the folder is configured differently.`, WARNING)
-            }
         const destRoot = this.task.dest
         const destMain = path.join(destRoot, main)
         const destMainSrv = path.join(destMain, cds.env.folders.srv)

package/lib/build/util.js

@@ -177,6 +177,18 @@ function getI18nDefaultFolder() {
     return cds.env.i18n.folders[0] ?? 'i18n'
 }
 
+function isClassicMtx() {
+    function _hasMtxDependency() {
+        try {
+            return !!require(path.join(cds.root, 'package.json'))?.dependencies?.['@sap/cds-mtx']
+        } catch (e) {
+            return false
+        }
+    }
+    return /true/i.test(process.env.OLD_MTX) || _hasMtxDependency()
+}
+
+
 /**
  * Return gnu-style error string for location `loc`:
  *  - 'File:Line:Col' without `loc.end`
@@ -266,6 +278,7 @@ module.exports = {
     flatten,
     copy,
     getI18nDefaultFolder,
+    isClassicMtx,
     BuildMessage,
     BuildError
 }

package/lib/client/activate.js

@@ -5,7 +5,7 @@ const axios = require('axios');
 const cds = require('../cds');
 const DEBUG = cds.debug('cli');
 const { collectFileContent, collectFiles, toUnixPath } = require('./helper/fs_helper');
-const { CliError } = require('./helper/errors');
+const { getMessage } = require('./helper/logging');
 
 const AuthManager = require('./auth_manager');
 const BaseCommand = require('./base_command');
@@ -30,7 +30,7 @@ async function checkFinished(jobId, statusUrl, params, finisher) {
         finisher.finished = true;
         clearInterval(finisher.timer);
         if (status === JOB_STATUS.FAILED) {
-            return finisher.reject(new CliError(`Job ${jobId} failed`, { error }));
+            return finisher.reject(getMessage(`Job ${jobId} failed`, { error }));
         }
         console.log('Extension active');
         finisher.resolve();
@@ -58,7 +58,7 @@ module.exports = class Activate extends BaseCommand {
         }
 
         if (!await this.checkProject(params.get('projectFolder'))) {
-            throw new CliError(params.get('projectFolder') + ' is not a valid extension project');
+            throw params.get('projectFolder') + ' is not a valid extension project';
         }
 
         try {
@@ -133,7 +133,7 @@ module.exports = class Activate extends BaseCommand {
         try {
             pkgJson = await fs.readFile(path.join(absoluteFolder, 'package.json'), 'utf-8');
         } catch (error) {
-            throw new CliError('No package.json file found', { error });
+            throw getMessage('No package.json file found', { error });
         }
         allFiles.set('package.json', pkgJson);
 
@@ -182,11 +182,11 @@ module.exports = class Activate extends BaseCommand {
             const { jobID: jobId, statusPath } = response.data;
 
             if (jobId === undefined) {
-                throw new CliError('Activation failed: did not receive job ID');
+                throw 'Activation failed: did not receive job ID';
             }
 
             if (!statusPath) {
-                throw new CliError(`Job ${jobId} failed: did not receive job-status path`);
+                throw `Job ${jobId} failed: did not receive job-status path`;
             }
 
             DEBUG?.(`Job ID: ${jobId}`);
@@ -199,7 +199,7 @@ module.exports = class Activate extends BaseCommand {
                     finished: false,
                     timer: null
                 };
-                finisher.timer = setInterval(checkFinished.bind(undefined, jobId, statusUrl, params, finisher), 250).unref();
+                finisher.timer = setInterval(checkFinished.bind(undefined, jobId, statusUrl, params, finisher), 250);
             });
         });
     }

package/lib/client/auth_manager.js

@@ -4,7 +4,7 @@ const cds = require('../cds');
 const DEBUG = cds.debug('cli');
 const { SettingsManager } = require('./settings_manager');
 const { ParamCollection } = require('./params');
-const { CliError } = require('./helper/errors');
+const { getMessage } = require('./helper/logging');
 
 function addTokenInfo(params, authData) {
     params.set('token', authData.access_token);
@@ -79,14 +79,14 @@ async function retrieveTokenOrPasscodeUrl(params) {
                 if (error.response?.status === 404) { // may represent 405 in case of wrong method
                     continue;
                 }
-                throw new CliError('Failed to get authentication token', { error });
+                throw getMessage('Failed to get authentication token', { error });
             }
             if (response) {
                 break;
             }
         }
         if (!response) {
-            throw new CliError('Failed to get authentication token');
+            throw 'Failed to get authentication token';
         }
         authData = response.data;
 
@@ -115,9 +115,9 @@ module.exports = class AuthManager {
                 if (params.get('saveData')) {
                     await SettingsManager.saveSettings(params);
                 }
-                throw new CliError(`Failed to login: no valid token or passcode provided. Get a passcode${
+                throw `Failed to login: no valid token or passcode provided. Get a passcode${
                     params.get('passcodeUrl') ? ' from ' + params.get('passcodeUrl') : ''
-                } and supply the code when re-running the command`);
+                } and supply the code when re-running the command`;
             }
             params.set('reqAuth', { headers: { Authorization: 'Bearer ' + params.get('token') } });
         }

package/lib/client/base_command.js

@@ -1,7 +1,9 @@
 const path = require('path');
 const fs = require('fs').promises;
 
-const { CliError } = require('./helper/errors');
+require('../util/pruneAxiosErrors');
+
+const { getMessage } = require('./helper/logging');
 
 const MTX_URL_PATH_PREFIX = 'mtx/v1/model/';
 const CUSTOM_FILE_URL_SUFFIX = 'customTenantContent';
@@ -20,23 +22,18 @@ module.exports = class BaseCommand {
         const prefix = `Request to ${url} failed`;
         switch (error.response?.status) {
             case 401:
-                throw new CliError(`${prefix}: invalid authentication.\nRetry with valid passcode${
+                throw getMessage(`${prefix}: invalid authentication.\nRetry with valid passcode${
                     params.has('passcodeUrl') ? ` from ${params.get('passcodeUrl')}` : ''
                 } or username/password (required if SaaS app is configured with mocked-auth).`, { error, command });
             case 403:
-                throw new CliError(prefix + ': insufficient authorization. Ensure client has all necessary roles.', { error, command });
+                throw getMessage(prefix + ': insufficient authorization. Ensure client has all necessary roles.', { error, command });
             case 404:
-                throw new CliError(prefix + ': resource not found.', { command });
+                throw getMessage(prefix + ': resource not found.', { error, command });
             case 422:
                 // Compilation or native-extension error.
-                throw new CliError(prefix + '.', { error, command });
+                throw getMessage(prefix + '.', { error, command });
             default:
                 // Unexpected error should be transparent to user.
-                if (!require('..').debug('axios')) {
-                    error.config?.auth && (error.config.auth = '...'); // TODO use &&= with Node > 14
-                    delete error.request;
-                    delete error.response;
-                }
                 throw error;
         }
     }

package/lib/client/extend.js

@@ -6,7 +6,7 @@ const AuthManager = require('./auth_manager');
 const BaseCommand = require('./base_command');
 const { normalizePath, isParent } = require('./helper/fs_helper');
 const Question = require('./helper/question');
-const { CliError } = require('./helper/errors');
+const { getMessage } = require('./helper/logging');
 
 const COMMAND_URL_SUFFIX = 'content';
 const CUSTOM_FILE_FOLDERS = ['wsdl'];
@@ -87,7 +87,7 @@ module.exports = class Extend extends BaseCommand {
 
         const runOnExistingProject = await Extend.checkProject(params.get('projectFolder'));
         if (runOnExistingProject && !(params.get('force') || params.get('templates'))) {
-            throw new CliError(folderExists(params.get('projectFolder')), { command: 'extend' });
+            throw getMessage(folderExists(params.get('projectFolder')), { command: 'extend' });
         }
 
         try {

package/lib/client/helper/logging.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 
-function getMessage(errorText, { error, help } = {}) {
+function getMessage(errorText, { error, command, help = command && getCommandHelp(command) } = {}) {
     let message = errorText ? errorText : '';
     if (error) {
         message += '\n' + (
@@ -8,7 +8,7 @@ function getMessage(errorText, { error, help } = {}) {
             || error.response?.data?.error?.message // response body == { error }
             || error.message                        // no response attached
         );
-        if (process.env.DEBUG && error.stack) {
+        if (error.stack && require('../../cds').debug('cli')) {
             message += '\n' + error.stack;
         }
     }
@@ -18,6 +18,11 @@ function getMessage(errorText, { error, help } = {}) {
     return message;
 }
 
+function getCommandHelp(command) {
+    const cli = require('../../../bin/cds');
+    return cli?.load(command, () => ({ help: '' }))?.help ?? '';
+}
+
 module.exports = {
     getMessage
 };

package/lib/client/params.js

@@ -1,7 +1,6 @@
 const cds = require('../cds');
 const DEBUG = cds.debug('cli');
 const { escapeRegex } = require('./helper/string_helper');
-const { CliError } = require('./helper/errors');
 
 
 // PARAM BASE TYPES
@@ -106,10 +105,10 @@ class Param {
             expectedType = typeof this.allowedValues[0];
         }
         if (typeof val !== expectedType) {
-            throw new CliError(`Failed to set '${(this.name)}' = ${JSON.stringify(val)}: expected value of type ${expectedType}`);
+            throw `Failed to set '${(this.name)}' = ${JSON.stringify(val)}: expected value of type ${expectedType}`;
         }
         if (this.allowedValues && !(this.allowedValues).includes(val)) {
-            throw new CliError(`Failed to set '${(this.name)}' = ${JSON.stringify(val)}: expected one of ${JSON.stringify(this.allowedValues)}`);
+            throw `Failed to set '${(this.name)}' = ${JSON.stringify(val)}: expected one of ${JSON.stringify(this.allowedValues)}`;
         }
     }
 

package/lib/client/pull.js

@@ -7,13 +7,13 @@ const axios = require('axios');
 
 const { login } = require('./auth_manager');
 const BaseCommand = require('./base_command');
-const { CliError } = require('./helper/errors');
+const { getMessage } = require('./helper/logging');
 
 module.exports = class Pull extends BaseCommand {
 
     static async run(paramValues) {
         if (!tar) {
-            throw new CliError(`cds pull requires @sap/cds version >= 6.2. Current version is ${cds.version}\n`);
+            throw `cds pull requires @sap/cds version >= 6.2. Current version is ${cds.version}\n`;
         }
 
         const params = await login(paramValues);
@@ -59,7 +59,7 @@ module.exports = class Pull extends BaseCommand {
         try {
             packageContents = JSON.parse(fs.readFileSync(packageJson, { encoding: 'utf-8' }));
         } catch (error) {
-            throw new CliError('package.json missing or unreadable', { error });
+            throw getMessage('package.json missing or unreadable', { error });
         }
         fs.writeFileSync(packageJson, JSON.stringify({
             ...packageContents,

package/lib/client/push.js

@@ -5,7 +5,7 @@ const axios = require('axios');
 
 const { login } = require('./auth_manager');
 const BaseCommand = require('./base_command');
-const { CliError } = require('./helper/errors');
+const { getMessage } = require('./helper/logging');
 const { schemaRegex } = require('./helper/url_helper');
 const buildSystem = require('../build')
 
@@ -39,7 +39,7 @@ module.exports = class Push extends BaseCommand {
             src = local(src);
         } else {
             if (!schemaRegex.test(src)) {
-                throw new CliError(`Nonexistent path: ${src}`, { command: 'push' });
+                throw getMessage(`Nonexistent path: ${src}`, { command: 'push' });
             }
             try {
                 content = (await axios.get(src, { responseEncoding: 'base64' })).data;
@@ -54,7 +54,7 @@ module.exports = class Push extends BaseCommand {
         try {
             return require(join(projectFolder, 'package.json')).name;
         } catch (error) {
-            throw new CliError(`Extension project at ${projectFolder} is missing package.json file`, { error, command: 'push' });
+            throw getMessage(`Extension project at ${projectFolder} is missing package.json file`, { error, command: 'push' });
         }
     }
 

package/lib/client/settings_manager.js

@@ -9,7 +9,6 @@ const { requireGlobal } = require('./helper/dependency_helper');
 const { getAppFromSuggestions, getSubdomain } = require('./helper/cf_helper');
 const isBas = require('./helper/env_helper');
 const Question = require('./helper/question');
-const { CliError } = require('./helper/errors');
 const { httpSchema, httpsSchema, schemaRegex, localhostRegex } = require('./helper/url_helper');
 const { capitalize } = require('./helper/string_helper');
 
@@ -95,7 +94,7 @@ async function getTokenBaseUrl(params, renewUrl) {
         return params.get('tokenUrl');
     }
     if (!params.has('appUrl')) {
-        throw new CliError('Failed to determine token URL: app URL not given');
+        throw 'Failed to determine token URL: app URL not given';
     }
     const baseUrl = new URL(params.get('appUrl'));
     const cleanPathname = pathname => baseUrl.pathname.replace(/\/?$/, pathname);
@@ -237,7 +236,7 @@ class SettingsManager {
 
             // Check required param: appUrl
             if (!params.has('appUrl')) {
-                throw new CliError('App URL not given. Please specify it or log in to Cloud Foundry and repeat this command.');
+                throw 'App URL not given. Please specify it or log in to Cloud Foundry and repeat this command.';
             }
         }
         async function renewTokenUrl() {
@@ -273,8 +272,8 @@ class SettingsManager {
 
         if (params.get('tokenStorage') === 'keyring' && params.get('saveData')) {
             // Explicit login w/o plain-text storage enabled
-            throw new CliError(capitalize(TOKEN_STORAGE_DESC.keyring) + ' requested but keytar not installed. ' +
-                'Run `npm install -g keytar` or switch to ' + TOKEN_STORAGE_DESC.plain + ' by adding `--plain` (discouraged).');
+            throw capitalize(TOKEN_STORAGE_DESC.keyring) + ' requested but keytar not installed. ' +
+                'Run `npm install -g keytar` or switch to ' + TOKEN_STORAGE_DESC.plain + ' by adding `--plain` (discouraged).';
         }
 
         const doLog = params.get('saveData') || logout
@@ -296,14 +295,14 @@ class SettingsManager {
             params.set('clientsecret', await Question.askQuestion('clientsecret: ', undefined, true));
             console.log();
             if (params.get('clientsecret') === '') {
-                throw new CliError('Clientsecret cannot be empty');
+                throw 'Clientsecret cannot be empty';
             }
         }
         async function addKey() {
             params.set('key', await Question.askQuestion('key: ', undefined, true));
             console.log();
             if (params.get('key') === '') {
-                throw new CliError('Key cannot be empty');
+                throw 'Key cannot be empty';
             }
         }
         async function addPasscode() {
@@ -311,7 +310,7 @@ class SettingsManager {
             params.set('passcode', (await Question.askQuestion(prompt, undefined, true)).trim());
             console.log();
             if (params.get('passcode') === '') {
-                throw new CliError('Passcode cannot be empty');
+                throw 'Passcode cannot be empty';
             }
         }
         function setRelevantAuth(auth) {

package/lib/client/tenant_action.js

@@ -2,7 +2,7 @@ const cds = require('../cds');
 const DEBUG = cds.debug('cli');
 
 const BaseCommand = require('./base_command');
-const { CliError } = require('./helper/errors');
+const { getMessage } = require('./helper/logging');
 const { ParamCollection } = require('./params');
 const AuthManager = require('./auth_manager');
 const { capitalize } = require('./helper/string_helper');
@@ -65,13 +65,13 @@ module.exports = class TenantAction extends BaseCommand {
                 libPath = require.resolve(libId);
                 DEBUG?.(`Using cds-mtxs from ${libPath}`);
             } catch (error) {
-                throw new CliError('@sap/cds-mtxs not found or outdated. Have you changed into the directory of your SaaS app? If so, please upgrade to @sap/cds-mtxs@>=1.7.0', { error, command: this.command });
+                throw getMessage('@sap/cds-mtxs not found or outdated. Have you changed into the directory of your SaaS app? If so, please upgrade to @sap/cds-mtxs@>=1.7.0', { error, command: this.command });
             }
         }
 
         const { cds_mtx } = require(libPath);
         if (!cds_mtx) {
-            throw new CliError('@sap/cds-mtxs outdated. Please upgrade to @sap/cds-mtxs@>=1.7.0 and re-run this command.');
+            throw '@sap/cds-mtxs outdated. Please upgrade to @sap/cds-mtxs@>=1.7.0 and re-run this command.';
         }
         return cds_mtx(this.command, tenant);
     }