@hubspot/cli 5.2.1-beta.0 → 5.2.1-beta.10

package/bin/cli.js

@@ -5,6 +5,7 @@ const updateNotifier = require('update-notifier');
 const chalk = require('chalk');
 
 const { logger } = require('@hubspot/local-dev-lib/logger');
+const { addUserAgentHeader } = require('@hubspot/local-dev-lib/http');
 const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
 const { setLogLevel, getCommandName } = require('../lib/commonOpts');
 const {
@@ -48,7 +49,7 @@ const notifier = updateNotifier({
   shouldNotifyInNpmScript: true,
 });
 
-const i18nKey = 'cli.commands.generalErrors';
+const i18nKey = 'commands.generalErrors';
 
 const CLI_UPGRADE_MESSAGE =
   chalk.bold('The CMS CLI is now the HubSpot CLI') +
@@ -110,9 +111,13 @@ const performChecks = argv => {
   }
 };
 
+const setRequestHeaders = () => {
+  addUserAgentHeader('HubSpot CLI', pkg.version);
+};
+
 const argv = yargs
   .usage('The command line interface to interact with HubSpot.')
-  .middleware([setLogLevel])
+  .middleware([setLogLevel, setRequestHeaders])
   .exitProcess(false)
   .fail(handleFailure)
   .option('debug', {

package/bin/hs

@@ -1,3 +1,3 @@
-#!/usr/bin/env node
+#!/usr/bin/env node --no-deprecation
 
 require('./cli');

package/commands/accounts/clean.js

@@ -13,7 +13,6 @@ const {
   addUseEnvironmentOptions,
   addTestingOptions,
 } = require('../../lib/commonOpts');
-const { getAccountName } = require('../../lib/sandboxes');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { getTableContents } = require('../../lib/ui/table');
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
@@ -21,8 +20,9 @@ const { getConfig, deleteAccount } = require('@hubspot/local-dev-lib/config');
 const {
   isSpecifiedHubSpotAuthError,
 } = require('@hubspot/local-dev-lib/errors/apiErrors');
+const { uiAccountDescription } = require('../../lib/ui');
 
-const i18nKey = 'cli.commands.accounts.subcommands.clean';
+const i18nKey = 'commands.accounts.subcommands.clean';
 
 exports.command = 'clean';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -87,7 +87,7 @@ exports.handler = async options => {
     });
     logger.log(
       getTableContents(
-        accountsToRemove.map(p => [getAccountName(p)]),
+        accountsToRemove.map(p => [uiAccountDescription(p.portalId)]),
         { border: { bodyLeft: '  ' } }
       )
     );
@@ -111,7 +111,7 @@ exports.handler = async options => {
         await deleteAccount(accountToRemove.name);
         logger.log(
           i18n(`${i18nKey}.removeSuccess`, {
-            accountName: getAccountName(accountToRemove),
+            accountName: accountToRemove.name,
           })
         );
       }
@@ -127,10 +127,10 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
-  addTestingOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
+  addTestingOptions(yargs);
 
   yargs.example([['$0 accounts clean']]);
 

package/commands/accounts/info.js

@@ -10,7 +10,7 @@ const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const { getTableContents } = require('../../lib/ui/table');
 
-const i18nKey = 'cli.commands.accounts.subcommands.info';
+const i18nKey = 'commands.accounts.subcommands.info';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.command = 'info [--account]';
@@ -39,8 +39,8 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
 
   yargs.example([
     ['$0 accounts info', i18n(`${i18nKey}.examples.default`)],

package/commands/accounts/list.js

@@ -9,15 +9,15 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { isSandbox, getSandboxName } = require('../../lib/sandboxes');
-const { isDeveloperTestAccount } = require('../../lib/developerTestAccounts');
+const { isSandbox, isDeveloperTestAccount } = require('../../lib/accountTypes');
+
 const { i18n } = require('../../lib/lang');
 const {
   HUBSPOT_ACCOUNT_TYPES,
   HUBSPOT_ACCOUNT_TYPE_STRINGS,
 } = require('@hubspot/local-dev-lib/constants/config');
 
-const i18nKey = 'cli.commands.accounts.subcommands.list';
+const i18nKey = 'commands.accounts.subcommands.list';
 
 exports.command = 'list';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -53,19 +53,20 @@ const sortAndMapPortals = portals => {
 
 const getPortalData = mappedPortalData => {
   const portalData = [];
-  Object.values(mappedPortalData).forEach(set => {
+  Object.entries(mappedPortalData).forEach(([key, set]) => {
+    const hasParentPortal = set.filter(
+      p => p.portalId === parseInt(key, 10)
+    )[0];
     set.forEach(portal => {
-      let name = portal.name;
+      let name = `${portal.name} [${
+        HUBSPOT_ACCOUNT_TYPE_STRINGS[portal.accountType]
+      }]`;
       if (isSandbox(portal)) {
-        name = `${portal.name} ${getSandboxName(portal)}`;
-        if (set.length > 1) {
+        if (hasParentPortal && set.length > 1) {
           name = `↳ ${name}`;
         }
       } else if (isDeveloperTestAccount(portal)) {
-        name = `${portal.name} [${
-          HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST]
-        }]`;
-        if (set.length > 1) {
+        if (hasParentPortal && set.length > 1) {
           name = `↳ ${name}`;
         }
       }
@@ -103,8 +104,8 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
 
   yargs.example([['$0 accounts list']]);
 

package/commands/accounts/remove.js

@@ -13,7 +13,7 @@ const { i18n } = require('../../lib/lang');
 const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
 const { loadAndValidateOptions } = require('../../lib/validation');
 
-const i18nKey = 'cli.commands.accounts.subcommands.remove';
+const i18nKey = 'commands.accounts.subcommands.remove';
 
 exports.command = 'remove [--account]';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/accounts/rename.js

@@ -10,7 +10,7 @@ const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 
-const i18nKey = 'cli.commands.accounts.subcommands.rename';
+const i18nKey = 'commands.accounts.subcommands.rename';
 
 exports.command = 'rename <accountName> <newName>';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -34,8 +34,8 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
 
   yargs.positional('accountName', {
     describe: i18n(`${i18nKey}.positionals.accountName.describe`),

package/commands/accounts/use.js

@@ -11,7 +11,7 @@ const { i18n } = require('../../lib/lang');
 const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
 const { loadAndValidateOptions } = require('../../lib/validation');
 
-const i18nKey = 'cli.commands.accounts.subcommands.use';
+const i18nKey = 'commands.accounts.subcommands.use';
 
 exports.command = 'use [--account]';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/accounts.js

@@ -7,14 +7,14 @@ const info = require('./accounts/info');
 const remove = require('./accounts/remove');
 const clean = require('./accounts/clean');
 
-const i18nKey = 'cli.commands.accounts';
+const i18nKey = 'commands.accounts';
 
 exports.command = 'accounts';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
 
   yargs
     .command({

package/commands/auth.js

@@ -31,9 +31,7 @@ const {
   personalAccessKeyPrompt,
   OAUTH_FLOW,
 } = require('../lib/prompts/personalAccessKeyPrompt');
-const {
-  enterAccountNamePrompt,
-} = require('../lib/prompts/enterAccountNamePrompt');
+const { cliAccountNamePrompt } = require('../lib/prompts/accountNamePrompt');
 const {
   setAsDefaultAccountPrompt,
 } = require('../lib/prompts/setAsDefaultAccountPrompt');
@@ -50,7 +48,7 @@ const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { uiFeatureHighlight } = require('../lib/ui');
 const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
 
-const i18nKey = 'cli.commands.auth';
+const i18nKey = 'commands.auth';
 
 const TRACKING_STATUS = {
   STARTED: 'started',
@@ -129,7 +127,7 @@ exports.handler = async options => {
       validName = updatedConfig.name;
 
       if (!validName) {
-        const { name: namePrompt } = await enterAccountNamePrompt(defaultName);
+        const { name: namePrompt } = await cliAccountNamePrompt(defaultName);
         validName = namePrompt;
       }
 
@@ -166,14 +164,14 @@ exports.handler = async options => {
   logger.log('');
   if (setAsDefault) {
     logger.success(
-      i18n(`cli.lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount`, {
+      i18n(`lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount`, {
         accountName,
       })
     );
   } else {
     const config = getConfig();
     logger.info(
-      i18n(`cli.lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
+      i18n(`lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
         accountName: config.defaultPortal,
       })
     );
@@ -218,8 +216,8 @@ exports.builder = yargs => {
     },
   });
 
-  addConfigOptions(yargs, true);
-  addTestingOptions(yargs, true);
+  addConfigOptions(yargs);
+  addTestingOptions(yargs);
 
   return yargs;
 };

package/commands/cms/convertFields.js

@@ -13,7 +13,7 @@ const {
 
 const { trackConvertFieldsUsage } = require('../../lib/usageTracking');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
-const i18nKey = 'cli.commands.convertFields';
+const i18nKey = 'commands.convertFields';
 
 exports.command = 'convert-fields';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/cms/lighthouseScore.js

@@ -20,7 +20,7 @@ const { HUBSPOT_FOLDER, MARKETPLACE_FOLDER } = require('../../lib/constants');
 const { uiLink } = require('../../lib/ui');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
-const i18nKey = 'cli.commands.cms.subcommands.lighthouseScore';
+const i18nKey = 'commands.cms.subcommands.lighthouseScore';
 
 const DEFAULT_TABLE_HEADER = [
   'Accessibility',
@@ -310,9 +310,9 @@ exports.builder = yargs => {
     ],
   ]);
 
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
 
   return yargs;
 };

package/commands/cms/reactModules.js

@@ -5,7 +5,7 @@ const { i18n } = require('../../lib/lang');
 const path = require('path');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 
-const i18nKey = 'cli.commands.cms.subcommands.reactModule';
+const i18nKey = 'commands.cms.subcommands.reactModule';
 
 exports.command = 'get-react-module [--name] [--dest]';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/cms.js

@@ -4,14 +4,14 @@ const lighthouseScore = require('./cms/lighthouseScore');
 const convertFields = require('./cms/convertFields');
 const reactModules = require('./cms/reactModules');
 
-const i18nKey = 'cli.commands.cms';
+const i18nKey = 'commands.cms';
 
 exports.command = 'cms';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
 
   yargs
     .command(lighthouseScore)

package/commands/config/set/allowUsageTracking.js

@@ -4,8 +4,7 @@ const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { i18n } = require('../../../lib/lang');
 
-const i18nKey =
-  'cli.commands.config.subcommands.set.options.allowUsageTracking';
+const i18nKey = 'commands.config.subcommands.set.options.allowUsageTracking';
 
 const enableOrDisableUsageTracking = async () => {
   const { isEnabled } = await promptUser([

package/commands/config/set/defaultMode.js

@@ -6,7 +6,7 @@ const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { i18n } = require('../../../lib/lang');
 
-const i18nKey = 'cli.commands.config.subcommands.set.options.defaultMode';
+const i18nKey = 'commands.config.subcommands.set.options.defaultMode';
 
 const ALL_MODES = Object.values(MODE);
 

package/commands/config/set/httpTimeout.js

@@ -4,7 +4,7 @@ const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { i18n } = require('../../../lib/lang');
 
-const i18nKey = 'cli.commands.config.subcommands.set.options.httpTimeout';
+const i18nKey = 'commands.config.subcommands.set.options.httpTimeout';
 
 const enterTimeout = async () => {
   const { timeout } = await promptUser([

package/commands/config/set.js

@@ -8,7 +8,7 @@ const { setDefaultMode } = require('./set/defaultMode');
 const { setHttpTimeout } = require('./set/httpTimeout');
 const { setAllowUsageTracking } = require('./set/allowUsageTracking');
 
-const i18nKey = 'cli.commands.config.subcommands.set';
+const i18nKey = 'commands.config.subcommands.set';
 
 exports.command = 'set';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/config.js

@@ -2,14 +2,14 @@ const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
 const { i18n } = require('../lib/lang');
 const set = require('./config/set');
 
-const i18nKey = 'cli.commands.config';
+const i18nKey = 'commands.config';
 
 exports.command = 'config';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
 
   yargs.command(set).demandCommand(1, '');
 

package/commands/create/api-sample.js

@@ -14,7 +14,7 @@ const {
 } = require('@hubspot/local-dev-lib/github');
 const { i18n } = require('../../lib/lang');
 
-const i18nKey = 'cli.commands.create.subcommands.apiSample';
+const i18nKey = 'commands.create.subcommands.apiSample';
 
 module.exports = {
   hidden: true,

package/commands/create/module.js

@@ -5,7 +5,7 @@ const { createModulePrompt } = require('../../lib/prompts/createModulePrompt');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
-const i18nKey = 'cli.commands.create.subcommands.module';
+const i18nKey = 'commands.create.subcommands.module';
 
 module.exports = {
   dest: ({ dest }) => dest,

package/commands/create/template.js

@@ -7,7 +7,7 @@ const {
 const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
-const i18nKey = 'cli.commands.create.subcommands.template';
+const i18nKey = 'commands.create.subcommands.template';
 
 module.exports = {
   dest: ({ dest }) => dest,

package/commands/create.js

@@ -34,7 +34,7 @@ const { trackCommandUsage } = require('../lib/usageTracking');
 const assets = require('./create/index');
 const { i18n } = require('../lib/lang');
 
-const i18nKey = 'cli.commands.create';
+const i18nKey = 'commands.create';
 
 const SUPPORTED_ASSET_TYPES = Object.keys(assets)
   .filter(t => !assets[t].hidden)

package/commands/customObject/create.js

@@ -12,7 +12,7 @@ const {
 } = require('@hubspot/local-dev-lib/api/customObjects');
 const { i18n } = require('../../lib/lang');
 
-const i18nKey = 'cli.commands.customObject.subcommands.create';
+const i18nKey = 'commands.customObject.subcommands.create';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 exports.command = 'create <name> <definition>';

package/commands/customObject/schema/create.js

@@ -24,8 +24,7 @@ const {
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { i18n } = require('../../../lib/lang');
 
-const i18nKey =
-  'cli.commands.customObject.subcommands.schema.subcommands.create';
+const i18nKey = 'commands.customObject.subcommands.schema.subcommands.create';
 const { EXIT_CODES } = require('../../../lib/enums/exitCodes');
 
 exports.command = 'create <definition>';
@@ -75,7 +74,7 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addTestingOptions(yargs, true);
+  addTestingOptions(yargs);
 
   yargs.positional('definition', {
     describe: i18n(`${i18nKey}.positionals.definition.describe`),

package/commands/customObject/schema/delete.js

@@ -9,8 +9,7 @@ const {
 } = require('@hubspot/local-dev-lib/api/customObjects');
 const { i18n } = require('../../../lib/lang');
 
-const i18nKey =
-  'cli.commands.customObject.subcommands.schema.subcommands.delete';
+const i18nKey = 'commands.customObject.subcommands.schema.subcommands.delete';
 
 exports.command = 'delete <name>';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/customObject/schema/fetch-all.js

@@ -13,8 +13,7 @@ const {
 const { i18n } = require('../../../lib/lang');
 const { logSchemas } = require('../../../lib/schema');
 
-const i18nKey =
-  'cli.commands.customObject.subcommands.schema.subcommands.fetchAll';
+const i18nKey = 'commands.customObject.subcommands.schema.subcommands.fetchAll';
 
 exports.command = 'fetch-all [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/customObject/schema/fetch.js

@@ -17,8 +17,7 @@ const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { getAccountId } = require('../../../lib/commonOpts');
 const { i18n } = require('../../../lib/lang');
 
-const i18nKey =
-  'cli.commands.customObject.subcommands.schema.subcommands.fetch';
+const i18nKey = 'commands.customObject.subcommands.schema.subcommands.fetch';
 
 exports.command = 'fetch <name> [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/customObject/schema/list.js

@@ -9,7 +9,7 @@ const { getAccountId } = require('../../../lib/commonOpts');
 const { listSchemas } = require('../../../lib/schema');
 const { i18n } = require('../../../lib/lang');
 
-const i18nKey = 'cli.commands.customObject.subcommands.schema.subcommands.list';
+const i18nKey = 'commands.customObject.subcommands.schema.subcommands.list';
 
 exports.command = 'list';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/customObject/schema/update.js

@@ -24,8 +24,7 @@ const {
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { i18n } = require('../../../lib/lang');
 
-const i18nKey =
-  'cli.commands.customObject.subcommands.schema.subcommands.update';
+const i18nKey = 'commands.customObject.subcommands.schema.subcommands.update';
 const { EXIT_CODES } = require('../../../lib/enums/exitCodes');
 
 exports.command = 'update <name> <definition>';
@@ -75,7 +74,7 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addTestingOptions(yargs, true);
+  addTestingOptions(yargs);
 
   yargs.positional('name', {
     describe: i18n(`${i18nKey}.positionals.name.describe`),

package/commands/customObject/schema.js

@@ -6,7 +6,7 @@ const listCommand = require('./schema/list');
 const updateSchema = require('./schema/update');
 const { i18n } = require('../../lib/lang');
 
-const i18nKey = 'cli.commands.customObject.subcommands.schema';
+const i18nKey = 'commands.customObject.subcommands.schema';
 
 exports.command = 'schema';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/customObject.js

@@ -5,7 +5,7 @@ const { i18n } = require('../lib/lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { uiBetaTag, uiLink } = require('../lib/ui');
 
-const i18nKey = 'cli.commands.customObject';
+const i18nKey = 'commands.customObject';
 
 exports.command = ['custom-object', 'custom', 'co'];
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
@@ -22,8 +22,8 @@ const logBetaMessage = () => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
 
   yargs
     .middleware([logBetaMessage])

package/commands/feedback.js

@@ -1,7 +1,7 @@
 const open = require('open');
 
 const { i18n } = require('../lib/lang');
-const { FEEDBACK_OPTIONS, FEEDBACK_URLS } = require('../lib/constants');
+const { FEEDBACK_URLS } = require('../lib/constants');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 
 const {
@@ -9,7 +9,7 @@ const {
   shouldOpenBrowserPrompt,
 } = require('../lib/prompts/feedbackPrompt');
 
-const i18nKey = 'cli.commands.project.subcommands.feedback';
+const i18nKey = 'commands.project.subcommands.feedback';
 
 exports.command = 'feedback';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -22,10 +22,8 @@ exports.handler = async options => {
   const { shouldOpen } = await shouldOpenBrowserPrompt(type, usedTypeFlag);
 
   if (shouldOpen || usedTypeFlag) {
-    const url =
-      type === FEEDBACK_OPTIONS.BUG || bugFlag
-        ? FEEDBACK_URLS.BUG
-        : FEEDBACK_URLS.GENERAL;
+    // NOTE: for now, all feedback should go to the hubspot-cli repository
+    const url = FEEDBACK_URLS.BUG;
     open(url, { url: true });
     logger.success(i18n(`${i18nKey}.success`, { url }));
   }

package/commands/fetch.js

@@ -14,7 +14,7 @@ const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('../lib/lang');
 
-const i18nKey = 'cli.commands.fetch';
+const i18nKey = 'commands.fetch';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
 
@@ -56,11 +56,11 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addOverwriteOptions(yargs, true);
-  addModeOptions(yargs, { read: true }, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addOverwriteOptions(yargs);
+  addModeOptions(yargs, { read: true });
+  addUseEnvironmentOptions(yargs);
 
   yargs.positional('src', {
     describe: i18n(`${i18nKey}.positionals.src.describe`),