@hubspot/cli 4.0.1-beta.2 → 4.0.1-beta.5

package/README.md

@@ -133,7 +133,7 @@ hs hubdb delete <id or name>
 
 ## Authentication
 
-There are three ways that the tools can authenticate with HubSpot.
+There are two ways that the tools can authenticate with HubSpot.
 
 ### Personal Access Key (recommended)
 
@@ -146,20 +146,6 @@ There are three ways that the tools can authenticate with HubSpot.
 3. Select `OAuth2` and follow the steps
 
 _**Note:** The Account ID used should be the Test Account ID (not the developer app ID). Client ID and Client Secret are from the developer app._
-
-### HubSpot API Key
-
-1. [Set up an API Key for the Account](https://knowledge.hubspot.com/articles/kcs_article/integrations/how-do-i-get-my-hubspot-api-key)
-2. Edit the [hubspot.config.yml](../../docs/HubspotConfigFile.md) file to set the `authType` for the account to `apikey` and add `apiKey` as shown below:
-
-```yaml
-defaultPortal: DEV
-portals:
-  - name: DEV
-    portalId: 123
-    authType: apikey
-    apiKey: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
-```
 ### Exit Codes
 
 The CLI will exit with one of the following exit codes:

package/bin/cli.js

@@ -35,6 +35,7 @@ const moduleCommand = require('../commands/module');
 const configCommand = require('../commands/config');
 const accountsCommand = require('../commands/accounts');
 const sandboxesCommand = require('../commands/sandbox');
+const cmsCommand = require('../commands/cms');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
 const notifier = updateNotifier({ pkg: { ...pkg, name: '@hubspot/cli' } });
@@ -129,6 +130,7 @@ const argv = yargs
   .command(authCommand)
   .command(initCommand)
   .command(logsCommand)
+  .command(cmsCommand)
   .command(lintCommand)
   .command(hubdbCommand)
   .command(watchCommand)

package/commands/accounts/use.js

@@ -5,47 +5,24 @@ const {
   updateDefaultAccount,
   getAccountId: getAccountIdFromConfig,
 } = require('@hubspot/cli-lib/lib/config');
-const { loadAndValidateOptions } = require('../../lib/validation');
 
-const { getAccountId } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { promptUser } = require('../../lib/prompts/promptUtils');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
+const { loadAndValidateOptions } = require('../../lib/validation');
 
 const i18nKey = 'cli.commands.accounts.subcommands.use';
 
-const selectAccountFromConfig = async config => {
-  const { default: selectedDefault } = await promptUser([
-    {
-      type: 'list',
-      look: false,
-      name: 'default',
-      pageSize: 20,
-      message: i18n(`${i18nKey}.promptMessage`),
-      choices: config.portals.map(p => ({
-        name: `${p.name} (${p.portalId})`,
-        value: p.name || p.portalId,
-      })),
-      default: config.defaultPortal,
-    },
-  ]);
-
-  return selectedDefault;
-};
-
 exports.command = 'use [--account]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
-  await loadAndValidateOptions({ debug: options.debug });
+  await loadAndValidateOptions(options, false);
 
-  const accountId = getAccountId(options);
   const config = getConfig();
 
   let newDefaultAccount = options.account;
 
-  trackCommandUsage('accounts-use', {}, accountId);
-
   if (!newDefaultAccount) {
     newDefaultAccount = await selectAccountFromConfig(config);
   } else if (!getAccountIdFromConfig(newDefaultAccount)) {
@@ -58,6 +35,12 @@ exports.handler = async options => {
     newDefaultAccount = await selectAccountFromConfig(config);
   }
 
+  trackCommandUsage(
+    'accounts-use',
+    {},
+    getAccountIdFromConfig(newDefaultAccount)
+  );
+
   updateDefaultAccount(newDefaultAccount);
 
   return logger.success(

package/commands/auth.js

@@ -3,7 +3,6 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const {
   OAUTH_AUTH_METHOD,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
-  API_KEY_AUTH_METHOD,
   ENVIRONMENTS,
   DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
 } = require('@hubspot/cli-lib/lib/constants');
@@ -22,7 +21,6 @@ const { promptUser } = require('../lib/prompts/promptUtils');
 const {
   personalAccessKeyPrompt,
   OAUTH_FLOW,
-  API_KEY_FLOW,
 } = require('../lib/prompts/personalAccessKeyPrompt');
 const {
   enterAccountNamePrompt,
@@ -80,25 +78,6 @@ exports.handler = async options => {
   let successAuthMethod;
 
   switch (authType) {
-    case API_KEY_AUTH_METHOD.value:
-      configData = await promptUser(API_KEY_FLOW);
-      updatedConfig = await updateAccountConfig(configData);
-      validName = updatedConfig.name;
-
-      if (!validName) {
-        const { name: namePrompt } = await enterAccountNamePrompt();
-        validName = namePrompt;
-      }
-
-      updateAccountConfig({
-        ...updatedConfig,
-        environment: updatedConfig.env,
-        name: validName,
-      });
-      writeConfig();
-
-      successAuthMethod = API_KEY_AUTH_METHOD.name;
-      break;
     case OAUTH_AUTH_METHOD.value:
       configData = await promptUser(OAUTH_FLOW);
       await authenticateWithOauth({
@@ -188,7 +167,6 @@ exports.builder = yargs => {
     choices: [
       `${PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
       `${OAUTH_AUTH_METHOD.value}`,
-      `${API_KEY_AUTH_METHOD.value}`,
     ],
     default: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
     defaultDescription: i18n(`${i18nKey}.positionals.type.defaultDescription`, {

package/commands/cms/lighthouseScore.js

@@ -0,0 +1,325 @@
+//const chalk = require('chalk');
+const Spinnies = require('spinnies');
+const {
+  addAccountOptions,
+  addConfigOptions,
+  addUseEnvironmentOptions,
+  getAccountId,
+} = require('../../lib/commonOpts');
+const { logger } = require('@hubspot/cli-lib/logger');
+const {
+  getTableContents,
+  getTableHeader,
+} = require('@hubspot/cli-lib/lib/table');
+const { loadAndValidateOptions } = require('../../lib/validation');
+const { promptUser } = require('../../lib/prompts/promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { fetchThemes } = require('@hubspot/cli-lib/api/designManager');
+const {
+  requestLighthouseScore,
+  getLighthouseScoreStatus,
+  getLighthouseScore,
+} = require('@hubspot/cli-lib/api/lighthouseScore');
+const {
+  HUBSPOT_FOLDER,
+  MARKETPLACE_FOLDER,
+} = require('@hubspot/cli-lib/lib/constants');
+const { uiLink } = require('../../lib/ui');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+
+const i18nKey = 'cli.commands.cms.subcommands.lighthouseScore';
+
+const DEFAULT_TABLE_HEADER = [
+  'Accessibility',
+  'Best practices',
+  'Performace',
+  'PWA',
+  'SEO',
+];
+
+exports.command = 'lighthouse-score [--theme]';
+exports.describe = i18n(`${i18nKey}.describe`);
+
+const selectTheme = async accountId => {
+  const { theme: selectedTheme } = await promptUser([
+    {
+      type: 'list',
+      look: false,
+      name: 'theme',
+      message: i18n(`${i18nKey}.info.promptMessage`),
+      choices: async () => {
+        try {
+          const result = await fetchThemes(accountId, {
+            limit: 500,
+            sorting: 'MOST_USED',
+          });
+          if (result && result.objects) {
+            return result.objects
+              .map(({ theme }) => theme.path)
+              .filter(
+                themePath =>
+                  !themePath.startsWith(HUBSPOT_FOLDER) &&
+                  !themePath.startsWith(MARKETPLACE_FOLDER)
+              );
+          }
+        } catch (err) {
+          logger.error(i18n(`${i18nKey}.errors.failedToFetchThemes`));
+          process.exit(EXIT_CODES.ERROR);
+        }
+      },
+    },
+  ]);
+
+  return selectedTheme;
+};
+
+exports.handler = async options => {
+  await loadAndValidateOptions(options);
+  const accountId = getAccountId(options);
+
+  const includeDesktopScore = options.target === 'desktop' || !options.verbose;
+  const includeMobileScore = options.target === 'mobile' || !options.verbose;
+  let themeToCheck = options.theme;
+
+  if (themeToCheck) {
+    let isValidTheme = true;
+    try {
+      const result = await fetchThemes(accountId, {
+        name: encodeURIComponent(themeToCheck),
+      });
+      isValidTheme = result && result.total;
+    } catch (err) {
+      isValidTheme = false;
+    }
+    if (!isValidTheme) {
+      logger.error(
+        i18n(`${i18nKey}.errors.themeNotFound`, { theme: themeToCheck })
+      );
+      process.exit(EXIT_CODES.ERROR);
+    }
+  } else {
+    themeToCheck = await selectTheme(accountId);
+    logger.log();
+  }
+
+  // Kick off the scoring
+  let requestResult;
+  try {
+    requestResult = await requestLighthouseScore(accountId, {
+      themePath: themeToCheck,
+    });
+  } catch (err) {
+    logger.debug(err);
+  }
+
+  if (!requestResult || !requestResult.mobileId || !requestResult.desktopId) {
+    logger.error(i18n(`${i18nKey}.errors.failedToGetLighthouseScore`));
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  // Poll till scoring is finished
+  try {
+    const spinnies = new Spinnies();
+
+    spinnies.add('lighthouseScore', {
+      text: i18n(`${i18nKey}.info.generatingScore`, { theme: themeToCheck }),
+    });
+
+    const checkScoreStatus = async () => {
+      const desktopScoreStatus = includeDesktopScore
+        ? await getLighthouseScoreStatus(accountId, {
+            themeId: requestResult.desktopId,
+          })
+        : 'COMPLETED';
+      const mobileScoreStatus = includeMobileScore
+        ? await getLighthouseScoreStatus(accountId, {
+            themeId: requestResult.mobileId,
+          })
+        : 'COMPLETED';
+
+      if (
+        desktopScoreStatus === 'REQUESTED' ||
+        mobileScoreStatus === 'REQUESTED'
+      ) {
+        await new Promise(resolve => setTimeout(resolve, 2000));
+        await checkScoreStatus();
+      }
+    };
+
+    await checkScoreStatus();
+
+    spinnies.remove('lighthouseScore');
+  } catch (err) {
+    logger.debug(err);
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  // Fetch the scoring results
+  let desktopScoreResult;
+  let mobileScoreResult;
+  let verboseViewAverageScoreResult;
+  try {
+    const params = { isAverage: !options.verbose };
+    desktopScoreResult = includeDesktopScore
+      ? await getLighthouseScore(accountId, {
+          ...params,
+          desktopId: requestResult.desktopId,
+        })
+      : {};
+    mobileScoreResult = includeMobileScore
+      ? await getLighthouseScore(accountId, {
+          ...params,
+          mobileId: requestResult.mobileId,
+        })
+      : {};
+    // This is needed to show the average scores above the verbose output
+    verboseViewAverageScoreResult = options.verbose
+      ? await getLighthouseScore(accountId, {
+          ...params,
+          isAverage: true,
+          desktopId: includeDesktopScore ? requestResult.desktopId : null,
+          mobileId: includeMobileScore ? requestResult.mobileId : null,
+        })
+      : {};
+  } catch (err) {
+    logger.error(i18n(`${i18nKey}.errors.failedToGetLighthouseScore`));
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  if (options.verbose) {
+    logger.log(`${themeToCheck} ${options.target} scores`);
+
+    const tableHeader = getTableHeader(DEFAULT_TABLE_HEADER);
+
+    const scores = verboseViewAverageScoreResult.scores
+      ? verboseViewAverageScoreResult.scores[0]
+      : {};
+
+    const averageTableData = [
+      scores.accessibilityScore,
+      scores.bestPracticesScore,
+      scores.performanceScore,
+      scores.pwaScore,
+      scores.seoScore,
+    ];
+
+    logger.log(
+      getTableContents([tableHeader, averageTableData], {
+        border: { bodyLeft: '  ' },
+      })
+    );
+    logger.log(i18n(`${i18nKey}.info.pageTemplateScoreTitle`));
+
+    const table2Header = getTableHeader([
+      'Template path',
+      ...DEFAULT_TABLE_HEADER,
+    ]);
+
+    const scoreResult =
+      options.target === 'desktop' ? desktopScoreResult : mobileScoreResult;
+
+    const templateTableData = scoreResult.scores.map(score => {
+      return [
+        score.templatePath,
+        score.accessibilityScore,
+        score.bestPracticesScore,
+        score.performanceScore,
+        score.pwaScore,
+        score.seoScore,
+      ];
+    });
+
+    logger.log(
+      getTableContents([table2Header, ...templateTableData], {
+        border: { bodyLeft: '  ' },
+      })
+    );
+
+    logger.log(i18n(`${i18nKey}.info.lighthouseLinksTitle`));
+
+    scoreResult.scores.forEach(score => {
+      logger.log(' ', uiLink(score.templatePath, score.link));
+    });
+
+    if (scoreResult.failedTemplatePaths.length) {
+      logger.log();
+      logger.error(i18n(`${i18nKey}.info.failedTemplatePathsTitle`));
+      scoreResult.failedTemplatePaths.forEach(failedTemplatePath => {
+        logger.log(' ', failedTemplatePath);
+      });
+    }
+
+    logger.log();
+    logger.info(
+      i18n(`${i18nKey}.info.targetDeviceNote`, { target: options.target })
+    );
+  } else {
+    logger.log(`Theme: ${themeToCheck}`);
+    const tableHeader = getTableHeader(['Target', ...DEFAULT_TABLE_HEADER]);
+
+    const getTableData = (target, scoreResult) => {
+      const scores = scoreResult.scores ? scoreResult.scores[0] : {};
+      return [
+        target,
+        scores.accessibilityScore,
+        scores.bestPracticesScore,
+        scores.performanceScore,
+        scores.pwaScore,
+        scores.seoScore,
+      ];
+    };
+
+    const tableData = [
+      getTableData('desktop', desktopScoreResult),
+      getTableData('mobile', mobileScoreResult),
+    ];
+
+    logger.log(
+      getTableContents([tableHeader, ...tableData], {
+        border: { bodyLeft: '  ' },
+      })
+    );
+
+    logger.info(i18n(`${i18nKey}.info.verboseOptionNote`));
+  }
+
+  logger.log();
+  logger.log(
+    `Powered by ${uiLink(
+      'Google Lighthouse',
+      'https://developer.chrome.com/docs/lighthouse/overview/'
+    )}.`
+  );
+
+  process.exit();
+};
+
+exports.builder = yargs => {
+  yargs.option('theme', {
+    describe: i18n(`${i18nKey}.options.theme.describe`),
+    type: 'string',
+  });
+  yargs.option('target', {
+    describe: i18n(`${i18nKey}.options.target.describe`),
+    type: 'string',
+    choices: ['desktop', 'mobile'],
+    default: 'desktop',
+  });
+  yargs.option('verbose', {
+    describe: i18n(`${i18nKey}.options.verbose.describe`),
+    boolean: true,
+    default: false,
+  });
+  yargs.example([
+    [
+      '$0 cms lighthouse-score --theme=my-theme',
+      i18n(`${i18nKey}.examples.default`),
+    ],
+  ]);
+
+  addConfigOptions(yargs, true);
+  addAccountOptions(yargs, true);
+  addUseEnvironmentOptions(yargs, true);
+
+  return yargs;
+};

package/commands/cms.js

@@ -0,0 +1,16 @@
+const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
+const lighthouseScore = require('./cms/lighthouseScore');
+
+// const i18nKey = 'cli.commands.cms';
+
+exports.command = 'cms';
+exports.describe = false; // i18n(`${i18nKey}.describe`);
+
+exports.builder = yargs => {
+  addConfigOptions(yargs, true);
+  addAccountOptions(yargs, true);
+
+  yargs.command(lighthouseScore).demandCommand(1, '');
+
+  return yargs;
+};

package/commands/fetch.js

@@ -76,5 +76,12 @@ exports.builder = yargs => {
     },
   });
 
+  yargs.options({
+    assetVersion: {
+      type: 'number',
+      describe: i18n(`${i18nKey}.options.assetVersion.describe`),
+    },
+  });
+
   return yargs;
 };

package/commands/init.js

@@ -5,17 +5,15 @@ const {
   createEmptyConfigFile,
   deleteEmptyConfigFile,
   updateDefaultAccount,
-  writeConfig,
-  updateAccountConfig,
 } = require('@hubspot/cli-lib/lib/config');
 const { addConfigOptions } = require('../lib/commonOpts');
 const { handleExit } = require('@hubspot/cli-lib/lib/process');
+const { checkAndUpdateGitignore } = require('@hubspot/cli-lib/lib/git');
 const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
 const {
   DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
   OAUTH_AUTH_METHOD,
-  API_KEY_AUTH_METHOD,
   ENVIRONMENTS,
 } = require('@hubspot/cli-lib/lib/constants');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
@@ -29,7 +27,6 @@ const { setLogLevel, addTestingOptions } = require('../lib/commonOpts');
 const { promptUser } = require('../lib/prompts/promptUtils');
 const {
   OAUTH_FLOW,
-  API_KEY_FLOW,
   personalAccessKeyPrompt,
 } = require('../lib/prompts/personalAccessKeyPrompt');
 const {
@@ -70,28 +67,14 @@ const oauthConfigCreationFlow = async env => {
   return accountConfig;
 };
 
-const apiKeyConfigCreationFlow = async env => {
-  const configData = await promptUser(API_KEY_FLOW);
-  const accountConfig = {
-    ...configData,
-    env,
-  };
-  updateAccountConfig(accountConfig);
-  updateDefaultAccount(accountConfig.name);
-  writeConfig();
-  return accountConfig;
-};
-
 const CONFIG_CREATION_FLOWS = {
   [PERSONAL_ACCESS_KEY_AUTH_METHOD.value]: personalAccessKeyConfigCreationFlow,
   [OAUTH_AUTH_METHOD.value]: oauthConfigCreationFlow,
-  [API_KEY_AUTH_METHOD.value]: apiKeyConfigCreationFlow,
 };
 
 const AUTH_TYPE_NAMES = {
   [PERSONAL_ACCESS_KEY_AUTH_METHOD.value]: PERSONAL_ACCESS_KEY_AUTH_METHOD.name,
   [OAUTH_AUTH_METHOD.value]: OAUTH_AUTH_METHOD.name,
-  [API_KEY_AUTH_METHOD.value]: API_KEY_AUTH_METHOD.name,
 };
 
 exports.command = 'init [--account]';
@@ -134,6 +117,8 @@ exports.handler = async options => {
     );
     const configPath = getConfigPath();
 
+    checkAndUpdateGitignore(configPath);
+
     logger.log('');
     logger.success(
       i18n(`${i18nKey}.success.configFileCreated`, {
@@ -164,7 +149,6 @@ exports.builder = yargs => {
       choices: [
         `${PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
         `${OAUTH_AUTH_METHOD.value}`,
-        `${API_KEY_AUTH_METHOD.value}`,
       ],
       default: PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
       defaultDescription: i18n(`${i18nKey}.options.auth.defaultDescription`, {

package/commands/project/logs.js

@@ -10,7 +10,10 @@ const {
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { outputLogs } = require('@hubspot/cli-lib/lib/logs');
-const { fetchProject } = require('@hubspot/cli-lib/api/dfs');
+const {
+  fetchProject,
+  fetchDeployComponentsMetadata,
+} = require('@hubspot/cli-lib/api/dfs');
 const {
   getTableContents,
   getTableHeader,
@@ -142,12 +145,30 @@ exports.handler = async options => {
   const endpointName = options.endpoint || promptEndpointName;
 
   let relativeAppPath;
+  let appId;
 
   if (appName && !endpointName) {
     await ensureProjectExists(accountId, projectName, {
       allowCreate: false,
     });
-    const { deployedBuild } = await fetchProject(accountId, projectName);
+
+    const { deployedBuild, id: projectId } = await fetchProject(
+      accountId,
+      projectName
+    );
+
+    const { results: deployComponents } = await fetchDeployComponentsMetadata(
+      accountId,
+      projectId
+    );
+
+    const appComponent = deployComponents.find(
+      c => c.componentName === appName
+    );
+
+    if (appComponent) {
+      appId = appComponent.componentIdentifier;
+    }
 
     if (deployedBuild && deployedBuild.subbuildStatuses) {
       const appSubbuild = deployedBuild.subbuildStatuses.find(
@@ -196,10 +217,15 @@ exports.handler = async options => {
   );
 
   logger.log(
-    uiLink(
-      i18n(`${i18nKey}.logs.hubspotLogsLink`),
-      getPrivateAppsUrl(accountId)
-    )
+    appId
+      ? uiLink(
+          i18n(`${i18nKey}.logs.hubspotLogsDirectLink`),
+          `${getPrivateAppsUrl(accountId)}/${appId}/logs/extensions`
+        )
+      : uiLink(
+          i18n(`${i18nKey}.logs.hubspotLogsLink`),
+          getPrivateAppsUrl(accountId)
+        )
   );
   logger.log();
   uiLine();

package/commands/sandbox/create.js

@@ -7,12 +7,15 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logger } = require('@hubspot/cli-lib/logger');
-
+const Spinnies = require('spinnies');
 const { createSandbox } = require('@hubspot/cli-lib/sandboxes');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { createSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
+const {
+  debugErrorAndContext,
+} = require('@hubspot/cli-lib/errorHandlers/standardErrors');
 const {
   ENVIRONMENTS,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
@@ -103,7 +106,7 @@ const personalAccessKeyFlow = async (env, account, name) => {
   ]);
 };
 
-exports.command = 'create [name]';
+exports.command = 'create [--name]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
@@ -113,6 +116,10 @@ exports.handler = async options => {
   const accountId = getAccountId(options);
   const accountConfig = getAccountConfig(accountId);
   const env = options.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
+  const spinnies = new Spinnies({
+    succeedColor: 'white',
+  });
+
   let namePrompt;
 
   trackCommandUsage('sandbox-create', {}, accountId);
@@ -123,26 +130,33 @@ exports.handler = async options => {
 
   const sandboxName = name || namePrompt.name;
 
-  logger.debug(
-    i18n(`${i18nKey}.debug.creating`, {
-      name: sandboxName,
-    })
-  );
   let result;
+
   try {
-    result = await createSandbox(accountId, sandboxName).then(
-      ({ name, sandboxHubId }) => {
-        logger.log('');
-        logger.success(
-          i18n(`${i18nKey}.success.create`, {
-            name,
-            sandboxHubId,
-          })
-        );
-        return { name, sandboxHubId };
-      }
-    );
+    spinnies.add('sandboxCreate', {
+      text: i18n(`${i18nKey}.loading.add`, {
+        sandboxName,
+      }),
+    });
+
+    result = await createSandbox(accountId, sandboxName);
+
+    logger.log('');
+    spinnies.succeed('sandboxCreate', {
+      text: i18n(`${i18nKey}.loading.succeed`, {
+        name: result.name,
+        sandboxHubId: result.sandboxHubId,
+      }),
+    });
   } catch (err) {
+    debugErrorAndContext(err);
+
+    spinnies.fail('sandboxCreate', {
+      text: i18n(`${i18nKey}.loading.fail`, {
+        sandboxName,
+      }),
+    });
+
     if (isMissingScopeError(err)) {
       logger.error(
         i18n(`${i18nKey}.failure.scopes.message`, {
@@ -167,17 +181,21 @@ exports.handler = async options => {
     process.exit(EXIT_CODES.SUCCESS);
   } catch (err) {
     logErrorInstance(err);
+    process.exit(EXIT_CODES.ERROR);
   }
 };
 
 exports.builder = yargs => {
-  yargs.positional('name', {
-    describe: i18n(`${i18nKey}.positionals.name.describe`),
+  yargs.option('name', {
+    describe: i18n(`${i18nKey}.options.name.describe`),
     type: 'string',
   });
 
   yargs.example([
-    ['$0 sandbox create MySandboxAccount', i18n(`${i18nKey}.examples.default`)],
+    [
+      '$0 sandbox create --name=MySandboxAccount',
+      i18n(`${i18nKey}.examples.default`),
+    ],
   ]);
 
   addConfigOptions(yargs, true);

package/commands/sandbox/delete.js

@@ -2,22 +2,149 @@ const {
   addAccountOptions,
   addConfigOptions,
   addUseEnvironmentOptions,
+  getAccountId,
+  addTestingOptions,
 } = require('../../lib/commonOpts');
 const { logger } = require('@hubspot/cli-lib/logger');
-
+const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
+const {
+  debugErrorAndContext,
+} = require('@hubspot/cli-lib/errorHandlers/standardErrors');
+
+const { deleteSandbox } = require('@hubspot/cli-lib/sandboxes');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { getConfig, getEnv } = require('@hubspot/cli-lib');
+const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
+const { removeAccountFromConfig } = require('@hubspot/cli-lib/lib/config');
+const {
+  selectAndSetAsDefaultAccountPrompt,
+} = require('../../lib/prompts/accountsPrompt');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const { promptUser } = require('../../lib/prompts/promptUtils');
+const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
+const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.delete';
 
-exports.command = 'delete';
+const SANDBOX_NOT_FOUND = 'SandboxErrors.SANDBOX_NOT_FOUND';
+const OBJECT_NOT_FOUND = 'OBJECT_NOT_FOUND';
+
+exports.command = 'delete [--account]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
-  await loadAndValidateOptions(options);
+  await loadAndValidateOptions(options, false);
+
+  const { account } = options;
+  const config = getConfig();
+
+  let accountPrompt;
+  if (!account) {
+    accountPrompt = await deleteSandboxPrompt(config);
+  }
+  const sandboxAccountId = getAccountId({
+    account: account || accountPrompt.account,
+  });
+
+  trackCommandUsage('sandbox-delete', {}, sandboxAccountId);
+
+  let parentAccountId;
+  for (const portal of config.portals) {
+    if (portal.portalId === sandboxAccountId) {
+      if (portal.parentAccountId) {
+        parentAccountId = portal.parentAccountId;
+      } else {
+        const parentAccountPrompt = await deleteSandboxPrompt(config, true);
+        parentAccountId = getAccountId({
+          account: parentAccountPrompt.account,
+        });
+      }
+    }
+  }
+
+  if (!getAccountId({ account: parentAccountId })) {
+    const baseUrl = getHubSpotWebsiteOrigin(
+      getEnv(sandboxAccountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
+    );
+    const url = `${baseUrl}/sandboxes/${parentAccountId}`;
+    const command = `hs auth ${
+      getEnv(sandboxAccountId) === 'qa' ? '--qa' : ''
+    } --account=${parentAccountId}`;
+    logger.log('');
+    logger.error(
+      i18n(`${i18nKey}.noParentPortalAvailable`, {
+        parentAccountId,
+        url,
+        command,
+      })
+    );
+    logger.log('');
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  logger.debug(
+    i18n(`${i18nKey}.debug.deleting`, {
+      account: account || accountPrompt.account,
+    })
+  );
+
+  try {
+    const { confirmSandboxDeletePrompt: confirmed } = await promptUser([
+      {
+        name: 'confirmSandboxDeletePrompt',
+        type: 'confirm',
+        message: i18n(`${i18nKey}.confirm`, {
+          account: account || accountPrompt.account,
+        }),
+      },
+    ]);
+    if (!confirmed) {
+      process.exit(EXIT_CODES.SUCCESS);
+    }
+
+    await deleteSandbox(parentAccountId, sandboxAccountId);
+
+    logger.log('');
+    logger.success(
+      i18n(`${i18nKey}.success.delete`, {
+        account: account || accountPrompt.account,
+        sandboxHubId: sandboxAccountId,
+      })
+    );
+    logger.log('');
+
+    const promptDefaultAccount = removeAccountFromConfig(sandboxAccountId);
+    if (promptDefaultAccount) {
+      await selectAndSetAsDefaultAccountPrompt(config);
+    }
+    process.exit(EXIT_CODES.SUCCESS);
+  } catch (err) {
+    debugErrorAndContext(err);
+
+    if (
+      err.error &&
+      err.error.category === OBJECT_NOT_FOUND &&
+      err.error.subCategory === SANDBOX_NOT_FOUND
+    ) {
+      logger.log('');
+      logger.warn(
+        i18n(`${i18nKey}.objectNotFound`, {
+          account: account || accountPrompt.account,
+        })
+      );
+      logger.log('');
 
-  logger.log('');
-  logger.log(i18n(`${i18nKey}.temporaryMessage`));
+      const promptDefaultAccount = removeAccountFromConfig(sandboxAccountId);
+      if (promptDefaultAccount) {
+        await selectAndSetAsDefaultAccountPrompt(config);
+      }
+      process.exit(EXIT_CODES.SUCCESS);
+    } else {
+      logger.error(err.error.message);
+    }
+    process.exit(EXIT_CODES.ERROR);
+  }
 };
 
 exports.builder = yargs => {
@@ -36,6 +163,7 @@ exports.builder = yargs => {
   addConfigOptions(yargs, true);
   addAccountOptions(yargs, true);
   addUseEnvironmentOptions(yargs, true);
+  addTestingOptions(yargs, true);
 
   return yargs;
 };

package/hubspot.sample.config.yml

@@ -11,13 +11,6 @@ allowUsageTracking: false
 
 # List of accounts that are intended to be used
 portals:
-  # Account set up to use an API Key
-  - name: DEV
-    portalId: 123
-    # Override mode for account
-    defaultMode: draft
-    authType: apikey
-    apiKey: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
   # Account set up to use OAuth2
   - name: PROD
     portalId: 456

package/lib/__tests__/validation.js

@@ -24,13 +24,6 @@ describe('validation', () => {
       getAccountConfig.mockReturnValueOnce(undefined);
       expect(await validateAccount({ account: 123 })).toBe(false);
     });
-    it('returns false if an api key is missing', async () => {
-      getAccountId.mockReturnValueOnce(123);
-      getAccountConfig.mockReturnValueOnce({
-        accountId: 123,
-      });
-      expect(await validateAccount({ account: 123 })).toBe(false);
-    });
     it('returns false for oauth2 authType if auth is missing', async () => {
       getAccountId.mockReturnValueOnce(123);
       getAccountConfig.mockReturnValueOnce({

package/lib/projects.js

@@ -343,8 +343,9 @@ const makePollTaskStatusFunc = ({
     }
   };
 
-  return async (accountId, taskName, taskId) => {
-    let hubspotLinkText = '';
+  return async (accountId, taskName, taskId, deployedBuildId = null) => {
+    const displayId = deployedBuildId || taskId;
+
     if (linkToHubSpot) {
       logger.log(`\n${linkToHubSpot(taskName, taskId, accountId)}\n`);
     }
@@ -372,7 +373,7 @@ const makePollTaskStatusFunc = ({
       const subTaskName = subTask[statusText.SUBTASK_NAME_KEY];
 
       spinnies.add(subTaskName, {
-        text: `${chalk.bold(subTaskName)} #${taskId} ${
+        text: `${chalk.bold(subTaskName)} #${displayId} ${
           statusText.STATUS_TEXT[statusText.STATES.ENQUEUED]
         }\n`,
         indent: 2,
@@ -395,7 +396,7 @@ const makePollTaskStatusFunc = ({
               return;
             }
 
-            const updatedText = `${chalk.bold(subTaskName)} #${taskId} ${
+            const updatedText = `${chalk.bold(subTaskName)} #${displayId} ${
               statusText.STATUS_TEXT[subTask.status]
             }\n`;
 
@@ -413,17 +414,17 @@ const makePollTaskStatusFunc = ({
           });
 
           if (isTaskComplete(taskStatus)) {
-            subTaskStatus.forEach(subTask => {
-              spinnies.remove(subTask[statusText.SUBTASK_NAME_KEY]);
-            });
+            // subTaskStatus.forEach(subTask => {
+            //   spinnies.remove(subTask[statusText.SUBTASK_NAME_KEY]);
+            // });
 
             if (status === statusText.STATES.SUCCESS) {
               spinnies.succeed('overallTaskStatus', {
-                text: `${statusStrings.SUCCESS(taskName)}${hubspotLinkText}`,
+                text: statusStrings.SUCCESS(taskName),
               });
             } else if (status === statusText.STATES.FAILURE) {
               spinnies.fail('overallTaskStatus', {
-                text: `${statusStrings.FAIL(taskName)}${hubspotLinkText}`,
+                text: statusStrings.FAIL(taskName),
               });
 
               const failedSubtask = subTaskStatus.filter(
@@ -433,7 +434,7 @@ const makePollTaskStatusFunc = ({
               uiLine();
               logger.log(
                 `${statusStrings.SUBTASK_FAIL(
-                  taskId,
+                  displayId,
                   failedSubtask.length === 1
                     ? failedSubtask[0][statusText.SUBTASK_NAME_KEY]
                     : failedSubtask.length + ' components'
@@ -481,8 +482,8 @@ const pollBuildStatus = makePollTaskStatusFunc({
     INITIALIZE: name => `Building ${chalk.bold(name)}`,
     SUCCESS: name => `Built ${chalk.bold(name)}`,
     FAIL: name => `Failed to build ${chalk.bold(name)}`,
-    SUBTASK_FAIL: (taskId, name) =>
-      `Build #${taskId} failed because there was a problem\nbuilding ${chalk.bold(
+    SUBTASK_FAIL: (buildId, name) =>
+      `Build #${buildId} failed because there was a problem\nbuilding ${chalk.bold(
         name
       )}`,
   },
@@ -495,8 +496,8 @@ const pollDeployStatus = makePollTaskStatusFunc({
     INITIALIZE: name => `Deploying ${chalk.bold(name)}`,
     SUCCESS: name => `Deployed ${chalk.bold(name)}`,
     FAIL: name => `Failed to deploy ${chalk.bold(name)}`,
-    SUBTASK_FAIL: (taskId, name) =>
-      `Deploy for build #${taskId} failed because there was a\nproblem deploying ${chalk.bold(
+    SUBTASK_FAIL: (deployedBuildId, name) =>
+      `Deploy for build #${deployedBuildId} failed because there was a\nproblem deploying ${chalk.bold(
         name
       )}`,
   },

package/lib/prompts/accountsPrompt.js

@@ -0,0 +1,47 @@
+const { updateDefaultAccount } = require('@hubspot/cli-lib/lib/config');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.commands.accounts.subcommands.use';
+
+const selectAccountFromConfig = async config => {
+  const { default: selectedDefault } = await promptUser([
+    {
+      type: 'list',
+      look: false,
+      name: 'default',
+      pageSize: 20,
+      message: i18n(`${i18nKey}.promptMessage`),
+      choices: config.portals.map(p => ({
+        name: `${p.name} (${p.portalId})`,
+        value: p.name || p.portalId,
+      })),
+      default: config.defaultPortal,
+    },
+  ]);
+
+  return selectedDefault;
+};
+
+const selectAndSetAsDefaultAccountPrompt = async config => {
+  const { default: selectedDefault } = await promptUser([
+    {
+      type: 'list',
+      look: false,
+      name: 'default',
+      pageSize: 20,
+      message: i18n(`${i18nKey}.promptMessage`),
+      choices: config.portals.map(p => ({
+        name: `${p.name} (${p.portalId})`,
+        value: p.name || p.portalId,
+      })),
+      default: config.defaultPortal,
+    },
+  ]);
+  updateDefaultAccount(selectedDefault);
+};
+
+module.exports = {
+  selectAndSetAsDefaultAccountPrompt,
+  selectAccountFromConfig,
+};

package/lib/prompts/personalAccessKeyPrompt.js

@@ -6,7 +6,6 @@ const {
 const { deleteEmptyConfigFile } = require('@hubspot/cli-lib/lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { API_KEY_REGEX } = require('../regex');
 const { promptUser } = require('./promptUtils');
 const { accountNamePrompt } = require('./enterAccountNamePrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
@@ -89,17 +88,6 @@ const CLIENT_SECRET = {
   },
 };
 
-const ACCOUNT_API_KEY = {
-  name: 'apiKey',
-  message: i18n(`${i18nKey}.enterApiKey`),
-  validate(val) {
-    if (!API_KEY_REGEX.test(val)) {
-      return i18n(`${i18nKey}.errors.invalidAPIKey`);
-    }
-    return true;
-  },
-};
-
 const PERSONAL_ACCESS_KEY_BROWSER_OPEN_PREP = {
   name: 'personalAcessKeyBrowserOpenPrep',
   type: 'confirm',
@@ -142,17 +130,14 @@ const OAUTH_FLOW = [
   CLIENT_SECRET,
   SCOPES,
 ];
-const API_KEY_FLOW = [accountNamePrompt(), ACCOUNT_ID, ACCOUNT_API_KEY];
 
 module.exports = {
   personalAccessKeyPrompt,
   CLIENT_ID,
   CLIENT_SECRET,
-  ACCOUNT_API_KEY,
   ACCOUNT_ID,
   SCOPES,
   PERSONAL_ACCESS_KEY,
   // Flows
-  API_KEY_FLOW,
   OAUTH_FLOW,
 };

package/lib/prompts/sandboxesPrompt.js

@@ -19,6 +19,25 @@ const createSandboxPrompt = () => {
   ]);
 };
 
+const deleteSandboxPrompt = (config, promptParentAccount = false) => {
+  return promptUser([
+    {
+      name: 'account',
+      message: i18n(
+        promptParentAccount
+          ? `${i18nKey}.selectParentAccountName`
+          : `${i18nKey}.selectAccountName`
+      ),
+      type: 'list',
+      look: false,
+      pageSize: 20,
+      choices: config.portals.map(p => p.name || p.portalId),
+      default: config.defaultPortal,
+    },
+  ]);
+};
+
 module.exports = {
   createSandboxPrompt,
+  deleteSandboxPrompt,
 };

package/lib/regex.js

@@ -1,7 +1,5 @@
-const API_KEY_REGEX = /^([a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12})$/i;
 const STRING_WITH_NO_SPACES_REGEX = /^\S*$/;
 
 module.exports = {
-  API_KEY_REGEX,
   STRING_WITH_NO_SPACES_REGEX,
 };

package/lib/validation.js

@@ -26,14 +26,19 @@ const fs = require('fs');
 const path = require('path');
 const { EXIT_CODES } = require('./enums/exitCodes');
 
-async function loadAndValidateOptions(options) {
+async function loadAndValidateOptions(options, shouldValidateAccount = true) {
   setLogLevel(options);
   logDebugInfo(options);
   const { config: configPath } = options;
   loadConfig(configPath, options);
   checkAndWarnGitInclusion(getConfigPath());
 
-  if (!(validateConfig() && (await validateAccount(options)))) {
+  let validAccount = true;
+  if (shouldValidateAccount) {
+    validAccount = await validateAccount(options);
+  }
+
+  if (!(validateConfig() && validAccount)) {
     process.exit(EXIT_CODES.ERROR);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.0.1-beta.2",
+  "version": "4.0.1-beta.5",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,8 +8,8 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "4.0.1-beta.2",
-    "@hubspot/serverless-dev-runtime": "4.0.1-beta.2",
+    "@hubspot/cli-lib": "4.0.1-beta.5",
+    "@hubspot/serverless-dev-runtime": "4.0.1-beta.5",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c8b5dbfe4753fc1b71c038801d5f641313712e71"
+  "gitHead": "af927b5e071f91db0dd415fca154a446f259fe3b"
 }