@hubspot/cli 6.2.2-experimental.2 → 6.3.0-experimental.0

package/commands/project/migrateApp.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const path = require('path');
-const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage, trackCommandMetadataUsage, } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { createProjectPrompt, } = require('../../lib/prompts/createProjectPrompt');
@@ -30,10 +30,10 @@ exports.command = 'migrate-app';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    const accountConfig = getAccountConfig(accountId);
-    const accountName = uiAccountDescription(accountId);
-    trackCommandUsage('migrate-app', {}, accountId);
+    const { derivedAccountId } = options;
+    const accountConfig = getAccountConfig(derivedAccountId);
+    const accountName = uiAccountDescription(derivedAccountId);
+    trackCommandUsage('migrate-app', {}, derivedAccountId);
     logger.log('');
     logger.log(uiBetaTag(i18n(`${i18nKey}.header.text`), false));
     logger.log(uiLink(i18n(`${i18nKey}.header.link`), 'https://developers.hubspot.com/docs/platform/migrate-a-public-app-to-projects'));
@@ -51,12 +51,12 @@ exports.handler = async (options) => {
     const { appId } = 'appId' in options
         ? options
         : await selectPublicAppPrompt({
-            accountId,
+            accountId: derivedAccountId,
             accountName,
             isMigratingApp: true,
         });
     try {
-        const { data: selectedApp } = await fetchPublicAppMetadata(appId, accountId);
+        const { data: selectedApp } = await fetchPublicAppMetadata(appId, derivedAccountId);
         // preventProjectMigrations returns true if we have not added app to allowlist config.
         // listingInfo will only exist for marketplace apps
         const preventProjectMigrations = selectedApp.preventProjectMigrations;
@@ -67,7 +67,7 @@ exports.handler = async (options) => {
         }
     }
     catch (error) {
-        logError(error, new ApiErrorContext({ accountId }));
+        logError(error, new ApiErrorContext({ accountId: derivedAccountId }));
         process.exit(EXIT_CODES.ERROR);
     }
     let projectName;
@@ -76,7 +76,7 @@ exports.handler = async (options) => {
         const { name, location } = await createProjectPrompt('', options, true);
         projectName = options.name || name;
         projectLocation = options.location || location;
-        const { projectExists } = await ensureProjectExists(accountId, projectName, {
+        const { projectExists } = await ensureProjectExists(derivedAccountId, projectName, {
             allowCreate: false,
             noLogs: true,
         });
@@ -88,7 +88,7 @@ exports.handler = async (options) => {
         }
     }
     catch (error) {
-        logError(error, new ApiErrorContext({ accountId }));
+        logError(error, new ApiErrorContext({ accountId: derivedAccountId }));
         process.exit(EXIT_CODES.ERROR);
     }
     logger.log('');
@@ -125,17 +125,17 @@ exports.handler = async (options) => {
                 process.exit(EXIT_CODES.SUCCESS);
             }
         });
-        const { data: migrateResponse } = await migrateApp(accountId, appId, projectName);
+        const { data: migrateResponse } = await migrateApp(derivedAccountId, appId, projectName);
         const { id } = migrateResponse;
-        const pollResponse = await poll(checkMigrationStatus, accountId, id);
+        const pollResponse = await poll(checkMigrationStatus, derivedAccountId, id);
         const { status, project } = pollResponse;
         if (status === 'SUCCESS') {
             const absoluteDestPath = path.resolve(getCwd(), projectLocation);
-            const { env } = getAccountConfig(accountId);
+            const { env } = accountConfig;
             const baseUrl = getHubSpotWebsiteOrigin(env);
-            const { data: zippedProject } = await downloadProject(accountId, projectName, 1);
+            const { data: zippedProject } = await downloadProject(derivedAccountId, projectName, 1);
             await extractZipArchive(zippedProject, sanitizeFileName(projectName), path.resolve(absoluteDestPath), { includesRootDir: true, hideLogs: true });
-            trackCommandMetadataUsage('migrate-app', { type: projectName, assetType: appId, successful: status }, accountId);
+            trackCommandMetadataUsage('migrate-app', { type: projectName, assetType: appId, successful: status }, derivedAccountId);
             SpinniesManager.succeed('migrateApp', {
                 text: i18n(`${i18nKey}.migrationStatus.done`),
                 succeedColor: 'white',
@@ -144,12 +144,12 @@ exports.handler = async (options) => {
             uiLine();
             logger.success(i18n(`${i18nKey}.migrationStatus.success`));
             logger.log('');
-            logger.log(uiLink(i18n(`${i18nKey}.projectDetailsLink`), `${baseUrl}/developer-projects/${accountId}/project/${encodeURIComponent(project.name)}`));
+            logger.log(uiLink(i18n(`${i18nKey}.projectDetailsLink`), `${baseUrl}/developer-projects/${derivedAccountId}/project/${encodeURIComponent(project.name)}`));
             process.exit(EXIT_CODES.SUCCESS);
         }
     }
     catch (error) {
-        trackCommandMetadataUsage('migrate-app', { projectName, appId, status: 'FAILURE', error }, accountId);
+        trackCommandMetadataUsage('migrate-app', { projectName, appId, status: 'FAILURE', error }, derivedAccountId);
         SpinniesManager.fail('migrateApp', {
             text: i18n(`${i18nKey}.migrationStatus.failure`),
             failColor: 'white',
@@ -158,7 +158,7 @@ exports.handler = async (options) => {
             error.errors.forEach(logError);
         }
         else {
-            logError(error, new ApiErrorContext({ accountId }));
+            logError(error, new ApiErrorContext({ accountId: derivedAccountId }));
         }
         process.exit(EXIT_CODES.ERROR);
     }

package/commands/project/open.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const open = require('open');
-const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, addTestingOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addTestingOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
@@ -16,13 +16,12 @@ exports.command = 'open [--project]';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    const { project } = options;
-    trackCommandUsage('project-open', null, accountId);
+    const { project, derivedAccountId } = options;
+    trackCommandUsage('project-open', null, derivedAccountId);
     const { projectConfig } = await getProjectConfig();
     let projectName = project;
     if (projectName) {
-        const { projectExists } = await ensureProjectExists(accountId, projectName, {
+        const { projectExists } = await ensureProjectExists(derivedAccountId, projectName, {
             allowCreate: false,
         });
         if (!projectExists) {
@@ -33,13 +32,13 @@ exports.handler = async (options) => {
         projectName = projectConfig.name;
     }
     else if (!projectName && !projectConfig) {
-        const namePrompt = await projectNamePrompt(accountId);
+        const namePrompt = await projectNamePrompt(derivedAccountId);
         if (!namePrompt.projectName) {
             process.exit(EXIT_CODES.ERROR);
         }
         projectName = namePrompt.projectName;
     }
-    const url = getProjectDetailUrl(projectName, accountId);
+    const url = getProjectDetailUrl(projectName, derivedAccountId);
     open(url, { url: true });
     logger.success(i18n(`${i18nKey}.success`, { projectName }));
     process.exit(EXIT_CODES.SUCCESS);

package/commands/project/upload.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const chalk = require('chalk');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { uiBetaTag, uiCommandReference } = require('../../lib/ui');
@@ -19,19 +19,18 @@ exports.command = 'upload [path] [--forceCreate] [--message]';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const { forceCreate, path: projectPath, message } = options;
-    const accountId = getAccountId(options);
-    const accountConfig = getAccountConfig(accountId);
+    const { forceCreate, path: projectPath, message, derivedAccountId } = options;
+    const accountConfig = getAccountConfig(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
-    trackCommandUsage('project-upload', { type: accountType }, accountId);
+    trackCommandUsage('project-upload', { type: accountType }, derivedAccountId);
     const { projectConfig, projectDir } = await getProjectConfig(projectPath);
     validateProjectConfig(projectConfig, projectDir);
-    await ensureProjectExists(accountId, projectConfig.name, {
+    await ensureProjectExists(derivedAccountId, projectConfig.name, {
         forceCreate,
         uploadCommand: true,
     });
     try {
-        const result = await handleProjectUpload(accountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message);
+        const result = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message);
         if (result.uploadError) {
             if (isSpecifiedError(result.uploadError, {
                 subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
@@ -42,7 +41,7 @@ exports.handler = async (options) => {
             }
             else {
                 logError(result.uploadError, new ApiErrorContext({
-                    accountId,
+                    accountId: derivedAccountId,
                     request: 'project upload',
                 }));
             }
@@ -56,12 +55,15 @@ exports.handler = async (options) => {
                 deployCommand: uiCommandReference(`hs project deploy --build=${result.buildId}`),
             }));
             logFeedbackMessage(result.buildId);
-            await displayWarnLogs(accountId, projectConfig.name, result.buildId);
+            await displayWarnLogs(derivedAccountId, projectConfig.name, result.buildId);
             process.exit(EXIT_CODES.SUCCESS);
         }
     }
     catch (e) {
-        logError(e, new ApiErrorContext({ accountId, request: 'project upload' }));
+        logError(e, new ApiErrorContext({
+            accountId: derivedAccountId,
+            request: 'project upload',
+        }));
         process.exit(EXIT_CODES.ERROR);
     }
 };

package/commands/project/watch.js

@@ -6,7 +6,7 @@ const { createWatcher } = require('../../lib/projectsWatch');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { PROJECT_ERROR_TYPES } = require('../../lib/constants');
-const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { uiBetaTag } = require('../../lib/ui');
 const { ensureProjectExists, getProjectConfig, handleProjectUpload, pollBuildStatus, pollDeployStatus, validateProjectConfig, logFeedbackMessage, } = require('../../lib/projects');
@@ -58,21 +58,20 @@ const handleUserInput = (accountId, projectName, currentBuildId) => {
 };
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const { initialUpload, path: projectPath } = options;
-    const accountId = getAccountId(options);
-    trackCommandUsage('project-watch', null, accountId);
+    const { initialUpload, path: projectPath, derivedAccountId } = options;
+    trackCommandUsage('project-watch', null, derivedAccountId);
     const { projectConfig, projectDir } = await getProjectConfig(projectPath);
     validateProjectConfig(projectConfig, projectDir);
-    await ensureProjectExists(accountId, projectConfig.name);
+    await ensureProjectExists(derivedAccountId, projectConfig.name);
     try {
-        const { data: { results: builds }, } = await fetchProjectBuilds(accountId, projectConfig.name, options);
+        const { data: { results: builds }, } = await fetchProjectBuilds(derivedAccountId, projectConfig.name, options);
         const hasNoBuilds = !builds || !builds.length;
         const startWatching = async () => {
-            await createWatcher(accountId, projectConfig, projectDir, handleBuildStatus, handleUserInput);
+            await createWatcher(derivedAccountId, projectConfig, projectDir, handleBuildStatus, handleUserInput);
         };
         // Upload all files if no build exists for this project yet
         if (initialUpload || hasNoBuilds) {
-            const result = await handleProjectUpload(accountId, projectConfig, projectDir, startWatching);
+            const result = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, startWatching);
             if (result.uploadError) {
                 if (isSpecifiedError(result.uploadError, {
                     subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
@@ -83,7 +82,7 @@ exports.handler = async (options) => {
                 }
                 else {
                     logError(result.uploadError, new ApiErrorContext({
-                        accountId,
+                        accountId: derivedAccountId,
                         request: 'project upload',
                     }));
                 }
@@ -95,7 +94,7 @@ exports.handler = async (options) => {
         }
     }
     catch (e) {
-        logError(e, new ApiErrorContext({ accountId }));
+        logError(e, new ApiErrorContext({ accountId: derivedAccountId }));
     }
 };
 exports.builder = yargs => {

package/commands/remove.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { deleteFile } = require('@hubspot/local-dev-lib/api/fileMapper');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError, ApiErrorContext } = require('../lib/errorHandlers/index');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../lib/commonOpts');
 const { loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('../lib/lang');
@@ -12,18 +12,20 @@ const i18nKey = 'commands.remove';
 exports.command = 'remove <path>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { path: hsPath } = options;
+    const { path: hsPath, derivedAccountId } = options;
     await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('remove', null, accountId);
+    trackCommandUsage('remove', null, derivedAccountId);
     try {
-        await deleteFile(accountId, hsPath);
-        logger.log(i18n(`${i18nKey}.deleted`, { accountId, path: hsPath }));
+        await deleteFile(derivedAccountId, hsPath);
+        logger.log(i18n(`${i18nKey}.deleted`, { accountId: derivedAccountId, path: hsPath }));
     }
     catch (error) {
-        logger.error(i18n(`${i18nKey}.errors.deleteFailed`, { accountId, path: hsPath }));
+        logger.error(i18n(`${i18nKey}.errors.deleteFailed`, {
+            accountId: derivedAccountId,
+            path: hsPath,
+        }));
         logError(error, new ApiErrorContext({
-            accountId,
+            accountId: derivedAccountId,
             request: hsPath,
         }));
     }

package/commands/sandbox/create.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, addTestingOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addTestingOptions, } = require('../../lib/commonOpts');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
@@ -25,11 +25,10 @@ exports.command = 'create [--name] [--type]';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const { name, type, force } = options;
-    const accountId = getAccountId(options);
-    const accountConfig = getAccountConfig(accountId);
-    const env = getValidEnv(getEnv(accountId));
-    trackCommandUsage('sandbox-create', null, accountId);
+    const { name, type, force, derivedAccountId } = options;
+    const accountConfig = getAccountConfig(derivedAccountId);
+    const env = getValidEnv(getEnv(derivedAccountId));
+    trackCommandUsage('sandbox-create', null, derivedAccountId);
     // Default account is not a production portal
     if (accountConfig.accountType &&
         accountConfig.accountType !== HUBSPOT_ACCOUNT_TYPES.STANDARD) {
@@ -60,12 +59,12 @@ exports.handler = async (options) => {
     catch (err) {
         if (isMissingScopeError(err)) {
             logger.error(i18n('lib.sandbox.create.failure.scopes.message', {
-                accountName: accountConfig.name || accountId,
+                accountName: accountConfig.name || derivedAccountId,
             }));
             const websiteOrigin = getHubSpotWebsiteOrigin(env);
-            const url = `${websiteOrigin}/personal-access-key/${accountId}`;
+            const url = `${websiteOrigin}/personal-access-key/${derivedAccountId}`;
             logger.info(i18n('lib.sandbox.create.failure.scopes.instructions', {
-                accountName: accountConfig.name || accountId,
+                accountName: accountConfig.name || derivedAccountId,
                 url,
             }));
         }

package/commands/sandbox/delete.js

@@ -10,23 +10,24 @@ const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { deleteSandbox } = require('@hubspot/local-dev-lib/api/sandboxHubs');
 const { i18n } = require('../../lib/lang');
 const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
-const { getConfig, getEnv, removeSandboxAccountFromConfig, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
+const { getConfig, getEnv, removeSandboxAccountFromConfig, updateDefaultAccount, getConfigDefaultAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
+const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { promptUser } = require('../../lib/prompts/promptUtils');
+const { uiAccountDescription, uiBetaTag } = require('../../lib/ui');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
-const { uiAccountDescription, uiBetaTag } = require('../../lib/ui');
 const i18nKey = 'commands.sandbox.subcommands.delete';
 exports.command = 'delete [--account]';
 exports.describe = exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
     await loadAndValidateOptions(options, false);
-    const { account, force } = options;
+    const { providedAccountId, force } = options;
     const config = getConfig();
     trackCommandUsage('sandbox-delete', null);
     let accountPrompt;
-    if (!account) {
+    if (!providedAccountId) {
         if (!force) {
             accountPrompt = await deleteSandboxPrompt(config);
         }
@@ -43,13 +44,14 @@ exports.handler = async (options) => {
         }
     }
     const sandboxAccountId = getAccountId({
-        account: account || accountPrompt.account,
+        account: providedAccountId || accountPrompt.account,
     });
-    const isDefaultAccount = sandboxAccountId === getAccountId(config.defaultPortal);
+    const isDefaultAccount = sandboxAccountId === getAccountId(getConfigDefaultAccount(config));
     const baseUrl = getHubSpotWebsiteOrigin(getValidEnv(getEnv(sandboxAccountId)));
     let parentAccountId;
-    for (const portal of config.portals) {
-        if (portal.portalId === sandboxAccountId) {
+    const accountsList = getConfigAccounts();
+    for (const portal of accountsList) {
+        if (getAccountIdentifier(portal) === sandboxAccountId) {
             if (portal.parentAccountId) {
                 parentAccountId = portal.parentAccountId;
             }
@@ -107,7 +109,7 @@ exports.handler = async (options) => {
             : `${i18nKey}.success.delete`;
         logger.log('');
         logger.success(i18n(deleteKey, {
-            account: account || accountPrompt.account,
+            account: providedAccountId || accountPrompt.account,
             sandboxHubId: sandboxAccountId,
         }));
         logger.log('');

package/commands/secrets/addSecret.js

@@ -6,7 +6,7 @@ const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { addSecret } = require('@hubspot/local-dev-lib/api/secrets');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { uiAccountDescription } = require('../../lib/ui');
 const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
 const { i18n } = require('../../lib/lang');
@@ -14,15 +14,14 @@ const i18nKey = 'commands.secrets.subcommands.add';
 exports.command = 'add <name>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { name: secretName } = options;
+    const { name: secretName, derivedAccountId } = options;
     await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('secrets-add', null, accountId);
+    trackCommandUsage('secrets-add', null, derivedAccountId);
     try {
         const { secretValue } = await secretValuePrompt();
-        await addSecret(accountId, secretName, secretValue);
+        await addSecret(derivedAccountId, secretName, secretValue);
         logger.success(i18n(`${i18nKey}.success.add`, {
-            accountIdentifier: uiAccountDescription(accountId),
+            accountIdentifier: uiAccountDescription(derivedAccountId),
             secretName,
         }));
     }
@@ -32,7 +31,7 @@ exports.handler = async (options) => {
         }));
         logError(err, new ApiErrorContext({
             request: 'add secret',
-            accountId,
+            accountId: derivedAccountId,
         }));
     }
 };

package/commands/secrets/deleteSecret.js

@@ -7,20 +7,19 @@ const { deleteSecret } = require('@hubspot/local-dev-lib/api/secrets');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { uiAccountDescription } = require('../../lib/ui');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.secrets.subcommands.delete';
 exports.command = 'delete <name>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { name: secretName } = options;
+    const { name: secretName, derivedAccountId } = options;
     await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('secrets-delete', null, accountId);
+    trackCommandUsage('secrets-delete', null, derivedAccountId);
     try {
-        await deleteSecret(accountId, secretName);
+        await deleteSecret(derivedAccountId, secretName);
         logger.success(i18n(`${i18nKey}.success.delete`, {
-            accountIdentifier: uiAccountDescription(accountId),
+            accountIdentifier: uiAccountDescription(derivedAccountId),
             secretName,
         }));
     }
@@ -30,7 +29,7 @@ exports.handler = async (options) => {
         }));
         logError(err, new ApiErrorContext({
             request: 'delete a secret',
-            accountId,
+            accountId: derivedAccountId,
         }));
     }
 };

package/commands/secrets/listSecrets.js

@@ -7,19 +7,19 @@ const { fetchSecrets } = require('@hubspot/local-dev-lib/api/secrets');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { uiAccountDescription } = require('../../lib/ui');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.secrets.subcommands.list';
 exports.command = 'list';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('secrets-list', null, accountId);
+    const { derivedAccountId } = options;
+    trackCommandUsage('secrets-list', null, derivedAccountId);
     try {
-        const { data: { results }, } = await fetchSecrets(accountId);
+        const { data: { results }, } = await fetchSecrets(derivedAccountId);
         const groupLabel = i18n(`${i18nKey}.groupLabel`, {
-            accountIdentifier: uiAccountDescription(accountId),
+            accountIdentifier: uiAccountDescription(derivedAccountId),
         });
         logger.group(groupLabel);
         results.forEach(secret => logger.log(secret));
@@ -29,7 +29,7 @@ exports.handler = async (options) => {
         logger.error(i18n(`${i18nKey}.errors.list`));
         logError(err, new ApiErrorContext({
             request: 'add secret',
-            accountId,
+            accountId: derivedAccountId,
         }));
     }
 };

package/commands/secrets/updateSecret.js

@@ -7,22 +7,21 @@ const { updateSecret } = require('@hubspot/local-dev-lib/api/secrets');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { uiAccountDescription } = require('../../lib/ui');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.secrets.subcommands.update';
 exports.command = 'update <name>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { name: secretName } = options;
+    const { name: secretName, derivedAccountId } = options;
     await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('secrets-update', null, accountId);
+    trackCommandUsage('secrets-update', null, derivedAccountId);
     try {
         const { secretValue } = await secretValuePrompt();
-        await updateSecret(accountId, secretName, secretValue);
+        await updateSecret(derivedAccountId, secretName, secretValue);
         logger.success(i18n(`${i18nKey}.success.update`, {
-            accountIdentifier: uiAccountDescription(accountId),
+            accountIdentifier: uiAccountDescription(derivedAccountId),
             secretName,
         }));
         logger.log(i18n(`${i18nKey}.success.updateExplanation`));
@@ -33,7 +32,7 @@ exports.handler = async (options) => {
         }));
         logError(err, new ApiErrorContext({
             request: 'update secret',
-            accountId,
+            accountId: derivedAccountId,
         }));
     }
 };

package/commands/theme/marketplace-validate.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } = require('../../lib/marketplaceValidate');
@@ -11,10 +11,9 @@ const i18nKey = 'commands.theme.subcommands.marketplaceValidate';
 exports.command = 'marketplace-validate <src>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { src } = options;
+    const { src, derivedAccountId } = options;
     await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('validate', null, accountId);
+    trackCommandUsage('validate', null, derivedAccountId);
     SpinniesManager.init();
     SpinniesManager.add('marketplaceValidation', {
         text: i18n(`${i18nKey}.logs.validatingTheme`, {
@@ -22,10 +21,10 @@ exports.handler = async (options) => {
         }),
     });
     const assetType = 'THEME';
-    const validationId = await kickOffValidation(accountId, assetType, src);
-    await pollForValidationFinish(accountId, validationId);
+    const validationId = await kickOffValidation(derivedAccountId, assetType, src);
+    await pollForValidationFinish(derivedAccountId, validationId);
     SpinniesManager.remove('marketplaceValidation');
-    const validationResults = await fetchValidationResults(accountId, validationId);
+    const validationResults = await fetchValidationResults(derivedAccountId, validationId);
     processValidationErrors(i18nKey, validationResults);
     displayValidationResults(i18nKey, validationResults);
     process.exit();

package/commands/theme/preview.js

@@ -5,7 +5,7 @@ const fs = require('fs');
 const path = require('path');
 const { i18n } = require('../../lib/lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { addAccountOptions, addConfigOptions, getAccountId, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions } = require('../../lib/commonOpts');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { preview } = require('@hubspot/theme-preview-dev-server');
 const { getUploadableFileList } = require('../../lib/upload');
@@ -89,9 +89,8 @@ const determineSrcAndDest = async (options) => {
     return { absoluteSrc, dest };
 };
 exports.handler = async (options) => {
-    const { notify, skipUpload, noSsl, port, debug, resetSession } = options;
+    const { notify, skipUpload, noSsl, port, debug, derivedAccountId, resetSession, } = options;
     await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
     const { absoluteSrc, dest } = await determineSrcAndDest(options);
     const filePaths = await getUploadableFileList(absoluteSrc, false);
     const startProgressBar = numFiles => {
@@ -133,7 +132,7 @@ exports.handler = async (options) => {
                     if (result.resultType == FILE_UPLOAD_RESULT_TYPES.FAILURE) {
                         logger.error('Uploading file "%s" to "%s" failed', result.file, dest);
                         logError(result.error, new ApiErrorContext({
-                            accountId,
+                            accountId: derivedAccountId,
                             request: dest,
                             payload: result.file,
                         }));
@@ -143,8 +142,8 @@ exports.handler = async (options) => {
         };
         return uploadOptions;
     };
-    trackCommandUsage('preview', accountId);
-    preview(accountId, absoluteSrc, dest, {
+    trackCommandUsage('preview', derivedAccountId);
+    preview(derivedAccountId, absoluteSrc, dest, {
         notify,
         filePaths,
         skipUpload,