@hubspot/cli 4.2.1-beta.2 → 4.2.1-beta.3

package/commands/accounts/clean.js

@@ -0,0 +1,139 @@
+const { logger } = require('@hubspot/cli-lib/logger');
+const {
+  accessTokenForPersonalAccessKey,
+} = require('@hubspot/cli-lib/personalAccessKey');
+const { getConfig } = require('@hubspot/cli-lib');
+
+const { trackCommandUsage } = require('../../lib/usageTracking');
+const { i18n } = require('../../lib/lang');
+const { loadAndValidateOptions } = require('../../lib/validation');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const {
+  addConfigOptions,
+  addAccountOptions,
+  addUseEnvironmentOptions,
+  addTestingOptions,
+} = require('../../lib/commonOpts');
+const { getAccountName } = require('../../lib/sandboxes');
+const { promptUser } = require('../../lib/prompts/promptUtils');
+const { getTableContents } = require('@hubspot/cli-lib/lib/table');
+const SpinniesManager = require('../../lib/SpinniesManager');
+const { deleteAccount } = require('@hubspot/cli-lib/lib/config');
+const {
+  isSpecifiedHubSpotAuthError,
+} = require('@hubspot/cli-lib/errorHandlers/apiErrors');
+
+const i18nKey = 'cli.commands.accounts.subcommands.clean';
+
+exports.command = 'clean';
+exports.describe = i18n(`${i18nKey}.describe`);
+
+exports.handler = async options => {
+  const { qa } = options;
+  await loadAndValidateOptions(options, false);
+
+  const config = getConfig();
+
+  trackCommandUsage('accounts-clean', null);
+
+  const filteredTestAccounts = config.portals.filter(p =>
+    qa ? p.env === 'qa' : p.env !== 'qa'
+  );
+
+  if (filteredTestAccounts && filteredTestAccounts.length === 0) {
+    logger.log(i18n(`${i18nKey}.noResults`));
+    process.exit(EXIT_CODES.SUCCESS);
+  }
+
+  const accountsToRemove = [];
+  SpinniesManager.init({
+    succeedColor: 'white',
+  });
+  SpinniesManager.add('accountsClean', {
+    text: i18n(`${i18nKey}.loading.add`),
+  });
+
+  for (const account of filteredTestAccounts) {
+    try {
+      await accessTokenForPersonalAccessKey(account.portalId);
+    } catch (error) {
+      if (
+        isSpecifiedHubSpotAuthError(error, {
+          statusCode: 401,
+          category: 'INVALID_AUTHENTICATION',
+          subCategory: 'LocalDevAuthErrorType.PORTAL_NOT_ACTIVE',
+        }) ||
+        isSpecifiedHubSpotAuthError(error, {
+          statusCode: 404,
+          category: 'INVALID_AUTHENTICATION',
+          subCategory: 'LocalDevAuthErrorType.INVALID_PORTAL_ID',
+        })
+      ) {
+        accountsToRemove.push(account);
+      }
+    }
+  }
+
+  if (accountsToRemove.length > 0) {
+    const oneAccountFound = accountsToRemove.length === 1;
+    SpinniesManager.succeed('accountsClean', {
+      text: i18n(
+        oneAccountFound
+          ? `${i18nKey}.inactiveAccountsFound.one`
+          : `${i18nKey}.inactiveAccountsFound.other`,
+        {
+          count: accountsToRemove.length,
+        }
+      ),
+    });
+    logger.log(
+      getTableContents(
+        accountsToRemove.map(p => [getAccountName(p)]),
+        { border: { bodyLeft: '  ' } }
+      )
+    );
+    const { accountsCleanPrompt } = await promptUser([
+      {
+        name: 'accountsCleanPrompt',
+        type: 'confirm',
+        message: i18n(
+          oneAccountFound
+            ? `${i18nKey}.confirm.one`
+            : `${i18nKey}.confirm.other`,
+          {
+            count: accountsToRemove.length,
+          }
+        ),
+      },
+    ]);
+    if (accountsCleanPrompt) {
+      logger.log('');
+      for (const accountToRemove of accountsToRemove) {
+        await deleteAccount(accountToRemove.name);
+        logger.log(
+          i18n(`${i18nKey}.removeSuccess`, {
+            accountName: getAccountName(accountToRemove),
+          })
+        );
+      }
+    }
+  } else {
+    SpinniesManager.succeed('accountsClean', {
+      text: i18n(`${i18nKey}.noResults`),
+    });
+  }
+
+  logger.log('');
+  process.exit(EXIT_CODES.SUCCESS);
+};
+
+exports.builder = yargs => {
+  addConfigOptions(yargs, true);
+  addAccountOptions(yargs, true);
+  addUseEnvironmentOptions(yargs, true);
+  addTestingOptions(yargs, true);
+
+  yargs.example([['$0 accounts clean']]);
+
+  return yargs;
+};

