@hubspot/cli 7.2.5-experimental.0 → 7.3.0-beta.0

package/bin/cli.js

@@ -6,7 +6,6 @@ const chalk = require('chalk');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { addUserAgentHeader } = require('@hubspot/local-dev-lib/http');
 const { loadConfig, getAccountId, configFileExists, getConfigPath, validateConfig, } = require('@hubspot/local-dev-lib/config');
-const { DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID, DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND, DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME, } = require('@hubspot/local-dev-lib/constants/config');
 const { logError } = require('../lib/errorHandlers/index');
 const { setLogLevel, getCommandName } = require('../lib/commonOpts');
 const { validateAccount } = require('../lib/validation');
@@ -49,15 +48,14 @@ const notifier = updateNotifier({
     distTag: 'latest',
     shouldNotifyInNpmScript: true,
 });
-const i18nKey = 'commands.generalErrors';
 const CMS_CLI_PACKAGE_NAME = '@hubspot/cms-cli';
 notifier.notify({
     message: pkg.name === CMS_CLI_PACKAGE_NAME
-        ? i18n(`${i18nKey}.updateNotify.cmsUpdateNotification`, {
+        ? i18n(`commands.generalErrors.updateNotify.cmsUpdateNotification`, {
             packageName: CMS_CLI_PACKAGE_NAME,
             updateCommand: uiCommandReference('{updateCommand}'),
         })
-        : i18n(`${i18nKey}.updateNotify.cliUpdateNotification`, {
+        : i18n(`commands.generalErrors.updateNotify.cliUpdateNotification`, {
             updateCommand: uiCommandReference('{updateCommand}'),
         }),
     defer: false,
@@ -69,7 +67,7 @@ notifier.notify({
         borderStyle: 'round',
         title: pkg.name === CMS_CLI_PACKAGE_NAME
             ? null
-            : chalk.bold(i18n(`${i18nKey}.updateNotify.notifyTitle`)),
+            : chalk.bold(i18n(`commands.generalErrors.updateNotify.notifyTitle`)),
     },
 });
 const getTerminalWidth = () => {
@@ -98,13 +96,13 @@ const performChecks = argv => {
     if (argv._[0] === 'config' &&
         argv._[1] === 'set' &&
         argv._[2] === 'default-account') {
-        logger.error(i18n(`${i18nKey}.setDefaultAccountMoved`));
+        logger.error(i18n(`commands.generalErrors.setDefaultAccountMoved`));
         process.exit(EXIT_CODES.ERROR);
     }
     // Require "project" command when running upload/watch inside of a project
     if (argv._.length === 1 && ['upload', 'watch'].includes(argv._[0])) {
         if (getIsInProject(argv.src)) {
-            logger.error(i18n(`${i18nKey}.srcIsProject`, {
+            logger.error(i18n(`commands.generalErrors.srcIsProject`, {
                 src: argv.src || './',
                 command: argv._.join(' '),
             }));
@@ -138,17 +136,9 @@ const isTargetedCommand = (options, commandMap) => {
     };
     return checkCommand(options, commandMap);
 };
-const skipConfigAccountsSubCommands = {
-    target: false,
-    subCommands: {
-        auth: { target: true },
-    },
-};
 const SKIP_CONFIG_VALIDATION = {
     init: { target: true },
     auth: { target: true },
-    accounts: skipConfigAccountsSubCommands,
-    account: skipConfigAccountsSubCommands,
 };
 const handleDeprecatedEnvVariables = options => {
     // HUBSPOT_PORTAL_ID is deprecated, but we'll still support it for now
@@ -156,7 +146,7 @@ const handleDeprecatedEnvVariables = options => {
     if (options.useEnv &&
         process.env.HUBSPOT_PORTAL_ID &&
         !process.env.HUBSPOT_ACCOUNT_ID) {
-        uiDeprecatedTag(i18n(`${i18nKey}.handleDeprecatedEnvVariables.portalEnvVarDeprecated`, {
+        uiDeprecatedTag(i18n(`commands.generalErrors.handleDeprecatedEnvVariables.portalEnvVarDeprecated`, {
             configPath: getConfigPath(),
         }));
         process.env.HUBSPOT_ACCOUNT_ID = process.env.HUBSPOT_PORTAL_ID;
@@ -173,39 +163,9 @@ const injectAccountIdMiddleware = async (options) => {
         options.derivedAccountId = parseInt(process.env.HUBSPOT_ACCOUNT_ID, 10);
     }
     else {
-        try {
-            options.derivedAccountId = getAccountId(account);
-        }
-        catch (error) {
-            logError(error);
-            if (error.cause === DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID) {
-                logger.log(i18n(`${i18nKey}.injectAccountIdMiddleware.invalidAccountId`, {
-                    overrideCommand: uiCommandReference('hs account create-override'),
-                    hsAccountFileName: DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
-                }));
-            }
-            if (error.cause === DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND) {
-                logger.log(i18n(`${i18nKey}.injectAccountIdMiddleware.accountNotFound`, {
-                    configPath: getConfigPath(),
-                    authCommand: uiCommandReference('hs account auth'),
-                    hsAccountFileName: DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
-                }));
-            }
-            process.exit(EXIT_CODES.ERROR);
-        }
+        options.derivedAccountId = getAccountId(account);
     }
 };
-const skipLoadConfigAccountSubCommands = {
-    target: false,
-    subCommands: { auth: { target: true } },
-};
-const SKIP_LOAD_CONFIG = {
-    account: skipLoadConfigAccountSubCommands,
-    accounts: skipLoadConfigAccountSubCommands,
-};
-const SKIP_CONFIG_FLAG_VALIDATION = {
-    config: { target: false, subCommands: { migrate: { target: true } } },
-};
 const loadConfigMiddleware = async (options) => {
     // Skip this when no command is provided
     if (!options._.length) {
@@ -217,21 +177,13 @@ const loadConfigMiddleware = async (options) => {
             process.exit(EXIT_CODES.ERROR);
         }
     };
-    if (configFileExists(true) &&
-        options.config &&
-        !isTargetedCommand(options, SKIP_CONFIG_FLAG_VALIDATION)) {
-        logger.error(i18n(`${i18nKey}.loadConfigMiddleware.configFileExists`, {
+    if (configFileExists(true) && options.config) {
+        logger.error(i18n(`commands.generalErrors.loadConfigMiddleware.configFileExists`, {
             configPath: getConfigPath(),
         }));
         process.exit(EXIT_CODES.ERROR);
     }
-    // There are two commands where we don't load config:
-    // 1. `hs init`
-    // 2. `hs account auth` only if the global config file does not exist
-    if (!isTargetedCommand(options, {
-        init: { target: true },
-    }) &&
-        !(isTargetedCommand(options, SKIP_LOAD_CONFIG) && !configFileExists(true))) {
+    else if (!isTargetedCommand(options, { init: { target: true } })) {
         const { config: configPath } = options;
         const config = loadConfig(configPath, options);
         // We don't run validateConfig() for auth because users should be able to run it when
@@ -252,7 +204,6 @@ const checkAndWarnGitInclusionMiddleware = options => {
 const accountsSubCommands = {
     target: false,
     subCommands: {
-        auth: { target: true },
         clean: { target: true },
         list: { target: true },
         ls: { target: true },
@@ -268,7 +219,6 @@ const sandboxesSubCommands = {
 const SKIP_ACCOUNT_VALIDATION = {
     init: { target: true },
     auth: { target: true },
-    config: { target: false, subCommands: { migrate: { target: true } } },
     account: accountsSubCommands,
     accounts: accountsSubCommands,
     sandbox: sandboxesSubCommands,

package/commands/account/clean.js

@@ -6,33 +6,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.describe = exports.command = void 0;
 exports.handler = handler;
 exports.builder = builder;
-const fs_1 = __importDefault(require("fs"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
 const index_1 = require("@hubspot/local-dev-lib/errors/index");
-const config_2 = require("@hubspot/local-dev-lib/config");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const commonOpts_1 = require("../../lib/commonOpts");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
-const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
 const table_1 = require("../../lib/ui/table");
 const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const ui_1 = require("../../lib/ui");
-const errorHandlers_1 = require("../../lib/errorHandlers");
-const i18nKey = 'commands.account.subcommands.clean';
 exports.command = 'clean';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.clean.describe`);
 async function handler(args) {
     const { qa } = args;
     (0, usageTracking_1.trackCommandUsage)('accounts-clean');
     const accountsList = (0, config_1.getConfigAccounts)() || [];
     const filteredTestAccounts = accountsList.filter(p => qa ? p.env === 'qa' : p.env !== 'qa');
     if (filteredTestAccounts && filteredTestAccounts.length === 0) {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.noResults`));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.clean.noResults`));
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     const accountsToRemove = [];
@@ -40,7 +35,7 @@ async function handler(args) {
         succeedColor: 'white',
     });
     SpinniesManager_1.default.add('accountsClean', {
-        text: (0, lang_1.i18n)(`${i18nKey}.loading.add`),
+        text: (0, lang_1.i18n)(`commands.account.subcommands.clean.loading.add`),
     });
     for (const account of filteredTestAccounts) {
         try {
@@ -66,65 +61,38 @@ async function handler(args) {
         const oneAccountFound = accountsToRemove.length === 1;
         SpinniesManager_1.default.succeed('accountsClean', {
             text: (0, lang_1.i18n)(oneAccountFound
-                ? `${i18nKey}.inactiveAccountsFound.one`
-                : `${i18nKey}.inactiveAccountsFound.other`, {
+                ? `commands.account.subcommands.clean.inactiveAccountsFound.one`
+                : `commands.account.subcommands.clean.inactiveAccountsFound.other`, {
                 count: accountsToRemove.length,
             }),
         });
         logger_1.logger.log((0, table_1.getTableContents)(accountsToRemove.map(p => [
             (0, ui_1.uiAccountDescription)((0, getAccountIdentifier_1.getAccountIdentifier)(p)),
         ]), { border: { bodyLeft: '  ' } }));
-        let promptMessage = (0, lang_1.i18n)(oneAccountFound ? `${i18nKey}.confirm.one` : `${i18nKey}.confirm.other`, {
-            count: accountsToRemove.length,
-        });
-        const accountOverride = (0, config_2.getCWDAccountOverride)();
-        const overrideFilePath = (0, config_2.getDefaultAccountOverrideFilePath)();
-        const accountOverrideMatches = accountsToRemove.some(account => account.name === accountOverride ||
-            // @ts-expect-error: Default account override files can only exist with global config
-            account.accountId === accountOverride);
-        if (overrideFilePath && accountOverride && accountOverrideMatches) {
-            promptMessage = `${promptMessage}${(0, lang_1.i18n)(`${i18nKey}.defaultAccountOverride`, {
-                overrideFilePath,
-            })}`;
-        }
         const { accountsCleanPrompt } = await (0, promptUtils_1.promptUser)([
             {
                 name: 'accountsCleanPrompt',
                 type: 'confirm',
-                message: promptMessage,
+                message: (0, lang_1.i18n)(oneAccountFound
+                    ? `commands.account.subcommands.clean.confirm.one`
+                    : `commands.account.subcommands.clean.confirm.other`, {
+                    count: accountsToRemove.length,
+                }),
             },
         ]);
         if (accountsCleanPrompt) {
             logger_1.logger.log('');
-            try {
-                if (overrideFilePath) {
-                    fs_1.default.unlinkSync(overrideFilePath);
-                }
-            }
-            catch (error) {
-                (0, errorHandlers_1.logError)(error);
-            }
             for (const accountToRemove of accountsToRemove) {
                 await (0, config_1.deleteAccount)(accountToRemove.name);
-                logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.removeSuccess`, {
+                logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.clean.removeSuccess`, {
                     accountName: accountToRemove.name,
                 }));
             }
-            // Get updated version of the config
-            (0, config_1.loadConfig)((0, config_1.getConfigPath)());
-            const defaultAccount = (0, config_1.getConfigDefaultAccount)();
-            if (defaultAccount &&
-                accountsToRemove.some(p => p.name === defaultAccount)) {
-                logger_1.logger.log();
-                logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.replaceDefaultAccount`));
-                const newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
-                (0, config_1.updateDefaultAccount)(newDefaultAccount);
-            }
         }
     }
     else {
         SpinniesManager_1.default.succeed('accountsClean', {
-            text: (0, lang_1.i18n)(`${i18nKey}.noResults`),
+            text: (0, lang_1.i18n)(`commands.account.subcommands.clean.noResults`),
         });
     }
     logger_1.logger.log('');

package/commands/account/info.js

@@ -7,10 +7,8 @@ const config_1 = require("@hubspot/local-dev-lib/config");
 const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const yargsUtils_1 = require("../../lib/yargsUtils");
 const lang_1 = require("../../lib/lang");
-const index_1 = require("../../lib/ui/index");
 const table_1 = require("../../lib/ui/table");
-const i18nKey = 'commands.account.subcommands.info';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.info.describe`);
 exports.command = 'info [account]';
 async function handler(args) {
     const { derivedAccountId } = args;
@@ -21,46 +19,24 @@ async function handler(args) {
         let scopeGroups = [];
         const response = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env, derivedAccountId);
         scopeGroups = response.scopeGroups.map(s => [s]);
-        // If a default account is present in the config, display it
-        const configPath = (0, config_1.getConfigPath)();
-        if (configPath) {
-            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.defaultAccountTitle`));
-            logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`${i18nKey}.configPath`, {
-                configPath,
-            })}`);
-            logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`${i18nKey}.defaultAccount`, {
-                account: (0, config_1.getDisplayDefaultAccount)(),
-            })}`);
-        }
-        // If a default account override is present, display it
-        const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
-        if (overrideFilePath) {
-            logger_1.logger.log('');
-            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.overrideFilePathTitle`));
-            logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`${i18nKey}.overrideFilePath`, { overrideFilePath })}`);
-            logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`${i18nKey}.overrideAccount`, {
-                account: (0, config_1.getConfigDefaultAccount)(),
-            })}`);
-        }
-        logger_1.logger.log('');
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.name`, { name: name }));
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.accountId`, { accountId: derivedAccountId }));
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.scopeGroups`));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.name`, { name: name }));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.accountId`, { accountId: derivedAccountId }));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.scopeGroups`));
         logger_1.logger.log((0, table_1.getTableContents)(scopeGroups, { border: { bodyLeft: '  ' } }));
     }
     else {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.errors.notUsingPersonalAccessKey`));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.errors.notUsingPersonalAccessKey`));
     }
 }
 function accountInfoBuilder(yargs) {
     yargs.positional('account', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
+        describe: (0, lang_1.i18n)(`commands.account.subcommands.info.options.account.describe`),
         type: 'string',
     });
     yargs.example([
-        ['$0 accounts info', (0, lang_1.i18n)(`${i18nKey}.examples.default`)],
-        ['$0 accounts info MyAccount', (0, lang_1.i18n)(`${i18nKey}.examples.nameBased`)],
-        ['$0 accounts info 1234567', (0, lang_1.i18n)(`${i18nKey}.examples.idBased`)],
+        ['$0 accounts info', (0, lang_1.i18n)(`commands.account.subcommands.info.examples.default`)],
+        ['$0 accounts info MyAccount', (0, lang_1.i18n)(`commands.account.subcommands.info.examples.nameBased`)],
+        ['$0 accounts info 1234567', (0, lang_1.i18n)(`commands.account.subcommands.info.examples.idBased`)],
     ]);
     return yargs;
 }

package/commands/account/list.js

@@ -7,15 +7,13 @@ const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
 const commonOpts_1 = require("../../lib/commonOpts");
-const index_1 = require("../../lib/ui/index");
 const table_1 = require("../../lib/ui/table");
 const usageTracking_1 = require("../../lib/usageTracking");
 const accountTypes_1 = require("../../lib/accountTypes");
 const lang_1 = require("../../lib/lang");
 const config_2 = require("@hubspot/local-dev-lib/constants/config");
-const i18nKey = 'commands.account.subcommands.list';
 exports.command = ['list', 'ls'];
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.account.subcommands.list.describe');
 function sortAndMapAccounts(accounts) {
     const mappedAccountData = {};
     // Standard and app developer accounts
@@ -78,32 +76,15 @@ async function handler(args) {
     const mappedAccountData = sortAndMapAccounts(accountsList);
     const accountData = getAccountData(mappedAccountData);
     accountData.unshift((0, table_1.getTableHeader)([
-        (0, lang_1.i18n)(`${i18nKey}.labels.name`),
-        (0, lang_1.i18n)(`${i18nKey}.labels.accountId`),
-        (0, lang_1.i18n)(`${i18nKey}.labels.authType`),
+        (0, lang_1.i18n)('commands.account.subcommands.list.labels.name'),
+        (0, lang_1.i18n)('commands.account.subcommands.list.labels.accountId'),
+        (0, lang_1.i18n)('commands.account.subcommands.list.labels.authType'),
     ]));
-    // If a default account is present in the config, display it
-    if (configPath) {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.defaultAccountTitle`));
-        logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`${i18nKey}.configPath`, {
-            configPath,
-        })}`);
-        logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`${i18nKey}.defaultAccount`, {
-            account: (0, config_1.getDisplayDefaultAccount)(),
-        })}`);
-        logger_1.logger.log('');
-    }
-    // If a default account override is present, display it
-    const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
-    if (overrideFilePath) {
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.overrideFilePathTitle`));
-        logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`${i18nKey}.overrideFilePath`, { overrideFilePath })}`);
-        logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`${i18nKey}.overrideAccount`, {
-            account: (0, config_1.getConfigDefaultAccount)(),
-        })}`);
-        logger_1.logger.log('');
-    }
-    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.accounts`));
+    logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.list.configPath', { configPath: configPath }));
+    logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.list.defaultAccount', {
+        account: (0, config_1.getConfigDefaultAccount)(),
+    }));
+    logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.list.accounts'));
     logger_1.logger.log((0, table_1.getTableContents)(accountData, { border: { bodyLeft: '  ' } }));
 }
 function builder(yargs) {

package/commands/account/remove.js

@@ -1,68 +1,39 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.describe = exports.command = void 0;
 exports.handler = handler;
 exports.builder = builder;
-const fs_1 = __importDefault(require("fs"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
-const promptUtils_1 = require("../../lib/prompts/promptUtils");
-const errorHandlers_1 = require("../../lib/errorHandlers");
 const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
 const commonOpts_1 = require("../../lib/commonOpts");
-const i18nKey = 'commands.account.subcommands.remove';
 exports.command = 'remove [account]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.remove.describe`);
 async function handler(args) {
     const { account } = args;
     let accountToRemove = account;
     if (accountToRemove && !(0, config_1.getAccountId)(accountToRemove)) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.accountNotFound`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.account.subcommands.remove.errors.accountNotFound`, {
             specifiedAccount: accountToRemove,
             configPath: (0, config_1.getConfigPath)(),
         }));
     }
     if (!accountToRemove || !(0, config_1.getAccountId)(accountToRemove)) {
-        accountToRemove = await (0, accountsPrompt_1.selectAccountFromConfig)((0, lang_1.i18n)(`${i18nKey}.prompts.selectAccountToRemove`));
+        accountToRemove = await (0, accountsPrompt_1.selectAccountFromConfig)((0, lang_1.i18n)(`commands.account.subcommands.remove.prompts.selectAccountToRemove`));
     }
     (0, usageTracking_1.trackCommandUsage)('accounts-remove', undefined, (0, config_1.getAccountId)(accountToRemove));
     const currentDefaultAccount = (0, config_1.getConfigDefaultAccount)();
-    const accountOverride = (0, config_1.getCWDAccountOverride)();
-    const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
-    if (overrideFilePath &&
-        accountOverride &&
-        accountOverride === accountToRemove) {
-        const { deleteOverrideFile } = await (0, promptUtils_1.promptUser)({
-            type: 'confirm',
-            name: 'deleteOverrideFile',
-            message: (0, lang_1.i18n)(`${i18nKey}.prompts.deleteOverrideFile`, {
-                overrideFilePath,
-                accountName: accountToRemove,
-            }),
-        });
-        try {
-            if (deleteOverrideFile) {
-                fs_1.default.unlinkSync(overrideFilePath);
-            }
-        }
-        catch (error) {
-            (0, errorHandlers_1.logError)(error);
-        }
-    }
     await (0, config_1.deleteAccount)(accountToRemove);
-    logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.accountRemoved`, {
+    logger_1.logger.success((0, lang_1.i18n)(`commands.account.subcommands.remove.success.accountRemoved`, {
         accountName: accountToRemove,
     }));
     // Get updated version of the config
     (0, config_1.loadConfig)((0, config_1.getConfigPath)());
     if (accountToRemove === currentDefaultAccount) {
         logger_1.logger.log();
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.replaceDefaultAccount`));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.remove.logs.replaceDefaultAccount`));
         const newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
         (0, config_1.updateDefaultAccount)(newDefaultAccount);
     }
@@ -70,12 +41,12 @@ async function handler(args) {
 function builder(yargs) {
     (0, commonOpts_1.addConfigOptions)(yargs);
     yargs.positional('account', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
+        describe: (0, lang_1.i18n)(`commands.account.subcommands.remove.options.account.describe`),
         type: 'string',
     });
     yargs.example([
-        ['$0 accounts remove', (0, lang_1.i18n)(`${i18nKey}.examples.default`)],
-        ['$0 accounts remove MyAccount', (0, lang_1.i18n)(`${i18nKey}.examples.byName`)],
+        ['$0 accounts remove', (0, lang_1.i18n)(`commands.account.subcommands.remove.examples.default`)],
+        ['$0 accounts remove MyAccount', (0, lang_1.i18n)(`commands.account.subcommands.remove.examples.byName`)],
     ]);
     return yargs;
 }

package/commands/account/rename.js

@@ -10,9 +10,8 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
-const i18nKey = 'commands.account.subcommands.rename';
 exports.command = 'rename <account-name> <new-name>';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.rename.describe`);
 async function handler(args) {
     const { accountName, newName, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('accounts-rename', undefined, derivedAccountId);
@@ -23,7 +22,7 @@ async function handler(args) {
         (0, errorHandlers_1.logError)(error);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.success.renamed`, {
+    logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.rename.success.renamed`, {
         name: accountName,
         newName,
     }));
@@ -33,11 +32,11 @@ function builder(yargs) {
     (0, commonOpts_1.addConfigOptions)(yargs);
     (0, commonOpts_1.addAccountOptions)(yargs);
     yargs.positional('account-name', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.accountName.describe`),
+        describe: (0, lang_1.i18n)(`commands.account.subcommands.rename.positionals.accountName.describe`),
         type: 'string',
     });
     yargs.positional('new-name', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.newName.describe`),
+        describe: (0, lang_1.i18n)(`commands.account.subcommands.rename.positionals.newName.describe`),
         type: 'string',
     });
     yargs.example([

package/commands/account/use.js

@@ -8,49 +8,35 @@ const config_1 = require("@hubspot/local-dev-lib/config");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
-const ui_1 = require("../../lib/ui");
-const i18nKey = 'commands.account.subcommands.use';
 exports.command = 'use [account]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.account.subcommands.use.describe');
 async function handler(args) {
     let newDefaultAccount = args.account;
     if (!newDefaultAccount) {
         newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
     }
     else if (!(0, config_1.getAccountId)(newDefaultAccount)) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.accountNotFound`, {
+        logger_1.logger.error((0, lang_1.i18n)('commands.account.subcommands.use.errors.accountNotFound', {
             specifiedAccount: newDefaultAccount,
             configPath: (0, config_1.getConfigPath)(),
         }));
         newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
     }
     (0, usageTracking_1.trackCommandUsage)('accounts-use', undefined, (0, config_1.getAccountId)(newDefaultAccount));
-    const accountOverride = (0, config_1.getCWDAccountOverride)();
-    const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
-    if (accountOverride && overrideFilePath) {
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.accountOverride`, {
-            accountOverride,
-        }));
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.accountOverrideCommands`, {
-            createOverrideCommand: (0, ui_1.uiCommandReference)('hs account create-override'),
-            removeOverrideCommand: (0, ui_1.uiCommandReference)('hs account remove-override'),
-        }));
-        logger_1.logger.log('');
-    }
     (0, config_1.updateDefaultAccount)(newDefaultAccount);
-    return logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.defaultAccountUpdated`, {
+    return logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.use.success.defaultAccountUpdated', {
         accountName: newDefaultAccount,
     }));
 }
 function builder(yargs) {
     yargs.positional('account', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
+        describe: (0, lang_1.i18n)('commands.account.subcommands.use.options.account.describe'),
         type: 'string',
     });
     yargs.example([
-        ['$0 accounts use', (0, lang_1.i18n)(`${i18nKey}.examples.default`)],
-        ['$0 accounts use MyAccount', (0, lang_1.i18n)(`${i18nKey}.examples.nameBased`)],
-        ['$0 accounts use 1234567', (0, lang_1.i18n)(`${i18nKey}.examples.idBased`)],
+        ['$0 accounts use', (0, lang_1.i18n)('commands.account.subcommands.use.examples.default')],
+        ['$0 accounts use MyAccount', (0, lang_1.i18n)('commands.account.subcommands.use.examples.nameBased')],
+        ['$0 accounts use 1234567', (0, lang_1.i18n)('commands.account.subcommands.use.examples.idBased')],
     ]);
     return yargs;
 }

