@hubspot/cli 6.3.0-experimental.0 → 6.4.0-beta.0

package/bin/cli.js

@@ -3,12 +3,10 @@
 const yargs = require('yargs');
 const updateNotifier = require('update-notifier');
 const chalk = require('chalk');
-const fs = require('fs');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { addUserAgentHeader } = require('@hubspot/local-dev-lib/http');
-const { loadConfig, configFileExists, } = require('@hubspot/local-dev-lib/config');
 const { logError } = require('../lib/errorHandlers/index');
-const { setLogLevel, getCommandName, injectAccountIdMiddleware, } = require('../lib/commonOpts');
+const { setLogLevel, getCommandName } = require('../lib/commonOpts');
 const { trackHelpUsage, trackConvertFieldsUsage, } = require('../lib/usageTracking');
 const { getIsInProject } = require('../lib/projects');
 const pkg = require('../package.json');
@@ -118,26 +116,9 @@ const performChecks = argv => {
 const setRequestHeaders = () => {
     addUserAgentHeader('HubSpot CLI', pkg.version);
 };
-const loadConfigMiddleware = async (options) => {
-    if (configFileExists(true)) {
-        loadConfig('', options);
-    }
-    if (options.config) {
-        if (fs.existsSync(options.config)) {
-            const { config: configPath } = options;
-            await loadConfig(configPath, options);
-        }
-    }
-};
 const argv = yargs
     .usage('The command line interface to interact with HubSpot.')
-    // loadConfigMiddleware loads the new hidden config for all commands
-    .middleware([
-    setLogLevel,
-    setRequestHeaders,
-    loadConfigMiddleware,
-    injectAccountIdMiddleware,
-])
+    .middleware([setLogLevel, setRequestHeaders])
     .exitProcess(false)
     .fail(handleFailure)
     .option('debug', {

package/commands/accounts/clean.js

@@ -11,9 +11,8 @@ const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, addTestin
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { getTableContents } = require('../../lib/ui/table');
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
+const { getConfig, deleteAccount } = require('@hubspot/local-dev-lib/config');
 const { uiAccountDescription } = require('../../lib/ui');
-const { deleteAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
-const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const i18nKey = 'commands.accounts.subcommands.clean';
 exports.command = 'clean';
@@ -21,9 +20,9 @@ exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { qa } = options;
     await loadAndValidateOptions(options, false);
+    const config = getConfig();
     trackCommandUsage('accounts-clean', null);
-    const accountsList = getConfigAccounts();
-    const filteredTestAccounts = accountsList.filter(p => qa ? p.env === 'qa' : p.env !== 'qa');
+    const filteredTestAccounts = config.portals.filter(p => qa ? p.env === 'qa' : p.env !== 'qa');
     if (filteredTestAccounts && filteredTestAccounts.length === 0) {
         logger.log(i18n(`${i18nKey}.noResults`));
         process.exit(EXIT_CODES.SUCCESS);
@@ -37,7 +36,7 @@ exports.handler = async (options) => {
     });
     for (const account of filteredTestAccounts) {
         try {
-            await accessTokenForPersonalAccessKey(getAccountIdentifier(account), true);
+            await accessTokenForPersonalAccessKey(account.portalId, true);
         }
         catch (error) {
             if (isSpecifiedError(error, {
@@ -63,9 +62,7 @@ exports.handler = async (options) => {
                 count: accountsToRemove.length,
             }),
         });
-        logger.log(getTableContents(accountsToRemove.map(p => [
-            uiAccountDescription(getAccountIdentifier(p)),
-        ]), { border: { bodyLeft: '  ' } }));
+        logger.log(getTableContents(accountsToRemove.map(p => [uiAccountDescription(p.portalId)]), { border: { bodyLeft: '  ' } }));
         const { accountsCleanPrompt } = await promptUser([
             {
                 name: 'accountsCleanPrompt',

package/commands/accounts/info.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { getAccessToken } = require('@hubspot/local-dev-lib/personalAccessKey');
-const { addAccountOptions, addConfigOptions } = require('../../lib/commonOpts');
+const { getAccountId, addAccountOptions, addConfigOptions, } = require('../../lib/commonOpts');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const { getTableContents } = require('../../lib/ui/table');
@@ -13,15 +13,15 @@ exports.describe = i18n(`${i18nKey}.describe`);
 exports.command = 'info [--account]';
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const { derivedAccountId } = options;
-    const config = getAccountConfig(derivedAccountId);
+    const accountId = getAccountId(options);
+    const config = getAccountConfig(accountId);
     // check if the provided account is using a personal access key, if not, show an error
-    if (config && config.authType === 'personalaccesskey') {
+    if (config.authType === 'personalaccesskey') {
         const { name, personalAccessKey, env } = config;
-        const response = await getAccessToken(personalAccessKey, env, derivedAccountId);
+        const response = await getAccessToken(personalAccessKey, env, accountId);
         const scopeGroups = response.scopeGroups.map(s => [s]);
         logger.log(i18n(`${i18nKey}.name`, { name }));
-        logger.log(i18n(`${i18nKey}.accountId`, { accountId: derivedAccountId }));
+        logger.log(i18n(`${i18nKey}.accountId`, { accountId }));
         logger.log(i18n(`${i18nKey}.scopeGroups`));
         logger.log(getTableContents(scopeGroups, { border: { bodyLeft: '  ' } }));
     }

package/commands/accounts/list.js

@@ -2,10 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getConfig, getConfigPath, getConfigDefaultAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
-const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
+const { getConfig, getConfigPath } = require('@hubspot/local-dev-lib/config');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
-const { addConfigOptions, addAccountOptions } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, getAccountId, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { isSandbox, isDeveloperTestAccount } = require('../../lib/accountTypes');
@@ -22,7 +21,7 @@ const sortAndMapPortals = portals => {
         (p.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD ||
             p.accountType === HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER))
         .forEach(portal => {
-        mappedPortalData[getAccountIdentifier(portal)] = [portal];
+        mappedPortalData[portal.portalId] = [portal];
     });
     // Non-standard portals (sandbox, developer test account)
     portals
@@ -35,7 +34,7 @@ const sortAndMapPortals = portals => {
             ];
         }
         else {
-            mappedPortalData[getAccountIdentifier(p)] = [p];
+            mappedPortalData[p.portalId] = [p];
         }
     });
     return mappedPortalData;
@@ -43,7 +42,7 @@ const sortAndMapPortals = portals => {
 const getPortalData = mappedPortalData => {
     const portalData = [];
     Object.entries(mappedPortalData).forEach(([key, set]) => {
-        const hasParentPortal = set.filter(p => getAccountIdentifier(p) === parseInt(key, 10))[0];
+        const hasParentPortal = set.filter(p => p.portalId === parseInt(key, 10))[0];
         set.forEach(portal => {
             let name = `${portal.name} [${HUBSPOT_ACCOUNT_TYPE_STRINGS[portal.accountType]}]`;
             if (isSandbox(portal)) {
@@ -56,19 +55,18 @@ const getPortalData = mappedPortalData => {
                     name = `↳ ${name}`;
                 }
             }
-            portalData.push([name, getAccountIdentifier(portal), portal.authType]);
+            portalData.push([name, portal.portalId, portal.authType]);
         });
     });
     return portalData;
 };
 exports.handler = async (options) => {
     await loadAndValidateOptions(options, false);
-    const { derivedAccountId } = options;
-    trackCommandUsage('accounts-list', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('accounts-list', null, accountId);
     const config = getConfig();
     const configPath = getConfigPath();
-    const accountsList = getConfigAccounts();
-    const mappedPortalData = sortAndMapPortals(accountsList);
+    const mappedPortalData = sortAndMapPortals(config.portals);
     const portalData = getPortalData(mappedPortalData);
     portalData.unshift(getTableHeader([
         i18n(`${i18nKey}.labels.name`),
@@ -76,9 +74,7 @@ exports.handler = async (options) => {
         i18n(`${i18nKey}.labels.authType`),
     ]));
     logger.log(i18n(`${i18nKey}.configPath`, { configPath }));
-    logger.log(i18n(`${i18nKey}.defaultAccount`, {
-        account: getConfigDefaultAccount(config),
-    }));
+    logger.log(i18n(`${i18nKey}.defaultAccount`, { account: config.defaultPortal }));
     logger.log(i18n(`${i18nKey}.accounts`));
     logger.log(getTableContents(portalData, { border: { bodyLeft: '  ' } }));
 };

package/commands/accounts/remove.js

@@ -13,7 +13,7 @@ exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     await loadAndValidateOptions(options, false);
     let config = getConfig();
-    let accountToRemove = options.providedAccountId;
+    let accountToRemove = options.account;
     if (accountToRemove && !getAccountIdFromConfig(accountToRemove)) {
         logger.error(i18n(`${i18nKey}.errors.accountNotFound`, {
             specifiedAccount: accountToRemove,

package/commands/accounts/rename.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { renameAccount } = require('@hubspot/local-dev-lib/config');
-const { addConfigOptions, addAccountOptions } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, getAccountId, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
@@ -12,8 +12,9 @@ exports.command = 'rename <accountName> <newName>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     loadAndValidateOptions(options);
-    const { accountName, newName, derivedAccountId } = options;
-    trackCommandUsage('accounts-rename', null, derivedAccountId);
+    const { accountName, newName } = options;
+    const accountId = getAccountId(options);
+    trackCommandUsage('accounts-rename', null, accountId);
     await renameAccount(accountName, newName);
     return logger.log(i18n(`${i18nKey}.success.renamed`, {
         name: accountName,

package/commands/auth.js

@@ -8,7 +8,7 @@ const { ENVIRONMENTS, } = require('@hubspot/local-dev-lib/constants/environments
 const { DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, } = require('@hubspot/local-dev-lib/constants/config');
 const { i18n } = require('../lib/lang');
 const { getAccessToken, updateConfigWithAccessToken, } = require('@hubspot/local-dev-lib/personalAccessKey');
-const { updateAccountConfig, writeConfig, getConfig, getConfigPath, loadConfig, getConfigDefaultAccount, } = require('@hubspot/local-dev-lib/config');
+const { updateAccountConfig, writeConfig, getConfig, getConfigPath, loadConfig, } = require('@hubspot/local-dev-lib/config');
 const { commaSeparatedValues, toKebabCase, } = require('@hubspot/local-dev-lib/text');
 const { promptUser } = require('../lib/prompts/promptUtils');
 const { personalAccessKeyPrompt, OAUTH_FLOW, } = require('../lib/prompts/personalAccessKeyPrompt');
@@ -36,17 +36,16 @@ exports.describe = i18n(`${i18nKey}.describe`, {
     supportedProtocols: SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT,
 });
 exports.handler = async (options) => {
-    const { type, config: c, qa, providedAccountId } = options;
+    const { type, config: c, qa, account } = options;
     const authType = (type && type.toLowerCase()) || PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
     setLogLevel(options);
-    const env = qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
-    // Needed to load deprecated config
-    loadConfig(c);
-    checkAndWarnGitInclusion(getConfigPath());
     if (!getConfigPath(c)) {
         logger.error(i18n(`${i18nKey}.errors.noConfigFileFound`));
         process.exit(EXIT_CODES.ERROR);
     }
+    const env = qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
+    loadConfig(c);
+    checkAndWarnGitInclusion(getConfigPath());
     trackCommandUsage('auth');
     trackAuthAction('auth', authType, TRACKING_STATUS.STARTED);
     let configData;
@@ -65,10 +64,7 @@ exports.handler = async (options) => {
             successAuthMethod = OAUTH_AUTH_METHOD.name;
             break;
         case PERSONAL_ACCESS_KEY_AUTH_METHOD.value:
-            configData = await personalAccessKeyPrompt({
-                env,
-                account: providedAccountId,
-            });
+            configData = await personalAccessKeyPrompt({ env, account });
             try {
                 token = await getAccessToken(configData.personalAccessKey, env);
                 defaultName = toKebabCase(token.hubName);
@@ -116,7 +112,7 @@ exports.handler = async (options) => {
     else {
         const config = getConfig();
         logger.info(i18n(`lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
-            accountName: getConfigDefaultAccount(config),
+            accountName: config.defaultPortal,
         }));
     }
     logger.success(i18n(`${i18nKey}.success.configFileUpdated`, {

package/commands/cms/lighthouseScore.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
 const { loadAndValidateOptions } = require('../../lib/validation');
@@ -54,14 +54,14 @@ const selectTheme = async (accountId) => {
 };
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const { target, verbose, theme, derivedAccountId } = options;
-    const includeDesktopScore = target === 'desktop' || !verbose;
-    const includeMobileScore = target === 'mobile' || !verbose;
-    let themeToCheck = theme;
+    const accountId = getAccountId(options);
+    const includeDesktopScore = options.target === 'desktop' || !options.verbose;
+    const includeMobileScore = options.target === 'mobile' || !options.verbose;
+    let themeToCheck = options.theme;
     if (themeToCheck) {
         let isValidTheme = true;
         try {
-            const { data: result } = await fetchThemes(derivedAccountId, {
+            const { data: result } = await fetchThemes(accountId, {
                 name: encodeURIComponent(themeToCheck),
             });
             isValidTheme = result && result.total;
@@ -75,13 +75,13 @@ exports.handler = async (options) => {
         }
     }
     else {
-        themeToCheck = await selectTheme(derivedAccountId);
+        themeToCheck = await selectTheme(accountId);
         logger.log();
     }
     // Kick off the scoring
     let requestResult;
     try {
-        const { data } = await requestLighthouseScore(derivedAccountId, {
+        const { data } = await requestLighthouseScore(accountId, {
             themePath: themeToCheck,
         });
         requestResult = data;
@@ -102,14 +102,14 @@ exports.handler = async (options) => {
         const checkScoreStatus = async () => {
             let desktopScoreStatus = 'COMPLETED';
             if (includeDesktopScore) {
-                const { data } = await getLighthouseScoreStatus(derivedAccountId, {
+                const { data } = await getLighthouseScoreStatus(accountId, {
                     themeId: requestResult.desktopId,
                 });
                 desktopScoreStatus = data;
             }
             let mobileScoreStatus = 'COMPLETED';
             if (includeDesktopScore) {
-                const { data } = await getLighthouseScoreStatus(derivedAccountId, {
+                const { data } = await getLighthouseScoreStatus(accountId, {
                     themeId: requestResult.mobileId,
                 });
                 mobileScoreStatus = data;
@@ -132,24 +132,24 @@ exports.handler = async (options) => {
     let mobileScoreResult = {};
     let verboseViewAverageScoreResult = {};
     try {
-        const params = { isAverage: !verbose };
+        const params = { isAverage: !options.verbose };
         if (includeDesktopScore) {
-            const { data } = await getLighthouseScore(derivedAccountId, {
+            const { data } = await getLighthouseScore(accountId, {
                 ...params,
                 desktopId: requestResult.desktopId,
             });
             desktopScoreResult = data;
         }
         if (includeMobileScore) {
-            const { data } = await getLighthouseScore(derivedAccountId, {
+            const { data } = await getLighthouseScore(accountId, {
                 ...params,
                 mobileId: requestResult.mobileId,
             });
             mobileScoreResult = data;
         }
         // This is needed to show the average scores above the verbose output
-        if (verbose) {
-            const { data } = await getLighthouseScore(derivedAccountId, {
+        if (options.verbose) {
+            const { data } = await getLighthouseScore(accountId, {
                 ...params,
                 isAverage: true,
                 desktopId: includeDesktopScore ? requestResult.desktopId : null,
@@ -162,8 +162,8 @@ exports.handler = async (options) => {
         logger.error(i18n(`${i18nKey}.errors.failedToGetLighthouseScore`));
         process.exit(EXIT_CODES.ERROR);
     }
-    if (verbose) {
-        logger.log(`${themeToCheck} ${target} scores`);
+    if (options.verbose) {
+        logger.log(`${themeToCheck} ${options.target} scores`);
         const tableHeader = getTableHeader(DEFAULT_TABLE_HEADER);
         const scores = verboseViewAverageScoreResult.scores
             ? verboseViewAverageScoreResult.scores[0]
@@ -183,7 +183,7 @@ exports.handler = async (options) => {
             'Template path',
             ...DEFAULT_TABLE_HEADER,
         ]);
-        const scoreResult = target === 'desktop' ? desktopScoreResult : mobileScoreResult;
+        const scoreResult = options.target === 'desktop' ? desktopScoreResult : mobileScoreResult;
         const templateTableData = scoreResult.scores.map(score => {
             return [
                 score.templatePath,
@@ -209,7 +209,7 @@ exports.handler = async (options) => {
             });
         }
         logger.log();
-        logger.info(i18n(`${i18nKey}.info.targetDeviceNote`, { target }));
+        logger.info(i18n(`${i18nKey}.info.targetDeviceNote`, { target: options.target }));
     }
     else {
         logger.log(`Theme: ${themeToCheck}`);

package/commands/config/set.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
+const { getAccountId } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
@@ -45,12 +46,12 @@ const handleConfigUpdate = async (accountId, options) => {
 };
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const { derivedAccountId } = options;
-    trackCommandUsage('config-set', null, derivedAccountId);
-    const configUpdated = await handleConfigUpdate(derivedAccountId, options);
+    const accountId = getAccountId(options);
+    trackCommandUsage('config-set', null, accountId);
+    const configUpdated = await handleConfigUpdate(accountId, options);
     if (!configUpdated) {
         const selectedOptions = await selectOptions();
-        await handleConfigUpdate(derivedAccountId, selectedOptions);
+        await handleConfigUpdate(accountId, selectedOptions);
     }
     process.exit(EXIT_CODES.SUCCESS);
 };

package/commands/create.js

@@ -27,7 +27,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require('fs-extra');
 const { logError } = require('../lib/errorHandlers/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { setLogLevel } = require('../lib/commonOpts');
+const { setLogLevel, getAccountId } = require('../lib/commonOpts');
 const { resolveLocalPath } = require('../lib/filesystem');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const assets = require('./create/index');
@@ -63,8 +63,7 @@ exports.handler = async (options) => {
     const asset = assets[assetType];
     const argsToPass = { assetType, name, dest, getInternalVersion, options };
     dest = argsToPass.dest = resolveLocalPath(asset.dest(argsToPass));
-    const { derivedAccountId } = options;
-    trackCommandUsage('create', { assetType }, derivedAccountId);
+    trackCommandUsage('create', { assetType }, getAccountId(options));
     try {
         await fs.ensureDir(dest);
     }

package/commands/customObject/create.js

@@ -6,6 +6,7 @@ const { logError } = require('../../lib/errorHandlers/index');
 const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const { checkAndConvertToJson, loadAndValidateOptions, } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
+const { getAccountId } = require('../../lib/commonOpts');
 const { batchCreateObjects, } = require('@hubspot/local-dev-lib/api/customObjects');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.customObject.subcommands.create';
@@ -13,20 +14,21 @@ const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 exports.command = 'create <name> <definition>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { definition, name, derivedAccountId } = options;
+    const { definition, name } = options;
     await loadAndValidateOptions(options);
-    trackCommandUsage('custom-object-batch-create', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('custom-object-batch-create', null, accountId);
     const filePath = getAbsoluteFilePath(definition);
     const objectJson = checkAndConvertToJson(filePath);
     if (!objectJson) {
         process.exit(EXIT_CODES.ERROR);
     }
     try {
-        await batchCreateObjects(derivedAccountId, name, objectJson);
+        await batchCreateObjects(accountId, name, objectJson);
         logger.success(i18n(`${i18nKey}.success.objectsCreated`));
     }
     catch (e) {
-        logError(e, { accountId: derivedAccountId });
+        logError(e, { accountId });
         logger.error(i18n(`${i18nKey}.errors.creationFailed`, {
             definition,
         }));

package/commands/customObject/schema/create.js

@@ -6,7 +6,7 @@ const { logError } = require('../../../lib/errorHandlers/index');
 const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const { checkAndConvertToJson, loadAndValidateOptions, } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
-const { addTestingOptions } = require('../../../lib/commonOpts');
+const { addTestingOptions, getAccountId } = require('../../../lib/commonOpts');
 const { getEnv, isConfigFlagEnabled, } = require('@hubspot/local-dev-lib/config');
 const { ENVIRONMENTS, } = require('@hubspot/local-dev-lib/constants/environments');
 const { CONFIG_FLAGS } = require('../../../lib/constants');
@@ -19,9 +19,10 @@ const { EXIT_CODES } = require('../../../lib/enums/exitCodes');
 exports.command = 'create <definition>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { definition, derivedAccountId } = options;
+    const { definition } = options;
     await loadAndValidateOptions(options);
-    trackCommandUsage('custom-object-schema-create', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('custom-object-schema-create', null, accountId);
     const filePath = getAbsoluteFilePath(definition);
     const schemaJson = checkAndConvertToJson(filePath);
     if (!schemaJson) {
@@ -29,20 +30,20 @@ exports.handler = async (options) => {
     }
     try {
         if (isConfigFlagEnabled(CONFIG_FLAGS.USE_CUSTOM_OBJECT_HUBFILE)) {
-            await createSchemaFromHubFile(derivedAccountId, filePath);
+            await createSchemaFromHubFile(accountId, filePath);
             logger.success(i18n(`${i18nKey}.success.schemaCreated`, {
-                accountId: derivedAccountId,
+                accountId,
             }));
         }
         else {
-            const { data } = await createObjectSchema(derivedAccountId, schemaJson);
+            const { data } = await createObjectSchema(accountId, schemaJson);
             logger.success(i18n(`${i18nKey}.success.schemaViewable`, {
-                url: `${getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD)}/contacts/${derivedAccountId}/objects/${data.objectTypeId}`,
+                url: `${getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD)}/contacts/${accountId}/objects/${data.objectTypeId}`,
             }));
         }
     }
     catch (e) {
-        logError(e, { accountId: derivedAccountId });
+        logError(e, { accountId });
         logger.error(i18n(`${i18nKey}.errors.creationFailed`, {
             definition,
         }));

package/commands/customObject/schema/delete.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
+const { getAccountId } = require('../../../lib/commonOpts');
 const { deleteObjectSchema, } = require('@hubspot/local-dev-lib/api/customObjects');
 const { i18n } = require('../../../lib/lang');
 const { logError } = require('../../../lib/errorHandlers');
@@ -11,11 +12,12 @@ const i18nKey = 'commands.customObject.subcommands.schema.subcommands.delete';
 exports.command = 'delete <name>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { name, derivedAccountId } = options;
+    const { name } = options;
     await loadAndValidateOptions(options);
-    trackCommandUsage('custom-object-schema-delete', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('custom-object-schema-delete', null, accountId);
     try {
-        await deleteObjectSchema(derivedAccountId, name);
+        await deleteObjectSchema(accountId, name);
         logger.success(i18n(`${i18nKey}.success.delete`, {
             name,
         }));

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
+const { getAccountId } = require('../../../lib/commonOpts');
 const { downloadSchemas, getResolvedPath, } = require('@hubspot/local-dev-lib/customObjects');
 const { i18n } = require('../../../lib/lang');
 const { logSchemas } = require('../../../lib/schema');
@@ -13,10 +14,10 @@ exports.command = 'fetch-all [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const { derivedAccountId } = options;
-    trackCommandUsage('custom-object-schema-fetch-all', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('custom-object-schema-fetch-all', null, accountId);
     try {
-        const schemas = await downloadSchemas(derivedAccountId, options.dest);
+        const schemas = await downloadSchemas(accountId, options.dest);
         logSchemas(schemas);
         logger.success(i18n(`${i18nKey}.success.fetch`, {
             path: getResolvedPath(options.dest),

package/commands/customObject/schema/fetch.js

@@ -10,26 +10,28 @@ const { fetchSchema } = require('@hubspot/local-dev-lib/api/fileTransport');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
+const { getAccountId } = require('../../../lib/commonOpts');
 const { i18n } = require('../../../lib/lang');
 const { logError } = require('../../../lib/errorHandlers');
 const i18nKey = 'commands.customObject.subcommands.schema.subcommands.fetch';
 exports.command = 'fetch <name> [dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { name, dest, derivedAccountId } = options;
+    const { name, dest } = options;
     await loadAndValidateOptions(options);
-    trackCommandUsage('custom-object-schema-fetch', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('custom-object-schema-fetch', null, accountId);
     try {
         if (isConfigFlagEnabled(CONFIG_FLAGS.USE_CUSTOM_OBJECT_HUBFILE)) {
             const fullpath = path.resolve(getCwd(), dest);
-            await fetchSchema(derivedAccountId, name, fullpath);
+            await fetchSchema(accountId, name, fullpath);
             logger.success(i18n(`${i18nKey}.success.save`, {
                 name,
                 path: fullpath,
             }));
         }
         else {
-            await downloadSchema(derivedAccountId, name, dest);
+            await downloadSchema(accountId, name, dest);
             logger.success(i18n(`${i18nKey}.success.savedToPath`, {
                 path: getResolvedPath(dest, name),
             }));

package/commands/customObject/schema/list.js

@@ -5,6 +5,7 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../../../lib/errorHandlers/index');
 const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
+const { getAccountId } = require('../../../lib/commonOpts');
 const { listSchemas } = require('../../../lib/schema');
 const { i18n } = require('../../../lib/lang');
 const i18nKey = 'commands.customObject.subcommands.schema.subcommands.list';
@@ -12,10 +13,10 @@ exports.command = 'list';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const { derivedAccountId } = options;
-    trackCommandUsage('custom-object-schema-list', null, derivedAccountId);
+    const accountId = getAccountId(options);
+    trackCommandUsage('custom-object-schema-list', null, accountId);
     try {
-        await listSchemas(derivedAccountId);
+        await listSchemas(accountId);
     }
     catch (e) {
         logError(e);