package/commands/accounts.js

@@ -5,6 +5,7 @@ const rename = require('./accounts/rename');
 const use = require('./accounts/use');
 const info = require('./accounts/info');
 const remove = require('./accounts/remove');
+const clean = require('./accounts/clean');
 
 const i18nKey = 'cli.commands.accounts';
 
@@ -24,6 +25,7 @@ exports.builder = yargs => {
     .command(use)
     .command(info)
     .command(remove)
+    .command(clean)
     .demandCommand(1, '');
 
   return yargs;

package/commands/project/dev.js

@@ -23,17 +23,19 @@ const {
   showPlatformVersionWarning,
 } = require('../../lib/projects');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { uiAccountDescription, uiBetaMessage, uiLine } = require('../../lib/ui');
+const {
+  uiAccountDescription,
+  uiBetaMessage,
+  uiCommandReference,
+  uiLine,
+} = require('../../lib/ui');
 const { confirmPrompt } = require('../../lib/prompts/promptUtils');
 const {
   selectTargetAccountPrompt,
+  confirmDefaultSandboxAccountPrompt,
 } = require('../../lib/prompts/projectDevTargetAccountPrompt');
 const SpinniesManager = require('../../lib/SpinniesManager');
-const {
-  LocalDevManager,
-  UPLOAD_PERMISSIONS,
-} = require('../../lib/LocalDevManager');
-const LocalDevManagerV2 = require('../../lib/LocalDevManagerV2');
+const LocalDevManager = require('../../lib/LocalDevManager');
 const { isSandbox } = require('../../lib/sandboxes');
 const { getAccountConfig, getEnv } = require('@hubspot/cli-lib');
 const { sandboxNamePrompt } = require('../../lib/prompts/sandboxesPrompt');
@@ -76,6 +78,9 @@ exports.handler = async options => {
 
   const { projectConfig, projectDir } = await getProjectConfig();
 
+  if (!options.debug) {
+    console.clear();
+  }
   uiBetaMessage(i18n(`${i18nKey}.logs.betaMessage`));
 
   if (!projectConfig) {
@@ -83,15 +88,29 @@ exports.handler = async options => {
     process.exit(EXIT_CODES.ERROR);
   }
 
-  await showPlatformVersionWarning(accountId, projectConfig);
-
   const accounts = getConfigAccounts();
   let targetAccountId = options.account ? accountId : null;
   let createNewSandbox = false;
   const defaultAccountIsSandbox = isSandbox(accountConfig);
 
   if (!targetAccountId && defaultAccountIsSandbox) {
-    targetAccountId = accountId;
+    logger.log();
+    const useDefaultSandboxAccount = await confirmDefaultSandboxAccountPrompt(
+      accountConfig.name,
+      accountConfig.sandboxAccountType
+    );
+
+    if (useDefaultSandboxAccount) {
+      targetAccountId = accountId;
+    } else {
+      logger.log(
+        i18n(`${i18nKey}.logs.declineDefaultSandboxExplanation`, {
+          useCommand: uiCommandReference('hs accounts use'),
+          devCommand: uiCommandReference('hs project dev'),
+        })
+      );
+      process.exit(EXIT_CODES.SUCCESS);
+    }
   }
 
   if (!targetAccountId) {
@@ -172,41 +191,37 @@ exports.handler = async options => {
     }
   }
 
+  logger.log();
   const projectExists = await ensureProjectExists(
     targetAccountId,
     projectConfig.name,
     {
       allowCreate: false,
       noLogs: true,
-      withPolling: true,
+      withPolling: createNewSandbox,
     }
   );
 
-  const isNonSandboxAccount =
-    !defaultAccountIsSandbox && targetAccountId === accountId;
-
-  let uploadPermission = isNonSandboxAccount
-    ? UPLOAD_PERMISSIONS.manual
-    : UPLOAD_PERMISSIONS.always;
-
   let deployedBuild;
 
   if (projectExists) {
     const project = await fetchProject(targetAccountId, projectConfig.name);
     deployedBuild = project.deployedBuild;
-
-    if (options.local || options.localAll || project.sourceIntegration) {
-      uploadPermission = UPLOAD_PERMISSIONS.never;
-    }
   }
 
   SpinniesManager.init();
 
+  if (!options.debug) {
+    console.clear();
+  }
+  uiBetaMessage(i18n(`${i18nKey}.logs.betaMessage`));
+
   if (!projectExists) {
     // Create the project without prompting if this is a newly created sandbox
     let shouldCreateProject = createNewSandbox;
 
     if (!shouldCreateProject) {
+      logger.log();
       uiLine();
       logger.warn(
         i18n(`${i18nKey}.logs.projectMustExistExplanation`, {
@@ -225,6 +240,8 @@ exports.handler = async options => {
     }
 
     if (shouldCreateProject) {
+      await showPlatformVersionWarning(accountId, projectConfig);
+
       try {
         SpinniesManager.add('createProject', {
           text: i18n(`${i18nKey}.status.creatingProject`, {
@@ -246,23 +263,16 @@ exports.handler = async options => {
       }
     } else {
       // We cannot continue if the project does not exist in the target account
+      logger.log();
       logger.log(i18n(`${i18nKey}.logs.choseNotToCreateProject`));
       process.exit(EXIT_CODES.SUCCESS);
     }
   }
 
-  SpinniesManager.add('devModeSetup', {
-    text: i18n(`${i18nKey}.status.startupMessage`, {
-      projectName: projectConfig.name,
-    }),
-    isParent: true,
-  });
-
   let initialUploadResult;
 
-  // Create an initial build if the project was newly created in the account or if
-  // our upload permission is set to "always"
-  if (!projectExists || uploadPermission === UPLOAD_PERMISSIONS.always) {
+  // Create an initial build if the project was newly created in the account
+  if (!projectExists) {
     initialUploadResult = await handleProjectUpload(
       targetAccountId,
       projectConfig,
@@ -272,8 +282,6 @@ exports.handler = async options => {
     );
 
     if (initialUploadResult.uploadError) {
-      SpinniesManager.fail('devModeSetup');
-
       if (
         isSpecifiedError(initialUploadResult.uploadError, {
           subCategory: ERROR_TYPES.PROJECT_LOCKED,
@@ -293,75 +301,42 @@ exports.handler = async options => {
       }
       process.exit(EXIT_CODES.ERROR);
     }
-  }
 
-  // Let the user know when the initial build or deploy fails
-  // Do this before starting the dev server for v2 behavior because we cannot
-  // run a server on a broken project
-  if (
-    (options.local || options.localAll) &&
-    initialUploadResult &&
-    !initialUploadResult.succeeded
-  ) {
-    SpinniesManager.fail('devModeSetup');
-
-    let subTasks = [];
-
-    if (initialUploadResult.buildResult.status === 'FAILURE') {
-      subTasks =
-        initialUploadResult.buildResult[PROJECT_BUILD_TEXT.SUBTASK_KEY];
-    } else if (initialUploadResult.deployResult.status === 'FAILURE') {
-      subTasks =
-        initialUploadResult.deployResult[PROJECT_DEPLOY_TEXT.SUBTASK_KEY];
-    }
+    if (!initialUploadResult.succeeded) {
+      let subTasks = [];
 
-    const failedSubTasks = subTasks.filter(task => task.status === 'FAILURE');
+      if (initialUploadResult.buildResult.status === 'FAILURE') {
+        subTasks =
+          initialUploadResult.buildResult[PROJECT_BUILD_TEXT.SUBTASK_KEY];
+      } else if (initialUploadResult.deployResult.status === 'FAILURE') {
+        subTasks =
+          initialUploadResult.deployResult[PROJECT_DEPLOY_TEXT.SUBTASK_KEY];
+      }
 
-    logger.log();
-    failedSubTasks.forEach(failedSubTask => {
-      console.log(failedSubTask.errorMessage);
-    });
-    logger.log();
+      const failedSubTasks = subTasks.filter(task => task.status === 'FAILURE');
 
-    process.exit(EXIT_CODES.ERROR);
+      logger.log();
+      failedSubTasks.forEach(failedSubTask => {
+        console.log(failedSubTask.errorMessage);
+      });
+      logger.log();
+
+      process.exit(EXIT_CODES.ERROR);
+    }
+
+    deployedBuild = initialUploadResult.buildResult;
   }
 
-  SpinniesManager.remove('devModeSetup');
-
-  const LocalDev =
-    options.local || options.localAll
-      ? new LocalDevManagerV2({
-          alpha: options.localAll,
-          debug: options.debug,
-          deployedBuild,
-          projectConfig,
-          projectDir,
-          targetAccountId,
-        })
-      : new LocalDevManager({
-          debug: options.debug,
-          projectConfig,
-          projectDir,
-          targetAccountId,
-          uploadPermission,
-        });
+  const LocalDev = new LocalDevManager({
+    debug: options.debug,
+    deployedBuild,
+    projectConfig,
+    projectDir,
+    targetAccountId,
+  });
 
   await LocalDev.start();
 
-  // Let the user know when the initial build or deploy fails
-  if (
-    !options.local &&
-    !options.localAll &&
-    initialUploadResult &&
-    !initialUploadResult.succeeded
-  ) {
-    if (initialUploadResult.buildResult.status === 'FAILURE') {
-      LocalDev.logBuildError(initialUploadResult.buildResult);
-    } else if (initialUploadResult.deployResult.status === 'FAILURE') {
-      LocalDev.logDeployError(initialUploadResult.deployResult);
-    }
-  }
-
   handleExit(LocalDev.stop);
 };
 
@@ -371,18 +346,6 @@ exports.builder = yargs => {
   addUseEnvironmentOptions(yargs, true);
   addTestingOptions(yargs, true);
 
-  yargs.option('local', {
-    describe: i18n(`${i18nKey}.options.local.describe`),
-    type: 'boolean',
-    hidden: true,
-  });
-
-  yargs.option('local-all', {
-    describe: i18n(`${i18nKey}.options.localAll.describe`),
-    type: 'boolean',
-    hidden: true,
-  });
-
   yargs.example([['$0 project dev', i18n(`${i18nKey}.examples.default`)]]);
 
   return yargs;

package/commands/project/download.js

@@ -17,10 +17,7 @@ const {
   downloadProject,
   fetchProjectBuilds,
 } = require('@hubspot/cli-lib/api/dfs');
-const {
-  createProjectConfig,
-  ensureProjectExists,
-} = require('../../lib/projects');
+const { ensureProjectExists, getProjectConfig } = require('../../lib/projects');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const {
   downloadProjectPrompt,
@@ -36,6 +33,13 @@ exports.describe = i18n(`${i18nKey}.describe`);
 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;
   let { project: promptedProjectName } = await downloadProjectPrompt(options);
   let projectName = promptedProjectName || project;
@@ -63,17 +67,6 @@ exports.handler = async options => {
 
     const absoluteDestPath = dest ? path.resolve(getCwd(), dest) : getCwd();
 
-    const projectConfigCreated = await createProjectConfig(
-      absoluteDestPath,
-      projectName,
-      { name: 'no-template' }
-    );
-
-    if (!projectConfigCreated) {
-      logger.log(i18n(`${i18nKey}.logs.downloadCancelled`));
-      process.exit(EXIT_CODES.SUCCESS);
-    }
-
     let buildNumberToDownload = buildNumber;
 
     if (!buildNumberToDownload) {
@@ -98,10 +91,8 @@ exports.handler = async options => {
     await extractZipArchive(
       zippedProject,
       projectName,
-      path.resolve(absoluteDestPath, 'src'),
-      {
-        includesRootDir: false,
-      }
+      path.resolve(absoluteDestPath),
+      { includesRootDir: false }
     );
 
     logger.log(

package/commands/sandbox/delete.js

@@ -28,8 +28,8 @@ const { promptUser } = require('../../lib/prompts/promptUtils');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const {
   isSpecifiedError,
+  isSpecifiedHubSpotAuthError,
 } = require('@hubspot/cli-lib/errorHandlers/apiErrors');
-const { HubSpotAuthError } = require('@hubspot/cli-lib/lib/models/Errors');
 const { getAccountName } = require('../../lib/sandboxes');
 const { getValidEnv } = require('@hubspot/cli-lib/lib/environment');
 
@@ -168,7 +168,7 @@ exports.handler = async options => {
   } catch (err) {
     debugErrorAndContext(err);
 
-    if (err instanceof HubSpotAuthError && err.statusCode === 401) {
+    if (isSpecifiedHubSpotAuthError(err, { statusCode: 401 })) {
       // Intercept invalid key error
       // This command uses the parent portal PAK to delete a sandbox, so we must specify which account needs a new key
       logger.log('');

package/commands/sandbox.js

@@ -1,12 +1,13 @@
 const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
+const { i18n } = require('../lib/lang');
 const create = require('./sandbox/create');
 const del = require('./sandbox/delete');
 const sync = require('./sandbox/sync');
 
-// const i18nKey = 'cli.commands.sandbox';
+const i18nKey = 'cli.commands.sandbox';
 
 exports.command = 'sandbox';
-exports.describe = false; // i18n(`${i18nKey}.describe`);
+exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.builder = yargs => {
   addConfigOptions(yargs, true);