@hubspot/cli 6.4.0 → 7.0.0-beta.0

package/commands/logs.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addGlobalOptions, } = require('../lib/commonOpts');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { outputLogs } = require('../lib/ui/serverlessFunctionLogs');
 const { getFunctionLogs, getLatestFunctionLog, } = require('@hubspot/local-dev-lib/api/functions');
 const { tailLogs } = require('../lib/serverlessLogs');
-const { loadAndValidateOptions } = require('../lib/validation');
 const { i18n } = require('../lib/lang');
+const { promptUser } = require('../lib/prompts/promptUtils');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { isHubSpotHttpError } = require('@hubspot/local-dev-lib/errors/index');
 const i18nKey = 'commands.logs';
@@ -20,8 +20,15 @@ const handleLogsError = (e, accountId, functionPath) => {
         }));
     }
 };
-const endpointLog = async (accountId, options) => {
-    const { latest, follow, compact, endpoint: functionPath } = options;
+const endpointLog = async (accountId, functionPath, options) => {
+    const { limit, latest, follow, compact } = options;
+    const requestOptions = {
+        limit,
+        latest,
+        follow,
+        compact,
+        endpoint: functionPath,
+    };
     logger.debug(i18n(`${i18nKey}.gettingLogs`, {
         latest,
         functionPath,
@@ -57,7 +64,7 @@ const endpointLog = async (accountId, options) => {
     }
     else {
         try {
-            const { data } = await getFunctionLogs(accountId, functionPath, options);
+            const { data } = await getFunctionLogs(accountId, functionPath, requestOptions);
             logsResp = data;
         }
         catch (e) {
@@ -66,17 +73,20 @@ const endpointLog = async (accountId, options) => {
         }
     }
     if (logsResp) {
-        return outputLogs(logsResp, options);
+        return outputLogs(logsResp, requestOptions);
     }
 };
 exports.command = 'logs [endpoint]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const { latest } = options;
-    const accountId = getAccountId(options);
-    trackCommandUsage('logs', { latest }, accountId);
-    endpointLog(accountId, options);
+    const { endpoint: endpointArgValue, latest, derivedAccountId } = options;
+    trackCommandUsage('logs', { latest }, derivedAccountId);
+    const { endpointPromptValue } = await promptUser({
+        name: 'endpointPromptValue',
+        message: i18n(`${i18nKey}.endpointPrompt`),
+        when: !endpointArgValue,
+    });
+    endpointLog(derivedAccountId, endpointArgValue || endpointPromptValue, options);
 };
 exports.builder = yargs => {
     yargs.positional('endpoint', {
@@ -95,18 +105,16 @@ exports.builder = yargs => {
             type: 'boolean',
         },
         follow: {
-            alias: ['t', 'tail', 'f'],
+            alias: ['f'],
             describe: i18n(`${i18nKey}.options.follow.describe`),
             type: 'boolean',
         },
         limit: {
-            alias: ['limit', 'n', 'max-count'],
             describe: i18n(`${i18nKey}.options.limit.describe`),
             type: 'number',
         },
     })
-        .conflicts('follow', 'limit')
-        .conflicts('functionName', 'endpoint');
+        .conflicts('follow', 'limit');
     yargs.example([
         ['$0 logs my-endpoint', i18n(`${i18nKey}.examples.default`)],
         ['$0 logs my-endpoint --limit=10', i18n(`${i18nKey}.examples.limit`)],
@@ -115,5 +123,6 @@ exports.builder = yargs => {
     addConfigOptions(yargs);
     addAccountOptions(yargs);
     addUseEnvironmentOptions(yargs);
+    addGlobalOptions(yargs);
     return yargs;
 };

package/commands/module/marketplace-validate.js

@@ -2,8 +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 { loadAndValidateOptions } = require('../../lib/validation');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } = require('../../lib/marketplaceValidate');
 const { i18n } = require('../../lib/lang');
@@ -11,10 +10,8 @@ const i18nKey = 'commands.module.subcommands.marketplaceValidate';
 exports.command = 'marketplace-validate <src>';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { src } = options;
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    trackCommandUsage('validate', null, accountId);
+    const { src, derivedAccountId } = options;
+    trackCommandUsage('validate', null, derivedAccountId);
     SpinniesManager.init();
     SpinniesManager.add('marketplaceValidation', {
         text: i18n(`${i18nKey}.logs.validatingModule`, {
@@ -22,10 +19,10 @@ exports.handler = async (options) => {
         }),
     });
     const assetType = 'MODULE';
-    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/module.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const marketplaceValidate = require('./module/marketplace-validate');
-const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addGlobalOptions, } = require('../lib/commonOpts');
 // const { i18n } = require('../lib/lang');
 // const i18nKey = 'commands.module';
 exports.command = 'module';
@@ -10,6 +10,7 @@ exports.describe = false; //i18n(`${i18nKey}.describe`);
 exports.builder = yargs => {
     addConfigOptions(yargs);
     addAccountOptions(yargs);
+    addGlobalOptions(yargs);
     yargs.command(marketplaceValidate).demandCommand(1, '');
     return yargs;
 };

package/commands/mv.js

@@ -5,10 +5,9 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { moveFile } = require('@hubspot/local-dev-lib/api/fileMapper');
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { logError, ApiErrorContext } = require('../lib/errorHandlers/index');
-const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../lib/commonOpts');
+const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, addGlobalOptions, } = require('../lib/commonOpts');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { isPathFolder } = require('../lib/filesystem');
-const { loadAndValidateOptions } = require('../lib/validation');
 const { i18n } = require('../lib/lang');
 const { uiBetaTag } = require('../lib/ui');
 const i18nKey = 'commands.mv';
@@ -22,21 +21,19 @@ const getCorrectedDestPath = (srcPath, destPath) => {
 exports.command = 'mv <srcPath> <destPath>';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const { srcPath, destPath } = options;
-    const accountId = getAccountId(options);
-    trackCommandUsage('mv', null, accountId);
+    const { srcPath, destPath, derivedAccountId } = options;
+    trackCommandUsage('mv', null, derivedAccountId);
     try {
-        await moveFile(accountId, srcPath, getCorrectedDestPath(srcPath, destPath));
+        await moveFile(derivedAccountId, srcPath, getCorrectedDestPath(srcPath, destPath));
         logger.success(i18n(`${i18nKey}.move`, {
-            accountId,
+            accountId: derivedAccountId,
             destPath,
             srcPath,
         }));
     }
     catch (error) {
         logger.error(i18n(`${i18nKey}.errors.moveFailed`, {
-            accountId,
+            accountId: derivedAccountId,
             destPath,
             srcPath,
         }));
@@ -48,7 +45,7 @@ exports.handler = async (options) => {
         }
         else {
             logError(error, new ApiErrorContext({
-                accountId,
+                accountId: derivedAccountId,
                 srcPath,
                 destPath,
             }));
@@ -56,9 +53,6 @@ exports.handler = async (options) => {
     }
 };
 exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
     yargs.positional('srcPath', {
         describe: 'Remote hubspot path',
         type: 'string',
@@ -67,5 +61,9 @@ exports.builder = yargs => {
         describe: 'Remote hubspot path',
         type: 'string',
     });
+    addConfigOptions(yargs);
+    addAccountOptions(yargs);
+    addUseEnvironmentOptions(yargs);
+    addGlobalOptions(yargs);
     return yargs;
 };

package/commands/open.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../lib/commonOpts');
+const exitCodes_1 = require("../lib/enums/exitCodes");
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addGlobalOptions, } = require('../lib/commonOpts');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { logSiteLinks, getSiteLinksAsArray, openLink } = require('../lib/links');
 const { promptUser } = require('../lib/prompts/promptUtils');
@@ -22,20 +23,19 @@ const createListPrompt = async (accountId) => promptUser([
 exports.command = 'open [shortcut]';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
-    const { shortcut, list } = options;
-    const accountId = getAccountId(options);
-    trackCommandUsage('open', null, accountId);
+    const { shortcut, list, derivedAccountId } = options;
+    trackCommandUsage('open', null, derivedAccountId);
     if (shortcut === undefined && !list) {
-        const choice = await createListPrompt(accountId);
-        openLink(accountId, choice.open);
+        const choice = await createListPrompt(derivedAccountId);
+        openLink(derivedAccountId, choice.open);
     }
-    else if (list || shortcut === 'list') {
-        logSiteLinks(accountId);
-        return;
+    else if (list) {
+        logSiteLinks(derivedAccountId);
     }
     else {
-        openLink(accountId, shortcut);
+        openLink(derivedAccountId, shortcut);
     }
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 };
 exports.builder = yargs => {
     yargs.positional('[shortcut]', {
@@ -57,5 +57,6 @@ exports.builder = yargs => {
     addConfigOptions(yargs);
     addAccountOptions(yargs);
     addUseEnvironmentOptions(yargs);
+    addGlobalOptions(yargs);
     return yargs;
 };

package/commands/project/add.js

@@ -2,25 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { logError } = require('../../lib/errorHandlers/index');
 const { fetchReleaseData } = require('@hubspot/local-dev-lib/github');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const { projectAddPrompt } = require('../../lib/prompts/projectAddPrompt');
 const { createProjectComponent, getProjectComponentsByVersion, } = require('../../lib/projects');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { uiBetaTag } = require('../../lib/ui');
 const { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, } = require('../../lib/constants');
 const i18nKey = 'commands.project.subcommands.add';
 exports.command = 'add';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
+    const { derivedAccountId } = options;
     logger.log('');
     logger.log(i18n(`${i18nKey}.creatingComponent.message`));
     logger.log('');
-    const accountId = getAccountId(options);
     const releaseData = await fetchReleaseData(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH);
     const projectComponentsVersion = releaseData.tag_name;
     const components = await getProjectComponentsByVersion(projectComponentsVersion);
@@ -29,7 +26,7 @@ exports.handler = async (options) => {
     if (!component) {
         component = components.find(t => t.path === options.type);
     }
-    trackCommandUsage('project-add', null, accountId);
+    trackCommandUsage('project-add', null, derivedAccountId);
     try {
         await createProjectComponent(component, name, projectComponentsVersion);
         logger.log('');

package/commands/project/cloneApp.js

@@ -3,9 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const path = require('path');
 const fs = require('fs');
-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 { i18n } = require('../../lib/lang');
 const { selectPublicAppPrompt, } = require('../../lib/prompts/selectPublicAppPrompt');
 const { createProjectPrompt, } = require('../../lib/prompts/createProjectPrompt');
@@ -26,11 +25,10 @@ const i18nKey = 'commands.project.subcommands.cloneApp';
 exports.command = 'clone-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('clone-app', {}, accountId);
+    const { derivedAccountId } = options;
+    const accountConfig = getAccountConfig(derivedAccountId);
+    const accountName = uiAccountDescription(derivedAccountId);
+    trackCommandUsage('clone-app', {}, derivedAccountId);
     if (!isAppDeveloperAccount(accountConfig)) {
         uiLine();
         logger.error(i18n(`${i18nKey}.errors.invalidAccountTypeTitle`));
@@ -42,58 +40,54 @@ exports.handler = async (options) => {
         process.exit(EXIT_CODES.SUCCESS);
     }
     let appId;
-    let name;
-    let location;
+    let projectName;
+    let projectDest;
     try {
         appId = options.appId;
         if (!appId) {
             const appIdResponse = await selectPublicAppPrompt({
-                accountId,
+                accountId: derivedAccountId,
                 accountName,
                 options,
                 isMigratingApp: false,
             });
             appId = appIdResponse.appId;
         }
-        const projectResponse = await createProjectPrompt('', options, true);
-        name = projectResponse.name;
-        location = projectResponse.location;
+        const { name, dest } = await createProjectPrompt('', options, true);
+        projectName = name;
+        projectDest = options.dest || dest;
     }
     catch (error) {
-        logError(error, new ApiErrorContext({ accountId }));
+        logError(error, new ApiErrorContext({ accountId: derivedAccountId }));
         process.exit(EXIT_CODES.ERROR);
     }
+    await trackCommandMetadataUsage('clone-app', { status: 'STARTED' }, derivedAccountId);
     try {
         SpinniesManager.init();
         SpinniesManager.add('cloneApp', {
             text: i18n(`${i18nKey}.cloneStatus.inProgress`),
         });
-        const { data: { exportId }, } = await cloneApp(accountId, appId);
-        const { status } = await poll(checkCloneStatus, accountId, exportId);
+        const { data: { exportId }, } = await cloneApp(derivedAccountId, appId);
+        const { status } = await poll(checkCloneStatus, derivedAccountId, exportId);
         if (status === 'SUCCESS') {
             // Ensure correct project folder structure exists
-            const baseDestPath = path.resolve(getCwd(), location);
+            const baseDestPath = path.resolve(getCwd(), projectDest);
             const absoluteDestPath = path.resolve(baseDestPath, 'src', 'app');
             fs.mkdirSync(absoluteDestPath, { recursive: true });
             // Extract zipped app files and place them in correct directory
-            const { data: zippedApp } = await downloadClonedProject(accountId, exportId);
-            await extractZipArchive(zippedApp, sanitizeFileName(name), absoluteDestPath, {
+            const { data: zippedApp } = await downloadClonedProject(derivedAccountId, exportId);
+            await extractZipArchive(zippedApp, sanitizeFileName(projectName), absoluteDestPath, {
                 includesRootDir: true,
                 hideLogs: true,
             });
             // Create hsproject.json file
             const configPath = path.join(baseDestPath, PROJECT_CONFIG_FILE);
             const configContent = {
-                name,
+                name: projectName,
                 srcDir: 'src',
                 platformVersion: '2023.2',
             };
             const success = writeProjectConfig(configPath, configContent);
-            trackCommandMetadataUsage('clone-app', {
-                type: name,
-                assetType: appId,
-                successful: success,
-            }, accountId);
             SpinniesManager.succeed('cloneApp', {
                 text: i18n(`${i18nKey}.cloneStatus.done`),
                 succeedColor: 'white',
@@ -103,33 +97,35 @@ exports.handler = async (options) => {
             }
             logger.log('');
             uiLine();
-            logger.success(i18n(`${i18nKey}.cloneStatus.success`, { location }));
+            logger.success(i18n(`${i18nKey}.cloneStatus.success`, { dest }));
             logger.log('');
             process.exit(EXIT_CODES.SUCCESS);
         }
     }
     catch (error) {
-        trackCommandMetadataUsage('clone-app', { projectName: name, appId, status: 'FAILURE', error }, accountId);
+        await trackCommandMetadataUsage('clone-app', { status: 'FAILURE' }, derivedAccountId);
         SpinniesManager.fail('cloneApp', {
             text: i18n(`${i18nKey}.cloneStatus.failure`),
             failColor: 'white',
         });
         // Migrations endpoints return a response object with an errors property. The errors property contains an array of errors.
         if (error.errors && Array.isArray(error.errors)) {
-            error.errors.forEach(e => logError(e, new ApiErrorContext({ accountId })));
+            error.errors.forEach(e => logError(e, new ApiErrorContext({ accountId: derivedAccountId })));
         }
         else {
-            logError(error, new ApiErrorContext({ accountId }));
+            logError(error, new ApiErrorContext({ accountId: derivedAccountId }));
         }
     }
+    await trackCommandMetadataUsage('clone-app', { status: 'SUCCESS' }, derivedAccountId);
+    process.exit(EXIT_CODES.SUCCESS);
 };
 exports.builder = yargs => {
     yargs.options({
-        location: {
-            describe: i18n(`${i18nKey}.options.location.describe`),
+        dest: {
+            describe: i18n(`${i18nKey}.options.dest.describe`),
             type: 'string',
         },
-        appId: {
+        'app-id': {
             describe: i18n(`${i18nKey}.options.appId.describe`),
             type: 'number',
         },

package/commands/project/create.js

@@ -1,9 +1,8 @@
 "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 { trackCommandUsage } = require('../../lib/usageTracking');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
 const path = require('path');
 const chalk = require('chalk');
@@ -18,17 +17,16 @@ const i18nKey = 'commands.project.subcommands.create';
 exports.command = 'create';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
+    const { derivedAccountId } = options;
     const hasCustomTemplateSource = Boolean(options.templateSource);
     let githubRef = '';
     if (!hasCustomTemplateSource) {
         const releaseData = await fetchReleaseData(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH);
         githubRef = releaseData.tag_name;
     }
-    const { name, template, location } = await createProjectPrompt(githubRef, options);
-    trackCommandUsage('project-create', { type: template.name }, accountId);
-    await createProjectConfig(path.resolve(getCwd(), options.location || location), options.name || name, template, options.templateSource, githubRef);
+    const { name, template, dest } = await createProjectPrompt(githubRef, options);
+    trackCommandUsage('project-create', { type: template.name }, derivedAccountId);
+    await createProjectConfig(path.resolve(getCwd(), options.dest || dest), options.name || name, template, options.templateSource, githubRef);
     logger.log('');
     logger.log(chalk.bold(i18n(`${i18nKey}.logs.welcomeMessage`)));
     uiFeatureHighlight([
@@ -44,15 +42,15 @@ exports.builder = yargs => {
             describe: i18n(`${i18nKey}.options.name.describe`),
             type: 'string',
         },
-        location: {
-            describe: i18n(`${i18nKey}.options.location.describe`),
+        dest: {
+            describe: i18n(`${i18nKey}.options.dest.describe`),
             type: 'string',
         },
         template: {
             describe: i18n(`${i18nKey}.options.template.describe`),
             type: 'string',
         },
-        templateSource: {
+        'template-source': {
             describe: i18n(`${i18nKey}.options.templateSource.describe`),
             type: 'string',
         },

package/commands/project/deploy.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const chalk = require('chalk');
-const { addAccountOptions, addConfigOptions, getAccountId, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { deployProject, fetchProject, } = require('@hubspot/local-dev-lib/api/projects');
-const { loadAndValidateOptions } = require('../../lib/validation');
-const { getProjectConfig, pollDeployStatus, getProjectDetailUrl, } = require('../../lib/projects');
+const { getProjectConfig } = require('../../lib/projects');
+const { pollDeployStatus } = require('../../lib/projects/buildAndDeploy');
+const { getProjectDetailUrl } = require('../../lib/projects/urls');
 const { projectNamePrompt } = require('../../lib/prompts/projectNamePrompt');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { i18n } = require('../../lib/lang');
@@ -37,18 +38,17 @@ const validateBuildId = (buildId, deployedBuildId, latestBuildId, projectName, a
     return true;
 };
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    const accountConfig = getAccountConfig(accountId);
+    const { derivedAccountId } = options;
+    const accountConfig = getAccountConfig(derivedAccountId);
     const { project: projectOption, buildId: buildIdOption } = options;
     const accountType = accountConfig && accountConfig.accountType;
-    trackCommandUsage('project-deploy', { type: accountType }, accountId);
+    trackCommandUsage('project-deploy', { type: accountType }, derivedAccountId);
     const { projectConfig } = await getProjectConfig();
     let projectName = projectOption;
     if (!projectOption && projectConfig) {
         projectName = projectConfig.name;
     }
-    const namePromptResponse = await projectNamePrompt(accountId, {
+    const namePromptResponse = await projectNamePrompt(derivedAccountId, {
         project: projectName,
     });
     if (!projectName && namePromptResponse.projectName) {
@@ -56,13 +56,13 @@ exports.handler = async (options) => {
     }
     let buildIdToDeploy = buildIdOption;
     try {
-        const { data: { latestBuild, deployedBuildId }, } = await fetchProject(accountId, projectName);
+        const { data: { latestBuild, deployedBuildId }, } = await fetchProject(derivedAccountId, projectName);
         if (!latestBuild || !latestBuild.buildId) {
             logger.error(i18n(`${i18nKey}.errors.noBuilds`));
             return process.exit(EXIT_CODES.ERROR);
         }
         if (buildIdToDeploy) {
-            const validationResult = validateBuildId(buildIdToDeploy, deployedBuildId, latestBuild.buildId, projectName, accountId);
+            const validationResult = validateBuildId(buildIdToDeploy, deployedBuildId, latestBuild.buildId, projectName, derivedAccountId);
             if (validationResult !== true) {
                 logger.error(validationResult);
                 return process.exit(EXIT_CODES.ERROR);
@@ -75,7 +75,7 @@ exports.handler = async (options) => {
                 default: latestBuild.buildId === deployedBuildId
                     ? undefined
                     : latestBuild.buildId,
-                validate: () => validateBuildId(buildId, deployedBuildId, latestBuild.buildId, projectName, accountId),
+                validate: buildId => validateBuildId(buildId, deployedBuildId, latestBuild.buildId, projectName, derivedAccountId),
             });
             buildIdToDeploy = deployBuildIdPromptResponse.buildId;
         }
@@ -83,20 +83,20 @@ exports.handler = async (options) => {
             logger.error(i18n(`${i18nKey}.errors.noBuildId`));
             return process.exit(EXIT_CODES.ERROR);
         }
-        const { data: deployResp } = await deployProject(accountId, projectName, buildIdToDeploy);
+        const { data: deployResp } = await deployProject(derivedAccountId, projectName, buildIdToDeploy);
         if (!deployResp || deployResp.error) {
             logger.error(i18n(`${i18nKey}.errors.deploy`, {
                 details: deployResp.error.message,
             }));
             return process.exit(EXIT_CODES.ERROR);
         }
-        await pollDeployStatus(accountId, projectName, deployResp.id, buildIdToDeploy);
+        await pollDeployStatus(derivedAccountId, projectName, deployResp.id, buildIdToDeploy);
     }
     catch (e) {
         if (isHubSpotHttpError(e) && e.status === 404) {
             logger.error(i18n(`${i18nKey}.errors.projectNotFound`, {
                 projectName: chalk.bold(projectName),
-                accountIdentifier: uiAccountDescription(accountId),
+                accountIdentifier: uiAccountDescription(derivedAccountId),
                 command: uiCommandReference('hs project upload'),
             }));
         }
@@ -104,7 +104,10 @@ exports.handler = async (options) => {
             logger.error(e.message);
         }
         else {
-            logError(e, new ApiErrorContext({ accountId, request: 'project deploy' }));
+            logError(e, new ApiErrorContext({
+                accountId: derivedAccountId,
+                request: 'project deploy',
+            }));
         }
         return process.exit(EXIT_CODES.ERROR);
     }
@@ -116,7 +119,7 @@ exports.builder = yargs => {
             type: 'string',
         },
         build: {
-            alias: ['buildId'],
+            alias: ['build-id'],
             describe: i18n(`${i18nKey}.options.build.describe`),
             type: 'number',
         },