package/commands/account.js

@@ -37,30 +37,24 @@ exports.describe = exports.command = void 0;
 exports.builder = builder;
 const commonOpts_1 = require("../lib/commonOpts");
 const lang_1 = require("../lib/lang");
-const auth = __importStar(require("./account/auth"));
 const list = __importStar(require("./account/list"));
 const rename = __importStar(require("./account/rename"));
 const use = __importStar(require("./account/use"));
 const info = __importStar(require("./account/info"));
 const remove = __importStar(require("./account/remove"));
 const clean = __importStar(require("./account/clean"));
-const createOverride = __importStar(require("./account/createOverride"));
-const removeOverride = __importStar(require("./account/removeOverride"));
 const i18nKey = 'commands.account';
 exports.command = ['account', 'accounts'];
 exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
 function builder(yargs) {
     (0, commonOpts_1.addGlobalOptions)(yargs);
     yargs
-        .command(auth)
         .command(list)
         .command(rename)
         .command(use)
         .command(info)
         .command(remove)
         .command(clean)
-        .command(createOverride)
-        .command(removeOverride)
         .demandCommand(1, '');
     return yargs;
 }

package/commands/auth.js

@@ -47,12 +47,8 @@ async function handler(args) {
     if (configPath) {
         (0, git_1.checkAndWarnGitInclusion)(configPath);
     }
-    if ((0, config_2.configFileExists)(true)) {
-        const globalConfigPath = (0, config_2.getConfigPath)('', true);
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.globalConfigFileExists`, {
-            configPath: globalConfigPath,
-            authCommand: (0, ui_1.uiCommandReference)('hs account auth'),
-        }));
+    if (!(0, config_2.getConfigPath)(configFlagValue)) {
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noConfigFileFound`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     (0, usageTracking_1.trackCommandUsage)('auth');