@hubspot/cli 6.4.0 → 7.0.0-beta.0

package/commands/project/dev.js

@@ -1,9 +1,8 @@
 "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 { trackCommandUsage } = require('../../lib/usageTracking');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { handleExit } = require('../../lib/process');
 const { i18n } = require('../../lib/lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
@@ -15,17 +14,16 @@ const SpinniesManager = require('../../lib/ui/SpinniesManager');
 const LocalDevManager = require('../../lib/LocalDevManager');
 const { isSandbox, isDeveloperTestAccount, isStandardAccount, isAppDeveloperAccount, } = require('../../lib/accountTypes');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
-const { findProjectComponents, getProjectComponentTypes, COMPONENT_TYPES, } = require('../../lib/projectStructure');
+const { findProjectComponents, getProjectComponentTypes, COMPONENT_TYPES, } = require('../../lib/projects/structure');
 const { confirmDefaultAccountIsTarget, suggestRecommendedNestedAccount, checkIfDefaultAccountIsSupported, createSandboxForLocalDev, createDeveloperTestAccountForLocalDev, createNewProjectForLocalDev, createInitialBuildForNewProject, useExistingDevTestAccount, checkIfAccountFlagIsSupported, checkIfParentAccountIsAuthed, } = require('../../lib/localDev');
 const i18nKey = 'commands.project.subcommands.dev';
-exports.command = 'dev [--account]';
+exports.command = 'dev';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const accountId = getAccountId(options);
-    const accountConfig = getAccountConfig(accountId);
-    const env = getValidEnv(getEnv(accountId));
-    trackCommandUsage('project-dev', null, accountId);
+    const { derivedAccountId, providedAccountId } = options;
+    const accountConfig = getAccountConfig(derivedAccountId);
+    const env = getValidEnv(getEnv(derivedAccountId));
+    trackCommandUsage('project-dev', null, derivedAccountId);
     const { projectConfig, projectDir } = await getProjectConfig();
     uiBetaTag(i18n(`${i18nKey}.logs.betaMessage`));
     logger.log(uiLink(i18n(`${i18nKey}.logs.learnMoreLocalDevServer`), 'https://developers.hubspot.com/docs/platform/project-cli-commands#start-a-local-development-server'));
@@ -53,12 +51,13 @@ exports.handler = async (options) => {
     const accounts = getConfigAccounts();
     const defaultAccountIsRecommendedType = isDeveloperTestAccount(accountConfig) ||
         (!hasPublicApps && isSandbox(accountConfig));
-    // The account that the project must exist in
-    let targetProjectAccountId = options.account ? accountId : null;
+    // targetProjectAccountId and targetTestingAccountId are set to null if --account flag is not provided.
+    // By setting them to null, we can later check if they need to be assigned based on the default account configuration and the type of app.
+    let targetProjectAccountId = providedAccountId ? derivedAccountId : null;
     // The account that we are locally testing against
-    let targetTestingAccountId = options.account ? accountId : null;
+    let targetTestingAccountId = providedAccountId ? derivedAccountId : null;
     // Check that the default account or flag option is valid for the type of app in this project
-    if (options.account) {
+    if (providedAccountId) {
         checkIfAccountFlagIsSupported(accountConfig, hasPublicApps);
         if (hasPublicApps) {
             targetProjectAccountId = accountConfig.parentAccountId;
@@ -69,14 +68,14 @@ exports.handler = async (options) => {
     }
     // The user is targeting an account type that we recommend developing on
     if (!targetProjectAccountId && defaultAccountIsRecommendedType) {
-        targetTestingAccountId = accountId;
+        targetTestingAccountId = derivedAccountId;
         await confirmDefaultAccountIsTarget(accountConfig, hasPublicApps);
         if (hasPublicApps) {
             checkIfParentAccountIsAuthed(accountConfig);
             targetProjectAccountId = accountConfig.parentAccountId;
         }
         else {
-            targetProjectAccountId = accountId;
+            targetProjectAccountId = derivedAccountId;
         }
     }
     let createNewSandbox = false;
@@ -94,13 +93,13 @@ exports.handler = async (options) => {
             isAppDeveloperAccount(accountConfig) && createNestedAccount;
     }
     if (createNewSandbox) {
-        targetProjectAccountId = await createSandboxForLocalDev(accountId, accountConfig, env);
+        targetProjectAccountId = await createSandboxForLocalDev(derivedAccountId, accountConfig, env);
         // We will be running our tests against this new sandbox account
         targetTestingAccountId = targetProjectAccountId;
     }
     if (createNewDeveloperTestAccount) {
-        targetTestingAccountId = await createDeveloperTestAccountForLocalDev(accountId, accountConfig, env);
-        targetProjectAccountId = accountId;
+        targetTestingAccountId = await createDeveloperTestAccountForLocalDev(derivedAccountId, accountConfig, env);
+        targetProjectAccountId = derivedAccountId;
     }
     // eslint-disable-next-line prefer-const
     let { projectExists, project } = await ensureProjectExists(targetProjectAccountId, projectConfig.name, {

package/commands/project/download.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const path = require('path');
 const chalk = require('chalk');
-const { getAccountId, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { getCwd, sanitizeFileName } = require('@hubspot/local-dev-lib/path');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
@@ -11,50 +11,47 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { extractZipArchive } = require('@hubspot/local-dev-lib/archive');
 const { downloadProject, fetchProjectBuilds, } = require('@hubspot/local-dev-lib/api/projects');
 const { ensureProjectExists, getProjectConfig } = require('../../lib/projects');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { downloadProjectPrompt, } = require('../../lib/prompts/downloadProjectPrompt');
 const { i18n } = require('../../lib/lang');
 const { uiBetaTag } = require('../../lib/ui');
 const i18nKey = 'commands.project.subcommands.download';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-exports.command = 'download [--project]';
+exports.command = 'download';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
     const { projectConfig } = await getProjectConfig();
     if (projectConfig) {
         logger.error(i18n(`${i18nKey}.warnings.cannotDownloadWithinProject`));
         process.exit(EXIT_CODES.ERROR);
     }
-    const { project, dest, buildNumber } = options;
+    const { project, dest, build, derivedAccountId } = options;
     const { project: promptedProjectName } = await downloadProjectPrompt(options);
     let projectName = promptedProjectName || project;
-    const accountId = getAccountId(options);
-    trackCommandUsage('project-download', null, accountId);
+    trackCommandUsage('project-download', null, derivedAccountId);
     try {
-        const { projectExists } = await ensureProjectExists(accountId, projectName, {
+        const { projectExists } = await ensureProjectExists(derivedAccountId, projectName, {
             allowCreate: false,
             noLogs: true,
         });
         if (!projectExists) {
             logger.error(i18n(`${i18nKey}.errors.projectNotFound`, {
                 projectName: chalk.bold(projectName),
-                accountId: chalk.bold(accountId),
+                accountId: chalk.bold(derivedAccountId),
             }));
             const { name: promptedProjectName } = await downloadProjectPrompt(options);
             projectName = promptedProjectName || project;
         }
         const absoluteDestPath = dest ? path.resolve(getCwd(), dest) : getCwd();
-        let buildNumberToDownload = buildNumber;
+        let buildNumberToDownload = build;
         if (!buildNumberToDownload) {
-            const { data: projectBuildsResult } = await fetchProjectBuilds(accountId, projectName);
+            const { data: projectBuildsResult } = await fetchProjectBuilds(derivedAccountId, projectName);
             const { results: projectBuilds } = projectBuildsResult;
             if (projectBuilds && projectBuilds.length) {
                 const latestBuild = projectBuilds[0];
                 buildNumberToDownload = latestBuild.buildId;
             }
         }
-        const { data: zippedProject } = await downloadProject(accountId, projectName, buildNumberToDownload);
+        const { data: zippedProject } = await downloadProject(derivedAccountId, projectName, buildNumberToDownload);
         await extractZipArchive(zippedProject, sanitizeFileName(projectName), path.resolve(absoluteDestPath), { includesRootDir: false });
         logger.log(i18n(`${i18nKey}.logs.downloadSucceeded`, {
             buildId: buildNumberToDownload,
@@ -63,11 +60,16 @@ exports.handler = async (options) => {
         process.exit(EXIT_CODES.SUCCESS);
     }
     catch (e) {
-        logError(e, new ApiErrorContext({ accountId, request: 'project download' }));
+        logError(e, new ApiErrorContext({
+            accountId: derivedAccountId,
+            request: 'project download',
+        }));
         process.exit(EXIT_CODES.ERROR);
     }
 };
 exports.builder = yargs => {
+    addAccountOptions(yargs);
+    addConfigOptions(yargs);
     addUseEnvironmentOptions(yargs);
     yargs.options({
         project: {
@@ -78,8 +80,9 @@ exports.builder = yargs => {
             describe: i18n(`${i18nKey}.options.dest.describe`),
             type: 'string',
         },
-        buildNumber: {
-            describe: i18n(`${i18nKey}.options.buildNumber.describe`),
+        build: {
+            describe: i18n(`${i18nKey}.options.build.describe`),
+            alias: ['build-id'],
             type: 'number',
         },
     });

package/commands/project/listBuilds.js

@@ -1,45 +1,49 @@
 "use strict";
 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 } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { fetchProject, fetchProjectBuilds, } = require('@hubspot/local-dev-lib/api/projects');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
-const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { uiBetaTag, uiLink } = require('../../lib/ui');
-const { loadAndValidateOptions } = require('../../lib/validation');
-const { getProjectConfig, getProjectDetailUrl, validateProjectConfig, } = require('../../lib/projects');
+const { getProjectConfig, validateProjectConfig, } = require('../../lib/projects');
+const { getProjectDetailUrl } = require('../../lib/projects/urls');
 const moment = require('moment');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { isHubSpotHttpError } = require('@hubspot/local-dev-lib/errors/index');
 const i18nKey = 'commands.project.subcommands.listBuilds';
-exports.command = 'list-builds [path]';
+exports.command = 'list-builds';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
-    await loadAndValidateOptions(options);
-    const { path: projectPath, limit } = options;
-    const accountId = getAccountId(options);
-    trackCommandUsage('project-list-builds', null, accountId);
-    const cwd = projectPath ? path.resolve(getCwd(), projectPath) : getCwd();
-    const { projectConfig, projectDir } = await getProjectConfig(cwd);
-    validateProjectConfig(projectConfig, projectDir);
-    logger.debug(`Fetching builds for project at path: ${projectPath}`);
+    const { project: projectFlagValue, limit, derivedAccountId } = options;
+    trackCommandUsage('project-list-builds', null, derivedAccountId);
+    let projectName = projectFlagValue;
+    if (!projectName) {
+        const { projectConfig, projectDir } = await getProjectConfig();
+        validateProjectConfig(projectConfig, projectDir);
+        projectName = projectConfig.name;
+    }
     const fetchAndDisplayBuilds = async (project, options) => {
-        const { data: { results, paging }, } = await fetchProjectBuilds(accountId, project.name, options);
+        const { data: { results, paging }, } = await fetchProjectBuilds(derivedAccountId, project.name, options);
         const currentDeploy = project.deployedBuildId;
         if (options && options.after) {
-            logger.log(`Showing the next ${results.length} builds for ${project.name}`);
+            logger.log(i18n(`${i18nKey}.logs.showingNextBuilds`, {
+                count: results.length,
+                projectName: project.name,
+            }));
         }
         else {
-            logger.log(`Showing the ${results.length} most recent builds for ${project.name}. ` +
-                uiLink('View all builds in project details.', getProjectDetailUrl(project.name, accountId)));
+            logger.log(i18n(`${i18nKey}.logs.showingRecentBuilds`, {
+                count: results.length,
+                projectName: project.name,
+                viewBuildsLink: uiLink(i18n(`${i18nKey}.logs.viewAllBuildsLink`), getProjectDetailUrl(project.name, derivedAccountId)),
+            }));
         }
         if (results.length === 0) {
-            logger.log('No builds found.');
+            logger.log(i18n(`${i18nKey}.errors.noBuilds`));
         }
         else {
             const builds = results.map(build => {
@@ -75,40 +79,40 @@ exports.handler = async (options) => {
         if (paging && paging.next) {
             await promptUser({
                 name: 'more',
-                message: 'Press <enter> to load more, or ctrl+c to exit',
+                message: i18n(`${i18nKey}.continueOrExitPrompt`),
             });
             await fetchAndDisplayBuilds(project, { limit, after: paging.next.after });
         }
     };
     try {
-        const { data: project } = await fetchProject(accountId, projectConfig.name);
+        const { data: project } = await fetchProject(derivedAccountId, projectName);
         await fetchAndDisplayBuilds(project, { limit });
     }
     catch (e) {
         if (isHubSpotHttpError(e) && e.status === 404) {
-            logger.error(`Project ${projectConfig.name} not found. `);
+            logger.error(i18n(`${i18nKey}.errors.projectNotFound`, { projectName }));
         }
         else {
-            logError(e, new ApiErrorContext({ accountId, projectName: projectConfig.name }));
+            logError(e, new ApiErrorContext({
+                accountId: derivedAccountId,
+                projectName,
+            }));
         }
     }
 };
 exports.builder = yargs => {
-    yargs.positional('path', {
-        describe: 'Path to a project folder',
-        type: 'string',
-    });
     yargs.options({
+        project: {
+            describe: i18n(`${i18nKey}.options.project.describe`),
+            type: 'string',
+        },
         limit: {
-            describe: 'Max number of builds to load',
+            describe: i18n(`${i18nKey}.options.limit.describe`),
             type: 'string',
         },
     });
     yargs.example([
-        [
-            '$0 project list-builds myProjectFolder',
-            'Fetch a list of builds for a project within the myProjectFolder folder',
-        ],
+        ['$0 project list-builds', i18n(`${i18nKey}.examples.default`)],
     ]);
     addConfigOptions(yargs);
     addAccountOptions(yargs);

package/commands/project/logs.js

@@ -4,17 +4,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const { getEnv } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { ENVIRONMENTS, } = require('@hubspot/local-dev-lib/constants/environments');
-const { getAccountId, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
+const { addUseEnvironmentOptions } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
 const { logError } = require('../../lib/errorHandlers/');
-const { loadAndValidateOptions } = require('../../lib/validation');
 const { uiBetaTag, uiLine, uiLink } = require('../../lib/ui');
 const { projectLogsPrompt } = require('../../lib/prompts/projectsLogsPrompt');
 const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const ProjectLogsManager = require('../../lib/ProjectLogsManager');
+const { ProjectLogsManager } = require('../../lib/projects/ProjectLogsManager');
 const i18nKey = 'commands.project.subcommands.logs';
 const getPrivateAppsUrl = accountId => {
     const baseUrl = getHubSpotWebsiteOrigin(getEnv(accountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD);
@@ -50,11 +49,10 @@ function logPreamble() {
 exports.command = 'logs';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 exports.handler = async (options) => {
-    const accountId = getAccountId(options);
-    trackCommandUsage('project-logs', null, accountId);
-    await loadAndValidateOptions(options);
+    const { derivedAccountId } = options;
+    trackCommandUsage('project-logs', null, derivedAccountId);
     try {
-        await ProjectLogsManager.init(accountId);
+        await ProjectLogsManager.init(derivedAccountId);
         const { functionName } = await projectLogsPrompt({
             functionChoices: ProjectLogsManager.getFunctionNames(),
             promptOptions: options,
@@ -65,7 +63,7 @@ exports.handler = async (options) => {
     }
     catch (e) {
         logError(e, {
-            accountId,
+            accountId: derivedAccountId,
             projectName: ProjectLogsManager.projectName,
         });
         return process.exit(EXIT_CODES.ERROR);

package/commands/project/migrateApp.js

@@ -2,9 +2,8 @@
 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');
 const { i18n } = require('../../lib/lang');
 const { selectPublicAppPrompt, } = require('../../lib/prompts/selectPublicAppPrompt');
@@ -29,11 +28,10 @@ const i18nKey = 'commands.project.subcommands.migrateApp';
 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 +49,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,16 +65,16 @@ exports.handler = async (options) => {
         }
     }
     catch (error) {
-        logError(error, new ApiErrorContext({ accountId }));
+        logError(error, new ApiErrorContext({ accountId: derivedAccountId }));
         process.exit(EXIT_CODES.ERROR);
     }
     let projectName;
-    let projectLocation;
+    let projectDest;
     try {
-        const { name, location } = await createProjectPrompt('', options, true);
+        const { name, dest } = await createProjectPrompt('', options, true);
         projectName = options.name || name;
-        projectLocation = options.location || location;
-        const { projectExists } = await ensureProjectExists(accountId, projectName, {
+        projectDest = options.dest || dest;
+        const { projectExists } = await ensureProjectExists(derivedAccountId, projectName, {
             allowCreate: false,
             noLogs: true,
         });
@@ -88,9 +86,10 @@ exports.handler = async (options) => {
         }
     }
     catch (error) {
-        logError(error, new ApiErrorContext({ accountId }));
+        logError(error, new ApiErrorContext({ accountId: derivedAccountId }));
         process.exit(EXIT_CODES.ERROR);
     }
+    await trackCommandMetadataUsage('migrate-app', { status: 'STARTED' }, derivedAccountId);
     logger.log('');
     uiLine();
     logger.warn(i18n(`${i18nKey}.warning.title`));
@@ -125,17 +124,16 @@ 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 absoluteDestPath = path.resolve(getCwd(), projectDest);
+            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);
             SpinniesManager.succeed('migrateApp', {
                 text: i18n(`${i18nKey}.migrationStatus.done`),
                 succeedColor: 'white',
@@ -144,12 +142,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);
+        await trackCommandMetadataUsage('migrate-app', { status: 'FAILURE' }, derivedAccountId);
         SpinniesManager.fail('migrateApp', {
             text: i18n(`${i18nKey}.migrationStatus.failure`),
             failColor: 'white',
@@ -158,10 +156,12 @@ 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);
     }
+    await trackCommandMetadataUsage('migrate-app', { status: 'SUCCESS' }, derivedAccountId);
+    process.exit(EXIT_CODES.SUCCESS);
 };
 exports.builder = yargs => {
     yargs.options({
@@ -169,11 +169,11 @@ 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',
         },
-        appId: {
+        'app-id': {
             describe: i18n(`${i18nKey}.options.appId.describe`),
             type: 'number',
         },

package/commands/project/open.js

@@ -2,27 +2,25 @@
 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');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getProjectConfig, getProjectDetailUrl, ensureProjectExists, } = require('../../lib/projects');
+const { getProjectConfig, ensureProjectExists } = require('../../lib/projects');
+const { getProjectDetailUrl } = require('../../lib/projects/urls');
 const { projectNamePrompt } = require('../../lib/prompts/projectNamePrompt');
 const { uiBetaTag } = require('../../lib/ui');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const i18nKey = 'commands.project.subcommands.open';
-exports.command = 'open [--project]';
+exports.command = 'open';
 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 +31,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);